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

Refactor

Browse source
This commit is contained in:
Christopher Schnick 2022-10-15 16:06:02 +02:00
parent 27843ae0fd
commit 55da767dab
186 changed files with 1541 additions and 1606 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
api/src/main/java/io/xpipe/api/DataSource.java
View file

@ -27,10 +27,6 @@ import java.nio.file.Path;
*/
public interface DataSource {
void forwardTo(DataSource target);
void appendTo(DataSource target);
/**
* NOT YET IMPLEMENTED!
*
@ -126,7 +122,6 @@ public interface DataSource {
}
}
/**
* Wrapper for {@link #create(DataSourceId, String, InputStream)} that creates an anonymous data source.
*/
@ -168,6 +163,10 @@ public interface DataSource {
return DataSourceImpl.create(id, type, in);
}
void forwardTo(DataSource target);
void appendTo(DataSource target);
public io.xpipe.core.source.DataSource<?> getInternalSource();
/**
@ -180,7 +179,6 @@ public interface DataSource {
*/
DataSourceType getType();
DataSourceConfig getConfig();
/**

4
api/src/main/java/io/xpipe/api/DataStores.java
View file

@ -12,7 +12,9 @@ public class DataStores {
public static void addNamedStore(DataStore store, String name) {
XPipeConnection.execute(con -> {
var req = StoreAddExchange.Request.builder()
.storeInput(store).name(name).build();
.storeInput(store)
.name(name)
.build();
StoreAddExchange.Response res = con.performSimpleExchange(req);
new QuietDialogHandler(res.getConfig(), con, Map.of()).handle();

72
api/src/main/java/io/xpipe/api/connector/XPipeConnection.java
View file

@ -8,6 +8,8 @@ import java.util.Optional;
public final class XPipeConnection extends BeaconConnection {
private XPipeConnection() {}
public static XPipeConnection open() {
var con = new XPipeConnection();
con.constructSocket();
@ -23,7 +25,9 @@ public final class XPipeConnection extends BeaconConnection {
throw new IllegalStateException();
}
DialogExchange.Response response = con.performSimpleExchange(DialogExchange.Request.builder().dialogKey(reference.getDialogId()).build());
DialogExchange.Response response = con.performSimpleExchange(DialogExchange.Request.builder()
.dialogKey(reference.getDialogId())
.build());
element = response.getElement();
if (response.getElement() == null) {
break;
@ -58,40 +62,6 @@ public final class XPipeConnection extends BeaconConnection {
}
}
private XPipeConnection() {
}
@Override
protected void constructSocket() {
if (!BeaconServer.isRunning()) {
try {
start();
} catch (Exception ex) {
throw new BeaconException("Unable to start xpipe daemon", ex);
}
var r = waitForStartup(null);
if (r.isEmpty()) {
throw new BeaconException("Wait for xpipe daemon timed out");
} else {
beaconClient = r.get();
return;
}
}
try {
beaconClient = new BeaconClient();
} catch (Exception ex) {
throw new BeaconException("Unable to connect to running xpipe daemon", ex);
}
}
private void start() throws Exception {
if (BeaconServer.tryStart() == null) {
throw new UnsupportedOperationException("Unable to determine xpipe daemon launch command");
};
}
public static Optional<BeaconClient> waitForStartup(Process process) {
for (int i = 0; i < 160; i++) {
if (process != null && !process.isAlive()) {
@ -125,6 +95,38 @@ public final class XPipeConnection extends BeaconConnection {
}
}
@Override
protected void constructSocket() {
if (!BeaconServer.isRunning()) {
try {
start();
} catch (Exception ex) {
throw new BeaconException("Unable to start xpipe daemon", ex);
}
var r = waitForStartup(null);
if (r.isEmpty()) {
throw new BeaconException("Wait for xpipe daemon timed out");
} else {
beaconClient = r.get();
return;
}
}
try {
beaconClient = new BeaconClient();
} catch (Exception ex) {
throw new BeaconException("Unable to connect to running xpipe daemon", ex);
}
}
private void start() throws Exception {
if (BeaconServer.tryStart() == null) {
throw new UnsupportedOperationException("Unable to determine xpipe daemon launch command");
}
;
}
@FunctionalInterface
public static interface Handler {

10
api/src/main/java/io/xpipe/api/impl/DataRawImpl.java
View file

@ -2,7 +2,9 @@ package io.xpipe.api.impl;
import io.xpipe.api.DataRaw;
import io.xpipe.api.DataSourceConfig;
import io.xpipe.core.source.*;
import io.xpipe.core.source.DataSourceId;
import io.xpipe.core.source.DataSourceInfo;
import io.xpipe.core.source.DataSourceType;
import java.io.InputStream;
@ -10,7 +12,11 @@ public class DataRawImpl extends DataSourceImpl implements DataRaw {
private final DataSourceInfo.Raw info;
public DataRawImpl(DataSourceId sourceId, DataSourceConfig sourceConfig, DataSourceInfo.Raw info, io.xpipe.core.source.DataSource<?> internalSource) {
public DataRawImpl(
DataSourceId sourceId,
DataSourceConfig sourceConfig,
DataSourceInfo.Raw info,
io.xpipe.core.source.DataSource<?> internalSource) {
super(sourceId, sourceConfig, internalSource);
this.info = info;
}

76
api/src/main/java/io/xpipe/api/impl/DataSourceImpl.java
View file

@ -13,28 +13,15 @@ import java.io.InputStream;
public abstract class DataSourceImpl implements DataSource {
@Override
public void forwardTo(DataSource target) {
XPipeConnection.execute(con -> {
var req = ForwardExchange.Request.builder()
.source(DataSourceReference.id(sourceId))
.target(DataSourceReference.id(target.getId()))
.build();
ForwardExchange.Response res = con.performSimpleExchange(req);
});
}
@Override
public void appendTo(DataSource target) {
XPipeConnection.execute(con -> {
var req = ForwardExchange.Request.builder()
.source(DataSourceReference.id(sourceId))
.target(DataSourceReference.id(target.getId()))
.append(true)
.build();
ForwardExchange.Response res = con.performSimpleExchange(req);
});
private final DataSourceId sourceId;
private final DataSourceConfig config;
private final io.xpipe.core.source.DataSource<?> internalSource;
public DataSourceImpl(
DataSourceId sourceId, DataSourceConfig config, io.xpipe.core.source.DataSource<?> internalSource) {
this.sourceId = sourceId;
this.config = config;
this.internalSource = internalSource;
}
public static DataSource get(DataSourceReference ds) {
@ -59,17 +46,17 @@ public abstract class DataSourceImpl implements DataSource {
var info = res.getInfo().asRaw();
yield new DataRawImpl(res.getId(), config, info, res.getInternalSource());
}
case COLLECTION -> throw new UnsupportedOperationException("Unimplemented case: " + res.getInfo().getType());
default -> throw new IllegalArgumentException("Unexpected value: " + res.getInfo().getType());
case COLLECTION -> throw new UnsupportedOperationException(
"Unimplemented case: " + res.getInfo().getType());
default -> throw new IllegalArgumentException(
"Unexpected value: " + res.getInfo().getType());
};
});
}
public static DataSource create(DataSourceId id, io.xpipe.core.source.DataSource<?> source) {
var startReq = AddSourceExchange.Request.builder()
.source(source)
.target(id)
.build();
var startReq =
AddSourceExchange.Request.builder().source(source).target(id).build();
var returnedId = XPipeConnection.execute(con -> {
AddSourceExchange.Response r = con.performSimpleExchange(startReq);
return r.getId();
@ -108,9 +95,7 @@ public abstract class DataSourceImpl implements DataSource {
var configInstance = startRes.getConfig();
XPipeConnection.finishDialog(configInstance);
var ref = id != null ?
DataSourceReference.id(id) :
DataSourceReference.latest();
var ref = id != null ? DataSourceReference.id(id) : DataSourceReference.latest();
return get(ref);
}
@ -137,20 +122,31 @@ public abstract class DataSourceImpl implements DataSource {
var configInstance = startRes.getConfig();
XPipeConnection.finishDialog(configInstance);
var ref = id != null ?
DataSourceReference.id(id) :
DataSourceReference.latest();
var ref = id != null ? DataSourceReference.id(id) : DataSourceReference.latest();
return get(ref);
}
private final DataSourceId sourceId;
private final DataSourceConfig config;
private final io.xpipe.core.source.DataSource<?> internalSource;
@Override
public void forwardTo(DataSource target) {
XPipeConnection.execute(con -> {
var req = ForwardExchange.Request.builder()
.source(DataSourceReference.id(sourceId))
.target(DataSourceReference.id(target.getId()))
.build();
ForwardExchange.Response res = con.performSimpleExchange(req);
});
}
public DataSourceImpl(DataSourceId sourceId, DataSourceConfig config, io.xpipe.core.source.DataSource<?> internalSource) {
this.sourceId = sourceId;
this.config = config;
this.internalSource = internalSource;
@Override
public void appendTo(DataSource target) {
XPipeConnection.execute(con -> {
var req = ForwardExchange.Request.builder()
.source(DataSourceReference.id(sourceId))
.target(DataSourceReference.id(target.getId()))
.append(true)
.build();
ForwardExchange.Response res = con.performSimpleExchange(req);
});
}
public io.xpipe.core.source.DataSource<?> getInternalSource() {

10
api/src/main/java/io/xpipe/api/impl/DataStructureImpl.java
View file

@ -3,13 +3,19 @@ package io.xpipe.api.impl;
import io.xpipe.api.DataSourceConfig;
import io.xpipe.api.DataStructure;
import io.xpipe.core.data.node.DataStructureNode;
import io.xpipe.core.source.*;
import io.xpipe.core.source.DataSourceId;
import io.xpipe.core.source.DataSourceInfo;
import io.xpipe.core.source.DataSourceType;
public class DataStructureImpl extends DataSourceImpl implements DataStructure {
private final DataSourceInfo.Structure info;
public DataStructureImpl(DataSourceId sourceId, DataSourceConfig sourceConfig, DataSourceInfo.Structure info, io.xpipe.core.source.DataSource<?> internalSource) {
public DataStructureImpl(
DataSourceId sourceId,
DataSourceConfig sourceConfig,
DataSourceInfo.Structure info,
io.xpipe.core.source.DataSource<?> internalSource) {
super(sourceId, sourceConfig, internalSource);
this.info = info;
}

10
api/src/main/java/io/xpipe/api/impl/DataTableAccumulatorImpl.java
View file

@ -47,7 +47,11 @@ public class DataTableAccumulatorImpl implements DataTableAccumulator {
connection.close();
var req = ReadExchange.Request.builder()
.target(id).store(res.getStore()).provider("xpbt").configureAll(false).build();
.target(id)
.store(res.getStore())
.provider("xpbt")
.configureAll(false)
.build();
ReadExchange.Response response = XPipeConnection.execute(con -> {
return con.performSimpleExchange(req);
});
@ -71,7 +75,9 @@ public class DataTableAccumulatorImpl implements DataTableAccumulator {
@Override
public synchronized void add(DataStructureNode row) {
TupleNode toUse = type.matches(row) ? row.asTuple() : type.convert(row).orElseThrow().asTuple();
TupleNode toUse = type.matches(row)
? row.asTuple()
: type.convert(row).orElseThrow().asTuple();
connection.withOutputStream(out -> {
writeDescriptor();
TypedDataStreamWriter.writeStructure(out, toUse, writtenDescriptor);

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

@ -27,7 +27,11 @@ public class DataTableImpl extends DataSourceImpl implements DataTable {
private final DataSourceInfo.Table info;
DataTableImpl(DataSourceId id, DataSourceConfig sourceConfig, DataSourceInfo.Table info, io.xpipe.core.source.DataSource<?> internalSource) {
DataTableImpl(
DataSourceId id,
DataSourceConfig sourceConfig,
DataSourceInfo.Table info,
io.xpipe.core.source.DataSource<?> internalSource) {
super(id, sourceConfig, internalSource);
this.info = info;
}
@ -44,8 +48,8 @@ public class DataTableImpl extends DataSourceImpl implements DataTable {
public Stream<TupleNode> stream() {
var iterator = new TableIterator();
return StreamSupport.stream(
Spliterators.spliteratorUnknownSize(iterator, Spliterator.ORDERED), false).onClose(iterator::finish);
return StreamSupport.stream(Spliterators.spliteratorUnknownSize(iterator, Spliterator.ORDERED), false)
.onClose(iterator::finish);
}
@Override
@ -63,15 +67,23 @@ public class DataTableImpl extends DataSourceImpl implements DataTable {
List<DataStructureNode> nodes = new ArrayList<>();
XPipeConnection.execute(con -> {
var req = QueryTableDataExchange.Request.builder()
.ref(DataSourceReference.id(getId())).maxRows(maxRows).build();
.ref(DataSourceReference.id(getId()))
.maxRows(maxRows)
.build();
con.performInputExchange(req, (QueryTableDataExchange.Response res, InputStream in) -> {
var r = new TypedDataStreamParser(info.getDataType());
r.parseStructures(in, TypedDataStructureNodeReader.of(info.getDataType()), nodes::add);
var r = new TypedDataStreamParser(info.getDataType());
r.parseStructures(in, TypedDataStructureNodeReader.of(info.getDataType()), nodes::add);
});
});
return ArrayNode.of(nodes);
}
@Override
public Iterator<TupleNode> iterator() {
return new TableIterator();
}
;
private class TableIterator implements Iterator<TupleNode> {
private final BeaconConnection connection;
@ -85,7 +97,9 @@ public class DataTableImpl extends DataSourceImpl implements DataTable {
connection = XPipeConnection.open();
var req = QueryTableDataExchange.Request.builder()
.ref(DataSourceReference.id(getId())).maxRows(Integer.MAX_VALUE).build();
.ref(DataSourceReference.id(getId()))
.maxRows(Integer.MAX_VALUE)
.build();
connection.sendRequest(req);
connection.receiveResponse();
connection.receiveBody();
@ -116,10 +130,5 @@ public class DataTableImpl extends DataSourceImpl implements DataTable {
return node;
}
};
@Override
public Iterator<TupleNode> iterator() {
return new TableIterator();
}
}

15
api/src/main/java/io/xpipe/api/impl/DataTextImpl.java
View file

@ -27,7 +27,11 @@ public class DataTextImpl extends DataSourceImpl implements DataText {
private final DataSourceInfo.Text info;
public DataTextImpl(DataSourceId sourceId, DataSourceConfig sourceConfig, DataSourceInfo.Text info, io.xpipe.core.source.DataSource<?> internalSource) {
public DataTextImpl(
DataSourceId sourceId,
DataSourceConfig sourceConfig,
DataSourceInfo.Text info,
io.xpipe.core.source.DataSource<?> internalSource) {
super(sourceId, sourceConfig, internalSource);
this.info = info;
}
@ -70,7 +74,9 @@ public class DataTextImpl extends DataSourceImpl implements DataText {
{
connection = XPipeConnection.open();
var req = QueryTextDataExchange.Request.builder()
.ref(DataSourceReference.id(getId())).maxLines(-1).build();
.ref(DataSourceReference.id(getId()))
.maxLines(-1)
.build();
connection.sendRequest(req);
connection.receiveResponse();
reader = new BufferedReader(new InputStreamReader(connection.receiveBody(), StandardCharsets.UTF_8));
@ -98,8 +104,7 @@ public class DataTextImpl extends DataSourceImpl implements DataText {
}
};
return StreamSupport
.stream(Spliterators.spliteratorUnknownSize(iterator, Spliterator.ORDERED), false)
return StreamSupport.stream(Spliterators.spliteratorUnknownSize(iterator, Spliterator.ORDERED), false)
.onClose(iterator::close);
}
@ -123,6 +128,4 @@ public class DataTextImpl extends DataSourceImpl implements DataText {
});
return builder.toString();
}
}

11
api/src/main/java/io/xpipe/api/util/QuietDialogHandler.java
View file

@ -14,9 +14,9 @@ import java.util.UUID;
public class QuietDialogHandler {
private final UUID dialogKey;
private DialogElement element;
private final BeaconConnection connection;
private final Map<String, String> overrides;
private DialogElement element;
public QuietDialogHandler(DialogReference ref, BeaconConnection connection, Map<String, String> overrides) {
this.dialogKey = ref.getDialogId();
@ -36,10 +36,13 @@ public class QuietDialogHandler {
response = handleQuery(q);
}
DialogExchange.Response res = connection.performSimpleExchange(
DialogExchange.Request.builder().dialogKey(dialogKey).value(response).build());
DialogExchange.Response res = connection.performSimpleExchange(DialogExchange.Request.builder()
.dialogKey(dialogKey)
.value(response)
.build());
if (res.getElement() != null && element.equals(res.getElement())) {
throw new ClientException("Invalid value for key " + res.getElement().toDisplayString());
throw new ClientException(
"Invalid value for key " + res.getElement().toDisplayString());
}
element = res.getElement();

5
api/src/main/java/io/xpipe/api/util/TypeDescriptor.java
View file

@ -6,8 +6,7 @@ import java.util.stream.Collectors;
public class TypeDescriptor {
public static String create(List<String> names) {
return "[" + names.stream()
.map(n -> n != null ? "\"" + n + "\"" : null)
.collect(Collectors.joining(",")) + "]\n";
return "[" + names.stream().map(n -> n != null ? "\"" + n + "\"" : null).collect(Collectors.joining(","))
+ "]\n";
}
}

2
api/src/main/java/module-info.java
View file

@ -5,4 +5,4 @@ module io.xpipe.api {
requires transitive io.xpipe.core;
requires io.xpipe.beacon;
}
}

8
api/src/test/java/io/xpipe/api/test/DataTableAccumulatorTest.java
View file

@ -15,13 +15,11 @@ public class DataTableAccumulatorTest extends ApiTest {
@Test
public void test() {
var type = TupleType.of(
List.of("col1", "col2"),
List.of(ValueType.of(), ValueType.of()));
var type = TupleType.of(List.of("col1", "col2"), List.of(ValueType.of(), ValueType.of()));
var acc = DataTableAccumulator.create(type);
var val = type.convert(
TupleNode.of(List.of(ValueNode.of("val1"), ValueNode.of("val2")))).orElseThrow();
var val = type.convert(TupleNode.of(List.of(ValueNode.of("val1"), ValueNode.of("val2"))))
.orElseThrow();
acc.add(val);
var table = acc.finish(":test");

3
api/src/test/java/io/xpipe/api/test/DataTableTest.java
View file

@ -9,7 +9,8 @@ public class DataTableTest extends ApiTest {
@BeforeAll
public static void setupStorage() throws Exception {
DataSource.create(DataSourceId.fromString(":usernames"), "csv", DataTableTest.class.getResource("username.csv"));
DataSource.create(
DataSourceId.fromString(":usernames"), "csv", DataTableTest.class.getResource("username.csv"));
}
@Test

2
api/src/test/java/module-info.java
View file

@ -6,4 +6,4 @@ module io.xpipe.api.test {
opens io.xpipe.api.test;
exports io.xpipe.api.test;
}
}

61
beacon/src/main/java/io/xpipe/beacon/BeaconClient.java
View file

@ -23,32 +23,6 @@ import static io.xpipe.beacon.BeaconConfig.BODY_SEPARATOR;
public class BeaconClient implements AutoCloseable {
@FunctionalInterface
public interface FailableBiConsumer<T, U, E extends Throwable> {
void accept(T var1, U var2) throws E;
}
@FunctionalInterface
public interface FailableConsumer<T, E extends Throwable> {
void accept(T var1) throws E;
}
@FunctionalInterface
public interface FailableRunnable<E extends Throwable> {
void run() throws E;
}
public static Optional<BeaconClient> tryConnect() {
try {
return Optional.of(new BeaconClient());
} catch (IOException ex) {
return Optional.empty();
}
}
private final Closeable closeable;
private final InputStream in;
private final OutputStream out;
@ -66,6 +40,14 @@ public class BeaconClient implements AutoCloseable {
this.out = out;
}
public static Optional<BeaconClient> tryConnect() {
try {
return Optional.of(new BeaconClient());
} catch (IOException ex) {
return Optional.empty();
}
}
public void close() throws ConnectorException {
try {
closeable.close();
@ -104,12 +86,13 @@ public class BeaconClient implements AutoCloseable {
json.set("messageType", new TextNode(prov.get().getId()));
json.set("messagePhase", new TextNode("request"));
//json.set("id", new TextNode(UUID.randomUUID().toString()));
// json.set("id", new TextNode(UUID.randomUUID().toString()));
var msg = JsonNodeFactory.instance.objectNode();
msg.set("xPipeMessage", json);
if (BeaconConfig.printMessages()) {
System.out.println("Sending request to server of type " + req.getClass().getName());
System.out.println(
"Sending request to server of type " + req.getClass().getName());
}
var writer = new StringWriter();
@ -198,13 +181,13 @@ public class BeaconClient implements AutoCloseable {
var type = content.required("messageType").textValue();
var phase = content.required("messagePhase").textValue();
//var requestId = UUID.fromString(content.required("id").textValue());
// var requestId = UUID.fromString(content.required("id").textValue());
if (!phase.equals("response")) {
throw new IllegalArgumentException();
}
content.remove("messageType");
content.remove("messagePhase");
//content.remove("id");
// content.remove("id");
var prov = MessageExchanges.byId(type);
if (prov.isEmpty()) {
@ -226,4 +209,22 @@ public class BeaconClient implements AutoCloseable {
public OutputStream getRawOutputStream() {
return out;
}
@FunctionalInterface
public interface FailableBiConsumer<T, U, E extends Throwable> {
void accept(T var1, U var2) throws E;
}
@FunctionalInterface
public interface FailableConsumer<T, E extends Throwable> {
void accept(T var1) throws E;
}
@FunctionalInterface
public interface FailableRunnable<E extends Throwable> {
void run() throws E;
}
}

29
beacon/src/main/java/io/xpipe/beacon/BeaconConfig.java
View file

@ -8,8 +8,14 @@ import java.nio.charset.StandardCharsets;
public class BeaconConfig {
public static final byte[] BODY_SEPARATOR = "\n\n".getBytes(StandardCharsets.UTF_8);
public static final String BEACON_PORT_PROP = "io.xpipe.beacon.port";
public static final int DEFAULT_PORT = System.getProperty("os.name").startsWith("Windows") ? 21721 : 21722;
private static final String PRINT_MESSAGES_PROPERTY = "io.xpipe.beacon.printMessages";
private static final String LAUNCH_DAEMON_IN_DEBUG_PROP = "io.xpipe.beacon.launchDebugDaemon";
private static final String ATTACH_DEBUGGER_PROP = "io.xpipe.beacon.attachDebuggerToDaemon";
private static final String EXEC_DEBUG_PROP = "io.xpipe.beacon.printDaemonOutput";
private static final String EXEC_PROCESS_PROP = "io.xpipe.beacon.customDaemonCommand";
private static final String DAEMON_ARGUMENTS_PROP = "io.xpipe.beacon.daemonArgs";
public static boolean printMessages() {
if (System.getProperty(PRINT_MESSAGES_PROPERTY) != null) {
@ -18,8 +24,6 @@ public class BeaconConfig {
return false;
}
private static final String LAUNCH_DAEMON_IN_DEBUG_PROP = "io.xpipe.beacon.launchDebugDaemon";
public static boolean launchDaemonInDebugMode() {
if (System.getProperty(LAUNCH_DAEMON_IN_DEBUG_PROP) != null) {
return Boolean.parseBoolean(System.getProperty(LAUNCH_DAEMON_IN_DEBUG_PROP));
@ -27,8 +31,6 @@ public class BeaconConfig {
return false;
}
private static final String ATTACH_DEBUGGER_PROP = "io.xpipe.beacon.attachDebuggerToDaemon";
public static boolean attachDebuggerToDaemon() {
if (System.getProperty(ATTACH_DEBUGGER_PROP) != null) {
return Boolean.parseBoolean(System.getProperty(ATTACH_DEBUGGER_PROP));
@ -36,10 +38,6 @@ public class BeaconConfig {
return false;
}
private static final String EXEC_DEBUG_PROP = "io.xpipe.beacon.printDaemonOutput";
public static boolean printDaemonOutput() {
if (System.getProperty(EXEC_DEBUG_PROP) != null) {
return Boolean.parseBoolean(System.getProperty(EXEC_DEBUG_PROP));
@ -47,11 +45,6 @@ public class BeaconConfig {
return false;
}
public static final String BEACON_PORT_PROP = "io.xpipe.beacon.port";
public static final int DEFAULT_PORT = System.getProperty("os.name").startsWith("Windows") ? 21721 : 21722;
public static int getUsedPort() {
if (System.getProperty(BEACON_PORT_PROP) != null) {
return Integer.parseInt(System.getProperty(BEACON_PORT_PROP));
@ -60,10 +53,6 @@ public class BeaconConfig {
return DEFAULT_PORT;
}
private static final String EXEC_PROCESS_PROP = "io.xpipe.beacon.customDaemonCommand";
public static String getCustomDaemonCommand() {
if (System.getProperty(EXEC_PROCESS_PROP) != null) {
return System.getProperty(EXEC_PROCESS_PROP);
@ -72,8 +61,6 @@ public class BeaconConfig {
return null;
}
private static final String DAEMON_ARGUMENTS_PROP = "io.xpipe.beacon.daemonArgs";
public static String getDaemonArguments() {
if (System.getProperty(DAEMON_ARGUMENTS_PROP) != null) {
return System.getProperty(DAEMON_ARGUMENTS_PROP);
@ -82,5 +69,3 @@ public class BeaconConfig {
return null;
}
}

21
beacon/src/main/java/io/xpipe/beacon/BeaconConnection.java
View file

@ -6,7 +6,6 @@ import java.io.OutputStream;
public abstract class BeaconConnection implements AutoCloseable {
protected BeaconClient beaconClient;
private InputStream bodyInput;
@ -74,9 +73,7 @@ public abstract class BeaconConnection implements AutoCloseable {
}
public <REQ extends RequestMessage, RES extends ResponseMessage> void performInputExchange(
REQ req,
BeaconClient.FailableBiConsumer<RES, InputStream, Exception> responseConsumer
) {
REQ req, BeaconClient.FailableBiConsumer<RES, InputStream, Exception> responseConsumer) {
checkClosed();
performInputOutputExchange(req, null, responseConsumer);
@ -85,8 +82,7 @@ public abstract class BeaconConnection implements AutoCloseable {
public <REQ extends RequestMessage, RES extends ResponseMessage> void performInputOutputExchange(
REQ req,
BeaconClient.FailableConsumer<OutputStream, IOException> reqWriter,
BeaconClient.FailableBiConsumer<RES, InputStream, Exception> responseConsumer
) {
BeaconClient.FailableBiConsumer<RES, InputStream, Exception> responseConsumer) {
checkClosed();
try {
@ -105,9 +101,7 @@ public abstract class BeaconConnection implements AutoCloseable {
}
}
public <REQ extends RequestMessage> void sendRequest(
REQ req
) {
public <REQ extends RequestMessage> void sendRequest(REQ req) {
checkClosed();
try {
@ -150,9 +144,7 @@ public abstract class BeaconConnection implements AutoCloseable {
}
public <REQ extends RequestMessage, RES extends ResponseMessage> RES performOutputExchange(
REQ req,
BeaconClient.FailableConsumer<OutputStream, Exception> reqWriter
) {
REQ req, BeaconClient.FailableConsumer<OutputStream, Exception> reqWriter) {
checkClosed();
try {
@ -166,9 +158,7 @@ public abstract class BeaconConnection implements AutoCloseable {
}
}
public <REQ extends RequestMessage, RES extends ResponseMessage> RES performSimpleExchange(
REQ req
) {
public <REQ extends RequestMessage, RES extends ResponseMessage> RES performSimpleExchange(REQ req) {
checkClosed();
try {
@ -192,7 +182,6 @@ public abstract class BeaconConnection implements AutoCloseable {
return new BeaconException("A beacon connection error occurred", s.getCause());
}
return new BeaconException("An unexpected error occurred", exception);
}
}

3
beacon/src/main/java/io/xpipe/beacon/BeaconException.java
View file

@ -5,8 +5,7 @@ package io.xpipe.beacon;
*/
public class BeaconException extends RuntimeException {
public BeaconException() {
}
public BeaconException() {}
public BeaconException(String message) {
super(message);

75
beacon/src/main/java/io/xpipe/beacon/BeaconServer.java
View file

@ -34,9 +34,8 @@ public class BeaconServer {
public static Process tryStartCustom() throws Exception {
var custom = BeaconConfig.getCustomDaemonCommand();
if (custom != null) {
var command = custom + " " + (BeaconConfig.getDaemonArguments() != null ?
BeaconConfig.getDaemonArguments() :
"");
var command =
custom + " " + (BeaconConfig.getDaemonArguments() != null ? BeaconConfig.getDaemonArguments() : "");
Process process = Runtime.getRuntime().exec(command);
printDaemonOutput(process, command);
return process;
@ -47,9 +46,8 @@ public class BeaconServer {
public static Process tryStart() throws Exception {
var daemonExecutable = getDaemonExecutable();
if (daemonExecutable.isPresent()) {
var command = "\"" + daemonExecutable.get() + "\" --external " + (BeaconConfig.getDaemonArguments() != null ?
BeaconConfig.getDaemonArguments() :
"");
var command = "\"" + daemonExecutable.get() + "\" --external "
+ (BeaconConfig.getDaemonArguments() != null ? BeaconConfig.getDaemonArguments() : "");
// Tell daemon that we launched from an external tool
Process process = Runtime.getRuntime().exec(command);
printDaemonOutput(process, command);
@ -65,35 +63,43 @@ public class BeaconServer {
System.out.println("Starting daemon: " + command);
}
new Thread(null, () -> {
try {
InputStreamReader isr = new InputStreamReader(proc.getInputStream());
BufferedReader br = new BufferedReader(isr);
String line;
while ((line = br.readLine()) != null) {
if (print) {
System.out.println("[xpiped] " + line);
}
}
} catch (Exception ioe) {
ioe.printStackTrace();
}
}, "daemon sysout").start();
new Thread(
null,
() -> {
try {
InputStreamReader isr = new InputStreamReader(proc.getInputStream());
BufferedReader br = new BufferedReader(isr);
String line;
while ((line = br.readLine()) != null) {
if (print) {
System.out.println("[xpiped] " + line);
}
}
} catch (Exception ioe) {
ioe.printStackTrace();
}
},
"daemon sysout")
.start();
new Thread(null, () -> {
try {
InputStreamReader isr = new InputStreamReader(proc.getErrorStream());
BufferedReader br = new BufferedReader(isr);
String line;
while ((line = br.readLine()) != null) {
if (print) {
System.err.println("[xpiped] " + line);
}
}
} catch (Exception ioe) {
ioe.printStackTrace();
}
}, "daemon syserr").start();
new Thread(
null,
() -> {
try {
InputStreamReader isr = new InputStreamReader(proc.getErrorStream());
BufferedReader br = new BufferedReader(isr);
String line;
while ((line = br.readLine()) != null) {
if (print) {
System.err.println("[xpiped] " + line);
}
}
} catch (Exception ioe) {
ioe.printStackTrace();
}
},
"daemon syserr")
.start();
}
public static boolean tryStop(BeaconClient client) throws Exception {
@ -111,7 +117,6 @@ public class BeaconServer {
} catch (Exception ex) {
}
if (base == null) {
if (System.getProperty("os.name").startsWith("Windows")) {
base = Path.of(System.getenv("LOCALAPPDATA"), "X-Pipe");

3
beacon/src/main/java/io/xpipe/beacon/ClientException.java
View file

@ -5,8 +5,7 @@ package io.xpipe.beacon;
*/
public class ClientException extends Exception {
public ClientException() {
}
public ClientException() {}
public ClientException(String message) {
super(message);

3
beacon/src/main/java/io/xpipe/beacon/ConnectorException.java
View file

@ -5,8 +5,7 @@ package io.xpipe.beacon;
*/
public class ConnectorException extends Exception {
public ConnectorException() {
}
public ConnectorException() {}
public ConnectorException(String message) {
super(message);

4
beacon/src/main/java/io/xpipe/beacon/RequestMessage.java
View file

@ -1,5 +1,3 @@
package io.xpipe.beacon;
public interface RequestMessage {
}
public interface RequestMessage {}

4
beacon/src/main/java/io/xpipe/beacon/ResponseMessage.java
View file

@ -1,5 +1,3 @@
package io.xpipe.beacon;
public interface ResponseMessage {
}
public interface ResponseMessage {}

3
beacon/src/main/java/io/xpipe/beacon/ServerException.java
View file

@ -5,8 +5,7 @@ package io.xpipe.beacon;
*/
public class ServerException extends Exception {
public ServerException() {
}
public ServerException() {}
public ServerException(String message) {
super(message);

4
beacon/src/main/java/io/xpipe/beacon/exchange/AddSourceExchange.java
View file

@ -21,7 +21,9 @@ public class AddSourceExchange implements MessageExchange {
@Value
public static class Request implements RequestMessage {
DataSourceId target;
@NonNull DataSource<?> source;
@NonNull
DataSource<?> source;
}
@Jacksonized

3
beacon/src/main/java/io/xpipe/beacon/exchange/ForwardExchange.java
View file

@ -31,6 +31,5 @@ public class ForwardExchange implements MessageExchange {
@Jacksonized
@Builder
@Value
public static class Response implements ResponseMessage {
}
public static class Response implements ResponseMessage {}
}

11
beacon/src/main/java/io/xpipe/beacon/exchange/MessageExchanges.java
View file

@ -15,7 +15,8 @@ public class MessageExchanges {
private static void loadAll() {
if (ALL == null) {
ALL = ServiceLoader.load(MessageExchange.class).stream()
.map(ServiceLoader.Provider::get).collect(Collectors.toSet());
.map(ServiceLoader.Provider::get)
.collect(Collectors.toSet());
}
}
@ -26,12 +27,16 @@ public class MessageExchanges {
public static <RQ extends RequestMessage> Optional<MessageExchange> byRequest(RQ req) {
loadAll();
return ALL.stream().filter(d -> d.getRequestClass().equals(req.getClass())).findAny();
return ALL.stream()
.filter(d -> d.getRequestClass().equals(req.getClass()))
.findAny();
}
public static <RP extends ResponseMessage> Optional<MessageExchange> byResponse(RP rep) {
loadAll();
return ALL.stream().filter(d -> d.getResponseClass().equals(rep.getClass())).findAny();
return ALL.stream()
.filter(d -> d.getResponseClass().equals(rep.getClass()))
.findAny();
}
public static Set<MessageExchange> getAll() {

4
beacon/src/main/java/io/xpipe/beacon/exchange/QueryDataSourceExchange.java
View file

@ -37,14 +37,18 @@ public class QueryDataSourceExchange implements MessageExchange {
public static class Response implements ResponseMessage {
@NonNull
DataSourceId id;
boolean disabled;
boolean hidden;
@NonNull
DataSourceInfo info;
@NonNull
String storeDisplay;
String provider;
@NonNull
Map<String, String> config;

3
beacon/src/main/java/io/xpipe/beacon/exchange/ReadExecuteExchange.java
View file

@ -32,6 +32,5 @@ public class ReadExecuteExchange implements MessageExchange {
@Jacksonized
@Builder
@Value
public static class Response implements ResponseMessage {
}
public static class Response implements ResponseMessage {}
}

3
beacon/src/main/java/io/xpipe/beacon/exchange/StopExchange.java
View file

@ -19,8 +19,7 @@ public class StopExchange implements MessageExchange {
@Jacksonized
@Builder
@Value
public static class Request implements RequestMessage {
}
public static class Request implements RequestMessage {}
@Jacksonized
@Builder

3
beacon/src/main/java/io/xpipe/beacon/exchange/StoreStreamExchange.java
View file

@ -20,8 +20,7 @@ public class StoreStreamExchange implements MessageExchange {
@Jacksonized
@Builder
@Value
public static class Request implements RequestMessage {
}
public static class Request implements RequestMessage {}
@Jacksonized
@Builder

5
beacon/src/main/java/io/xpipe/beacon/exchange/api/QueryRawDataExchange.java
View file

@ -1,8 +1,8 @@
package io.xpipe.beacon.exchange.api;
import io.xpipe.beacon.exchange.MessageExchange;
import io.xpipe.beacon.RequestMessage;
import io.xpipe.beacon.ResponseMessage;
import io.xpipe.beacon.exchange.MessageExchange;
import io.xpipe.core.source.DataSourceReference;
import lombok.Builder;
import lombok.NonNull;
@ -29,6 +29,5 @@ public class QueryRawDataExchange implements MessageExchange {
@Jacksonized
@Builder
@Value
public static class Response implements ResponseMessage {
}
public static class Response implements ResponseMessage {}
}

5
beacon/src/main/java/io/xpipe/beacon/exchange/api/QueryTableDataExchange.java
View file

@ -1,8 +1,8 @@
package io.xpipe.beacon.exchange.api;
import io.xpipe.beacon.exchange.MessageExchange;
import io.xpipe.beacon.RequestMessage;
import io.xpipe.beacon.ResponseMessage;
import io.xpipe.beacon.exchange.MessageExchange;
import io.xpipe.core.source.DataSourceReference;
import lombok.Builder;
import lombok.NonNull;
@ -32,6 +32,5 @@ public class QueryTableDataExchange implements MessageExchange {
@Jacksonized
@Builder
@Value
public static class Response implements ResponseMessage {
}
public static class Response implements ResponseMessage {}
}

5
beacon/src/main/java/io/xpipe/beacon/exchange/api/QueryTextDataExchange.java
View file

@ -1,8 +1,8 @@
package io.xpipe.beacon.exchange.api;
import io.xpipe.beacon.exchange.MessageExchange;
import io.xpipe.beacon.RequestMessage;
import io.xpipe.beacon.ResponseMessage;
import io.xpipe.beacon.exchange.MessageExchange;
import io.xpipe.core.source.DataSourceReference;
import lombok.Builder;
import lombok.NonNull;
@ -30,6 +30,5 @@ public class QueryTextDataExchange implements MessageExchange {
@Jacksonized
@Builder
@Value
public static class Response implements ResponseMessage {
}
public static class Response implements ResponseMessage {}
}

2
beacon/src/main/java/io/xpipe/beacon/exchange/cli/ConvertExchange.java
View file

@ -1,8 +1,8 @@
package io.xpipe.beacon.exchange.cli;
import io.xpipe.beacon.exchange.MessageExchange;
import io.xpipe.beacon.RequestMessage;
import io.xpipe.beacon.ResponseMessage;
import io.xpipe.beacon.exchange.MessageExchange;
import io.xpipe.core.dialog.DialogReference;
import io.xpipe.core.source.DataSourceId;
import io.xpipe.core.source.DataSourceReference;

3
beacon/src/main/java/io/xpipe/beacon/exchange/cli/DialogExchange.java
View file

@ -1,8 +1,8 @@
package io.xpipe.beacon.exchange.cli;
import io.xpipe.beacon.exchange.MessageExchange;
import io.xpipe.beacon.RequestMessage;
import io.xpipe.beacon.ResponseMessage;
import io.xpipe.beacon.exchange.MessageExchange;
import io.xpipe.core.dialog.DialogElement;
import lombok.Builder;
import lombok.NonNull;
@ -34,6 +34,7 @@ public class DialogExchange implements MessageExchange {
public static class Request implements RequestMessage {
@NonNull
UUID dialogKey;
String value;
boolean cancel;
}

3
beacon/src/main/java/io/xpipe/beacon/exchange/cli/EditStoreExchange.java
View file

@ -28,6 +28,7 @@ public class EditStoreExchange implements MessageExchange {
@Builder
@Value
public static class Response implements ResponseMessage {
@NonNull DialogReference dialog;
@NonNull
DialogReference dialog;
}
}

4
beacon/src/main/java/io/xpipe/beacon/exchange/cli/InstanceExchange.java
View file

@ -19,9 +19,7 @@ public class InstanceExchange implements MessageExchange {
@Jacksonized
@Builder
@Value
public static class Request implements RequestMessage {
}
public static class Request implements RequestMessage {}
@Jacksonized
@Builder

8
beacon/src/main/java/io/xpipe/beacon/exchange/cli/ListCollectionsExchange.java
View file

@ -1,9 +1,9 @@
package io.xpipe.beacon.exchange.cli;
import io.xpipe.beacon.exchange.MessageExchange;
import io.xpipe.beacon.exchange.data.CollectionListEntry;
import io.xpipe.beacon.RequestMessage;
import io.xpipe.beacon.ResponseMessage;
import io.xpipe.beacon.exchange.MessageExchange;
import io.xpipe.beacon.exchange.data.CollectionListEntry;
import lombok.Builder;
import lombok.Value;
import lombok.extern.jackson.Jacksonized;
@ -20,9 +20,7 @@ public class ListCollectionsExchange implements MessageExchange {
@Jacksonized
@Builder
@Value
public static class Request implements RequestMessage {
}
public static class Request implements RequestMessage {}
@Jacksonized
@Builder

4
beacon/src/main/java/io/xpipe/beacon/exchange/cli/ListEntriesExchange.java
View file

@ -1,9 +1,9 @@
package io.xpipe.beacon.exchange.cli;
import io.xpipe.beacon.exchange.MessageExchange;
import io.xpipe.beacon.exchange.data.EntryListEntry;
import io.xpipe.beacon.RequestMessage;
import io.xpipe.beacon.ResponseMessage;
import io.xpipe.beacon.exchange.MessageExchange;
import io.xpipe.beacon.exchange.data.EntryListEntry;
import lombok.Builder;
import lombok.Value;
import lombok.extern.jackson.Jacksonized;

8
beacon/src/main/java/io/xpipe/beacon/exchange/cli/ListStoresExchange.java
View file

@ -1,9 +1,9 @@
package io.xpipe.beacon.exchange.cli;
import io.xpipe.beacon.exchange.MessageExchange;
import io.xpipe.beacon.exchange.data.StoreListEntry;
import io.xpipe.beacon.RequestMessage;
import io.xpipe.beacon.ResponseMessage;
import io.xpipe.beacon.exchange.MessageExchange;
import io.xpipe.beacon.exchange.data.StoreListEntry;
import lombok.Builder;
import lombok.Value;
import lombok.extern.jackson.Jacksonized;
@ -20,9 +20,7 @@ public class ListStoresExchange implements MessageExchange {
@Jacksonized
@Builder
@Value
public static class Request implements RequestMessage {
}
public static class Request implements RequestMessage {}
@Jacksonized
@Builder

6
beacon/src/main/java/io/xpipe/beacon/exchange/cli/ModeExchange.java
View file

@ -1,8 +1,8 @@
package io.xpipe.beacon.exchange.cli;
import io.xpipe.beacon.exchange.MessageExchange;
import io.xpipe.beacon.RequestMessage;
import io.xpipe.beacon.ResponseMessage;
import io.xpipe.beacon.exchange.MessageExchange;
import lombok.Builder;
import lombok.NonNull;
import lombok.Value;
@ -26,7 +26,5 @@ public class ModeExchange implements MessageExchange {
@Jacksonized
@Builder
@Value
public static class Response implements ResponseMessage {
}
public static class Response implements ResponseMessage {}
}

5
beacon/src/main/java/io/xpipe/beacon/exchange/cli/RemoveCollectionExchange.java
View file

@ -1,8 +1,8 @@
package io.xpipe.beacon.exchange.cli;
import io.xpipe.beacon.exchange.MessageExchange;
import io.xpipe.beacon.RequestMessage;
import io.xpipe.beacon.ResponseMessage;
import io.xpipe.beacon.exchange.MessageExchange;
import lombok.Builder;
import lombok.NonNull;
import lombok.Value;
@ -26,6 +26,5 @@ public class RemoveCollectionExchange implements MessageExchange {
@Jacksonized
@Builder
@Value
public static class Response implements ResponseMessage {
}
public static class Response implements ResponseMessage {}
}

2
beacon/src/main/java/io/xpipe/beacon/exchange/cli/RemoveEntryExchange.java
View file

@ -1,8 +1,8 @@
package io.xpipe.beacon.exchange.cli;
import io.xpipe.beacon.exchange.MessageExchange;
import io.xpipe.beacon.RequestMessage;
import io.xpipe.beacon.ResponseMessage;
import io.xpipe.beacon.exchange.MessageExchange;
import io.xpipe.core.source.DataSourceId;
import io.xpipe.core.source.DataSourceReference;
import lombok.Builder;

5
beacon/src/main/java/io/xpipe/beacon/exchange/cli/RemoveStoreExchange.java
View file

@ -1,8 +1,8 @@
package io.xpipe.beacon.exchange.cli;
import io.xpipe.beacon.exchange.MessageExchange;
import io.xpipe.beacon.RequestMessage;
import io.xpipe.beacon.ResponseMessage;
import io.xpipe.beacon.exchange.MessageExchange;
import lombok.Builder;
import lombok.NonNull;
import lombok.Value;
@ -28,6 +28,5 @@ public class RemoveStoreExchange implements MessageExchange {
@Jacksonized
@Builder
@Value
public static class Response implements ResponseMessage {
}
public static class Response implements ResponseMessage {}
}

6
beacon/src/main/java/io/xpipe/beacon/exchange/cli/RenameCollectionExchange.java
View file

@ -1,8 +1,8 @@
package io.xpipe.beacon.exchange.cli;
import io.xpipe.beacon.exchange.MessageExchange;
import io.xpipe.beacon.RequestMessage;
import io.xpipe.beacon.ResponseMessage;
import io.xpipe.beacon.exchange.MessageExchange;
import lombok.Builder;
import lombok.NonNull;
import lombok.Value;
@ -21,6 +21,7 @@ public class RenameCollectionExchange implements MessageExchange {
public static class Request implements RequestMessage {
@NonNull
String collectionName;
@NonNull
String newName;
}
@ -28,6 +29,5 @@ public class RenameCollectionExchange implements MessageExchange {
@Jacksonized
@Builder
@Value
public static class Response implements ResponseMessage {
}
public static class Response implements ResponseMessage {}
}

5
beacon/src/main/java/io/xpipe/beacon/exchange/cli/RenameEntryExchange.java
View file

@ -1,8 +1,8 @@
package io.xpipe.beacon.exchange.cli;
import io.xpipe.beacon.exchange.MessageExchange;
import io.xpipe.beacon.RequestMessage;
import io.xpipe.beacon.ResponseMessage;
import io.xpipe.beacon.exchange.MessageExchange;
import io.xpipe.core.source.DataSourceId;
import io.xpipe.core.source.DataSourceReference;
import lombok.Builder;
@ -32,6 +32,7 @@ public class RenameEntryExchange implements MessageExchange {
@Builder
@Value
public static class Response implements ResponseMessage {
@NonNull DataSourceId newId;
@NonNull
DataSourceId newId;
}
}

6
beacon/src/main/java/io/xpipe/beacon/exchange/cli/RenameStoreExchange.java
View file

@ -1,8 +1,8 @@
package io.xpipe.beacon.exchange.cli;
import io.xpipe.beacon.exchange.MessageExchange;
import io.xpipe.beacon.RequestMessage;
import io.xpipe.beacon.ResponseMessage;
import io.xpipe.beacon.exchange.MessageExchange;
import lombok.Builder;
import lombok.NonNull;
import lombok.Value;
@ -21,6 +21,7 @@ public class RenameStoreExchange implements MessageExchange {
public static class Request implements RequestMessage {
@NonNull
String storeName;
@NonNull
String newName;
}
@ -28,6 +29,5 @@ public class RenameStoreExchange implements MessageExchange {
@Jacksonized
@Builder
@Value
public static class Response implements ResponseMessage {
}
public static class Response implements ResponseMessage {}
}

5
beacon/src/main/java/io/xpipe/beacon/exchange/cli/SelectExchange.java
View file

@ -1,8 +1,8 @@
package io.xpipe.beacon.exchange.cli;
import io.xpipe.beacon.exchange.MessageExchange;
import io.xpipe.beacon.RequestMessage;
import io.xpipe.beacon.ResponseMessage;
import io.xpipe.beacon.exchange.MessageExchange;
import io.xpipe.core.source.DataSourceReference;
import lombok.Builder;
import lombok.NonNull;
@ -27,6 +27,5 @@ public class SelectExchange implements MessageExchange {
@Jacksonized
@Builder
@Value
public static class Response implements ResponseMessage {
}
public static class Response implements ResponseMessage {}
}

10
beacon/src/main/java/io/xpipe/beacon/exchange/cli/SourceProviderListExchange.java
View file

@ -1,9 +1,9 @@
package io.xpipe.beacon.exchange.cli;
import io.xpipe.beacon.exchange.MessageExchange;
import io.xpipe.beacon.exchange.data.ProviderEntry;
import io.xpipe.beacon.RequestMessage;
import io.xpipe.beacon.ResponseMessage;
import io.xpipe.beacon.exchange.MessageExchange;
import io.xpipe.beacon.exchange.data.ProviderEntry;
import io.xpipe.core.source.DataSourceType;
import lombok.Builder;
import lombok.NonNull;
@ -23,13 +23,13 @@ public class SourceProviderListExchange implements MessageExchange {
@Jacksonized
@Builder
@Value
public static class Request implements RequestMessage {
}
public static class Request implements RequestMessage {}
@Jacksonized
@Builder
@Value
public static class Response implements ResponseMessage {
@NonNull Map<DataSourceType, List<ProviderEntry>> entries;
@NonNull
Map<DataSourceType, List<ProviderEntry>> entries;
}
}

5
beacon/src/main/java/io/xpipe/beacon/exchange/cli/StatusExchange.java
View file

@ -1,8 +1,8 @@
package io.xpipe.beacon.exchange.cli;
import io.xpipe.beacon.exchange.MessageExchange;
import io.xpipe.beacon.RequestMessage;
import io.xpipe.beacon.ResponseMessage;
import io.xpipe.beacon.exchange.MessageExchange;
import lombok.Builder;
import lombok.Value;
import lombok.extern.jackson.Jacksonized;
@ -17,8 +17,7 @@ public class StatusExchange implements MessageExchange {
@Jacksonized
@Builder
@Value
public static class Request implements RequestMessage {
}
public static class Request implements RequestMessage {}
@Jacksonized
@Builder

2
beacon/src/main/java/io/xpipe/beacon/exchange/cli/StoreAddExchange.java
View file

@ -1,8 +1,8 @@
package io.xpipe.beacon.exchange.cli;
import io.xpipe.beacon.exchange.MessageExchange;
import io.xpipe.beacon.RequestMessage;
import io.xpipe.beacon.ResponseMessage;
import io.xpipe.beacon.exchange.MessageExchange;
import io.xpipe.core.dialog.DialogReference;
import io.xpipe.core.store.DataStore;
import lombok.Builder;

6
beacon/src/main/java/io/xpipe/beacon/exchange/cli/StoreProviderListExchange.java
View file

@ -21,13 +21,13 @@ public class StoreProviderListExchange implements MessageExchange {
@Jacksonized
@Builder
@Value
public static class Request implements RequestMessage {
}
public static class Request implements RequestMessage {}
@Jacksonized
@Builder
@Value
public static class Response implements ResponseMessage {
@NonNull List<ProviderEntry> entries;
@NonNull
List<ProviderEntry> entries;
}
}

6
beacon/src/main/java/io/xpipe/beacon/exchange/cli/VersionExchange.java
View file

@ -1,8 +1,8 @@
package io.xpipe.beacon.exchange.cli;
import io.xpipe.beacon.exchange.MessageExchange;
import io.xpipe.beacon.RequestMessage;
import io.xpipe.beacon.ResponseMessage;
import io.xpipe.beacon.exchange.MessageExchange;
import lombok.Builder;
import lombok.Value;
import lombok.extern.jackson.Jacksonized;
@ -17,9 +17,7 @@ public class VersionExchange implements MessageExchange {
@lombok.extern.jackson.Jacksonized
@lombok.Builder
@lombok.Value
public static class Request implements RequestMessage {
}
public static class Request implements RequestMessage {}
@Jacksonized
@Builder

5
beacon/src/main/java/io/xpipe/beacon/exchange/cli/WriteExecuteExchange.java
View file

@ -1,8 +1,8 @@
package io.xpipe.beacon.exchange.cli;
import io.xpipe.beacon.exchange.MessageExchange;
import io.xpipe.beacon.RequestMessage;
import io.xpipe.beacon.ResponseMessage;
import io.xpipe.beacon.exchange.MessageExchange;
import io.xpipe.core.source.DataSourceReference;
import lombok.Builder;
import lombok.NonNull;
@ -35,6 +35,5 @@ public class WriteExecuteExchange implements MessageExchange {
@Jacksonized
@Builder
@Value
public static class Response implements ResponseMessage {
}
public static class Response implements ResponseMessage {}
}

2
beacon/src/main/java/io/xpipe/beacon/exchange/cli/WritePreparationExchange.java
View file

@ -26,8 +26,10 @@ public class WritePreparationExchange implements MessageExchange {
@Value
public static class Request implements RequestMessage {
String type;
@NonNull
DataStore output;
@NonNull
DataSourceReference source;
}

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

@ -1,5 +1,7 @@
import io.xpipe.beacon.exchange.*;
import io.xpipe.beacon.exchange.api.*;
import io.xpipe.beacon.exchange.api.QueryRawDataExchange;
import io.xpipe.beacon.exchange.api.QueryTableDataExchange;
import io.xpipe.beacon.exchange.api.QueryTextDataExchange;
import io.xpipe.beacon.exchange.cli.*;
module io.xpipe.beacon {
@ -21,6 +23,7 @@ module io.xpipe.beacon {
requires static lombok;
uses MessageExchange;
provides io.xpipe.beacon.exchange.MessageExchange with
ForwardExchange,
InstanceExchange,
@ -55,4 +58,4 @@ module io.xpipe.beacon {
QueryRawDataExchange,
QueryTableDataExchange,
VersionExchange;
}
}

2
core/build.gradle
View file

@ -13,7 +13,7 @@ compileJava {
options.compilerArgs << '-parameters'
}
dependencies{
dependencies {
api group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "2.13.0"
implementation group: 'com.fasterxml.jackson.module', name: 'jackson-module-parameter-names', version: "2.13.0"
implementation group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: "2.13.0"

91
core/src/main/java/io/xpipe/core/charsetter/Charsetter.java
View file

@ -4,7 +4,10 @@ import io.xpipe.core.store.FileStore;
import io.xpipe.core.store.StreamDataStore;
import lombok.Value;
import java.io.*;
import java.io.BufferedReader;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.nio.ByteBuffer;
import java.nio.CharBuffer;
import java.nio.charset.*;
@ -15,8 +18,12 @@ import java.util.Map;
public abstract class Charsetter {
private static final int MAX_BYTES = 8192;
public static Charsetter INSTANCE;
private static CharsetterUniverse universe;
protected Charsetter() {}
protected static void checkInit() {
if (universe == null) {
throw new IllegalStateException("Charsetter not initialized");
@ -27,30 +34,25 @@ public abstract class Charsetter {
universe = CharsetterUniverse.create(ctx);
}
@Value
public static class Result {
StreamCharset charset;
NewLine newLine;
}
protected Charsetter() {
}
public static Charsetter INSTANCE;
public static Charsetter get() {
return INSTANCE;
}
@FunctionalInterface
public interface FailableSupplier<R, E extends Throwable> {
R get() throws E;
}
@FunctionalInterface
public interface FailableConsumer<T, E extends Throwable> {
void accept(T var1) throws E;
private static int count(byte[] outerArray, byte[] smallerArray) {
int count = 0;
for (int i = 0; i < outerArray.length - smallerArray.length + 1; ++i) {
boolean found = true;
for (int j = 0; j < smallerArray.length; ++j) {
if (outerArray[i + j] != smallerArray[j]) {
found = false;
break;
}
}
if (found) {
count++;
}
}
return count;
}
public BufferedReader reader(StreamDataStore store, StreamCharset charset) throws Exception {
@ -73,16 +75,15 @@ public abstract class Charsetter {
return new BufferedReader(new InputStreamReader(stream, charset.getCharset()));
}
public abstract Result read(FailableSupplier<InputStream, Exception> in, FailableConsumer<InputStreamReader, Exception> con) throws Exception;
private static final int MAX_BYTES = 8192;
public abstract Result read(
FailableSupplier<InputStream, Exception> in, FailableConsumer<InputStreamReader, Exception> con)
throws Exception;
public Result detect(StreamDataStore store) throws Exception {
Result result = new Result(null, null);
if (store.canOpen()) {
try (InputStream inputStream = store.openBufferedInput()) {
StreamCharset detected = null;
for (var charset : StreamCharset.COMMON) {
@ -135,25 +136,10 @@ public abstract class Charsetter {
return null;
}
return count.entrySet().stream().min(Comparator.comparingInt(Map.Entry::getValue))
.orElseThrow().getKey();
}
private static int count(byte[] outerArray, byte[] smallerArray) {
int count = 0;
for (int i = 0; i < outerArray.length - smallerArray.length + 1; ++i) {
boolean found = true;
for (int j = 0; j < smallerArray.length; ++j) {
if (outerArray[i + j] != smallerArray[j]) {
found = false;
break;
}
}
if (found) {
count++;
}
}
return count;
return count.entrySet().stream()
.min(Comparator.comparingInt(Map.Entry::getValue))
.orElseThrow()
.getKey();
}
public Charset inferCharset(byte[] content) {
@ -179,4 +165,21 @@ public abstract class Charsetter {
return StandardCharsets.UTF_8;
}
@FunctionalInterface
public interface FailableSupplier<R, E extends Throwable> {
R get() throws E;
}
@FunctionalInterface
public interface FailableConsumer<T, E extends Throwable> {
void accept(T var1) throws E;
}
@Value
public static class Result {
StreamCharset charset;
NewLine newLine;
}
}

12
core/src/main/java/io/xpipe/core/charsetter/CharsetterContext.java
View file

@ -11,15 +11,13 @@ import java.util.Locale;
@AllArgsConstructor
public class CharsetterContext {
public static CharsetterContext empty() {
return new CharsetterContext(Charset.defaultCharset().name(), Locale.getDefault(), Locale.getDefault(), List.of());
}
String systemCharsetName;
Locale systemLocale;
Locale appLocale;
List<String> observedCharsets;
public static CharsetterContext empty() {
return new CharsetterContext(
Charset.defaultCharset().name(), Locale.getDefault(), Locale.getDefault(), List.of());
}
}

27
core/src/main/java/io/xpipe/core/charsetter/NewLine.java
View file

@ -5,24 +5,11 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import java.util.Arrays;
public enum NewLine {
@JsonProperty("lf")
LF("\n", "lf"),
@JsonProperty("crlf")
CRLF("\r\n", "crlf");
public static NewLine platform() {
return Arrays.stream(values())
.filter(n -> n.getNewLine().equals(System.getProperty("line.separator")))
.findFirst().orElseThrow();
}
public static NewLine id(String id) {
return Arrays.stream(values())
.filter(n -> n.getId().equalsIgnoreCase(id))
.findFirst().orElseThrow();
}
private final String newLine;
private final String id;
@ -31,6 +18,20 @@ public enum NewLine {
this.id = id;
}
public static NewLine platform() {
return Arrays.stream(values())
.filter(n -> n.getNewLine().equals(System.getProperty("line.separator")))
.findFirst()
.orElseThrow();
}
public static NewLine id(String id) {
return Arrays.stream(values())
.filter(n -> n.getId().equalsIgnoreCase(id))
.findFirst()
.orElseThrow();
}
public String getNewLine() {
return newLine;
}

91
core/src/main/java/io/xpipe/core/charsetter/StreamCharset.java
View file

@ -13,10 +13,42 @@ import java.util.stream.Stream;
@Value
public class StreamCharset {
public static final StreamCharset UTF8 = new StreamCharset(StandardCharsets.UTF_8, null);
public static final StreamCharset UTF8_BOM =
new StreamCharset(StandardCharsets.UTF_8, new byte[] {(byte) 0xEF, (byte) 0xBB, (byte) 0xBF});
public static final StreamCharset UTF16 = new StreamCharset(StandardCharsets.UTF_16, null);
public static final StreamCharset UTF16_BOM =
new StreamCharset(StandardCharsets.UTF_16, new byte[] {(byte) 0xFE, (byte) 0xFF});
public static final StreamCharset UTF16_LE = new StreamCharset(StandardCharsets.UTF_16LE, null);
public static final StreamCharset UTF16_LE_BOM =
new StreamCharset(StandardCharsets.UTF_16LE, new byte[] {(byte) 0xFF, (byte) 0xFE});
public static final StreamCharset UTF32 = new StreamCharset(Charset.forName("utf-32"), null);
public static final StreamCharset UTF32_BOM =
new StreamCharset(Charset.forName("utf-32"), new byte[] {0x00, 0x00, (byte) 0xFE, (byte) 0xFF});
public static final List<StreamCharset> COMMON = List.of(
UTF8,
UTF8_BOM,
UTF16,
UTF16_BOM,
UTF16_LE,
UTF16_LE_BOM,
UTF32,
UTF32_BOM,
new StreamCharset(StandardCharsets.US_ASCII, null),
new StreamCharset(StandardCharsets.ISO_8859_1, null),
new StreamCharset(Charset.forName("Windows-1251"), null),
new StreamCharset(Charset.forName("Windows-1252"), null));
public static final List<StreamCharset> RARE = Charset.availableCharsets().values().stream()
.filter(charset -> COMMON.stream().noneMatch(c -> c.getCharset().equals(charset)))
.map(charset -> new StreamCharset(charset, null))
.toList();
Charset charset;
byte[] byteOrderMark;
public static StreamCharset get(Charset charset, boolean byteOrderMark) {
return Stream.concat(COMMON.stream(), RARE.stream())
.filter(streamCharset -> streamCharset.getCharset()
.equals(charset) && streamCharset.hasByteOrderMark() == byteOrderMark)
.filter(streamCharset ->
streamCharset.getCharset().equals(charset) && streamCharset.hasByteOrderMark() == byteOrderMark)
.findFirst()
.orElseThrow();
}
@ -24,66 +56,15 @@ public class StreamCharset {
@JsonCreator
public static StreamCharset get(String s) {
var byteOrderMark = s.endsWith("-bom");
var charset = Charset.forName(s.substring(
0, s.length() - (byteOrderMark ?
4 :
0)));
var charset = Charset.forName(s.substring(0, s.length() - (byteOrderMark ? 4 : 0)));
return StreamCharset.get(charset, byteOrderMark);
}
Charset charset;
byte[] byteOrderMark;
@JsonValue
public String toString() {
return getCharset()
.name().toLowerCase(Locale.ROOT) + (hasByteOrderMark() ?
"-bom" :
"");
return getCharset().name().toLowerCase(Locale.ROOT) + (hasByteOrderMark() ? "-bom" : "");
}
public static final StreamCharset UTF8 = new StreamCharset(StandardCharsets.UTF_8, null);
public static final StreamCharset UTF8_BOM = new StreamCharset(StandardCharsets.UTF_8, new byte[]{
(byte) 0xEF,
(byte) 0xBB,
(byte) 0xBF
});
public static final StreamCharset UTF16 = new StreamCharset(StandardCharsets.UTF_16, null);
public static final StreamCharset UTF16_BOM = new StreamCharset(StandardCharsets.UTF_16, new byte[]{
(byte) 0xFE,
(byte) 0xFF
});
public static final StreamCharset UTF16_LE = new StreamCharset(StandardCharsets.UTF_16LE, null);
public static final StreamCharset UTF16_LE_BOM = new StreamCharset(StandardCharsets.UTF_16LE, new byte[]{
(byte) 0xFF,
(byte) 0xFE
});
public static final StreamCharset UTF32 = new StreamCharset(Charset.forName("utf-32"), null);
public static final StreamCharset UTF32_BOM = new StreamCharset(Charset.forName("utf-32"), new byte[]{
0x00,
0x00,
(byte) 0xFE,
(byte) 0xFF
});
public static final List<StreamCharset> COMMON = List.of(
UTF8, UTF8_BOM, UTF16, UTF16_BOM, UTF16_LE, UTF16_LE_BOM, UTF32, UTF32_BOM, new StreamCharset(StandardCharsets.US_ASCII, null),
new StreamCharset(StandardCharsets.ISO_8859_1, null),
new StreamCharset(Charset.forName("Windows-1251"), null), new StreamCharset(Charset.forName("Windows-1252"), null)
);
public static final List<StreamCharset> RARE = Charset.availableCharsets()
.values()
.stream()
.filter(charset -> COMMON.stream()
.noneMatch(c -> c.getCharset()
.equals(charset)))
.map(charset -> new StreamCharset(charset, null))
.toList();
public boolean hasByteOrderMark() {
return byteOrderMark != null;
}

6
core/src/main/java/io/xpipe/core/data/generic/GenericArrayReader.java
View file

@ -1,7 +1,7 @@
package io.xpipe.core.data.generic;
import io.xpipe.core.data.node.DataStructureNode;
import io.xpipe.core.data.node.ArrayNode;
import io.xpipe.core.data.node.DataStructureNode;
import io.xpipe.core.data.node.ValueNode;
import java.util.ArrayList;
@ -16,8 +16,8 @@ public class GenericArrayReader implements GenericAbstractReader {
private int currentIndex = 0;
private GenericAbstractReader currentReader;
private DataStructureNode created;
public GenericArrayReader() {
}
public GenericArrayReader() {}
public static GenericArrayReader newReader(int length) {
var ar = new GenericArrayReader();

19
core/src/main/java/io/xpipe/core/data/generic/GenericDataStreamCallback.java
View file

@ -4,22 +4,15 @@ import java.util.Map;
public interface GenericDataStreamCallback {
default void onName(String name) {
}
default void onName(String name) {}
default void onArrayStart(int length) {
}
default void onArrayStart(int length) {}
default void onArrayEnd(Map<Integer, String> metaAttributes) {
}
default void onArrayEnd(Map<Integer, String> metaAttributes) {}
default void onTupleStart(int length) {
}
default void onTupleStart(int length) {}
default void onTupleEnd(Map<Integer, String> metaAttributes) {
}
default void onTupleEnd(Map<Integer, String> metaAttributes) {}
default void onValue(byte[] value, Map<Integer, String> metaAttributes) {
}
default void onValue(byte[] value, Map<Integer, String> metaAttributes) {}
}

1
core/src/main/java/io/xpipe/core/data/generic/GenericDataStructureNodeReader.java
View file

@ -86,7 +86,6 @@ public class GenericDataStructureNodeReader implements GenericDataStreamCallback
return;
}
node = ValueNode.of(value).tag(metaAttributes);
}
}

4
core/src/main/java/io/xpipe/core/data/generic/GenericTupleReader.java
View file

@ -18,8 +18,8 @@ public class GenericTupleReader implements GenericAbstractReader {
private int currentIndex = 0;
private GenericAbstractReader currentReader;
private DataStructureNode created;
public GenericTupleReader() {
}
public GenericTupleReader() {}
public static GenericTupleReader newReader(int length) {
var tr = new GenericTupleReader();

11
core/src/main/java/io/xpipe/core/data/node/ArrayNode.java
View file

@ -8,6 +8,8 @@ import java.util.stream.Collectors;
public abstract class ArrayNode extends DataStructureNode {
protected ArrayNode() {}
public static ArrayNode empty() {
return of(List.of());
}
@ -20,9 +22,6 @@ public abstract class ArrayNode extends DataStructureNode {
return new SimpleArrayNode(nodes);
}
protected ArrayNode() {
}
@Override
public boolean equals(Object o) {
if (this == o) {
@ -32,7 +31,8 @@ public abstract class ArrayNode extends DataStructureNode {
return false;
}
var toReturn = getNodes().equals(that.getNodes()) && Objects.equals(getMetaAttributes(), that.getMetaAttributes());
var toReturn =
getNodes().equals(that.getNodes()) && Objects.equals(getMetaAttributes(), that.getMetaAttributes());
// Useful for debugging
if (toReturn == false) {
@ -64,6 +64,7 @@ public abstract class ArrayNode extends DataStructureNode {
@Override
public final ArrayType determineDataType() {
return ArrayType.ofSharedType(getNodes().stream().map(DataStructureNode::determineDataType).toList());
return ArrayType.ofSharedType(
getNodes().stream().map(DataStructureNode::determineDataType).toList());
}
}

23
core/src/main/java/io/xpipe/core/data/node/DataStructureNode.java
View file

@ -67,7 +67,6 @@ public abstract class DataStructureNode implements Iterable<DataStructureNode> {
return this;
}
public String getMetaAttribute(Integer key) {
if (metaAttributes == null) {
return null;
@ -104,9 +103,6 @@ public abstract class DataStructureNode implements Iterable<DataStructureNode> {
throw unsupported("get nodes");
}
public record KeyValue(String key, DataStructureNode value) {
}
protected abstract String getName();
protected UnsupportedOperationException unsupported(String s) {
@ -125,12 +121,15 @@ public abstract class DataStructureNode implements Iterable<DataStructureNode> {
}
public String metaToString() {
return "(" + (metaAttributes != null ?
metaAttributes.entrySet()
.stream()
.map(e -> e.getValue() != null ? e.getKey() + ":" + e.getValue() : e.getKey().toString())
.collect(Collectors.joining("|")) :
"") + ")";
return "("
+ (metaAttributes != null
? metaAttributes.entrySet().stream()
.map(e -> e.getValue() != null
? e.getKey() + ":" + e.getValue()
: e.getKey().toString())
.collect(Collectors.joining("|"))
: "")
+ ")";
}
public abstract String toString(int indent);
@ -146,11 +145,11 @@ public abstract class DataStructureNode implements Iterable<DataStructureNode> {
public boolean isValue() {
return false;
}
public DataStructureNode set(int index, DataStructureNode node) {
throw unsupported("set at index");
}
public final ValueNode asValue() {
if (!isValue()) {
throw new UnsupportedOperationException(getName() + " is not a value node");
@ -235,4 +234,6 @@ public abstract class DataStructureNode implements Iterable<DataStructureNode> {
public Iterator<DataStructureNode> iterator() {
throw unsupported("iterator creation");
}
public record KeyValue(String key, DataStructureNode value) {}
}

8
core/src/main/java/io/xpipe/core/data/node/DataStructureNodePointer.java
View file

@ -152,9 +152,7 @@ public class DataStructureNodePointer {
@Override
public DataStructureNode tryMatch(DataStructureNode n) {
var res = n.stream()
.filter(selector)
.findAny();
var res = n.stream().filter(selector).findAny();
return res.orElse(null);
}
@ -184,7 +182,6 @@ public class DataStructureNodePointer {
return new Builder(new ArrayList<>(path));
}
public Builder name(String name) {
path.add(new NameElement(name));
return this;
@ -219,7 +216,8 @@ public class DataStructureNodePointer {
});
}
public Builder pointerEvaluation(DataStructureNodePointer pointer, Function<DataStructureNode, String> converter) {
public Builder pointerEvaluation(
DataStructureNodePointer pointer, Function<DataStructureNode, String> converter) {
path.add(new FunctionElement((current) -> {
var res = pointer.get(current);
if (res != null) {

8
core/src/main/java/io/xpipe/core/data/node/LinkedTupleNode.java
View file

@ -84,7 +84,9 @@ public class LinkedTupleNode extends TupleNode {
@Override
public DataType determineDataType() {
return TupleType.of(getKeyNames(), getNodes().stream().map(DataStructureNode::determineDataType).toList());
return TupleType.of(
getKeyNames(),
getNodes().stream().map(DataStructureNode::determineDataType).toList());
}
@Override
@ -142,7 +144,6 @@ public class LinkedTupleNode extends TupleNode {
return "LinkedTupleNode(" + size() + ")";
}
@Override
public int size() {
return tupleNodes.stream().mapToInt(TupleNode::size).sum();
@ -174,6 +175,7 @@ public class LinkedTupleNode extends TupleNode {
return this;
}
return new LinkedTupleNode(tupleNodes.stream().map(n -> n.isMutable() ? n : n.mutable()).toList());
return new LinkedTupleNode(
tupleNodes.stream().map(n -> n.isMutable() ? n : n.mutable()).toList());
}
}

4
core/src/main/java/io/xpipe/core/data/node/SimpleArrayNode.java
View file

@ -10,8 +10,6 @@ import java.util.function.Consumer;
import java.util.stream.Stream;
@AllArgsConstructor
public class SimpleArrayNode extends ArrayNode {
List<DataStructureNode> nodes;
@ -79,6 +77,4 @@ public class SimpleArrayNode extends ArrayNode {
nodes.remove(index);
return this;
}
}

7
core/src/main/java/io/xpipe/core/data/node/SimpleValueNode.java
View file

@ -23,8 +23,11 @@ public class SimpleValueNode extends ValueNode {
@Override
public String toString(int indent) {
var string = getRawData().length == 0 && !hasMetaAttribute(IS_TEXT) ? "<null>" : new String(getRawData(), StandardCharsets.UTF_8);
return (hasMetaAttribute(IS_TEXT) ? "\"" : "") + string + (hasMetaAttribute(IS_TEXT) ? "\"" : "") + " " + metaToString();
var string = getRawData().length == 0 && !hasMetaAttribute(IS_TEXT)
? "<null>"
: new String(getRawData(), StandardCharsets.UTF_8);
return (hasMetaAttribute(IS_TEXT) ? "\"" : "") + string + (hasMetaAttribute(IS_TEXT) ? "\"" : "") + " "
+ metaToString();
}
@Override

32
core/src/main/java/io/xpipe/core/data/node/TupleNode.java
View file

@ -5,7 +5,6 @@ import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
public abstract class TupleNode extends DataStructureNode {
public static Builder builder() {
@ -46,13 +45,15 @@ public abstract class TupleNode extends DataStructureNode {
public String toString(int indent) {
var is = " ".repeat(indent);
var start = "{\n";
var kvs = getKeyValuePairs().stream().map(kv -> {
if (kv.key() == null) {
return is + " " + kv.value().toString(indent + 1) + "\n";
} else {
return is + " " + kv.key() + "=" + kv.value().toString(indent + 1) + "\n";
}
}).collect(Collectors.joining());
var kvs = getKeyValuePairs().stream()
.map(kv -> {
if (kv.key() == null) {
return is + " " + kv.value().toString(indent + 1) + "\n";
} else {
return is + " " + kv.key() + "=" + kv.value().toString(indent + 1) + "\n";
}
})
.collect(Collectors.joining());
var end = is + "}";
return start + kvs + end;
}
@ -65,8 +66,9 @@ public abstract class TupleNode extends DataStructureNode {
if (!(o instanceof TupleNode that)) {
return false;
}
var toReturn = getKeyNames().equals(that.getKeyNames()) && getNodes().equals(that.getNodes()) &&
Objects.equals(getMetaAttributes(), that.getMetaAttributes());
var toReturn = getKeyNames().equals(that.getKeyNames())
&& getNodes().equals(that.getNodes())
&& Objects.equals(getMetaAttributes(), that.getMetaAttributes());
// Useful for debugging
if (toReturn == false) {
@ -98,11 +100,11 @@ public abstract class TupleNode extends DataStructureNode {
public TupleNode build() {
boolean hasKeys = entries.stream().anyMatch(kv -> kv.key() != null);
return hasKeys ? TupleNode.of(
entries.stream().map(KeyValue::key).toList(),
entries.stream().map(KeyValue::value).toList()
) :
TupleNode.of(entries.stream().map(KeyValue::value).toList());
return hasKeys
? TupleNode.of(
entries.stream().map(KeyValue::key).toList(),
entries.stream().map(KeyValue::value).toList())
: TupleNode.of(entries.stream().map(KeyValue::value).toList());
}
}
}

53
core/src/main/java/io/xpipe/core/data/node/ValueNode.java
View file

@ -11,32 +11,7 @@ import java.util.Objects;
public abstract class ValueNode extends DataStructureNode {
protected ValueNode() {
}
@Override
public boolean equals(Object o) {
if (this == o) {
return true;
}
if (!(o instanceof ValueNode that)) {
return false;
}
var toReturn = Arrays.equals(getRawData(), that.getRawData()) && Objects.equals(getMetaAttributes(), that.getMetaAttributes());
// Useful for debugging
if (toReturn == false) {
return false;
}
return toReturn;
}
@Override
public int hashCode() {
return Arrays.hashCode(getRawData()) + Objects.hash(getMetaAttributes());
}
protected ValueNode() {}
public static ValueNode nullValue() {
return new SimpleValueNode(new byte[0]).tag(IS_NULL).asValue();
@ -79,6 +54,7 @@ public abstract class ValueNode extends DataStructureNode {
created.tag(IS_FLOATING_POINT);
return created;
}
public static ValueNode ofBoolean(Boolean bool) {
var created = of(bool);
created.tag(IS_BOOLEAN);
@ -93,6 +69,30 @@ public abstract class ValueNode extends DataStructureNode {
return of(o.toString().getBytes(StandardCharsets.UTF_8));
}
@Override
public boolean equals(Object o) {
if (this == o) {
return true;
}
if (!(o instanceof ValueNode that)) {
return false;
}
var toReturn = Arrays.equals(getRawData(), that.getRawData())
&& Objects.equals(getMetaAttributes(), that.getMetaAttributes());
// Useful for debugging
if (toReturn == false) {
return false;
}
return toReturn;
}
@Override
public int hashCode() {
return Arrays.hashCode(getRawData()) + Objects.hash(getMetaAttributes());
}
@Override
public final int asInt() {
return Integer.parseInt(asString());
@ -114,5 +114,4 @@ public abstract class ValueNode extends DataStructureNode {
}
public abstract byte[] getRawData();
}

12
core/src/main/java/io/xpipe/core/data/type/DataTypeVisitor.java
View file

@ -2,15 +2,11 @@ package io.xpipe.core.data.type;
public interface DataTypeVisitor {
default void onValue(ValueType type) {
}
default void onValue(ValueType type) {}
default void onTuple(TupleType type) {
}
default void onTuple(TupleType type) {}
default void onArray(ArrayType type) {
}
default void onArray(ArrayType type) {}
default void onWildcard(WildcardType type) {
}
default void onWildcard(WildcardType type) {}
}

4
core/src/main/java/io/xpipe/core/data/type/DataTypeVisitors.java
View file

@ -41,9 +41,7 @@ public class DataTypeVisitors {
* Creates a visitor that allows for visiting possible recursive columns of table.
*/
public static DataTypeVisitor table(
Consumer<String> newTuple,
Runnable endTuple,
BiConsumer<String, DataStructureNodePointer> newValue) {
Consumer<String> newTuple, Runnable endTuple, BiConsumer<String, DataStructureNodePointer> newValue) {
return new DataTypeVisitor() {
private final Stack<TupleType> tuples = new Stack<>();
private final Stack<Integer> keyIndices = new Stack<>();

4
core/src/main/java/io/xpipe/core/data/type/WildcardType.java
View file

@ -17,6 +17,8 @@ import java.util.Optional;
@Value
public class WildcardType extends DataType {
private WildcardType() {}
/**
* Creates a new instance.
*/
@ -24,8 +26,6 @@ public class WildcardType extends DataType {
return new WildcardType();
}
private WildcardType() {}
@Override
public String getName() {
return "wildcard";

24
core/src/main/java/io/xpipe/core/data/typed/TypedDataStreamCallback.java
View file

@ -7,27 +7,19 @@ import java.util.Map;
public interface TypedDataStreamCallback {
default void onValue(byte[] data, Map<Integer, String> metaAttributes) {
}
default void onValue(byte[] data, Map<Integer, String> metaAttributes) {}
default void onGenericNode(DataStructureNode node) {
}
default void onGenericNode(DataStructureNode node) {}
default void onTupleBegin(TupleType type) {
}
default void onTupleBegin(TupleType type) {}
default void onTupleEnd(Map<Integer, String> metaAttributes) {
}
default void onTupleEnd(Map<Integer, String> metaAttributes) {}
default void onArrayBegin(int size) {
}
default void onArrayBegin(int size) {}
default void onArrayEnd(Map<Integer, String> metaAttributes) {
}
default void onArrayEnd(Map<Integer, String> metaAttributes) {}
default void onNodeBegin() {
}
default void onNodeBegin() {}
default void onNodeEnd() {
}
default void onNodeEnd() {}
}

9
core/src/main/java/io/xpipe/core/data/typed/TypedDataStreamParser.java
View file

@ -1,9 +1,9 @@
package io.xpipe.core.data.typed;
import io.xpipe.core.data.node.DataStructureNode;
import io.xpipe.core.data.node.DataStructureNodeIO;
import io.xpipe.core.data.generic.GenericDataStreamParser;
import io.xpipe.core.data.generic.GenericDataStructureNodeReader;
import io.xpipe.core.data.node.DataStructureNode;
import io.xpipe.core.data.node.DataStructureNodeIO;
import io.xpipe.core.data.type.ArrayType;
import io.xpipe.core.data.type.DataType;
import io.xpipe.core.data.type.TupleType;
@ -21,7 +21,7 @@ public class TypedDataStreamParser {
this.dataType = dataType;
}
private boolean hasNext(InputStream in) throws IOException {
private boolean hasNext(InputStream in) throws IOException {
var b = in.read();
if (b == -1) {
return false;
@ -34,7 +34,8 @@ public class TypedDataStreamParser {
return true;
}
public void parseStructures(InputStream in, TypedAbstractReader cb, Consumer<DataStructureNode> consumer) throws IOException {
public void parseStructures(InputStream in, TypedAbstractReader cb, Consumer<DataStructureNode> consumer)
throws IOException {
while (hasNext(in)) {
cb.onNodeBegin();
parse(in, cb, dataType);

18
core/src/main/java/io/xpipe/core/data/typed/TypedDataStructureNodeReader.java
View file

@ -12,20 +12,13 @@ import java.util.Stack;
public class TypedDataStructureNodeReader implements TypedAbstractReader {
public static TypedDataStructureNodeReader of(DataType type) {
return new TypedDataStructureNodeReader(type);
}
private DataStructureNode readNode;
private final Stack<List<DataStructureNode>> children;
private final Stack<DataStructureNode> nodes;
private int arrayDepth;
private final List<DataType> flattened;
private DataStructureNode readNode;
private int arrayDepth;
private DataType expectedType;
private int currentExpectedTypeIndex;
private TypedDataStructureNodeReader(DataType type) {
flattened = new ArrayList<>();
type.visit(DataTypeVisitors.flatten(flattened::add));
@ -34,6 +27,10 @@ public class TypedDataStructureNodeReader implements TypedAbstractReader {
expectedType = flattened.get(0);
}
public static TypedDataStructureNodeReader of(DataType type) {
return new TypedDataStructureNodeReader(type);
}
@Override
public void onNodeBegin() {
if (nodes.size() != 0 || children.size() != 0) {
@ -134,7 +131,8 @@ public class TypedDataStructureNodeReader implements TypedAbstractReader {
private void moveExpectedType(boolean force) {
if (!isInArray() || force) {
currentExpectedTypeIndex++;
expectedType = currentExpectedTypeIndex == flattened.size() ? null : flattened.get(currentExpectedTypeIndex);
expectedType =
currentExpectedTypeIndex == flattened.size() ? null : flattened.get(currentExpectedTypeIndex);
}
}

3
core/src/main/java/io/xpipe/core/dialog/BaseQueryElement.java
View file

@ -20,7 +20,8 @@ public class BaseQueryElement extends DialogElement {
protected String value;
@JsonCreator
public BaseQueryElement(String description, boolean newLine, boolean required, boolean secret, boolean quiet, String value) {
public BaseQueryElement(
String description, boolean newLine, boolean required, boolean secret, boolean quiet, String value) {
this.description = description;
this.newLine = newLine;
this.required = required;

27
core/src/main/java/io/xpipe/core/dialog/ChoiceElement.java
View file

@ -18,6 +18,18 @@ public class ChoiceElement extends DialogElement {
private int selected;
@JsonCreator
public ChoiceElement(String description, List<Choice> elements, boolean required, int selected) {
if (elements.stream().allMatch(Choice::isDisabled)) {
throw new IllegalArgumentException("All choices are disabled");
}
this.description = description;
this.elements = elements;
this.required = required;
this.selected = selected;
}
@Override
public boolean requiresExplicitUserInput() {
return required && selected == -1;
@ -42,7 +54,8 @@ public class ChoiceElement extends DialogElement {
}
for (int i = 0; i < elements.size(); i++) {
if (elements.get(i).getCharacter() != null && elements.get(i).getCharacter().equals(c)) {
if (elements.get(i).getCharacter() != null
&& elements.get(i).getCharacter().equals(c)) {
selected = i;
return true;
}
@ -59,18 +72,6 @@ public class ChoiceElement extends DialogElement {
return false;
}
@JsonCreator
public ChoiceElement(String description, List<Choice> elements, boolean required, int selected) {
if (elements.stream().allMatch(Choice::isDisabled)) {
throw new IllegalArgumentException("All choices are disabled");
}
this.description = description;
this.elements = elements;
this.required = required;
this.selected = selected;
}
public List<Choice> getElements() {
return elements;
}

182
core/src/main/java/io/xpipe/core/dialog/Dialog.java
View file

@ -2,7 +2,9 @@ package io.xpipe.core.dialog;
import io.xpipe.core.util.SecretValue;
import java.util.*;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.function.Consumer;
import java.util.function.Function;
import java.util.function.Predicate;
@ -24,6 +26,10 @@ import java.util.function.Supplier;
*/
public abstract class Dialog {
private final List<Consumer<?>> completion = new ArrayList<>();
protected Object eval;
private Supplier<?> evaluation;
/**
* Creates an empty dialogue. This dialogue completes immediately and does not handle any questions or answers.
*/
@ -43,33 +49,6 @@ public abstract class Dialog {
};
}
public static class Choice extends Dialog {
private final ChoiceElement element;
private Choice(String description, List<io.xpipe.core.dialog.Choice> elements, boolean required, int selected) {
this.element = new ChoiceElement(description, elements, required, selected);
}
@Override
public DialogElement start() throws Exception {
return element;
}
@Override
protected DialogElement next(String answer) throws Exception {
if (element.apply(answer)) {
return null;
}
return element;
}
private int getSelected() {
return element.getSelected();
}
}
/**
* Creates a choice dialogue.
*
@ -78,7 +57,8 @@ public abstract class Dialog {
* @param required signals whether a choice is required or can be left empty
* @param selected the selected element index
*/
public static Dialog.Choice choice(String description, List<io.xpipe.core.dialog.Choice> elements, boolean required, int selected) {
public static Dialog.Choice choice(
String description, List<io.xpipe.core.dialog.Choice> elements, boolean required, int selected) {
Dialog.Choice c = new Dialog.Choice(description, elements, required, selected);
c.evaluateTo(c::getSelected);
return c;
@ -94,8 +74,11 @@ public abstract class Dialog {
* @param vals the range of possible elements
*/
@SafeVarargs
public static <T> Dialog.Choice choice(String description, Function<T, String> toString, boolean required, T def, T... vals) {
var elements = Arrays.stream(vals).map(v -> new io.xpipe.core.dialog.Choice(null, toString.apply(v))).toList();
public static <T> Dialog.Choice choice(
String description, Function<T, String> toString, boolean required, T def, T... vals) {
var elements = Arrays.stream(vals)
.map(v -> new io.xpipe.core.dialog.Choice(null, toString.apply(v)))
.toList();
var index = Arrays.asList(vals).indexOf(def);
if (def != null && index == -1) {
throw new IllegalArgumentException("Default value " + def.toString() + " is not in possible values");
@ -111,38 +94,6 @@ public abstract class Dialog {
return c;
}
public static class Query extends Dialog {
private final QueryElement element;
private <T> Query(String description, boolean newLine, boolean required, boolean quiet, T value, QueryConverter<T> converter, boolean hidden) {
this.element = new QueryElement(description, newLine, required, quiet, value, converter, hidden);
}
@Override
public DialogElement start() throws Exception {
return element;
}
@Override
protected DialogElement next(String answer) throws Exception {
if (element.requiresExplicitUserInput() && (answer == null || answer.trim()
.length() == 0)) {
return element;
}
if (element.apply(answer)) {
return null;
}
return element;
}
private <T> T getConvertedValue() {
return element.getConvertedValue();
}
}
/**
* Creates a simple query dialogue.
*
@ -155,7 +106,13 @@ public abstract class Dialog {
* @param value the default value
* @param converter the converter
*/
public static <T> Dialog.Query query(String description, boolean newLine, boolean required, boolean quiet, T value, QueryConverter<T> converter) {
public static <T> Dialog.Query query(
String description,
boolean newLine,
boolean required,
boolean quiet,
T value,
QueryConverter<T> converter) {
var q = new <T>Dialog.Query(description, newLine, required, quiet, value, converter, false);
q.evaluateTo(q::getConvertedValue);
return q;
@ -201,8 +158,7 @@ public abstract class Dialog {
DialogElement currentElement = ds[current].receive(answer);
if (currentElement == null) {
DialogElement next = null;
while (current < ds.length - 1 && (next = ds[++current].start()) == null) {
}
while (current < ds.length - 1 && (next = ds[++current].start()) == null) {}
;
return next;
}
@ -218,7 +174,6 @@ public abstract class Dialog {
public static <T> Dialog repeatIf(Dialog d, Predicate<T> shouldRepeat) {
return new Dialog() {
@Override
public DialogElement start() throws Exception {
eval = null;
@ -272,11 +227,6 @@ public abstract class Dialog {
return of(new BusyElement());
}
public static interface FailableSupplier<T> {
T get() throws Exception;
}
/**
* Creates a dialogue that will only evaluate when needed.
* This allows a dialogue to incorporate completion information about a previous dialogue.
@ -305,7 +255,6 @@ public abstract class Dialog {
private static Dialog of(DialogElement e) {
return new Dialog() {
@Override
public DialogElement start() throws Exception {
eval = null;
@ -323,7 +272,6 @@ public abstract class Dialog {
};
}
/**
* Creates a dialogue that will not be executed if the condition is true.
*/
@ -393,7 +341,12 @@ public abstract class Dialog {
* @param selected the index of the element that is selected by default
* @param c the dialogue index mapping function
*/
public static Dialog fork(String description, List<io.xpipe.core.dialog.Choice> elements, boolean required, int selected, Function<Integer, Dialog> c) {
public static Dialog fork(
String description,
List<io.xpipe.core.dialog.Choice> elements,
boolean required,
int selected,
Function<Integer, Dialog> c) {
var choice = new ChoiceElement(description, elements, required, selected);
return new Dialog() {
@ -427,13 +380,9 @@ public abstract class Dialog {
};
}
protected Object eval;
private Supplier<?> evaluation;
private final List<Consumer<?>> completion = new ArrayList<>();
/* TODO: Implement automatic completion mechanism for start as well
* In case start returns null, the completion is not automatically done.
* */
* In case start returns null, the completion is not automatically done.
* */
public abstract DialogElement start() throws Exception;
public Dialog evaluateTo(Dialog d) {
@ -493,4 +442,75 @@ public abstract class Dialog {
}
protected abstract DialogElement next(String answer) throws Exception;
public static interface FailableSupplier<T> {
T get() throws Exception;
}
public static class Choice extends Dialog {
private final ChoiceElement element;
private Choice(String description, List<io.xpipe.core.dialog.Choice> elements, boolean required, int selected) {
this.element = new ChoiceElement(description, elements, required, selected);
}
@Override
public DialogElement start() throws Exception {
return element;
}
@Override
protected DialogElement next(String answer) throws Exception {
if (element.apply(answer)) {
return null;
}
return element;
}
private int getSelected() {
return element.getSelected();
}
}
public static class Query extends Dialog {
private final QueryElement element;
private <T> Query(
String description,
boolean newLine,
boolean required,
boolean quiet,
T value,
QueryConverter<T> converter,
boolean hidden) {
this.element = new QueryElement(description, newLine, required, quiet, value, converter, hidden);
}
@Override
public DialogElement start() throws Exception {
return element;
}
@Override
protected DialogElement next(String answer) throws Exception {
if (element.requiresExplicitUserInput()
&& (answer == null || answer.trim().length() == 0)) {
return element;
}
if (element.apply(answer)) {
return null;
}
return element;
}
private <T> T getConvertedValue() {
return element.getConvertedValue();
}
}
}

6
core/src/main/java/io/xpipe/core/dialog/DialogCancelException.java
View file

@ -5,8 +5,7 @@ package io.xpipe.core.dialog;
*/
public class DialogCancelException extends Exception {
public DialogCancelException() {
}
public DialogCancelException() {}
public DialogCancelException(String message) {
super(message);
@ -20,7 +19,8 @@ public class DialogCancelException extends Exception {
super(cause);
}
public DialogCancelException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
public DialogCancelException(
String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
super(message, cause, enableSuppression, writableStackTrace);
}
}

40
core/src/main/java/io/xpipe/core/dialog/QueryConverter.java
View file

@ -23,7 +23,6 @@ public abstract class QueryConverter<T> {
}
};
public static final QueryConverter<StreamCharset> CHARSET = new QueryConverter<StreamCharset>() {
@Override
protected StreamCharset fromString(String s) {
@ -60,26 +59,27 @@ public abstract class QueryConverter<T> {
}
};
public static final QueryConverter<Map.Entry<String, String>> HTTP_HEADER = new QueryConverter<Map.Entry<String, String>>() {
@Override
protected Map.Entry<String, String> fromString(String s) {
if (!s.contains(":")) {
throw new IllegalArgumentException("Missing colon");
}
public static final QueryConverter<Map.Entry<String, String>> HTTP_HEADER =
new QueryConverter<Map.Entry<String, String>>() {
@Override
protected Map.Entry<String, String> fromString(String s) {
if (!s.contains(":")) {
throw new IllegalArgumentException("Missing colon");
}
var split = s.split(":");
if (split.length != 2) {
throw new IllegalArgumentException("Too many colons");
}
var split = s.split(":");
if (split.length != 2) {
throw new IllegalArgumentException("Too many colons");
}
return new AbstractMap.SimpleEntry<>(split[0].trim(), split[1].trim());
}
return new AbstractMap.SimpleEntry<>(split[0].trim(), split[1].trim());
}
@Override
protected String toString(Map.Entry<String, String> value) {
return value.getKey() + ": " + value.getValue();
}
};
@Override
protected String toString(Map.Entry<String, String> value) {
return value.getKey() + ": " + value.getValue();
}
};
public static final QueryConverter<URI> URI = new QueryConverter<URI>() {
@Override
@ -141,9 +141,7 @@ public abstract class QueryConverter<T> {
@Override
protected String toString(Boolean value) {
return value ?
"yes" :
"no";
return value ? "yes" : "no";
}
};

9
core/src/main/java/io/xpipe/core/dialog/QueryElement.java
View file

@ -7,7 +7,14 @@ public class QueryElement extends BaseQueryElement {
private final QueryConverter<?> converter;
public <T> QueryElement(String description, boolean newLine, boolean required, boolean quiet, T value, QueryConverter<T> converter, boolean hidden) {
public <T> QueryElement(
String description,
boolean newLine,
boolean required,
boolean quiet,
T value,
QueryConverter<T> converter,
boolean hidden) {
super(description, newLine, required, hidden, quiet, value != null ? converter.toString(value) : null);
this.converter = converter;
}

2
core/src/main/java/io/xpipe/core/impl/BatchTableWriteConnection.java
View file

@ -50,5 +50,3 @@ public abstract class BatchTableWriteConnection implements TableWriteConnection
protected abstract DataStructureNodeAcceptor<ArrayNode> writeBatchLinesAcceptor();
}

1
core/src/main/java/io/xpipe/core/impl/BinarySource.java
View file

@ -37,7 +37,6 @@ public class BinarySource extends RawDataSource<StreamDataStore> {
};
}
@Override
protected RawReadConnection newReadConnection() {
return new RawReadConnection() {

3
core/src/main/java/io/xpipe/core/impl/LimitTableReadConnection.java
View file

@ -48,8 +48,7 @@ public class LimitTableReadConnection implements TableReadConnection {
}
count++;
var returned = lineAcceptor
.accept(node);
var returned = lineAcceptor.accept(node);
localCounter.getAndIncrement();
return returned;

6
core/src/main/java/io/xpipe/core/impl/PreservingTableWriteConnection.java
View file

@ -9,14 +9,12 @@ import io.xpipe.core.source.TableWriteConnection;
public class PreservingTableWriteConnection extends PreservingWriteConnection implements TableWriteConnection {
public PreservingTableWriteConnection(DataSource<?> source, DataSourceConnection connection,
boolean append
) {
public PreservingTableWriteConnection(DataSource<?> source, DataSourceConnection connection, boolean append) {
super(DataSourceType.TABLE, source, append, connection);
}
@Override
public DataStructureNodeAcceptor<TupleNode> writeLinesAcceptor() {
return ((TableWriteConnection)connection).writeLinesAcceptor();
return ((TableWriteConnection) connection).writeLinesAcceptor();
}
}

5
core/src/main/java/io/xpipe/core/impl/PreservingTextWriteConnection.java
View file

@ -7,10 +7,7 @@ import io.xpipe.core.source.TextWriteConnection;
public class PreservingTextWriteConnection extends PreservingWriteConnection implements TextWriteConnection {
public PreservingTextWriteConnection(
DataSource<?> source, DataSourceConnection connection,
boolean append
) {
public PreservingTextWriteConnection(DataSource<?> source, DataSourceConnection connection, boolean append) {
super(DataSourceType.TEXT, source, append, connection);
}

12
core/src/main/java/io/xpipe/core/impl/PreservingWriteConnection.java
View file

@ -9,12 +9,13 @@ import java.nio.file.Files;
public class PreservingWriteConnection implements DataSourceConnection {
protected final DataSourceConnection connection;
private final DataSourceType type;
private final DataSource<?> source;
private final boolean append ;
protected final DataSourceConnection connection;
private final boolean append;
public PreservingWriteConnection(DataSourceType type, DataSource<?> source, boolean append, DataSourceConnection connection) {
public PreservingWriteConnection(
DataSourceType type, DataSource<?> source, boolean append, DataSourceConnection connection) {
this.type = type;
this.source = source;
this.append = append;
@ -26,13 +27,13 @@ public class PreservingWriteConnection implements DataSourceConnection {
var nativeStore = FileStore.local(temp);
var nativeSource = DataSource.createInternalDataSource(type, nativeStore);
if (source.getStore().canOpen()) {
try (var in = source.openReadConnection(); var out = nativeSource.openWriteConnection()) {
try (var in = source.openReadConnection();
var out = nativeSource.openWriteConnection()) {
in.forward(out);
}
;
}
connection.init();
if (source.getStore().canOpen()) {
@ -45,5 +46,4 @@ public class PreservingWriteConnection implements DataSourceConnection {
public void close() throws Exception {
connection.close();
}
}

1
core/src/main/java/io/xpipe/core/impl/TextReadConnection.java
View file

@ -24,7 +24,6 @@ public class TextReadConnection extends StreamReadConnection implements io.xpipe
return bufferedReader.lines();
}
@Override
public void close() throws Exception {
bufferedReader.close();

2
core/src/main/java/io/xpipe/core/impl/TextSource.java
View file

@ -14,7 +14,7 @@ import lombok.extern.jackson.Jacksonized;
@JsonTypeName("text")
@SuperBuilder
@Jacksonized
public final class TextSource extends TextDataSource<StreamDataStore> implements Charsettable {
public final class TextSource extends TextDataSource<StreamDataStore> implements Charsettable {
private final StreamCharset charset;
private final NewLine newLine;

2
core/src/main/java/io/xpipe/core/impl/XpbsWriteConnection.java
View file

@ -13,6 +13,6 @@ public class XpbsWriteConnection extends StreamWriteConnection implements Struct
@Override
public void write(DataStructureNode node) throws Exception {
GenericDataStreamWriter.writeStructure(outputStream,node);
GenericDataStreamWriter.writeStructure(outputStream, node);
}
}

23
core/src/main/java/io/xpipe/core/impl/XpbtReadConnection.java
View file

@ -21,6 +21,15 @@ import java.util.concurrent.atomic.AtomicReference;
public class XpbtReadConnection implements TableReadConnection {
private final StreamDataStore store;
private TupleType dataType;
private InputStream inputStream;
private TypedDataStreamParser parser;
private boolean empty;
protected XpbtReadConnection(StreamDataStore store) {
this.store = store;
}
@Override
public void init() throws Exception {
this.inputStream = store.openBufferedInput();
@ -36,8 +45,8 @@ public class XpbtReadConnection implements TableReadConnection {
this.inputStream.skip(headerLength + 1);
List<String> names = JacksonMapper.newMapper()
.disable(JsonParser.Feature.AUTO_CLOSE_SOURCE)
.readerFor(new TypeReference<List<String>>() {
}).readValue(header);
.readerFor(new TypeReference<List<String>>() {})
.readValue(header);
TupleType dataType = TupleType.tableType(names);
this.dataType = dataType;
this.parser = new TypedDataStreamParser(dataType);
@ -48,16 +57,6 @@ public class XpbtReadConnection implements TableReadConnection {
inputStream.close();
}
private TupleType dataType;
private final StreamDataStore store;
private InputStream inputStream;
private TypedDataStreamParser parser;
private boolean empty;
protected XpbtReadConnection(StreamDataStore store) {
this.store = store;
}
@Override
public TupleType getDataType() {
return dataType;

2
core/src/main/java/io/xpipe/core/impl/XpbtSource.java
View file

@ -13,8 +13,6 @@ import lombok.extern.jackson.Jacksonized;
@Jacksonized
public class XpbtSource extends TableDataSource<StreamDataStore> {
@Override
protected TableWriteConnection newWriteConnection() {
return new XpbtWriteConnection(store);

3
core/src/main/java/io/xpipe/core/impl/XpbtWriteConnection.java
View file

@ -58,7 +58,8 @@ public class XpbtWriteConnection implements TableWriteConnection {
try (JsonGenerator g = f.createGenerator(writer)
.disable(JsonGenerator.Feature.AUTO_CLOSE_TARGET)
.setPrettyPrinter(new DefaultPrettyPrinter())) {
JacksonMapper.newMapper().disable(JsonGenerator.Feature.AUTO_CLOSE_TARGET)
JacksonMapper.newMapper()
.disable(JsonGenerator.Feature.AUTO_CLOSE_TARGET)
.writeValue(g, tupleNode.getKeyNames());
writer.append("\n");
}

6
core/src/main/java/io/xpipe/core/source/CollectionReadConnection.java
View file

@ -14,9 +14,9 @@ public interface CollectionReadConnection extends DataSourceReadConnection {
try (var tCon = (CollectionWriteConnection) con) {
tCon.init();
listEntries().forEach(s -> {
// try (var subCon = open(s)) {
// ((CollectionWriteConnection) con).write(s, subCon);
// }
// try (var subCon = open(s)) {
// ((CollectionWriteConnection) con).write(s, subCon);
// }
});
}
}

Some files were not shown because too many files have changed in this diff Show more