diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/ErrorResponse.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/response/ErrorResponse.java similarity index 85% rename from src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/ErrorResponse.java rename to src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/response/ErrorResponse.java index 77d7137..1136e11 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/ErrorResponse.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/response/ErrorResponse.java @@ -1,6 +1,6 @@ -package ch.unibas.dmi.dbis.cs108.casono.server.network.response; +package ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response; -import ch.unibas.dmi.dbis.cs108.casono.server.network.response.builder.ResponseBody; +import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.builder.ResponseBody; import ch.unibas.dmi.dbis.cs108.casono.server.network.sessions.SessionId; /** Response representing an error outcome for a client's request. */ diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/OkResponse.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/response/OkResponse.java similarity index 78% rename from src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/OkResponse.java rename to src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/response/OkResponse.java index 0d5288f..f0d7cd6 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/OkResponse.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/response/OkResponse.java @@ -1,6 +1,6 @@ -package ch.unibas.dmi.dbis.cs108.casono.server.network.response; +package ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response; -import ch.unibas.dmi.dbis.cs108.casono.server.network.response.builder.ResponseBody; +import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.builder.ResponseBody; 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/response/PrimitiveResponse.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/response/PrimitiveResponse.java similarity index 84% rename from src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/PrimitiveResponse.java rename to src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/response/PrimitiveResponse.java index 1ef7a6a..3f7ce3d 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/PrimitiveResponse.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/response/PrimitiveResponse.java @@ -1,4 +1,4 @@ -package ch.unibas.dmi.dbis.cs108.casono.server.network.response; +package ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response; 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/response/Response.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/response/Response.java similarity index 90% rename from src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/Response.java rename to src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/response/Response.java index 5ba94bb..d0918fb 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/Response.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/response/Response.java @@ -1,6 +1,6 @@ -package ch.unibas.dmi.dbis.cs108.casono.server.network.response; +package ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response; -import ch.unibas.dmi.dbis.cs108.casono.server.network.response.builder.ResponseBody; +import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.builder.ResponseBody; import ch.unibas.dmi.dbis.cs108.casono.server.network.sessions.SessionId; /** Abstract base class for all server responses sent to clients. */ diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/SuccessResponse.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/response/SuccessResponse.java similarity index 85% rename from src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/SuccessResponse.java rename to src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/response/SuccessResponse.java index b901a82..3df95b9 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/SuccessResponse.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/response/SuccessResponse.java @@ -1,6 +1,6 @@ -package ch.unibas.dmi.dbis.cs108.casono.server.network.response; +package ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response; -import ch.unibas.dmi.dbis.cs108.casono.server.network.response.builder.ResponseBody; +import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.builder.ResponseBody; 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/response/builder/ResponseBlock.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/response/builder/ResponseBlock.java similarity index 81% rename from src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/builder/ResponseBlock.java rename to src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/response/builder/ResponseBlock.java index d0f13f5..e738a27 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/builder/ResponseBlock.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/response/builder/ResponseBlock.java @@ -1,4 +1,4 @@ -package ch.unibas.dmi.dbis.cs108.casono.server.network.response.builder; +package ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.builder; import java.util.List; diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/builder/ResponseBody.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/response/builder/ResponseBody.java similarity index 86% rename from src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/builder/ResponseBody.java rename to src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/response/builder/ResponseBody.java index 44ad8f6..fdd4a02 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/builder/ResponseBody.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/response/builder/ResponseBody.java @@ -1,8 +1,8 @@ -package ch.unibas.dmi.dbis.cs108.casono.server.network.response.builder; +package ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.builder; import java.util.List; -import ch.unibas.dmi.dbis.cs108.casono.server.network.response.Response; +import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.Response; /** * Immutable container for the structured content of a {@link Response}. diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/builder/ResponseBodyBuilder.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/response/builder/ResponseBodyBuilder.java similarity index 95% rename from src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/builder/ResponseBodyBuilder.java rename to src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/response/builder/ResponseBodyBuilder.java index 0c78770..c05083d 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/builder/ResponseBodyBuilder.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/response/builder/ResponseBodyBuilder.java @@ -1,4 +1,4 @@ -package ch.unibas.dmi.dbis.cs108.casono.server.network.response.builder; +package ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.builder; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/builder/ResponseNode.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/response/builder/ResponseNode.java similarity index 71% rename from src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/builder/ResponseNode.java rename to src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/response/builder/ResponseNode.java index f9a51aa..b2bb118 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/builder/ResponseNode.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/response/builder/ResponseNode.java @@ -1,4 +1,4 @@ -package ch.unibas.dmi.dbis.cs108.casono.server.network.response.builder; +package ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.builder; /** * Marker interface for elements that may appear in a {@link ResponseBody}. diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/builder/ResponseParameter.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/response/builder/ResponseParameter.java similarity index 89% rename from src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/builder/ResponseParameter.java rename to src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/response/builder/ResponseParameter.java index f537b69..73ffbf7 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/builder/ResponseParameter.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/response/builder/ResponseParameter.java @@ -1,4 +1,4 @@ -package ch.unibas.dmi.dbis.cs108.casono.server.network.response.builder; +package ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.builder; /** * A parameter node stored in a {@link ResponseBody}. diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/dispatcher/ResponseDispatcher.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/response/dispatcher/ResponseDispatcher.java similarity index 83% rename from src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/dispatcher/ResponseDispatcher.java rename to src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/response/dispatcher/ResponseDispatcher.java index cb2172b..1be2f27 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/dispatcher/ResponseDispatcher.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/response/dispatcher/ResponseDispatcher.java @@ -1,7 +1,7 @@ -package ch.unibas.dmi.dbis.cs108.casono.server.network.response.dispatcher; +package ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.dispatcher; -import ch.unibas.dmi.dbis.cs108.casono.server.network.response.PrimitiveResponse; -import ch.unibas.dmi.dbis.cs108.casono.server.network.response.Response; +import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.PrimitiveResponse; +import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.Response; import ch.unibas.dmi.dbis.cs108.casono.server.network.sessions.Session; import ch.unibas.dmi.dbis.cs108.casono.server.network.sessions.SessionManager; diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/dispatcher/ResponseEncoder.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/response/dispatcher/ResponseEncoder.java similarity index 85% rename from src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/dispatcher/ResponseEncoder.java rename to src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/response/dispatcher/ResponseEncoder.java index f824d00..013ddd5 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/dispatcher/ResponseEncoder.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/response/dispatcher/ResponseEncoder.java @@ -1,10 +1,10 @@ -package ch.unibas.dmi.dbis.cs108.casono.server.network.response.dispatcher; +package ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.dispatcher; -import ch.unibas.dmi.dbis.cs108.casono.server.network.response.PrimitiveResponse; -import ch.unibas.dmi.dbis.cs108.casono.server.network.response.Response; -import ch.unibas.dmi.dbis.cs108.casono.server.network.response.builder.ResponseBlock; -import ch.unibas.dmi.dbis.cs108.casono.server.network.response.builder.ResponseNode; -import ch.unibas.dmi.dbis.cs108.casono.server.network.response.builder.ResponseParameter; +import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.PrimitiveResponse; +import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.Response; +import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.builder.ResponseBlock; +import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.builder.ResponseNode; +import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.builder.ResponseParameter; /** * Utility responsible for encoding a {@link Response} into a protocol payload string and wrapping 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 ba33dd5..5f58068 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 @@ -3,7 +3,7 @@ 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.response.PrimitiveResponse; +import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.PrimitiveResponse; import ch.unibas.dmi.dbis.cs108.casono.server.network.transport.TransportLayer; import java.io.IOException; import java.time.Instant; diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/sessions/SessionWriter.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/sessions/SessionWriter.java index e5c3e78..c59abb3 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/sessions/SessionWriter.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/sessions/SessionWriter.java @@ -1,6 +1,6 @@ package ch.unibas.dmi.dbis.cs108.casono.server.network.sessions; -import ch.unibas.dmi.dbis.cs108.casono.server.network.response.PrimitiveResponse; +import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.PrimitiveResponse; import ch.unibas.dmi.dbis.cs108.casono.server.network.transport.RawPacket; import ch.unibas.dmi.dbis.cs108.casono.server.network.transport.TransportLayer; import java.io.IOException;