From ba6ff36ee2c801a4e99a834a044cfe1027367d89 Mon Sep 17 00:00:00 2001 From: Lars Simon Winzer Date: Mon, 30 Mar 2026 18:00:34 +0200 Subject: [PATCH] Chore: Move ResponseBodyBuilder to 'builder' subfolder in response section --- .../cs108/casono/server/network/response/ErrorResponse.java | 1 + .../dbis/cs108/casono/server/network/response/OkResponse.java | 1 + .../dbis/cs108/casono/server/network/response/Response.java | 1 + .../cs108/casono/server/network/response/ResponseEncoder.java | 4 ++++ .../cs108/casono/server/network/response/SuccessResponse.java | 1 + .../server/network/response/{ => builder}/ResponseBlock.java | 2 +- .../server/network/response/{ => builder}/ResponseBody.java | 4 +++- .../network/response/{ => builder}/ResponseBodyBuilder.java | 2 +- .../server/network/response/{ => builder}/ResponseNode.java | 2 +- .../network/response/{ => builder}/ResponseParameter.java | 2 +- 10 files changed, 15 insertions(+), 5 deletions(-) rename src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/{ => builder}/ResponseBlock.java (83%) rename src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/{ => builder}/ResponseBody.java (87%) rename src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/{ => builder}/ResponseBodyBuilder.java (95%) rename src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/{ => builder}/ResponseNode.java (73%) rename src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/{ => builder}/ResponseParameter.java (90%) 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/response/ErrorResponse.java index 602181b..77d7137 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/response/ErrorResponse.java @@ -1,5 +1,6 @@ package ch.unibas.dmi.dbis.cs108.casono.server.network.response; +import ch.unibas.dmi.dbis.cs108.casono.server.network.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/response/OkResponse.java index a3f26c5..0d5288f 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/response/OkResponse.java @@ -1,5 +1,6 @@ package ch.unibas.dmi.dbis.cs108.casono.server.network.response; +import ch.unibas.dmi.dbis.cs108.casono.server.network.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/Response.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/Response.java index 8a3cf96..5ba94bb 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/response/Response.java @@ -1,5 +1,6 @@ package ch.unibas.dmi.dbis.cs108.casono.server.network.response; +import ch.unibas.dmi.dbis.cs108.casono.server.network.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/ResponseEncoder.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/ResponseEncoder.java index dbe8d12..4f228a5 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/ResponseEncoder.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/ResponseEncoder.java @@ -1,5 +1,9 @@ package ch.unibas.dmi.dbis.cs108.casono.server.network.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; + /** * Utility responsible for encoding a {@link Response} into a protocol payload string and wrapping * it into a {@link PrimitiveResponse} suitable for transmission. 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/response/SuccessResponse.java index e88913f..b901a82 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/response/SuccessResponse.java @@ -1,5 +1,6 @@ package ch.unibas.dmi.dbis.cs108.casono.server.network.response; +import ch.unibas.dmi.dbis.cs108.casono.server.network.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/ResponseBlock.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/builder/ResponseBlock.java similarity index 83% rename from src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/ResponseBlock.java rename to src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/builder/ResponseBlock.java index 075abaf..d0f13f5 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/ResponseBlock.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/builder/ResponseBlock.java @@ -1,4 +1,4 @@ -package ch.unibas.dmi.dbis.cs108.casono.server.network.response; +package ch.unibas.dmi.dbis.cs108.casono.server.network.response.builder; import java.util.List; diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/ResponseBody.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/builder/ResponseBody.java similarity index 87% rename from src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/ResponseBody.java rename to src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/builder/ResponseBody.java index 8c52ffc..44ad8f6 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/ResponseBody.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/builder/ResponseBody.java @@ -1,7 +1,9 @@ -package ch.unibas.dmi.dbis.cs108.casono.server.network.response; +package ch.unibas.dmi.dbis.cs108.casono.server.network.response.builder; import java.util.List; +import ch.unibas.dmi.dbis.cs108.casono.server.network.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/ResponseBodyBuilder.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/builder/ResponseBodyBuilder.java similarity index 95% rename from src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/ResponseBodyBuilder.java rename to src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/builder/ResponseBodyBuilder.java index f6491b0..0c78770 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/ResponseBodyBuilder.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/builder/ResponseBodyBuilder.java @@ -1,4 +1,4 @@ -package ch.unibas.dmi.dbis.cs108.casono.server.network.response; +package ch.unibas.dmi.dbis.cs108.casono.server.network.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/ResponseNode.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/builder/ResponseNode.java similarity index 73% rename from src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/ResponseNode.java rename to src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/builder/ResponseNode.java index c3af815..f9a51aa 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/ResponseNode.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/builder/ResponseNode.java @@ -1,4 +1,4 @@ -package ch.unibas.dmi.dbis.cs108.casono.server.network.response; +package ch.unibas.dmi.dbis.cs108.casono.server.network.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/ResponseParameter.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/builder/ResponseParameter.java similarity index 90% rename from src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/ResponseParameter.java rename to src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/builder/ResponseParameter.java index 87f599a..f537b69 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/ResponseParameter.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/builder/ResponseParameter.java @@ -1,4 +1,4 @@ -package ch.unibas.dmi.dbis.cs108.casono.server.network.response; +package ch.unibas.dmi.dbis.cs108.casono.server.network.response.builder; /** * A parameter node stored in a {@link ResponseBody}.