From 6e446b665ad550b17bd6f7f804898e61fb31f412 Mon Sep 17 00:00:00 2001
From: Lars Simon Winzer <lars.winzer@stud.unibas.ch>
Date: Mon, 30 Mar 2026 18:21:56 +0200
Subject: [PATCH] Chore: Move 'tokenizer' into protocol section

---
 .../network/protocol/parser/ProtocolParser.java       | 11 ++++++-----
 .../{ => network/protocol}/tokenizer/RawToken.java    |  2 +-
 .../protocol}/tokenizer/RawTokenType.java             |  2 +-
 .../{ => network/protocol}/tokenizer/State.java       |  2 +-
 .../{ => network/protocol}/tokenizer/Token.java       |  2 +-
 .../protocol}/tokenizer/TokenClassifier.java          |  2 +-
 .../{ => network/protocol}/tokenizer/TokenType.java   |  2 +-
 .../{ => network/protocol}/tokenizer/Tokenizer.java   |  2 +-
 .../protocol}/tokenizer/TokenizerException.java       |  2 +-
 .../casono/server/network/sessions/SessionReader.java |  3 ++-
 .../dbis/cs108/casono/server/tokenizer/StateTest.java |  2 ++
 .../server/tokenizer/TokenizerExceptionTest.java      |  2 ++
 12 files changed, 20 insertions(+), 14 deletions(-)
 rename src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/{ => network/protocol}/tokenizer/RawToken.java (65%)
 rename src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/{ => network/protocol}/tokenizer/RawTokenType.java (53%)
 rename src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/{ => network/protocol}/tokenizer/State.java (90%)
 rename src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/{ => network/protocol}/tokenizer/Token.java (61%)
 rename src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/{ => network/protocol}/tokenizer/TokenClassifier.java (98%)
 rename src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/{ => network/protocol}/tokenizer/TokenType.java (65%)
 rename src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/{ => network/protocol}/tokenizer/Tokenizer.java (98%)
 rename src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/{ => network/protocol}/tokenizer/TokenizerException.java (85%)

diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/parser/ProtocolParser.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/parser/ProtocolParser.java
index 853845f..b107ea6 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/parser/ProtocolParser.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/parser/ProtocolParser.java
@@ -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.protocol.request.RawRequest;
-import ch.unibas.dmi.dbis.cs108.casono.server.tokenizer.RawToken;
-import ch.unibas.dmi.dbis.cs108.casono.server.tokenizer.Token;
-import ch.unibas.dmi.dbis.cs108.casono.server.tokenizer.TokenClassifier;
-import ch.unibas.dmi.dbis.cs108.casono.server.tokenizer.TokenType;
-import ch.unibas.dmi.dbis.cs108.casono.server.tokenizer.Tokenizer;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.tokenizer.RawToken;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.tokenizer.Token;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.tokenizer.TokenClassifier;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.tokenizer.TokenType;
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.tokenizer.Tokenizer;
+
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/tokenizer/RawToken.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/tokenizer/RawToken.java
similarity index 65%
rename from src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/tokenizer/RawToken.java
rename to src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/tokenizer/RawToken.java
index c8bc6bb..d454904 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/tokenizer/RawToken.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/tokenizer/RawToken.java
@@ -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. */
 public record RawToken(RawTokenType type, String value, int line, int column) {}
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/tokenizer/RawTokenType.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/tokenizer/RawTokenType.java
similarity index 53%
rename from src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/tokenizer/RawTokenType.java
rename to src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/tokenizer/RawTokenType.java
index b37d430..309767e 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/tokenizer/RawTokenType.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/tokenizer/RawTokenType.java
@@ -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 {
     WORD,
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/tokenizer/State.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/tokenizer/State.java
similarity index 90%
rename from src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/tokenizer/State.java
rename to src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/tokenizer/State.java
index d130a52..faf7e6f 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/tokenizer/State.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/tokenizer/State.java
@@ -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.List;
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/tokenizer/Token.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/tokenizer/Token.java
similarity index 61%
rename from src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/tokenizer/Token.java
rename to src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/tokenizer/Token.java
index 93b9026..f885eba 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/tokenizer/Token.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/tokenizer/Token.java
@@ -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. */
 public record Token(TokenType type, String value, int line, int column) {}
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/tokenizer/TokenClassifier.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/tokenizer/TokenClassifier.java
similarity index 98%
rename from src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/tokenizer/TokenClassifier.java
rename to src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/tokenizer/TokenClassifier.java
index cb19021..4d5c26a 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/tokenizer/TokenClassifier.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/tokenizer/TokenClassifier.java
@@ -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.List;
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/tokenizer/TokenType.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/tokenizer/TokenType.java
similarity index 65%
rename from src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/tokenizer/TokenType.java
rename to src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/tokenizer/TokenType.java
index af52b02..3496607 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/tokenizer/TokenType.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/tokenizer/TokenType.java
@@ -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. */
 public enum TokenType {
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/tokenizer/Tokenizer.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/tokenizer/Tokenizer.java
similarity index 98%
rename from src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/tokenizer/Tokenizer.java
rename to src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/tokenizer/Tokenizer.java
index 805d05b..24920f9 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/tokenizer/Tokenizer.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/tokenizer/Tokenizer.java
@@ -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;
 
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/tokenizer/TokenizerException.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/tokenizer/TokenizerException.java
similarity index 85%
rename from src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/tokenizer/TokenizerException.java
rename to src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/tokenizer/TokenizerException.java
index 0975b1d..1e3e9bf 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/tokenizer/TokenizerException.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/tokenizer/TokenizerException.java
@@ -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. */
 public class TokenizerException extends RuntimeException {
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/sessions/SessionReader.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/sessions/SessionReader.java
index 824385b..33bc224 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/sessions/SessionReader.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/sessions/SessionReader.java
@@ -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.Request;
 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.TransportLayer;
-import ch.unibas.dmi.dbis.cs108.casono.server.tokenizer.TokenizerException;
+
 import java.io.EOFException;
 import java.io.IOException;
 import org.apache.logging.log4j.LogManager;
diff --git a/src/test/java/ch/unibas/dmi/dbis/cs108/casono/server/tokenizer/StateTest.java b/src/test/java/ch/unibas/dmi/dbis/cs108/casono/server/tokenizer/StateTest.java
index fd1717b..b368663 100644
--- a/src/test/java/ch/unibas/dmi/dbis/cs108/casono/server/tokenizer/StateTest.java
+++ b/src/test/java/ch/unibas/dmi/dbis/cs108/casono/server/tokenizer/StateTest.java
@@ -6,6 +6,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.junit.jupiter.api.Test;
 
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.tokenizer.State;
+
 class StateTest {
     @Test
     void testConstructor() {
diff --git a/src/test/java/ch/unibas/dmi/dbis/cs108/casono/server/tokenizer/TokenizerExceptionTest.java b/src/test/java/ch/unibas/dmi/dbis/cs108/casono/server/tokenizer/TokenizerExceptionTest.java
index d161b9b..c2b4178 100644
--- a/src/test/java/ch/unibas/dmi/dbis/cs108/casono/server/tokenizer/TokenizerExceptionTest.java
+++ b/src/test/java/ch/unibas/dmi/dbis/cs108/casono/server/tokenizer/TokenizerExceptionTest.java
@@ -4,6 +4,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.junit.jupiter.api.Test;
 
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.tokenizer.TokenizerException;
+
 class TokenizerExceptionTest {
     @Test
     void testConstructorAndGetters() {