beenull/xpipe-mirror
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2024-09-19 13:51:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move packages

Browse source
This commit is contained in:
Christopher Schnick 2021-12-10 16:24:11 +01:00
parent 5dced71551
commit db8338c5e9
14 changed files with 34 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
api/src/main/java/io/xpipe/api/impl/DataTableImpl.java
View file

@ -6,8 +6,8 @@ import io.xpipe.beacon.ClientException;
import io.xpipe.beacon.ConnectorException; import io.xpipe.beacon.ConnectorException;
import io.xpipe.beacon.ServerException; import io.xpipe.beacon.ServerException;
import io.xpipe.beacon.socket.SocketClient; import io.xpipe.beacon.socket.SocketClient;
import io.xpipe.beacon.message.impl.ReadTableDataExchange; import io.xpipe.beacon.exchange.ReadTableDataExchange;
import io.xpipe.beacon.message.impl.ReadTableInfoExchange; import io.xpipe.beacon.exchange.ReadTableInfoExchange;
import io.xpipe.core.data.DataStructureNode; import io.xpipe.core.data.DataStructureNode;
import io.xpipe.core.data.generic.ArrayNode; import io.xpipe.core.data.generic.ArrayNode;
import io.xpipe.core.data.generic.TupleNode; import io.xpipe.core.data.generic.TupleNode;

3
beacon/src/main/java/io/xpipe/beacon/message/impl/ListCollectionsExchange.java → beacon/src/main/java/io/xpipe/beacon/exchange/ListCollectionsExchange.java
View file

@ -1,6 +1,5 @@
package io.xpipe.beacon.message.impl; package io.xpipe.beacon.exchange;
import io.xpipe.beacon.message.MessageExchange;
import io.xpipe.beacon.message.RequestMessage; import io.xpipe.beacon.message.RequestMessage;
import io.xpipe.beacon.message.ResponseMessage; import io.xpipe.beacon.message.ResponseMessage;

5
beacon/src/main/java/io/xpipe/beacon/message/impl/ListEntriesExchange.java → beacon/src/main/java/io/xpipe/beacon/exchange/ListEntriesExchange.java
View file

@ -1,12 +1,11 @@
package io.xpipe.beacon.message.impl; package io.xpipe.beacon.exchange;
import io.xpipe.beacon.message.MessageExchange;
import io.xpipe.beacon.message.RequestMessage; import io.xpipe.beacon.message.RequestMessage;
import io.xpipe.beacon.message.ResponseMessage; import io.xpipe.beacon.message.ResponseMessage;
import java.util.List; import java.util.List;
public class ListEntriesExchange implements MessageExchange<ListEntriesExchange.Request, ListEntriesExchange.Response> { public abstract class ListEntriesExchange implements MessageExchange<ListEntriesExchange.Request, ListEntriesExchange.Response> {
@Override @Override
public String getId() { public String getId() {

6
beacon/src/main/java/io/xpipe/beacon/message/MessageExchange.java → beacon/src/main/java/io/xpipe/beacon/exchange/MessageExchange.java
View file

@ -1,5 +1,7 @@
package io.xpipe.beacon.message; package io.xpipe.beacon.exchange;
import io.xpipe.beacon.message.RequestMessage;
import io.xpipe.beacon.message.ResponseMessage;
import io.xpipe.beacon.socket.SocketServer; import io.xpipe.beacon.socket.SocketServer;
import java.io.InputStream; import java.io.InputStream;
@ -13,5 +15,5 @@ public interface MessageExchange<RQ extends RequestMessage, RP extends ResponseM
Class<RP> getResponseClass(); Class<RP> getResponseClass();
default void handleRequest(SocketServer server, RQ msg, InputStream body, Socket clientSocket) throws Exception {} void handleRequest(SocketServer server, RQ msg, InputStream body, Socket clientSocket) throws Exception;
} }

5
beacon/src/main/java/io/xpipe/beacon/message/MessageExchanges.java → beacon/src/main/java/io/xpipe/beacon/exchange/MessageExchanges.java
View file

@ -1,4 +1,7 @@
package io.xpipe.beacon.message; package io.xpipe.beacon.exchange;
import io.xpipe.beacon.message.RequestMessage;
import io.xpipe.beacon.message.ResponseMessage;
import java.util.Optional; import java.util.Optional;
import java.util.ServiceLoader; import java.util.ServiceLoader;

3
beacon/src/main/java/io/xpipe/beacon/message/impl/ModeExchange.java → beacon/src/main/java/io/xpipe/beacon/exchange/ModeExchange.java
View file

@ -1,6 +1,5 @@
package io.xpipe.beacon.message.impl; package io.xpipe.beacon.exchange;
import io.xpipe.beacon.message.MessageExchange;
import io.xpipe.beacon.message.RequestMessage; import io.xpipe.beacon.message.RequestMessage;
import io.xpipe.beacon.message.ResponseMessage; import io.xpipe.beacon.message.ResponseMessage;

3
beacon/src/main/java/io/xpipe/beacon/message/impl/ReadStructureExchange.java → beacon/src/main/java/io/xpipe/beacon/exchange/ReadStructureExchange.java
View file

@ -1,6 +1,5 @@
package io.xpipe.beacon.message.impl; package io.xpipe.beacon.exchange;
import io.xpipe.beacon.message.MessageExchange;
import io.xpipe.beacon.message.RequestMessage; import io.xpipe.beacon.message.RequestMessage;
import io.xpipe.beacon.message.ResponseMessage; import io.xpipe.beacon.message.ResponseMessage;
import io.xpipe.core.source.DataSourceId; import io.xpipe.core.source.DataSourceId;

3
beacon/src/main/java/io/xpipe/beacon/message/impl/ReadTableDataExchange.java → beacon/src/main/java/io/xpipe/beacon/exchange/ReadTableDataExchange.java
View file

@ -1,6 +1,5 @@
package io.xpipe.beacon.message.impl; package io.xpipe.beacon.exchange;
import io.xpipe.beacon.message.MessageExchange;
import io.xpipe.beacon.message.RequestMessage; import io.xpipe.beacon.message.RequestMessage;
import io.xpipe.beacon.message.ResponseMessage; import io.xpipe.beacon.message.ResponseMessage;
import io.xpipe.core.source.DataSourceId; import io.xpipe.core.source.DataSourceId;

3
beacon/src/main/java/io/xpipe/beacon/message/impl/ReadTableInfoExchange.java → beacon/src/main/java/io/xpipe/beacon/exchange/ReadTableInfoExchange.java
View file

@ -1,6 +1,5 @@
package io.xpipe.beacon.message.impl; package io.xpipe.beacon.exchange;
import io.xpipe.beacon.message.MessageExchange;
import io.xpipe.beacon.message.RequestMessage; import io.xpipe.beacon.message.RequestMessage;
import io.xpipe.beacon.message.ResponseMessage; import io.xpipe.beacon.message.ResponseMessage;
import io.xpipe.core.data.type.DataType; import io.xpipe.core.data.type.DataType;

3
beacon/src/main/java/io/xpipe/beacon/message/impl/StatusExchange.java → beacon/src/main/java/io/xpipe/beacon/exchange/StatusExchange.java
View file

@ -1,6 +1,5 @@
package io.xpipe.beacon.message.impl; package io.xpipe.beacon.exchange;
import io.xpipe.beacon.message.MessageExchange;
import io.xpipe.beacon.message.RequestMessage; import io.xpipe.beacon.message.RequestMessage;
import io.xpipe.beacon.message.ResponseMessage; import io.xpipe.beacon.message.ResponseMessage;

3
beacon/src/main/java/io/xpipe/beacon/message/impl/VersionExchange.java → beacon/src/main/java/io/xpipe/beacon/exchange/VersionExchange.java
View file

@ -1,6 +1,5 @@
package io.xpipe.beacon.message.impl; package io.xpipe.beacon.exchange;
import io.xpipe.beacon.message.MessageExchange;
import io.xpipe.beacon.message.RequestMessage; import io.xpipe.beacon.message.RequestMessage;
import io.xpipe.beacon.message.ResponseMessage; import io.xpipe.beacon.message.ResponseMessage;

10
beacon/src/main/java/io/xpipe/beacon/socket/SocketClient.java
View file

@ -6,10 +6,12 @@ import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.JsonNodeFactory; import com.fasterxml.jackson.databind.node.JsonNodeFactory;
import com.fasterxml.jackson.databind.node.ObjectNode; import com.fasterxml.jackson.databind.node.ObjectNode;
import com.fasterxml.jackson.databind.node.TextNode; import com.fasterxml.jackson.databind.node.TextNode;
import io.xpipe.beacon.ClientException; import io.xpipe.beacon.*;
import io.xpipe.beacon.ConnectorException; import io.xpipe.beacon.exchange.MessageExchanges;
import io.xpipe.beacon.ServerException; import io.xpipe.beacon.message.ClientErrorMessage;
import io.xpipe.beacon.message.*; import io.xpipe.beacon.message.RequestMessage;
import io.xpipe.beacon.message.ResponseMessage;
import io.xpipe.beacon.message.ServerErrorMessage;
import io.xpipe.core.util.JacksonHelper; import io.xpipe.core.util.JacksonHelper;
import org.apache.commons.lang3.function.FailableBiConsumer; import org.apache.commons.lang3.function.FailableBiConsumer;
import org.slf4j.Logger; import org.slf4j.Logger;

6
beacon/src/main/java/io/xpipe/beacon/socket/SocketServer.java
View file

@ -6,7 +6,11 @@ import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.JsonNodeFactory; import com.fasterxml.jackson.databind.node.JsonNodeFactory;
import com.fasterxml.jackson.databind.node.ObjectNode; import com.fasterxml.jackson.databind.node.ObjectNode;
import com.fasterxml.jackson.databind.node.TextNode; import com.fasterxml.jackson.databind.node.TextNode;
import io.xpipe.beacon.message.*; import io.xpipe.beacon.exchange.MessageExchanges;
import io.xpipe.beacon.message.ClientErrorMessage;
import io.xpipe.beacon.message.RequestMessage;
import io.xpipe.beacon.message.ResponseMessage;
import io.xpipe.beacon.message.ServerErrorMessage;
import io.xpipe.core.util.JacksonHelper; import io.xpipe.core.util.JacksonHelper;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

8
beacon/src/main/java/module-info.java
View file

@ -1,9 +1,9 @@
import io.xpipe.beacon.message.MessageExchange; import io.xpipe.beacon.exchange.MessageExchange;
module io.xpipe.beacon { module io.xpipe.beacon {
exports io.xpipe.beacon; exports io.xpipe.beacon;
exports io.xpipe.beacon.exchange;
exports io.xpipe.beacon.message; exports io.xpipe.beacon.message;
exports io.xpipe.beacon.message.impl;
requires org.slf4j; requires org.slf4j;
requires org.slf4j.simple; requires org.slf4j.simple;
@ -13,10 +13,10 @@ module io.xpipe.beacon {
requires io.xpipe.core; requires io.xpipe.core;
opens io.xpipe.beacon; opens io.xpipe.beacon;
opens io.xpipe.beacon.message; opens io.xpipe.beacon.exchange;
opens io.xpipe.beacon.message.impl;
exports io.xpipe.beacon.socket; exports io.xpipe.beacon.socket;
opens io.xpipe.beacon.socket; opens io.xpipe.beacon.socket;
opens io.xpipe.beacon.message;
requires org.apache.commons.lang; requires org.apache.commons.lang;