From e0b791589c499884bafff38fc1478253783306e6 Mon Sep 17 00:00:00 2001 From: Lars Simon Winzer Date: Mon, 30 Mar 2026 18:17:11 +0200 Subject: [PATCH] Chore: Move 'request' folder into protocol section --- .../server/network/command/execution/CommandHandler.java | 2 +- .../server/network/command/execution/CommandRouter.java | 2 +- .../server/network/command/parsing/CommandParser.java | 4 ++-- .../network/command/parsing/CommandParserDispatcher.java | 4 ++-- .../server/network/protocol/parser/ProtocolParser.java | 2 +- .../network/{ => protocol}/request/PrimitiveRequest.java | 2 +- .../server/network/{ => protocol}/request/RawRequest.java | 2 +- .../server/network/{ => protocol}/request/Request.java | 2 +- .../network/{ => protocol}/request/RequestContext.java | 2 +- .../request/accessor/MissingParameterException.java | 2 +- .../request/accessor/ParameterParseException.java | 2 +- .../request/accessor/RequestParameterAccessor.java | 2 +- .../{ => protocol}/request/accessor/ThrowingParser.java | 2 +- .../casono/server/network/sessions/SessionReader.java | 8 ++++---- 14 files changed, 19 insertions(+), 19 deletions(-) rename src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/{ => protocol}/request/PrimitiveRequest.java (81%) rename src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/{ => protocol}/request/RawRequest.java (72%) rename src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/{ => protocol}/request/Request.java (87%) rename src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/{ => protocol}/request/RequestContext.java (86%) rename src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/{ => protocol}/request/accessor/MissingParameterException.java (90%) rename src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/{ => protocol}/request/accessor/ParameterParseException.java (91%) rename src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/{ => protocol}/request/accessor/RequestParameterAccessor.java (97%) rename src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/{ => protocol}/request/accessor/ThrowingParser.java (84%) diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/command/execution/CommandHandler.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/command/execution/CommandHandler.java index e0d5524..0fdae3c 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/command/execution/CommandHandler.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/command/execution/CommandHandler.java @@ -1,6 +1,6 @@ package ch.unibas.dmi.dbis.cs108.casono.server.network.command.execution; -import ch.unibas.dmi.dbis.cs108.casono.server.network.request.Request; +import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.Request; public interface CommandHandler { void execute(T request); diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/command/execution/CommandRouter.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/command/execution/CommandRouter.java index ea8c6ea..2fccfe9 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/command/execution/CommandRouter.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/command/execution/CommandRouter.java @@ -3,7 +3,7 @@ package ch.unibas.dmi.dbis.cs108.casono.server.network.command.execution; import java.util.HashMap; import java.util.Map; -import ch.unibas.dmi.dbis.cs108.casono.server.network.request.Request; +import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.Request; public class CommandRouter { private final Map, CommandHandler> handlers = new HashMap<>(); diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/command/parsing/CommandParser.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/command/parsing/CommandParser.java index 6907ff5..3a3b76f 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/command/parsing/CommandParser.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/command/parsing/CommandParser.java @@ -1,7 +1,7 @@ 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; +import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.PrimitiveRequest; +import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.Request; /** * Parser to convert the PrimitiveRequest to a Request and performing checks for required fields and diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/command/parsing/CommandParserDispatcher.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/command/parsing/CommandParserDispatcher.java index 1854400..9031616 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/command/parsing/CommandParserDispatcher.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/command/parsing/CommandParserDispatcher.java @@ -3,8 +3,8 @@ package ch.unibas.dmi.dbis.cs108.casono.server.network.command.parsing; import java.util.HashMap; import java.util.Map; -import ch.unibas.dmi.dbis.cs108.casono.server.network.request.PrimitiveRequest; -import ch.unibas.dmi.dbis.cs108.casono.server.network.request.Request; +import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.PrimitiveRequest; +import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.Request; /** Dispatcher all CommandParser are registered in */ public class CommandParserDispatcher { 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 862e968..853845f 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,7 +1,7 @@ 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.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.tokenizer.Token; import ch.unibas.dmi.dbis.cs108.casono.server.tokenizer.TokenClassifier; 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/protocol/request/PrimitiveRequest.java similarity index 81% rename from src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/request/PrimitiveRequest.java rename to src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/request/PrimitiveRequest.java index 17825b2..c31a91a 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/protocol/request/PrimitiveRequest.java @@ -1,4 +1,4 @@ -package ch.unibas.dmi.dbis.cs108.casono.server.network.request; +package ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request; import java.util.List; 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/protocol/request/RawRequest.java similarity index 72% rename from src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/request/RawRequest.java rename to src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/request/RawRequest.java index f9293b2..ba0be0d 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/protocol/request/RawRequest.java @@ -1,4 +1,4 @@ -package ch.unibas.dmi.dbis.cs108.casono.server.network.request; +package ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request; import java.util.List; diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/request/Request.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/request/Request.java similarity index 87% rename from src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/request/Request.java rename to src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/request/Request.java index f056cb8..1e618ad 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/request/Request.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/request/Request.java @@ -1,4 +1,4 @@ -package ch.unibas.dmi.dbis.cs108.casono.server.network.request; +package ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request; import ch.unibas.dmi.dbis.cs108.casono.server.network.sessions.SessionId; diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/request/RequestContext.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/request/RequestContext.java similarity index 86% rename from src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/request/RequestContext.java rename to src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/request/RequestContext.java index ff57463..63816f6 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/request/RequestContext.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/request/RequestContext.java @@ -1,4 +1,4 @@ -package ch.unibas.dmi.dbis.cs108.casono.server.network.request; +package ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request; import ch.unibas.dmi.dbis.cs108.casono.server.network.sessions.SessionId; diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/request/accessor/MissingParameterException.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/request/accessor/MissingParameterException.java similarity index 90% rename from src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/request/accessor/MissingParameterException.java rename to src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/request/accessor/MissingParameterException.java index bbc04e7..bda6e7e 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/request/accessor/MissingParameterException.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/request/accessor/MissingParameterException.java @@ -1,4 +1,4 @@ -package ch.unibas.dmi.dbis.cs108.casono.server.network.request.accessor; +package ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.accessor; /** Exception thrown when a required parameter key is not found. */ public class MissingParameterException extends RuntimeException { diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/request/accessor/ParameterParseException.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/request/accessor/ParameterParseException.java similarity index 91% rename from src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/request/accessor/ParameterParseException.java rename to src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/request/accessor/ParameterParseException.java index 2bb9752..e6f9f1f 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/request/accessor/ParameterParseException.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/request/accessor/ParameterParseException.java @@ -1,4 +1,4 @@ -package ch.unibas.dmi.dbis.cs108.casono.server.network.request.accessor; +package ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.accessor; /** Exception thrown when a parameter value cannot be converted to the requested type. */ public class ParameterParseException extends RuntimeException { 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/protocol/request/accessor/RequestParameterAccessor.java similarity index 97% rename from src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/request/accessor/RequestParameterAccessor.java rename to src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/request/accessor/RequestParameterAccessor.java index f46c15a..082bf62 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/protocol/request/accessor/RequestParameterAccessor.java @@ -1,4 +1,4 @@ -package ch.unibas.dmi.dbis.cs108.casono.server.network.request.accessor; +package ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.accessor; import java.util.List; import java.util.Map; diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/request/accessor/ThrowingParser.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/request/accessor/ThrowingParser.java similarity index 84% rename from src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/request/accessor/ThrowingParser.java rename to src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/request/accessor/ThrowingParser.java index 90b2fcc..688304b 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/request/accessor/ThrowingParser.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/request/accessor/ThrowingParser.java @@ -1,4 +1,4 @@ -package ch.unibas.dmi.dbis.cs108.casono.server.network.request.accessor; +package ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.accessor; /** * Functional parser interface used to convert a raw string parameter into a target type. 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 6d941c8..824385b 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 @@ -6,10 +6,10 @@ 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.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; -import ch.unibas.dmi.dbis.cs108.casono.server.network.request.RawRequest; -import ch.unibas.dmi.dbis.cs108.casono.server.network.request.Request; -import ch.unibas.dmi.dbis.cs108.casono.server.network.request.RequestContext; +import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.PrimitiveRequest; +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.transport.RawPacket; import ch.unibas.dmi.dbis.cs108.casono.server.network.transport.TransportLayer; import ch.unibas.dmi.dbis.cs108.casono.server.tokenizer.TokenizerException;