src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/ServerApp.java

@@ -45,53 +45,52 @@ import org.apache.logging.log4j.Logger;
 
 /** Application class for starting the server. */
 public class ServerApp {
-    private static final int USER_CLEANUP_JOB_DELAY = 0;
-    private static final int USER_CLEANUP_JOB_PERIOD = 10;
-    private static final int USER_CLEANUP_JOB_RECONNECT_THRESHOLD = 10;
-    private static final int SESSION_DISCONNECT_JOB_DELAY = 0;
-    private static final int SESSION_DISCONNECT_JOB_PERIOD = 2;
-    private static final int SESSION_DISCONNECT_JOB_TIMEOUT = 5;
+        private static final int USER_CLEANUP_JOB_DELAY = 0;
+        private static final int USER_CLEANUP_JOB_PERIOD = 10;
+        private static final int USER_CLEANUP_JOB_RECONNECT_THRESHOLD = 10;
+        private static final int SESSION_DISCONNECT_JOB_DELAY = 0;
+        private static final int SESSION_DISCONNECT_JOB_PERIOD = 2;
+        private static final int SESSION_DISCONNECT_JOB_TIMEOUT = 5;
 
-    public static void start(String arg) {
-        int port = Integer.parseInt(arg);
+        public static void start(String arg) {
+                int port = Integer.parseInt(arg);
 
-        Logger logger = LogManager.getLogger(ServerApp.class);
-        logger.info("Starting server at port {}", port);
+                Logger logger = LogManager.getLogger(ServerApp.class);
+                logger.info("Starting server at port {}", port);
 
-        EventBus eventBus = new EventBus();
-        CommandParserDispatcher dispatcher = new CommandParserDispatcher();
-        SessionManager sessionManager = new SessionManager(eventBus, dispatcher);
-        ResponseDispatcher responseDispatcher = new ResponseDispatcher(sessionManager);
-        CommandHandlerExecutor handlerExecutor = new CommandHandlerExecutor(responseDispatcher);
-        CommandRouter router = new CommandRouter(handlerExecutor);
+                EventBus eventBus = new EventBus();
+                CommandParserDispatcher dispatcher = new CommandParserDispatcher();
+                SessionManager sessionManager = new SessionManager(eventBus, dispatcher);
+                ResponseDispatcher responseDispatcher = new ResponseDispatcher(sessionManager);
+                CommandHandlerExecutor handlerExecutor = new CommandHandlerExecutor(responseDispatcher);
+                CommandRouter router = new CommandRouter(handlerExecutor);
 
-        eventBus.subscribe(DisconnectEvent.class, event -> sessionManager.onDisconnect(event));
+                eventBus.subscribe(DisconnectEvent.class, event -> sessionManager.onDisconnect(event));
 
-        UserRegistry userRegistry = new UserRegistry();
-        eventBus.subscribe(
-                DisconnectEvent.class, event -> userRegistry.onDisconnect(event.sessionId()));
-        ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1);
-        scheduler.scheduleAtFixedRate(
-                new UserCleanupJob(
-                        userRegistry, Duration.ofSeconds(USER_CLEANUP_JOB_RECONNECT_THRESHOLD)),
-                USER_CLEANUP_JOB_DELAY,
-                USER_CLEANUP_JOB_PERIOD,
-                TimeUnit.SECONDS);
-        scheduler.scheduleAtFixedRate(
-                new SessionDisconnectJob(
-                        sessionManager,
-                        eventBus,
-                        Duration.ofSeconds(SESSION_DISCONNECT_JOB_TIMEOUT)),
-                SESSION_DISCONNECT_JOB_DELAY,
-                SESSION_DISCONNECT_JOB_PERIOD,
-                TimeUnit.SECONDS);
+                UserRegistry userRegistry = new UserRegistry();
+                eventBus.subscribe(
+                                DisconnectEvent.class, event -> userRegistry.onDisconnect(event.sessionId()));
+                ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1);
+                scheduler.scheduleAtFixedRate(
+                                new UserCleanupJob(
+                                                userRegistry, Duration.ofSeconds(USER_CLEANUP_JOB_RECONNECT_THRESHOLD)),
+                                USER_CLEANUP_JOB_DELAY,
+                                USER_CLEANUP_JOB_PERIOD,
+                                TimeUnit.SECONDS);
+                scheduler.scheduleAtFixedRate(
+                                new SessionDisconnectJob(
+                                                sessionManager,
+                                                eventBus,
+                                                Duration.ofSeconds(SESSION_DISCONNECT_JOB_TIMEOUT)),
+                                SESSION_DISCONNECT_JOB_DELAY,
+                                SESSION_DISCONNECT_JOB_PERIOD,
+                                TimeUnit.SECONDS);
 
-        LobbyManager lobbyManager = new LobbyManager();
-        registerCommands(dispatcher, router, responseDispatcher, userRegistry, lobbyManager);
+        registerCommands(dispatcher, router, responseDispatcher, userRegistry);
 
-        NetworkManager networkManager = new NetworkManager(port, sessionManager, router);
-        networkManager.start();
-    }
+                NetworkManager networkManager = new NetworkManager(port, sessionManager, router);
+                networkManager.start();
+        }
 
     /**
      * Registers command parsers and handlers.
@@ -104,51 +103,39 @@ public class ServerApp {
             CommandParserDispatcher parserDispatcher,
             CommandRouter commandRouter,
             ResponseDispatcher responseDispatcher,
-            UserRegistry userRegistry,
-            LobbyManager lobbyManager) {
+            UserRegistry userRegistry) {
         parserDispatcher.register("PING", new PingParser());
         commandRouter.register(PingRequest.class, new PingHandler(responseDispatcher));
 
-        parserDispatcher.register("CHECK_USERNAME", new CheckUsernameParser());
-        commandRouter.register(
-                CheckUsernameRequest.class,
-                new CheckUsernameHandler(responseDispatcher, userRegistry));
+                parserDispatcher.register("CHECK_USERNAME", new CheckUsernameParser());
+                commandRouter.register(
+                                CheckUsernameRequest.class,
+                                new CheckUsernameHandler(responseDispatcher, userRegistry));
 
-        parserDispatcher.register("LOGIN", new LoginParser());
-        commandRouter.register(
-                LoginRequest.class, new LoginHandler(responseDispatcher, userRegistry));
+                parserDispatcher.register("LOGIN", new LoginParser());
+                commandRouter.register(
+                                LoginRequest.class, new LoginHandler(responseDispatcher, userRegistry));
 
-        parserDispatcher.register("LOGOUT", new LogoutParser());
-        commandRouter.register(
-                LogoutRequest.class, new LogoutHandler(responseDispatcher, userRegistry));
+                parserDispatcher.register("LOGOUT", new LogoutParser());
+                commandRouter.register(
+                                LogoutRequest.class, new LogoutHandler(responseDispatcher, userRegistry));
 
-        parserDispatcher.register("SEND_MESSAGE", new SendMessageParser());
-        commandRouter.register(
-                SendMessageRequest.class, new SendMessageHandler(responseDispatcher, userRegistry));
+                parserDispatcher.register("SEND_MESSAGE", new SendMessageParser());
+                commandRouter.register(
+                                SendMessageRequest.class, new SendMessageHandler(responseDispatcher, userRegistry));
 
-        parserDispatcher.register("GET_MESSAGE_COUNT", new GetMessageCountParser());
-        commandRouter.register(
-                GetMessageCountRequest.class,
-                new GetMessageCountHandler(responseDispatcher, userRegistry));
+                parserDispatcher.register("GET_MESSAGE_COUNT", new GetMessageCountParser());
+                commandRouter.register(
+                                GetMessageCountRequest.class,
+                                new GetMessageCountHandler(responseDispatcher, userRegistry));
 
-        parserDispatcher.register("GET_NEXT_MESSAGE", new GetNextMessageParser());
-        commandRouter.register(
-                GetNextMessageRequest.class,
-                new GetNextMessageHandler(responseDispatcher, userRegistry));
+                parserDispatcher.register("GET_NEXT_MESSAGE", new GetNextMessageParser());
+                commandRouter.register(
+                                GetNextMessageRequest.class,
+                                new GetNextMessageHandler(responseDispatcher, userRegistry));
 
         parserDispatcher.register("LIST_USERS", new ListUsersParser());
         commandRouter.register(
                 ListUsersRequest.class, new ListUsersHandler(responseDispatcher, userRegistry));
-
-        // Lobby commands
-        parserDispatcher.register(
-                "JOIN_LOBBY",
-                new ch.unibas.dmi.dbis.cs108.casono.server.app.commands.lobby.join_lobby
-                        .JoinLobbyParser());
-        commandRouter.register(
-                ch.unibas.dmi.dbis.cs108.casono.server.app.commands.lobby.join_lobby
-                        .JoinLobbyRequest.class,
-                new ch.unibas.dmi.dbis.cs108.casono.server.app.commands.lobby.join_lobby
-                        .JoinLobbyHandler(responseDispatcher, lobbyManager, userRegistry));
     }
 }