Add more data sources and refactor some parts

This commit is contained in:
Christopher Schnick
2022-03-03 16:44:14 +01:00
parent bcc581c0bd
commit 2c041ecb0e
42 changed files with 775 additions and 196 deletions
@@ -16,8 +16,8 @@ public class BeaconConfig {
private static final String BEACON_PORT_PROP = "io.xpipe.beacon.port";
private static final int DEFAULT_PORT = 21721;
public static final String BEACON_PORT_PROP = "io.xpipe.beacon.port";
public static final int DEFAULT_PORT = 21721;
public static int getUsedPort() {
if (System.getProperty(BEACON_PORT_PROP) != null) {
@@ -2,30 +2,28 @@ package io.xpipe.beacon.exchange;
import io.xpipe.beacon.message.RequestMessage;
import io.xpipe.beacon.message.ResponseMessage;
import io.xpipe.core.source.DataSourceConfigInstance;
import io.xpipe.core.source.DataSourceInfo;
import io.xpipe.core.source.DataSourceReference;
import io.xpipe.core.source.*;
import io.xpipe.core.store.DataStore;
import lombok.Builder;
import lombok.NonNull;
import lombok.Value;
import lombok.extern.jackson.Jacksonized;
public class InfoExchange implements MessageExchange<InfoExchange.Request, InfoExchange.Response> {
public class QueryDataSourceExchange implements MessageExchange<QueryDataSourceExchange.Request, QueryDataSourceExchange.Response> {
@Override
public String getId() {
return "info";
return "queryDataSource";
}
@Override
public Class<InfoExchange.Request> getRequestClass() {
return InfoExchange.Request.class;
public Class<QueryDataSourceExchange.Request> getRequestClass() {
return QueryDataSourceExchange.Request.class;
}
@Override
public Class<InfoExchange.Response> getResponseClass() {
return InfoExchange.Response.class;
public Class<QueryDataSourceExchange.Response> getResponseClass() {
return QueryDataSourceExchange.Response.class;
}
@Jacksonized
@@ -40,11 +38,15 @@ public class InfoExchange implements MessageExchange<InfoExchange.Request, InfoE
@Builder
@Value
public static class Response implements ResponseMessage {
@NonNull
DataSourceId id;
@NonNull
DataSourceInfo info;
@NonNull
DataStore store;
@NonNull
DataSourceDescriptor<?> descriptor;
@NonNull
DataSourceConfigInstance config;
}
}
+1 -1
View File
@@ -31,7 +31,7 @@ module io.xpipe.beacon {
ReadPreparationExchange,
ReadExecuteExchange,
DialogExchange,
InfoExchange,
QueryDataSourceExchange,
PreStoreExchange,
EditPreparationExchange,
EditExecuteExchange,