Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[#159] Moved Java Tokenizer to its own module #160

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@

import java.util.OptionalInt;

import net.zscript.javareceiver.tokenizer.BlockIterator;
import net.zscript.javareceiver.tokenizer.ZscriptExpression;
import net.zscript.model.components.Zchars;
import net.zscript.tokenizer.ZscriptExpression;

public abstract class ValidatingResponse implements ZscriptResponse {
protected final ZscriptExpression expression;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import java.util.OptionalInt;

import net.zscript.javareceiver.tokenizer.BlockIterator;
import net.zscript.model.components.Zchars;
import net.zscript.model.components.ZscriptStatus;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import net.zscript.javaclient.commandPaths.ZscriptFieldSet;
import net.zscript.javaclient.commandbuilder.Respondable;
import net.zscript.javaclient.commandbuilder.ZscriptResponse;
import net.zscript.javareceiver.tokenizer.ZscriptExpression;
import net.zscript.tokenizer.ZscriptExpression;
import net.zscript.util.ByteString;

public abstract class ZscriptCommandNode<T extends ZscriptResponse> extends CommandSequenceNode implements Respondable<T> {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
package net.zscript.javaclient.commandbuilder.defaultCommands;

import java.nio.charset.StandardCharsets;
import java.util.Collections;
import java.util.Map;

import net.zscript.javaclient.commandbuilder.commandnodes.CommandSequenceNode;
import net.zscript.javaclient.commandbuilder.commandnodes.ZscriptCommandNode;
import net.zscript.javareceiver.tokenizer.ZscriptExpression;
import net.zscript.model.components.Zchars;
import net.zscript.model.components.ZscriptStatus;
import net.zscript.tokenizer.ZscriptExpression;

public class AbortCommandNode extends ZscriptCommandNode<DefaultResponse> {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
package net.zscript.javaclient.commandbuilder.defaultCommands;

import net.zscript.javaclient.commandbuilder.commandnodes.CommandSequenceNode;
import net.zscript.javaclient.commandbuilder.commandnodes.ZscriptCommandBuilder;
import net.zscript.javaclient.commandbuilder.commandnodes.ZscriptCommandNode;
import net.zscript.javaclient.commandbuilder.ZscriptResponse;
import net.zscript.javareceiver.tokenizer.ZscriptExpression;
import net.zscript.tokenizer.ZscriptExpression;

public class BlankCommandNode extends ZscriptCommandNode<DefaultResponse> {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import java.util.OptionalInt;

import net.zscript.javaclient.commandbuilder.ZscriptResponse;
import net.zscript.javareceiver.tokenizer.ZscriptExpression;
import net.zscript.tokenizer.ZscriptExpression;

public class DefaultResponse implements ZscriptResponse {
private final ZscriptExpression expression;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
package net.zscript.javaclient.commandbuilder.defaultCommands;

import java.nio.charset.StandardCharsets;
import java.util.Collections;
import java.util.Map;

import net.zscript.javaclient.commandbuilder.ZscriptResponse;
import net.zscript.javaclient.commandbuilder.commandnodes.CommandSequenceNode;
import net.zscript.javaclient.commandbuilder.commandnodes.ZscriptCommandNode;
import net.zscript.javareceiver.tokenizer.ZscriptExpression;
import net.zscript.model.components.Zchars;
import net.zscript.model.components.ZscriptStatus;
import net.zscript.tokenizer.ZscriptExpression;

public class FailureCommandNode extends ZscriptCommandNode<DefaultResponse> {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
package net.zscript.javaclient.commandbuilder.defaultCommands;

import java.nio.charset.StandardCharsets;

import net.zscript.javaclient.commandbuilder.ZscriptResponse;
import net.zscript.javaclient.commandbuilder.commandnodes.ZscriptCommandBuilder;
import net.zscript.javaclient.commandbuilder.commandnodes.ZscriptCommandNode;
import net.zscript.javareceiver.tokenizer.ZscriptExpression;
import net.zscript.model.components.Zchars;
import net.zscript.tokenizer.ZscriptExpression;

public class GenericCommandBuilder extends ZscriptCommandBuilder<DefaultResponse> {
public ZscriptCommandBuilder<DefaultResponse> setField(byte key, int value) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import net.zscript.javaclient.commandbuilder.Respondable;
import net.zscript.javaclient.commandbuilder.ZscriptResponse;
import net.zscript.javaclient.commandbuilder.commandnodes.ResponseCaptor;
import net.zscript.javareceiver.tokenizer.ZscriptExpression;
import net.zscript.tokenizer.ZscriptExpression;

public abstract class NotificationSection<T extends ZscriptResponse> implements Respondable<T> {
public abstract Class<T> getResponseType();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import net.zscript.javaclient.commandbuilder.commandnodes.ZscriptCommandBuilder;
import net.zscript.javaclient.commandbuilder.commandnodes.ZscriptCommandNode;
import net.zscript.javareceiver.tokenizer.ZscriptExpression;
import net.zscript.tokenizer.ZscriptExpression;

public class DemoActivateCommand extends ZscriptCommandNode<DemoActivateCommand.DemoActivateCommandResponse> {
// private final boolean alreadyActivated;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,9 @@

import static java.nio.charset.StandardCharsets.ISO_8859_1;

import net.zscript.javaclient.commandbuilder.ValidatingResponse;
import net.zscript.javaclient.commandbuilder.commandnodes.ZscriptCommandBuilder;
import net.zscript.javaclient.commandbuilder.commandnodes.ZscriptCommandNode;
import net.zscript.javaclient.commandbuilder.defaultCommands.DefaultResponse;
import net.zscript.javareceiver.tokenizer.ZscriptExpression;
import net.zscript.tokenizer.ZscriptExpression;

public class DemoCapabilitiesCommandBuilder extends ZscriptCommandBuilder<DemoCapabilitiesCommandResponse> {
public static final int USER_FIRMWARE = 0;
Expand Down Expand Up @@ -74,4 +72,3 @@ public boolean canFail() {
return false;
}
}

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package net.zscript.javaclient.commandbuilder.commandNodes;

import net.zscript.javaclient.commandbuilder.ValidatingResponse;
import net.zscript.javareceiver.tokenizer.ZscriptExpression;
import net.zscript.tokenizer.ZscriptExpression;

public class DemoCapabilitiesCommandResponse extends ValidatingResponse {
private int infoType = DemoCapabilitiesCommandBuilder.USER_FIRMWARE;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import net.zscript.javaclient.commandbuilder.defaultCommands.*;
import net.zscript.javaclient.commandbuilder.*;
import net.zscript.javaclient.commandbuilder.commandnodes.*;
import net.zscript.javaclient.commandbuilder.notifications.*;
import net.zscript.javareceiver.tokenizer.*;
import net.zscript.tokenizer.*;
import net.zscript.model.components.*;

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package net.zscript.model.modules.testing.test;

import java.util.function.Consumer;

import static net.zscript.client.modules.test.testing.TestingModule.TestCommand0Command.TestCommand0Response.BitsetRespTestU.Lion;
import static net.zscript.client.modules.test.testing.TestingModule.TestCommand0Command.TestCommand0Response.BitsetRespTestU.Tabby;
import static net.zscript.client.modules.test.testing.TestingModule.TestCommand0Command.TestCommand0Response.BitsetRespTestU.Tiger;
Expand All @@ -8,20 +10,18 @@

import org.junit.jupiter.api.Test;

import java.util.function.Consumer;

import net.zscript.client.modules.test.testing.TestingModule;
import net.zscript.client.modules.test.testing.TestingModule.TestCommand0Command.TestCommand0Response.BitsetRespTestV;
import net.zscript.client.modules.test.testing.TestingModule.TestCommand0Command.TestCommand0Response.EnumRespTestP;
import net.zscript.client.modules.test.testing.TestingModule.TestCommand0Command.TestCommand0Response.EnumRespTestQ;
import net.zscript.javaclient.commandbuilder.ZscriptResponse;
import net.zscript.javaclient.commandbuilder.commandnodes.ResponseCaptor;
import net.zscript.javaclient.commandbuilder.commandnodes.ZscriptCommandBuilder;
import net.zscript.javaclient.commandbuilder.commandnodes.ZscriptCommandNode;
import net.zscript.javaclient.commandbuilder.ZscriptResponse;
import net.zscript.javareceiver.tokenizer.TokenBuffer.TokenReader;
import net.zscript.javareceiver.tokenizer.TokenExtendingBuffer;
import net.zscript.javareceiver.tokenizer.Tokenizer;
import net.zscript.javareceiver.tokenizer.ZscriptTokenExpression;
import net.zscript.tokenizer.TokenBuffer.TokenReader;
import net.zscript.tokenizer.TokenExtendingBuffer;
import net.zscript.tokenizer.Tokenizer;
import net.zscript.tokenizer.ZscriptTokenExpression;

public class JavaCommandBuilderResponseTest {
final TokenExtendingBuffer buffer = new TokenExtendingBuffer();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
import java.util.List;
import java.util.Optional;

import static net.zscript.javareceiver.tokenizer.TokenBuffer.TokenReader;
import static net.zscript.javareceiver.tokenizer.TokenBuffer.TokenReader.ReadToken;
import static net.zscript.tokenizer.TokenBuffer.TokenReader;
import static net.zscript.tokenizer.TokenBuffer.TokenReader.ReadToken;

import net.zscript.javaclient.sequence.ResponseSequence;
import net.zscript.javareceiver.tokenizer.Tokenizer;
import net.zscript.model.components.Zchars;
import net.zscript.tokenizer.Tokenizer;
import net.zscript.util.OptIterator;

public class CompleteAddressedResponse {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import java.util.Arrays;
import java.util.List;

import static net.zscript.javareceiver.tokenizer.TokenBuffer.TokenReader.ReadToken;
import static net.zscript.tokenizer.TokenBuffer.TokenReader.ReadToken;

import net.zscript.model.components.Zchars;
import net.zscript.util.ByteString.ByteAppendable;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
import java.util.Optional;
import java.util.Set;

import static net.zscript.javareceiver.tokenizer.TokenBuffer.TokenReader.ReadToken;
import static net.zscript.tokenizer.TokenBuffer.TokenReader.ReadToken;

import net.zscript.javareceiver.tokenizer.TokenBufferIterator;
import net.zscript.javareceiver.tokenizer.Tokenizer;
import net.zscript.model.ZscriptModel;
import net.zscript.model.components.Zchars;
import net.zscript.tokenizer.TokenBufferIterator;
import net.zscript.tokenizer.Tokenizer;
import net.zscript.util.ByteString.ByteAppendable;
import net.zscript.util.ByteString.ByteStringBuilder;
import net.zscript.util.OptIterator;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
import java.util.ListIterator;
import java.util.Optional;

import static net.zscript.javareceiver.tokenizer.TokenBuffer.TokenReader.ReadToken;
import static net.zscript.tokenizer.TokenBuffer.TokenReader.ReadToken;

import net.zscript.javareceiver.tokenizer.TokenBufferIterator;
import net.zscript.javareceiver.tokenizer.Tokenizer;
import net.zscript.model.components.Zchars;
import net.zscript.tokenizer.TokenBufferIterator;
import net.zscript.tokenizer.Tokenizer;
import net.zscript.util.ByteString.ByteAppendable;
import net.zscript.util.ByteString.ByteStringBuilder;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@

import static java.util.Collections.emptyList;

import net.zscript.javareceiver.tokenizer.BlockIterator;
import net.zscript.javareceiver.tokenizer.TokenBuffer;
import net.zscript.javareceiver.tokenizer.TokenBufferIterator;
import net.zscript.javareceiver.tokenizer.ZscriptExpression;
import net.zscript.model.components.Zchars;
import net.zscript.tokenizer.BlockIterator;
import net.zscript.tokenizer.TokenBuffer;
import net.zscript.tokenizer.TokenBufferIterator;
import net.zscript.tokenizer.ZscriptExpression;
import net.zscript.util.ByteString;
import net.zscript.util.ByteString.ByteAppendable;
import net.zscript.util.ByteString.ByteStringBuilder;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@

import java.util.Collection;

import static net.zscript.javareceiver.tokenizer.TokenBuffer.TokenReader.ReadToken;
import static net.zscript.tokenizer.TokenBuffer.TokenReader.ReadToken;

import net.zscript.javaclient.commandPaths.CommandExecutionPath;
import net.zscript.javareceiver.tokenizer.TokenBufferIterator;
import net.zscript.model.ZscriptModel;
import net.zscript.model.components.Zchars;
import net.zscript.tokenizer.TokenBufferIterator;
import net.zscript.util.ByteString.ByteAppendable;
import net.zscript.util.ByteString.ByteStringBuilder;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package net.zscript.javaclient.sequence;

import net.zscript.javaclient.commandPaths.ResponseExecutionPath;
import net.zscript.javareceiver.tokenizer.TokenBuffer;
import net.zscript.javareceiver.tokenizer.TokenBufferIterator;
import net.zscript.model.components.Zchars;
import net.zscript.tokenizer.TokenBuffer;
import net.zscript.tokenizer.TokenBufferIterator;
import net.zscript.util.ByteString.ByteAppendable;
import net.zscript.util.ByteString.ByteStringBuilder;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import java.util.BitSet;

import static net.zscript.javareceiver.tokenizer.TokenBuffer.TokenReader.ReadToken;
import static net.zscript.tokenizer.TokenBuffer.TokenReader.ReadToken;

import net.zscript.model.components.Zchars;
import net.zscript.util.ByteString.ByteAppendable;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
import nl.jqno.equalsverifier.EqualsVerifier;
import org.junit.jupiter.api.Test;

import net.zscript.javareceiver.tokenizer.TokenBuffer;
import net.zscript.javareceiver.tokenizer.TokenBuffer.TokenReader;
import net.zscript.javareceiver.tokenizer.TokenBuffer.TokenReader.ReadToken;
import net.zscript.javareceiver.tokenizer.TokenRingBuffer;
import net.zscript.javareceiver.tokenizer.Tokenizer;
import net.zscript.model.components.Zchars;
import net.zscript.tokenizer.TokenBuffer;
import net.zscript.tokenizer.TokenBuffer.TokenReader;
import net.zscript.tokenizer.TokenBuffer.TokenReader.ReadToken;
import net.zscript.tokenizer.TokenRingBuffer;
import net.zscript.tokenizer.Tokenizer;
import net.zscript.util.ByteString;

class ZscriptAddressTest {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
import org.junit.jupiter.params.provider.MethodSource;

import net.zscript.javaclient.commandPaths.CommandExecutionPath;
import net.zscript.javareceiver.tokenizer.TokenExtendingBuffer;
import net.zscript.javareceiver.tokenizer.Tokenizer;
import net.zscript.tokenizer.TokenExtendingBuffer;
import net.zscript.tokenizer.Tokenizer;

public class CommandExecutionPathRegenerationTest {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@

import net.zscript.ascii.AnsiCharacterStylePrinter;
import net.zscript.javaclient.commandPaths.CommandExecutionPath;
import net.zscript.javareceiver.tokenizer.TokenExtendingBuffer;
import net.zscript.javareceiver.tokenizer.Tokenizer;
import net.zscript.tokenizer.TokenExtendingBuffer;
import net.zscript.tokenizer.Tokenizer;

public class CompleteCommandGrapherTest {
CommandGraph.GraphPrintSettings basicSettings = new CommandGraph.GraphPrintSettings(new StandardCommandGrapher.CommandPrintSettings(" ", VerbositySetting.NAME), true, 2,
Expand Down
7 changes: 7 additions & 0 deletions clients/java-client-lib/client-main/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,18 @@
<version>[2.0.0,3.0.0)</version>
</dependency>

<!-- Test Dependencies -->
<dependency>
<groupId>net.zscript</groupId>
<artifactId>zscript-java-client-command-builders</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.zscript</groupId>
<artifactId>java-receiver</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
import net.zscript.javaclient.addressing.CompleteAddressedResponse;
import net.zscript.javaclient.nodes.Connection;
import net.zscript.javaclient.threading.ZscriptWorkerThread;
import net.zscript.javareceiver.tokenizer.TokenExtendingBuffer;
import net.zscript.javareceiver.tokenizer.Tokenizer;
import net.zscript.tokenizer.TokenExtendingBuffer;
import net.zscript.tokenizer.Tokenizer;

public abstract class RawConnection implements Connection, AutoCloseable {
private final ZscriptWorkerThread thread = new ZscriptWorkerThread();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
import net.zscript.javaclient.commandbuilder.notifications.NotificationId;
import net.zscript.javaclient.nodes.ZscriptNode;
import net.zscript.javaclient.sequence.CommandSequence;
import net.zscript.javareceiver.tokenizer.TokenExtendingBuffer;
import net.zscript.javareceiver.tokenizer.Tokenizer;
import net.zscript.model.ZscriptModel;
import net.zscript.tokenizer.TokenExtendingBuffer;
import net.zscript.tokenizer.Tokenizer;

public class Device {
private final ZscriptModel model;
Expand Down
Loading
Loading