From 47475dc4d303e7409affd8469a770b968fa5411c Mon Sep 17 00:00:00 2001 From: Mathis Ginkel Date: Sun, 10 May 2026 16:49:15 +0200 Subject: [PATCH] Style: Apply Spotless --- .../casono/client/network/ClientService.java | 3 +- .../client/network/ClientServiceTest.java | 34 +++++++++++-------- 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientService.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientService.java index 7503824..f2ace09 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientService.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientService.java @@ -247,8 +247,7 @@ public class ClientService { // Allow primitive values to contain hyphens (UUIDs) in addition to // digits/words/colons static Pattern responseRex = - Pattern.compile( - "(?\\w+)=(('(?([^']|\\')+)')|(?[^ ]+))"); + Pattern.compile("(?\\w+)=(('(?([^']|\\')+)')|(?[^ ]+))"); /** * Removes escape characters from a string, specifically converting escaped single quotes (\') diff --git a/src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientServiceTest.java b/src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientServiceTest.java index 6efca40..46b5718 100644 --- a/src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientServiceTest.java +++ b/src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientServiceTest.java @@ -1,44 +1,48 @@ package ch.unibas.dmi.dbis.cs108.casono.client.network; +import static org.junit.jupiter.api.Assertions.assertEquals; + import ch.unibas.dmi.dbis.cs108.casono.server.network.command.parsing.RequestParameter; +import java.util.*; import org.junit.jupiter.api.Test; -import java.util.*; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotEquals; - public class ClientServiceTest { - @Test public void parsingResponse() { ArrayList params = new ArrayList<>(); params.add(new RequestParameter("KEY", "VALUE")); - params.add(new RequestParameter("STANDARD_TEXT", "Lorem ipsum dolor sit amet, consectetur adipiscing elit")); + params.add( + new RequestParameter( + "STANDARD_TEXT", + "Lorem ipsum dolor sit amet, consectetur adipiscing elit")); params.add(new RequestParameter("TEXT_BASED_EMOJI_WITHOUT_QUOTATION_MARKS", ";-)")); - params.add(new RequestParameter("TEXT_WITH_QUOTATION_MARKS", "SOMEBODY SAYS: 'HALLO WELT'")); + params.add( + new RequestParameter("TEXT_WITH_QUOTATION_MARKS", "SOMEBODY SAYS: 'HALLO WELT'")); params.add(new RequestParameter("NUMBERS", "123456789")); params.add(new RequestParameter("SOME_SPECIAL_CHARACTERS", "°^!§$%&/()=[]}?*+~'#`")); params.add(new RequestParameter("WRONG_CHARACTERS", "# * ~ +")); params.add(new RequestParameter("WRONG_TEXT", "HELLO WORLD")); - ArrayList paramsAsResponseLines = new ArrayList<>(); + ArrayList paramsAsResponseLines = new ArrayList<>(); for (RequestParameter parameter : params) { - if (!parameter.key().equals("WRONG_TEXT") && !parameter.key().equals("WRONG_CHARACTERS") && parameter.value().contains(" ")) { + if (!parameter.key().equals("WRONG_TEXT") + && !parameter.key().equals("WRONG_CHARACTERS") + && parameter.value().contains(" ")) { String newValue = "'" + parameter.value() + "'"; paramsAsResponseLines.add(String.format("%s=%s", parameter.key(), newValue)); } else { - paramsAsResponseLines.add(String.format("%s=%s", parameter.key(), parameter.value())); + paramsAsResponseLines.add( + String.format("%s=%s", parameter.key(), parameter.value())); } } assertEquals(8, paramsAsResponseLines.size()); - - List msgRes = new ArrayList<>(ClientService.convertToRequestParameters(paramsAsResponseLines)); + List msgRes = + new ArrayList<>(ClientService.convertToRequestParameters(paramsAsResponseLines)); assertEquals(6, msgRes.size()); @@ -46,7 +50,7 @@ public class ClientServiceTest { assertEquals(params.get(i), msgRes.get(i)); } - assert(!msgRes.contains(params.get(6))); - assert(!msgRes.contains(params.get(7))); + assert (!msgRes.contains(params.get(6))); + assert (!msgRes.contains(params.get(7))); } }