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 b9e6679..2391450 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 @@ -4,7 +4,6 @@ import ch.unibas.dmi.dbis.cs108.casono.server.domain.user.UserCleanupJob; import ch.unibas.dmi.dbis.cs108.casono.server.domain.user.UserRegistry; import ch.unibas.dmi.dbis.cs108.casono.server.network.NetworkManager; import ch.unibas.dmi.dbis.cs108.casono.server.network.command.CommandRouter; -import ch.unibas.dmi.dbis.cs108.casono.server.network.command.TestCommandHandler; 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.parser.CommandParserDispatcher; diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/command/CommandRouter.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/command/CommandRouter.java index 0dafc58..0badeff 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/command/CommandRouter.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/command/CommandRouter.java @@ -1,10 +1,9 @@ package ch.unibas.dmi.dbis.cs108.casono.server.network.command; +import ch.unibas.dmi.dbis.cs108.casono.server.network.parser.Request; import java.util.HashMap; import java.util.Map; -import ch.unibas.dmi.dbis.cs108.casono.server.network.parser.Request; - public class CommandRouter { private final Map, CommandHandler> handlers = new HashMap<>(); @@ -12,14 +11,17 @@ public class CommandRouter { handlers.put(request, handler); } - // Safe, because during registration, it's ensured that the provided CommandHandler only receives requests it can handle. + // Safe, because during registration, it's ensured that the provided CommandHandler only + // receives requests it can handle. @SuppressWarnings("unchecked") public void execute(Request request) { - CommandHandler handler = (CommandHandler) handlers.get(request.getClass()); + CommandHandler handler = + (CommandHandler) handlers.get(request.getClass()); if (handler == null) { String requestName = request.getClass().toString(); - throw new UnknownRequestException("Unable to execute request " + requestName + ". Type unknown", requestName); + throw new UnknownRequestException( + "Unable to execute request " + requestName + ". Type unknown", requestName); } handler.execute(request); } 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 0c5027b..d6e2094 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 @@ -26,7 +26,10 @@ public class Session { * @throws IOException if an I/O error occurs during initialization */ public Session( - TransportLayer transport, EventBus eventBus, CommandParserDispatcher dispatcher, CommandRouter router) { + TransportLayer transport, + EventBus eventBus, + CommandParserDispatcher dispatcher, + CommandRouter router) { this.id = new SessionId(); this.transport = transport; this.dispatcher = dispatcher; 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 a33e7b0..65a97a3 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 @@ -20,7 +20,8 @@ public class SessionManager { private final CommandRouter router; /** Constructs a new SessionManager. */ - public SessionManager(EventBus eventBus, CommandParserDispatcher dispatcher, CommandRouter router) { + public SessionManager( + EventBus eventBus, CommandParserDispatcher dispatcher, CommandRouter router) { this.sessions = new ConcurrentHashMap<>(); this.eventBus = eventBus; this.logger = LogManager.getLogger(SessionManager.class); diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/sessions/SessionReader.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/sessions/SessionReader.java index 8ba5c62..cd74de9 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/sessions/SessionReader.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/sessions/SessionReader.java @@ -56,7 +56,7 @@ public class SessionReader implements Runnable { logger.debug("Converted to {}", primitiveRequest); Request request = dispatcher.parse(primitiveRequest); - + router.execute(request); } catch (EOFException e) { logger.info("Client disconnected");