From d4b501015829911485c8516db74e8dc618acb288 Mon Sep 17 00:00:00 2001 From: Lars Simon Winzer Date: Mon, 30 Mar 2026 17:45:08 +0200 Subject: [PATCH] Chore: Rename Parameter to RequestParameter --- .../casono/server/network/parser/ProtocolParser.java | 8 ++++---- .../parser/{Parameter.java => RequestParameter.java} | 2 +- .../casono/server/network/request/PrimitiveRequest.java | 4 ++-- .../cs108/casono/server/network/request/RawRequest.java | 4 ++-- .../request/accessor/RequestParameterAccessor.java | 6 +++--- 5 files changed, 12 insertions(+), 12 deletions(-) rename src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/parser/{Parameter.java => RequestParameter.java} (73%) diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/parser/ProtocolParser.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/parser/ProtocolParser.java index 87a7495..ca90162 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/parser/ProtocolParser.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/parser/ProtocolParser.java @@ -25,7 +25,7 @@ public class ProtocolParser { Iterator iterator = tokens.iterator(); String command = readCommand(iterator); - List parameters = readParameters(iterator); + List parameters = readParameters(iterator); return new RawRequest(command, parameters); } @@ -51,8 +51,8 @@ public class ProtocolParser { * @param iterator * @return list containing all parsed parameters */ - private static List readParameters(Iterator iterator) { - List parameters = new ArrayList<>(); + private static List readParameters(Iterator iterator) { + List parameters = new ArrayList<>(); try { while (iterator.hasNext()) { @@ -66,7 +66,7 @@ public class ProtocolParser { readSeperator(iterator.next()); String value = readValue(iterator.next()); - parameters.add(new Parameter(key, value)); + parameters.add(new RequestParameter(key, value)); } } catch (NoSuchElementException e) { throw new ProtocolParserException("Ran out of tokens while reading parameter"); diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/parser/Parameter.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/parser/RequestParameter.java similarity index 73% rename from src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/parser/Parameter.java rename to src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/parser/RequestParameter.java index fb35343..00b8016 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/parser/Parameter.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/parser/RequestParameter.java @@ -1,4 +1,4 @@ package ch.unibas.dmi.dbis.cs108.casono.server.network.parser; /** Used in the PrimitiveRequest class to store the key of a parameter with its respective value */ -public record Parameter(String key, String value) {} +public record RequestParameter(String key, String value) {} 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 d853bab..71b35a2 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,8 +2,8 @@ package ch.unibas.dmi.dbis.cs108.casono.server.network.request; import java.util.List; -import ch.unibas.dmi.dbis.cs108.casono.server.network.parser.Parameter; +import ch.unibas.dmi.dbis.cs108.casono.server.network.parser.RequestParameter; /** Created by the ProtocolParser to allow easy access to the request contents */ public record PrimitiveRequest( - RequestContext context, String command, List parameters) {} + RequestContext context, String command, List parameters) {} 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 f93486a..86aee86 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.Parameter; +import ch.unibas.dmi.dbis.cs108.casono.server.network.parser.RequestParameter; -public record RawRequest(String command, List parameters) {} +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 259883d..ed95c84 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.Parameter; +import ch.unibas.dmi.dbis.cs108.casono.server.network.parser.RequestParameter; /** * Provides typed access to a request's parameters by indexing them by key. @@ -20,10 +20,10 @@ public class RequestParameterAccessor { * * @param parameters to use */ - public RequestParameterAccessor(List parameters) { + public RequestParameterAccessor(List parameters) { this.index = parameters.stream() - .collect(Collectors.toUnmodifiableMap(Parameter::key, Parameter::value)); + .collect(Collectors.toUnmodifiableMap(RequestParameter::key, RequestParameter::value)); } /**