Move packages

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

View file

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

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.ResponseMessage;

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.ResponseMessage;
import java.util.List;
public class ListEntriesExchange implements MessageExchange<ListEntriesExchange.Request, ListEntriesExchange.Response> {
public abstract class ListEntriesExchange implements MessageExchange<ListEntriesExchange.Request, ListEntriesExchange.Response> {
@Override
public String getId() {

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 java.io.InputStream;
@ -13,5 +15,5 @@ public interface MessageExchange<RQ extends RequestMessage, RP extends ResponseM
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;
}

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.ServiceLoader;

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.ResponseMessage;

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.ResponseMessage;
import io.xpipe.core.source.DataSourceId;

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.ResponseMessage;
import io.xpipe.core.source.DataSourceId;

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.ResponseMessage;
import io.xpipe.core.data.type.DataType;

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.ResponseMessage;

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.ResponseMessage;

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.ObjectNode;
import com.fasterxml.jackson.databind.node.TextNode;
import io.xpipe.beacon.ClientException;
import io.xpipe.beacon.ConnectorException;
import io.xpipe.beacon.ServerException;
import io.xpipe.beacon.message.*;
import io.xpipe.beacon.*;
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 org.apache.commons.lang3.function.FailableBiConsumer;
import org.slf4j.Logger;

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.ObjectNode;
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 org.slf4j.Logger;
import org.slf4j.LoggerFactory;

View file

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