[#175] move main nodes -> devicenodes

susanw1 · Jan 15, 2025 · 7032822 · 7032822
1 parent 0a19d06
commit 7032822
Show file tree

Hide file tree

Showing 25 changed files with 33 additions and 34 deletions.
diff --git a/acceptance-tests/src/main/java/net/zscript/acceptance/ConnectionSteps.java b/acceptance-tests/src/main/java/net/zscript/acceptance/ConnectionSteps.java
@@ -22,7 +22,7 @@
 
 import net.zscript.javaclient.commandpaths.ResponseElement;
 import net.zscript.javaclient.commandpaths.ZscriptFieldSet;
-import net.zscript.javaclient.nodes.DirectConnection;
+import net.zscript.javaclient.devicenodes.DirectConnection;
 import net.zscript.javaclient.sequence.ResponseSequence;
 import net.zscript.javareceiver.testing.CollectingConsumer;
 import net.zscript.model.components.Zchars;

diff --git a/acceptance-tests/src/main/java/net/zscript/acceptance/DeviceSteps.java b/acceptance-tests/src/main/java/net/zscript/acceptance/DeviceSteps.java
@@ -16,9 +16,9 @@
 
 import net.zscript.javaclient.commandpaths.ResponseElement;
 import net.zscript.javaclient.commandpaths.ResponseExecutionPath;
+import net.zscript.javaclient.devicenodes.DirectConnection;
+import net.zscript.javaclient.devicenodes.ZscriptNode;
 import net.zscript.javaclient.devices.ZscriptDevice;
-import net.zscript.javaclient.nodes.DirectConnection;
-import net.zscript.javaclient.nodes.ZscriptNode;
 import net.zscript.javareceiver.testing.CollectingConsumer;
 import net.zscript.model.ZscriptModel;
 import net.zscript.model.components.Zchars;

diff --git a/acceptance-tests/src/main/java/net/zscript/acceptance/LocalJavaReceiverSteps.java b/acceptance-tests/src/main/java/net/zscript/acceptance/LocalJavaReceiverSteps.java
@@ -6,7 +6,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import net.zscript.javaclient.nodes.DirectConnection;
+import net.zscript.javaclient.devicenodes.DirectConnection;
 import net.zscript.javaclient.testing.LocalConnection;
 import net.zscript.javareceiver.core.Zscript;
 import net.zscript.javareceiver.modules.core.ZscriptCoreModule;

diff --git a/...b/client-core/src/main/java/net/zscript/javaclient/commandpaths/CommandExecutionPath.java b/...b/client-core/src/main/java/net/zscript/javaclient/commandpaths/CommandExecutionPath.java
@@ -38,7 +38,7 @@
  * success/failure, so a CommandExecutionPath is essentially "execution-aware".
  * <p>
  * It's the bare "thing that we want executing", before adding the addressing and sequence-level fields which get it to the right place and in the right state. These might be added
- * by a client runtime representing a device node hierarchy, see {@link net.zscript.javaclient.nodes.ZscriptNode#send(CommandExecutionPath, Consumer)}.
+ * by a client runtime representing a device node hierarchy, see {@link net.zscript.javaclient.devicenodes.ZscriptNode#send(CommandExecutionPath, Consumer)}.
  * <p>
  * On execution, the corresponding response object is a {@link ResponseExecutionPath}.
  */

diff --git a/.../client-core/src/main/java/net/zscript/javaclient/commandpaths/ResponseExecutionPath.java b/.../client-core/src/main/java/net/zscript/javaclient/commandpaths/ResponseExecutionPath.java
@@ -25,7 +25,7 @@
  * by a CommandExecutionPath (see {@link CommandExecutionPath#compareResponses(ResponseExecutionPath)}) to produce a complete comprehension of what happened during execution.
  * <p>
  * This class represents the result of execution of a {@link CommandExecutionPath} once the addressing and sequence-level fields have been processed, ie by a client runtime
- * representing a device node hierarchy, see {@link net.zscript.javaclient.nodes.ZscriptNode#send(CommandExecutionPath, Consumer)}.
+ * representing a device node hierarchy, see {@link net.zscript.javaclient.devicenodes.ZscriptNode#send(CommandExecutionPath, Consumer)}.
  */
 public class ResponseExecutionPath implements Iterable<ResponseElement>, ByteAppendable {
 

diff --git a/...nt-lib/client-main/src/main/java/net/zscript/javaclient/connectors/ZscriptConnectors.java b/...nt-lib/client-main/src/main/java/net/zscript/javaclient/connectors/ZscriptConnectors.java
@@ -6,7 +6,7 @@
 
 import net.zscript.javaclient.connectors.serial.SerialConnector;
 import net.zscript.javaclient.connectors.tcp.TcpConnector;
-import net.zscript.javaclient.nodes.DirectConnection;
+import net.zscript.javaclient.devicenodes.DirectConnection;
 
 public class ZscriptConnectors {
     public static final TcpConnector    TCP    = new TcpConnector();

diff --git a/.../client-main/src/main/java/net/zscript/javaclient/connectors/serial/SerialConnection.java b/.../client-main/src/main/java/net/zscript/javaclient/connectors/serial/SerialConnection.java
@@ -13,7 +13,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import net.zscript.javaclient.nodes.DirectConnection;
+import net.zscript.javaclient.devicenodes.DirectConnection;
 
 /**
  *

diff --git a/...nt-lib/client-main/src/main/java/net/zscript/javaclient/connectors/tcp/TcpConnection.java b/...nt-lib/client-main/src/main/java/net/zscript/javaclient/connectors/tcp/TcpConnection.java
@@ -10,7 +10,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import net.zscript.javaclient.nodes.DirectConnection;
+import net.zscript.javaclient.devicenodes.DirectConnection;
 
 public class TcpConnection extends DirectConnection {
     private static final Logger LOG = LoggerFactory.getLogger(TcpConnection.class);

diff --git a/...pt/javaclient/nodes/AddressingSystem.java → ...aclient/devicenodes/AddressingSystem.java b/...pt/javaclient/nodes/AddressingSystem.java → ...aclient/devicenodes/AddressingSystem.java
@@ -1,4 +1,4 @@
-package net.zscript.javaclient.nodes;
+package net.zscript.javaclient.devicenodes;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/.../zscript/javaclient/nodes/Connection.java → ...pt/javaclient/devicenodes/Connection.java b/.../zscript/javaclient/nodes/Connection.java → ...pt/javaclient/devicenodes/Connection.java
@@ -1,4 +1,4 @@
-package net.zscript.javaclient.nodes;
+package net.zscript.javaclient.devicenodes;
 
 import java.util.function.Consumer;
 

diff --git a/...pt/javaclient/nodes/ConnectionBuffer.java → ...aclient/devicenodes/ConnectionBuffer.java b/...pt/javaclient/nodes/ConnectionBuffer.java → ...aclient/devicenodes/ConnectionBuffer.java
@@ -1,4 +1,4 @@
-package net.zscript.javaclient.nodes;
+package net.zscript.javaclient.devicenodes;
 
 import java.util.ArrayDeque;
 import java.util.ArrayList;

diff --git a/...pt/javaclient/nodes/DirectConnection.java → ...aclient/devicenodes/DirectConnection.java b/...pt/javaclient/nodes/DirectConnection.java → ...aclient/devicenodes/DirectConnection.java
@@ -1,4 +1,4 @@
-package net.zscript.javaclient.nodes;
+package net.zscript.javaclient.devicenodes;
 
 import java.io.Closeable;
 import java.io.IOException;

diff --git a/...script/javaclient/nodes/EchoAssigner.java → .../javaclient/devicenodes/EchoAssigner.java b/...script/javaclient/nodes/EchoAssigner.java → .../javaclient/devicenodes/EchoAssigner.java
@@ -1,4 +1,4 @@
-package net.zscript.javaclient.nodes;
+package net.zscript.javaclient.devicenodes;
 
 import java.util.BitSet;
 

diff --git a/...ipt/javaclient/nodes/QueuingStrategy.java → ...vaclient/devicenodes/QueuingStrategy.java b/...ipt/javaclient/nodes/QueuingStrategy.java → ...vaclient/devicenodes/QueuingStrategy.java
@@ -1,4 +1,4 @@
-package net.zscript.javaclient.nodes;
+package net.zscript.javaclient.devicenodes;
 
 import net.zscript.javaclient.addressing.AddressedCommand;
 import net.zscript.javaclient.commandpaths.CommandExecutionPath;

diff --git a/...client/nodes/StandardQueuingStrategy.java → .../devicenodes/StandardQueuingStrategy.java b/...client/nodes/StandardQueuingStrategy.java → .../devicenodes/StandardQueuingStrategy.java
@@ -1,4 +1,4 @@
-package net.zscript.javaclient.nodes;
+package net.zscript.javaclient.devicenodes;
 
 import java.util.ArrayDeque;
 import java.util.Queue;

diff --git a/...pt/javaclient/nodes/ZscriptBasicNode.java → ...aclient/devicenodes/ZscriptBasicNode.java b/...pt/javaclient/nodes/ZscriptBasicNode.java → ...aclient/devicenodes/ZscriptBasicNode.java
@@ -1,4 +1,4 @@
-package net.zscript.javaclient.nodes;
+package net.zscript.javaclient.devicenodes;
 
 import java.util.Collection;
 import java.util.HashMap;

diff --git a/...zscript/javaclient/nodes/ZscriptNode.java → ...t/javaclient/devicenodes/ZscriptNode.java b/...zscript/javaclient/nodes/ZscriptNode.java → ...t/javaclient/devicenodes/ZscriptNode.java
@@ -1,4 +1,4 @@
-package net.zscript.javaclient.nodes;
+package net.zscript.javaclient.devicenodes;
 
 import java.lang.reflect.Proxy;
 import java.util.concurrent.TimeUnit;

diff --git a/...script/javaclient/nodes/package-info.java → .../javaclient/devicenodes/package-info.java b/...script/javaclient/nodes/package-info.java → .../javaclient/devicenodes/package-info.java
@@ -1,4 +1,4 @@
 @ParametersAreNonnullByDefault
-package net.zscript.javaclient.nodes;
+package net.zscript.javaclient.devicenodes;
 
 import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/...va-client-lib/client-main/src/main/java/net/zscript/javaclient/devices/ZscriptDevice.java b/...va-client-lib/client-main/src/main/java/net/zscript/javaclient/devices/ZscriptDevice.java
@@ -29,7 +29,7 @@
 import net.zscript.javaclient.commandpaths.CommandExecutionPath;
 import net.zscript.javaclient.commandpaths.ResponseExecutionPath;
 import net.zscript.javaclient.commandpaths.ZscriptFieldSet;
-import net.zscript.javaclient.nodes.ZscriptNode;
+import net.zscript.javaclient.devicenodes.ZscriptNode;
 import net.zscript.javaclient.sequence.CommandSequence;
 import net.zscript.javaclient.sequence.ResponseSequence;
 import net.zscript.javaclient.tokens.ExtendingTokenBuffer;

diff --git a/...-client-lib/client-main/src/main/java/net/zscript/javaclient/testing/LocalConnection.java b/...-client-lib/client-main/src/main/java/net/zscript/javaclient/testing/LocalConnection.java
@@ -12,7 +12,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import net.zscript.javaclient.nodes.DirectConnection;
+import net.zscript.javaclient.devicenodes.DirectConnection;
 import net.zscript.model.components.Zchars;
 
 /**

diff --git a/...va-client-lib/client-main/src/test/java/net/zscript/javaclient/connection/SerialMain.java b/...va-client-lib/client-main/src/test/java/net/zscript/javaclient/connection/SerialMain.java
@@ -9,7 +9,7 @@
 import net.zscript.javaclient.commandpaths.CommandExecutionPath;
 import net.zscript.javaclient.connectors.ZscriptConnectors;
 import net.zscript.javaclient.connectors.serial.SerialConnector;
-import net.zscript.javaclient.nodes.DirectConnection;
+import net.zscript.javaclient.devicenodes.DirectConnection;
 import net.zscript.javaclient.sequence.CommandSequence;
 import net.zscript.javaclient.tokens.ExtendingTokenBuffer;
 import net.zscript.model.modules.base.CoreModule;

diff --git a/.../java-client-lib/client-main/src/test/java/net/zscript/javaclient/connection/TcpMain.java b/.../java-client-lib/client-main/src/test/java/net/zscript/javaclient/connection/TcpMain.java
@@ -6,7 +6,7 @@
 import net.zscript.javaclient.commandpaths.CommandExecutionPath;
 import net.zscript.javaclient.connectors.ZscriptConnectors;
 import net.zscript.javaclient.connectors.ZscriptConnectors.ZscriptConnector;
-import net.zscript.javaclient.nodes.DirectConnection;
+import net.zscript.javaclient.devicenodes.DirectConnection;
 import net.zscript.javaclient.sequence.CommandSequence;
 import net.zscript.javaclient.tokens.ExtendingTokenBuffer;
 import net.zscript.model.modules.base.CoreModule;

diff --git a/demo/demo-morse/client/src/main/java/net/zscript/demo/morse/MorseFullCli.java b/demo/demo-morse/client/src/main/java/net/zscript/demo/morse/MorseFullCli.java
@@ -23,9 +23,9 @@
 import net.zscript.javaclient.commandbuilderapi.nodes.CommandSequenceNode;
 import net.zscript.javaclient.commandbuilderapi.nodes.ResponseCaptor;
 import net.zscript.javaclient.connectors.serial.SerialConnection;
+import net.zscript.javaclient.devicenodes.ZscriptNode;
 import net.zscript.javaclient.devices.ResponseSequenceCallback;
 import net.zscript.javaclient.devices.ZscriptDevice;
-import net.zscript.javaclient.nodes.ZscriptNode;
 import net.zscript.model.ZscriptModel;
 import net.zscript.model.modules.base.CoreModule;
 import net.zscript.model.modules.base.PinsModule;

diff --git a/demo/demo-morse/client/src/main/java/net/zscript/demo/morse/MorseReceiver.java b/demo/demo-morse/client/src/main/java/net/zscript/demo/morse/MorseReceiver.java
@@ -8,7 +8,6 @@
 
 import static net.zscript.model.modules.base.PinsModule.DigitalNotificationSectionContent.Value;
 
-import net.zscript.javaclient.commandbuilderapi.nodes.ResponseCaptor;
 import net.zscript.javaclient.devices.ZscriptDevice;
 import net.zscript.model.modules.base.OuterCoreModule;
 import net.zscript.model.modules.base.PinsModule;
@@ -41,14 +40,14 @@ public void startReceiving() {
             lastTimeNano = System.nanoTime();
 
             // // Older notification registration system, using Captors.
-            ResponseCaptor<PinsModule.DigitalNotificationSectionContent> captor = ResponseCaptor.create();
-            device.getNotificationHandle(PinsModule.DigitalNotification.ID)
-                    .getSection(PinsModule.DigitalNotificationSectionContent.class)
-                    .setCaptor(captor);
-            device.setNotificationListener_Prev(PinsModule.DigitalNotification.ID, notificationSequenceCallback -> {
-                PinsModule.DigitalNotificationSectionContent content = notificationSequenceCallback.getResponseFor(captor).get();
-
-            });
+            //            ResponseCaptor<PinsModule.DigitalNotificationSectionContent> captor = ResponseCaptor.create();
+            //            device.getNotificationHandle(PinsModule.DigitalNotification.ID)
+            //                    .getSection(PinsModule.DigitalNotificationSectionContent.class)
+            //                    .setCaptor(captor);
+            //            device.setNotificationListener_Prev(PinsModule.DigitalNotification.ID, notificationSequenceCallback -> {
+            //                PinsModule.DigitalNotificationSectionContent content = notificationSequenceCallback.getResponseFor(captor).get();
+            //
+            //            });
 
             device.setNotificationListener(PinsModule.DigitalNotification.ID, n -> {
                 PinsModule.DigitalNotificationSectionContent content = n.getDigitalSection();

diff --git a/demo/demo-morse/client/src/main/java/net/zscript/demo/morse/MorseSimple.java b/demo/demo-morse/client/src/main/java/net/zscript/demo/morse/MorseSimple.java
@@ -6,8 +6,8 @@
 import com.fazecast.jSerialComm.SerialPort;
 
 import net.zscript.javaclient.connectors.serial.SerialConnection;
+import net.zscript.javaclient.devicenodes.ZscriptNode;
 import net.zscript.javaclient.devices.ZscriptDevice;
-import net.zscript.javaclient.nodes.ZscriptNode;
 import net.zscript.model.ZscriptModel;
 import net.zscript.model.modules.base.CoreModule;