Chore: Rename Parameter to RequestParameter
This commit is contained in:
+4
-4
@@ -25,7 +25,7 @@ public class ProtocolParser {
|
|||||||
|
|
||||||
Iterator<Token> iterator = tokens.iterator();
|
Iterator<Token> iterator = tokens.iterator();
|
||||||
String command = readCommand(iterator);
|
String command = readCommand(iterator);
|
||||||
List<Parameter> parameters = readParameters(iterator);
|
List<RequestParameter> parameters = readParameters(iterator);
|
||||||
|
|
||||||
return new RawRequest(command, parameters);
|
return new RawRequest(command, parameters);
|
||||||
}
|
}
|
||||||
@@ -51,8 +51,8 @@ public class ProtocolParser {
|
|||||||
* @param iterator
|
* @param iterator
|
||||||
* @return list containing all parsed parameters
|
* @return list containing all parsed parameters
|
||||||
*/
|
*/
|
||||||
private static List<Parameter> readParameters(Iterator<Token> iterator) {
|
private static List<RequestParameter> readParameters(Iterator<Token> iterator) {
|
||||||
List<Parameter> parameters = new ArrayList<>();
|
List<RequestParameter> parameters = new ArrayList<>();
|
||||||
|
|
||||||
try {
|
try {
|
||||||
while (iterator.hasNext()) {
|
while (iterator.hasNext()) {
|
||||||
@@ -66,7 +66,7 @@ public class ProtocolParser {
|
|||||||
readSeperator(iterator.next());
|
readSeperator(iterator.next());
|
||||||
String value = readValue(iterator.next());
|
String value = readValue(iterator.next());
|
||||||
|
|
||||||
parameters.add(new Parameter(key, value));
|
parameters.add(new RequestParameter(key, value));
|
||||||
}
|
}
|
||||||
} catch (NoSuchElementException e) {
|
} catch (NoSuchElementException e) {
|
||||||
throw new ProtocolParserException("Ran out of tokens while reading parameter");
|
throw new ProtocolParserException("Ran out of tokens while reading parameter");
|
||||||
|
|||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package ch.unibas.dmi.dbis.cs108.casono.server.network.parser;
|
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 */
|
/** 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) {}
|
||||||
+2
-2
@@ -2,8 +2,8 @@ package ch.unibas.dmi.dbis.cs108.casono.server.network.request;
|
|||||||
|
|
||||||
import java.util.List;
|
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 */
|
/** Created by the ProtocolParser to allow easy access to the request contents */
|
||||||
public record PrimitiveRequest(
|
public record PrimitiveRequest(
|
||||||
RequestContext context, String command, List<Parameter> parameters) {}
|
RequestContext context, String command, List<RequestParameter> parameters) {}
|
||||||
|
|||||||
+2
-2
@@ -2,6 +2,6 @@ package ch.unibas.dmi.dbis.cs108.casono.server.network.request;
|
|||||||
|
|
||||||
import java.util.List;
|
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<Parameter> parameters) {}
|
public record RawRequest(String command, List<RequestParameter> parameters) {}
|
||||||
|
|||||||
+3
-3
@@ -4,7 +4,7 @@ import java.util.List;
|
|||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.stream.Collectors;
|
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.
|
* Provides typed access to a request's parameters by indexing them by key.
|
||||||
@@ -20,10 +20,10 @@ public class RequestParameterAccessor {
|
|||||||
*
|
*
|
||||||
* @param parameters to use
|
* @param parameters to use
|
||||||
*/
|
*/
|
||||||
public RequestParameterAccessor(List<Parameter> parameters) {
|
public RequestParameterAccessor(List<RequestParameter> parameters) {
|
||||||
this.index =
|
this.index =
|
||||||
parameters.stream()
|
parameters.stream()
|
||||||
.collect(Collectors.toUnmodifiableMap(Parameter::key, Parameter::value));
|
.collect(Collectors.toUnmodifiableMap(RequestParameter::key, RequestParameter::value));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
Reference in New Issue
Block a user