Chore: Move 'tokenizer' into protocol section
This commit is contained in:
+6
-5
@@ -2,11 +2,12 @@ package ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.parser;
|
|||||||
|
|
||||||
import ch.unibas.dmi.dbis.cs108.casono.server.network.command.parsing.RequestParameter;
|
import ch.unibas.dmi.dbis.cs108.casono.server.network.command.parsing.RequestParameter;
|
||||||
import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.RawRequest;
|
import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.RawRequest;
|
||||||
import ch.unibas.dmi.dbis.cs108.casono.server.tokenizer.RawToken;
|
import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.tokenizer.RawToken;
|
||||||
import ch.unibas.dmi.dbis.cs108.casono.server.tokenizer.Token;
|
import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.tokenizer.Token;
|
||||||
import ch.unibas.dmi.dbis.cs108.casono.server.tokenizer.TokenClassifier;
|
import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.tokenizer.TokenClassifier;
|
||||||
import ch.unibas.dmi.dbis.cs108.casono.server.tokenizer.TokenType;
|
import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.tokenizer.TokenType;
|
||||||
import ch.unibas.dmi.dbis.cs108.casono.server.tokenizer.Tokenizer;
|
import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.tokenizer.Tokenizer;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Iterator;
|
import java.util.Iterator;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package ch.unibas.dmi.dbis.cs108.casono.server.tokenizer;
|
package ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.tokenizer;
|
||||||
|
|
||||||
/** Represents a raw (unclassified) token in the tokenizer. */
|
/** Represents a raw (unclassified) token in the tokenizer. */
|
||||||
public record RawToken(RawTokenType type, String value, int line, int column) {}
|
public record RawToken(RawTokenType type, String value, int line, int column) {}
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package ch.unibas.dmi.dbis.cs108.casono.server.tokenizer;
|
package ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.tokenizer;
|
||||||
|
|
||||||
public enum RawTokenType {
|
public enum RawTokenType {
|
||||||
WORD,
|
WORD,
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package ch.unibas.dmi.dbis.cs108.casono.server.tokenizer;
|
package ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.tokenizer;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package ch.unibas.dmi.dbis.cs108.casono.server.tokenizer;
|
package ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.tokenizer;
|
||||||
|
|
||||||
/** Represents a token in the tokenizer. */
|
/** Represents a token in the tokenizer. */
|
||||||
public record Token(TokenType type, String value, int line, int column) {}
|
public record Token(TokenType type, String value, int line, int column) {}
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package ch.unibas.dmi.dbis.cs108.casono.server.tokenizer;
|
package ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.tokenizer;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package ch.unibas.dmi.dbis.cs108.casono.server.tokenizer;
|
package ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.tokenizer;
|
||||||
|
|
||||||
/** Enumeration of token types used in the tokenizer. */
|
/** Enumeration of token types used in the tokenizer. */
|
||||||
public enum TokenType {
|
public enum TokenType {
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package ch.unibas.dmi.dbis.cs108.casono.server.tokenizer;
|
package ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.tokenizer;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package ch.unibas.dmi.dbis.cs108.casono.server.tokenizer;
|
package ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.tokenizer;
|
||||||
|
|
||||||
/** Exception thrown during tokenization. */
|
/** Exception thrown during tokenization. */
|
||||||
public class TokenizerException extends RuntimeException {
|
public class TokenizerException extends RuntimeException {
|
||||||
+2
-1
@@ -10,9 +10,10 @@ import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.Primitive
|
|||||||
import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.RawRequest;
|
import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.RawRequest;
|
||||||
import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.Request;
|
import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.Request;
|
||||||
import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.RequestContext;
|
import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.RequestContext;
|
||||||
|
import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.tokenizer.TokenizerException;
|
||||||
import ch.unibas.dmi.dbis.cs108.casono.server.network.transport.RawPacket;
|
import ch.unibas.dmi.dbis.cs108.casono.server.network.transport.RawPacket;
|
||||||
import ch.unibas.dmi.dbis.cs108.casono.server.network.transport.TransportLayer;
|
import ch.unibas.dmi.dbis.cs108.casono.server.network.transport.TransportLayer;
|
||||||
import ch.unibas.dmi.dbis.cs108.casono.server.tokenizer.TokenizerException;
|
|
||||||
import java.io.EOFException;
|
import java.io.EOFException;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import org.apache.logging.log4j.LogManager;
|
import org.apache.logging.log4j.LogManager;
|
||||||
|
|||||||
@@ -6,6 +6,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
|
|||||||
|
|
||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
|
import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.tokenizer.State;
|
||||||
|
|
||||||
class StateTest {
|
class StateTest {
|
||||||
@Test
|
@Test
|
||||||
void testConstructor() {
|
void testConstructor() {
|
||||||
|
|||||||
+2
@@ -4,6 +4,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
|
|||||||
|
|
||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
|
import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.tokenizer.TokenizerException;
|
||||||
|
|
||||||
class TokenizerExceptionTest {
|
class TokenizerExceptionTest {
|
||||||
@Test
|
@Test
|
||||||
void testConstructorAndGetters() {
|
void testConstructorAndGetters() {
|
||||||
|
|||||||
Reference in New Issue
Block a user