From ed24ba7214fe9fd4d1313bb37026de76e42c2374 Mon Sep 17 00:00:00 2001 From: Lars Simon Winzer Date: Mon, 30 Mar 2026 17:54:19 +0200 Subject: [PATCH] Chore: Move command parsing to 'parsing' subfolder in command section --- .../java/ch/unibas/dmi/dbis/cs108/casono/server/ServerApp.java | 2 +- .../network/{parser => command/parsing}/CommandParser.java | 2 +- .../{parser => command/parsing}/CommandParserDispatcher.java | 2 +- .../network/{parser => command/parsing}/RequestParameter.java | 2 +- .../{parser => command/parsing}/UnknownCommandException.java | 2 +- .../casono/server/network/protocol/parser/ProtocolParser.java | 2 +- .../cs108/casono/server/network/request/PrimitiveRequest.java | 2 +- .../dbis/cs108/casono/server/network/request/RawRequest.java | 2 +- .../network/request/accessor/RequestParameterAccessor.java | 2 +- .../dmi/dbis/cs108/casono/server/network/sessions/Session.java | 2 +- .../cs108/casono/server/network/sessions/SessionManager.java | 2 +- .../cs108/casono/server/network/sessions/SessionReader.java | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) rename src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/{parser => command/parsing}/CommandParser.java (87%) rename src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/{parser => command/parsing}/CommandParserDispatcher.java (94%) rename src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/{parser => command/parsing}/RequestParameter.java (69%) rename src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/{parser => command/parsing}/UnknownCommandException.java (78%) diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/ServerApp.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/ServerApp.java index 6c1f5ec..5687b5b 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/ServerApp.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/ServerApp.java @@ -4,9 +4,9 @@ import ch.unibas.dmi.dbis.cs108.casono.server.domain.user.UserCleanupJob; import ch.unibas.dmi.dbis.cs108.casono.server.domain.user.UserRegistry; import ch.unibas.dmi.dbis.cs108.casono.server.network.NetworkManager; import ch.unibas.dmi.dbis.cs108.casono.server.network.command.execution.CommandRouter; +import ch.unibas.dmi.dbis.cs108.casono.server.network.command.parsing.CommandParserDispatcher; import ch.unibas.dmi.dbis.cs108.casono.server.network.events.DisconnectEvent; import ch.unibas.dmi.dbis.cs108.casono.server.network.events.EventBus; -import ch.unibas.dmi.dbis.cs108.casono.server.network.parser.CommandParserDispatcher; import ch.unibas.dmi.dbis.cs108.casono.server.network.sessions.SessionDisconnectJob; import ch.unibas.dmi.dbis.cs108.casono.server.network.sessions.SessionManager; import java.time.Duration; diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/parser/CommandParser.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/command/parsing/CommandParser.java similarity index 87% rename from src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/parser/CommandParser.java rename to src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/command/parsing/CommandParser.java index d4fbe22..6907ff5 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/parser/CommandParser.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/command/parsing/CommandParser.java @@ -1,4 +1,4 @@ -package ch.unibas.dmi.dbis.cs108.casono.server.network.parser; +package ch.unibas.dmi.dbis.cs108.casono.server.network.command.parsing; import ch.unibas.dmi.dbis.cs108.casono.server.network.request.PrimitiveRequest; import ch.unibas.dmi.dbis.cs108.casono.server.network.request.Request; diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/parser/CommandParserDispatcher.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/command/parsing/CommandParserDispatcher.java similarity index 94% rename from src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/parser/CommandParserDispatcher.java rename to src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/command/parsing/CommandParserDispatcher.java index dbb5bf8..1854400 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/parser/CommandParserDispatcher.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/command/parsing/CommandParserDispatcher.java @@ -1,4 +1,4 @@ -package ch.unibas.dmi.dbis.cs108.casono.server.network.parser; +package ch.unibas.dmi.dbis.cs108.casono.server.network.command.parsing; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/parser/RequestParameter.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/command/parsing/RequestParameter.java similarity index 69% rename from src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/parser/RequestParameter.java rename to src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/command/parsing/RequestParameter.java index 00b8016..d0ca720 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/parser/RequestParameter.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/command/parsing/RequestParameter.java @@ -1,4 +1,4 @@ -package ch.unibas.dmi.dbis.cs108.casono.server.network.parser; +package ch.unibas.dmi.dbis.cs108.casono.server.network.command.parsing; /** Used in the PrimitiveRequest class to store the key of a parameter with its respective value */ public record RequestParameter(String key, String value) {} diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/parser/UnknownCommandException.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/command/parsing/UnknownCommandException.java similarity index 78% rename from src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/parser/UnknownCommandException.java rename to src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/command/parsing/UnknownCommandException.java index 5048d70..0b5759b 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/parser/UnknownCommandException.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/command/parsing/UnknownCommandException.java @@ -1,4 +1,4 @@ -package ch.unibas.dmi.dbis.cs108.casono.server.network.parser; +package ch.unibas.dmi.dbis.cs108.casono.server.network.command.parsing; /** * Exception thrown when the CommandParserDispatcher has no registered handler for the provided 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 99bd05f..862e968 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 @@ -1,6 +1,6 @@ package ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.parser; -import ch.unibas.dmi.dbis.cs108.casono.server.network.parser.RequestParameter; +import ch.unibas.dmi.dbis.cs108.casono.server.network.command.parsing.RequestParameter; import ch.unibas.dmi.dbis.cs108.casono.server.network.request.RawRequest; import ch.unibas.dmi.dbis.cs108.casono.server.tokenizer.RawToken; import ch.unibas.dmi.dbis.cs108.casono.server.tokenizer.Token; diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/request/PrimitiveRequest.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/request/PrimitiveRequest.java index 71b35a2..17825b2 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/request/PrimitiveRequest.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/request/PrimitiveRequest.java @@ -2,7 +2,7 @@ package ch.unibas.dmi.dbis.cs108.casono.server.network.request; import java.util.List; -import ch.unibas.dmi.dbis.cs108.casono.server.network.parser.RequestParameter; +import ch.unibas.dmi.dbis.cs108.casono.server.network.command.parsing.RequestParameter; /** Created by the ProtocolParser to allow easy access to the request contents */ public record PrimitiveRequest( diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/request/RawRequest.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/request/RawRequest.java index 86aee86..f9293b2 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/request/RawRequest.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/request/RawRequest.java @@ -2,6 +2,6 @@ package ch.unibas.dmi.dbis.cs108.casono.server.network.request; import java.util.List; -import ch.unibas.dmi.dbis.cs108.casono.server.network.parser.RequestParameter; +import ch.unibas.dmi.dbis.cs108.casono.server.network.command.parsing.RequestParameter; public record RawRequest(String command, List parameters) {} diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/request/accessor/RequestParameterAccessor.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/request/accessor/RequestParameterAccessor.java index ed95c84..f46c15a 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/request/accessor/RequestParameterAccessor.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/request/accessor/RequestParameterAccessor.java @@ -4,7 +4,7 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import ch.unibas.dmi.dbis.cs108.casono.server.network.parser.RequestParameter; +import ch.unibas.dmi.dbis.cs108.casono.server.network.command.parsing.RequestParameter; /** * Provides typed access to a request's parameters by indexing them by key. diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/sessions/Session.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/sessions/Session.java index 5e78115..ba33dd5 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/sessions/Session.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/sessions/Session.java @@ -1,8 +1,8 @@ package ch.unibas.dmi.dbis.cs108.casono.server.network.sessions; import ch.unibas.dmi.dbis.cs108.casono.server.network.command.execution.CommandRouter; +import ch.unibas.dmi.dbis.cs108.casono.server.network.command.parsing.CommandParserDispatcher; import ch.unibas.dmi.dbis.cs108.casono.server.network.events.EventBus; -import ch.unibas.dmi.dbis.cs108.casono.server.network.parser.CommandParserDispatcher; import ch.unibas.dmi.dbis.cs108.casono.server.network.response.PrimitiveResponse; import ch.unibas.dmi.dbis.cs108.casono.server.network.transport.TransportLayer; import java.io.IOException; diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/sessions/SessionManager.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/sessions/SessionManager.java index eafc0c7..ba25cf4 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/sessions/SessionManager.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/sessions/SessionManager.java @@ -1,9 +1,9 @@ package ch.unibas.dmi.dbis.cs108.casono.server.network.sessions; import ch.unibas.dmi.dbis.cs108.casono.server.network.command.execution.CommandRouter; +import ch.unibas.dmi.dbis.cs108.casono.server.network.command.parsing.CommandParserDispatcher; import ch.unibas.dmi.dbis.cs108.casono.server.network.events.DisconnectEvent; import ch.unibas.dmi.dbis.cs108.casono.server.network.events.EventBus; -import ch.unibas.dmi.dbis.cs108.casono.server.network.parser.CommandParserDispatcher; import ch.unibas.dmi.dbis.cs108.casono.server.network.transport.TransportLayer; import java.io.IOException; import java.util.Collection; 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 5cd9bc6..6d941c8 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 @@ -1,9 +1,9 @@ package ch.unibas.dmi.dbis.cs108.casono.server.network.sessions; import ch.unibas.dmi.dbis.cs108.casono.server.network.command.execution.CommandRouter; +import ch.unibas.dmi.dbis.cs108.casono.server.network.command.parsing.CommandParserDispatcher; import ch.unibas.dmi.dbis.cs108.casono.server.network.events.DisconnectEvent; import ch.unibas.dmi.dbis.cs108.casono.server.network.events.EventBus; -import ch.unibas.dmi.dbis.cs108.casono.server.network.parser.CommandParserDispatcher; import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.parser.ProtocolParser; import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.parser.ProtocolParserException; import ch.unibas.dmi.dbis.cs108.casono.server.network.request.PrimitiveRequest;