From b19e923356fbb96dad3f985e334a3723269e5ae6 Mon Sep 17 00:00:00 2001 From: Lars Simon Winzer Date: Fri, 20 Mar 2026 17:09:59 +0100 Subject: [PATCH] Style: Magic number, linelength and trailing whitespace --- .../dbis/cs108/casono/server/ServerApp.java | 3 +-- .../server/network/sessions/Session.java | 4 +++- .../network/sessions/SessionManager.java | 23 ++++++++++--------- .../network/sessions/SessionWriter.java | 5 +++- 4 files changed, 20 insertions(+), 15 deletions(-) diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/ServerApp.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/ServerApp.java index 985b60a..126b341 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/ServerApp.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/ServerApp.java @@ -27,8 +27,7 @@ public class ServerApp { EventBus eventBus = new EventBus(); SessionManager sessionManager = new SessionManager(eventBus); - eventBus.subscribe( - DisconnectEvent.class, event -> sessionManager.onDisconnect(event)); + eventBus.subscribe(DisconnectEvent.class, event -> sessionManager.onDisconnect(event)); NetworkManager networkManager = new NetworkManager(port, sessionManager); UserRegistry userRegistry = new UserRegistry(); 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 9837127..84f4489 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 @@ -13,6 +13,8 @@ public class Session { private final TransportLayer transport; private final BlockingQueue responseQueue; + private final int RESPOND_QUEUE_SIZE = 32; + /** * Creates a new Session with the given transport and event bus. * @@ -23,7 +25,7 @@ public class Session { public Session(TransportLayer transport, EventBus eventBus) { this.id = new SessionId(); this.transport = transport; - this.responseQueue = new ArrayBlockingQueue<>(32); + this.responseQueue = new ArrayBlockingQueue<>(RESPOND_QUEUE_SIZE); } /** diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/sessions/SessionManager.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/sessions/SessionManager.java index efe43ca..c81c119 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/sessions/SessionManager.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/sessions/SessionManager.java @@ -1,15 +1,14 @@ package ch.unibas.dmi.dbis.cs108.casono.server.network.sessions; +import ch.unibas.dmi.dbis.cs108.casono.server.network.events.DisconnectEvent; +import ch.unibas.dmi.dbis.cs108.casono.server.network.events.EventBus; +import ch.unibas.dmi.dbis.cs108.casono.server.network.transport.TransportLayer; import java.io.IOException; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import ch.unibas.dmi.dbis.cs108.casono.server.network.events.DisconnectEvent; -import ch.unibas.dmi.dbis.cs108.casono.server.network.events.EventBus; -import ch.unibas.dmi.dbis.cs108.casono.server.network.transport.TransportLayer; - /** Manages active sessions in the server. */ public class SessionManager { private Map sessions; @@ -25,9 +24,9 @@ public class SessionManager { /** * Create new Session from provided transport. - * - *

Will create both worker threads and start them. - * + * + *

Will create both worker threads and start them. + * * @param transport to create session from * @return newly created session */ @@ -50,15 +49,17 @@ public class SessionManager { /** * Disconnect specified client - * - *

WARNING: Client will be uninformed about disconnect. Use with caution. - * + * + *

WARNING: Client will be uninformed about disconnect. Use with caution. + * * @param id of the client to disconnect */ public void disconnect(SessionId id) { SessionHandle handle = sessions.get(id); if (handle == null) { - logger.warn("Requested to disconnect client with id {}. Failed as client is not found", id.value()); + logger.warn( + "Requested to disconnect client with id {}. Failed as client is not found", + id.value()); return; } logger.debug("Disconnecting session {}", id.value()); 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 7d85fec..e5c3e78 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 @@ -29,7 +29,10 @@ public class SessionWriter implements Runnable { packet = new RawPacket(response.requestId(), response.payload()); transport.write(packet); } catch (IOException e) { - logger.error("Unexpected exception while writing to transport. RawPacket: {}", packet, e); + logger.error( + "Unexpected exception while writing to transport. RawPacket: {}", + packet, + e); } catch (InterruptedException e) { logger.warn("Thread got interrupted", e); break;