From 007e8638782b8428db2c81975645bf68f905f729 Mon Sep 17 00:00:00 2001 From: Jona Walpert Date: Thu, 16 Apr 2026 10:25:57 +0200 Subject: [PATCH] Chore: fix long imports to make code more readable --- .../dbis/cs108/casono/server/ServerApp.java | 179 +++++++----------- 1 file changed, 71 insertions(+), 108 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 25f38e1..3a1820d 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 @@ -6,6 +6,21 @@ import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.change_username.Chang import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.check_nick.CheckUsernameHandler; import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.check_nick.CheckUsernameParser; import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.check_nick.CheckUsernameRequest; +import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.game.bet.PlayerBetHandler; +import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.game.bet.PlayerBetParser; +import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.game.bet.PlayerBetRequest; +import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.game.call.PlayerCallHandler; +import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.game.call.PlayerCallParser; +import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.game.call.PlayerCallRequest; +import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.game.fold.PlayerFoldHandler; +import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.game.fold.PlayerFoldParser; +import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.game.fold.PlayerFoldRequest; +import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.game.get_game_state.GetGameStateHandler; +import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.game.get_game_state.GetGameStateParser; +import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.game.get_game_state.GetGameStateRequest; +import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.game.raise.PlayerRaiseHandler; +import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.game.raise.PlayerRaiseParser; +import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.game.raise.PlayerRaiseRequest; import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.get_message_count.GetMessageCountHandler; import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.get_message_count.GetMessageCountParser; import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.get_message_count.GetMessageCountRequest; @@ -15,6 +30,21 @@ import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.get_next_message.GetN import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.list_users.ListUsersHandler; import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.list_users.ListUsersParser; import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.list_users.ListUsersRequest; +import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.lobby.create_lobby.CreateLobbyHandler; +import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.lobby.create_lobby.CreateLobbyParser; +import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.lobby.create_lobby.CreateLobbyRequest; +import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.lobby.get_lobby_list.GetLobbyListHandler; +import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.lobby.get_lobby_list.GetLobbyListParser; +import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.lobby.get_lobby_list.GetLobbyListRequest; +import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.lobby.get_lobby_status.GetLobbyStatusHandler; +import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.lobby.get_lobby_status.GetLobbyStatusParser; +import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.lobby.get_lobby_status.GetLobbyStatusRequest; +import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.lobby.join_lobby.JoinLobbyHandler; +import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.lobby.join_lobby.JoinLobbyParser; +import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.lobby.join_lobby.JoinLobbyRequest; +import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.lobby.start_game.StartGameHandler; +import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.lobby.start_game.StartGameParser; +import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.lobby.start_game.StartGameRequest; import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.login.LoginHandler; import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.login.LoginParser; import ch.unibas.dmi.dbis.cs108.casono.server.app.commands.login.LoginRequest; @@ -31,6 +61,7 @@ import ch.unibas.dmi.dbis.cs108.casono.server.domain.lobby.LobbyManager; 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.execution.CommandHandler; import ch.unibas.dmi.dbis.cs108.casono.server.network.command.execution.CommandHandlerExecutor; import ch.unibas.dmi.dbis.cs108.casono.server.network.command.execution.CommandRouter; import ch.unibas.dmi.dbis.cs108.casono.server.network.command.parsing.CommandParserDispatcher; @@ -204,152 +235,84 @@ public class ServerApp { ListUsersRequest.class, new ListUsersHandler(responseDispatcher, userRegistry)); // GET_LOBBY_LIST registration - parserDispatcher.register( - "GET_LOBBY_LIST", - new ch.unibas.dmi.dbis.cs108.casono.server.app.commands.lobby.get_lobby_list - .GetLobbyListParser()); + parserDispatcher.register("GET_LOBBY_LIST", new GetLobbyListParser()); commandRouter.register( - ch.unibas.dmi.dbis.cs108.casono.server.app.commands.lobby.get_lobby_list - .GetLobbyListRequest.class, - (ch.unibas.dmi.dbis.cs108.casono.server.network.command.execution.CommandHandler< - ch.unibas.dmi.dbis.cs108.casono.server.app.commands.lobby - .get_lobby_list.GetLobbyListRequest>) - new ch.unibas.dmi.dbis.cs108.casono.server.app.commands.lobby.get_lobby_list - .GetLobbyListHandler(responseDispatcher, context.lobbyManager())); + GetLobbyListRequest.class, + (CommandHandler) + new GetLobbyListHandler(responseDispatcher, context.lobbyManager())); // GET_GAME_STATE registration - parserDispatcher.register( - "GET_GAME_STATE", - new ch.unibas.dmi.dbis.cs108.casono.server.app.commands.game.get_game_state - .GetGameStateParser()); + parserDispatcher.register("GET_GAME_STATE", new GetGameStateParser()); commandRouter.register( - ch.unibas.dmi.dbis.cs108.casono.server.app.commands.game.get_game_state - .GetGameStateRequest.class, - (ch.unibas.dmi.dbis.cs108.casono.server.network.command.execution.CommandHandler< - ch.unibas.dmi.dbis.cs108.casono.server.app.commands.game - .get_game_state.GetGameStateRequest>) - new ch.unibas.dmi.dbis.cs108.casono.server.app.commands.game.get_game_state - .GetGameStateHandler( + GetGameStateRequest.class, + (CommandHandler) + new GetGameStateHandler( responseDispatcher, context.lobbyManager(), userRegistry)); // BET registration - parserDispatcher.register( - "BET", - new ch.unibas.dmi.dbis.cs108.casono.server.app.commands.game.bet.PlayerBetParser()); + parserDispatcher.register("BET", new PlayerBetParser()); commandRouter.register( - ch.unibas.dmi.dbis.cs108.casono.server.app.commands.game.bet.PlayerBetRequest.class, - (ch.unibas.dmi.dbis.cs108.casono.server.network.command.execution.CommandHandler< - ch.unibas.dmi.dbis.cs108.casono.server.app.commands.game.bet - .PlayerBetRequest>) - new ch.unibas.dmi.dbis.cs108.casono.server.app.commands.game.bet - .PlayerBetHandler( + PlayerBetRequest.class, + (CommandHandler) + new PlayerBetHandler( responseDispatcher, userRegistry, context.lobbyManager())); // RAISE registration - parserDispatcher.register( - "RAISE", - new ch.unibas.dmi.dbis.cs108.casono.server.app.commands.game.raise - .PlayerRaiseParser()); + parserDispatcher.register("RAISE", new PlayerRaiseParser()); commandRouter.register( - ch.unibas.dmi.dbis.cs108.casono.server.app.commands.game.raise.PlayerRaiseRequest - .class, - (ch.unibas.dmi.dbis.cs108.casono.server.network.command.execution.CommandHandler< - ch.unibas.dmi.dbis.cs108.casono.server.app.commands.game.raise - .PlayerRaiseRequest>) - new ch.unibas.dmi.dbis.cs108.casono.server.app.commands.game.raise - .PlayerRaiseHandler( + PlayerRaiseRequest.class, + (CommandHandler) + new PlayerRaiseHandler( responseDispatcher, userRegistry, context.lobbyManager())); // CALL registration - parserDispatcher.register( - "CALL", - new ch.unibas.dmi.dbis.cs108.casono.server.app.commands.game.call - .PlayerCallParser()); + parserDispatcher.register("CALL", new PlayerCallParser()); commandRouter.register( - ch.unibas.dmi.dbis.cs108.casono.server.app.commands.game.call.PlayerCallRequest - .class, - (ch.unibas.dmi.dbis.cs108.casono.server.network.command.execution.CommandHandler< - ch.unibas.dmi.dbis.cs108.casono.server.app.commands.game.call - .PlayerCallRequest>) - new ch.unibas.dmi.dbis.cs108.casono.server.app.commands.game.call - .PlayerCallHandler( + PlayerCallRequest.class, + (CommandHandler) + new PlayerCallHandler( responseDispatcher, userRegistry, context.lobbyManager())); // FOLD registration - parserDispatcher.register( - "FOLD", - new ch.unibas.dmi.dbis.cs108.casono.server.app.commands.game.fold - .PlayerFoldParser()); + parserDispatcher.register("FOLD", new PlayerFoldParser()); commandRouter.register( - ch.unibas.dmi.dbis.cs108.casono.server.app.commands.game.fold.PlayerFoldRequest - .class, - (ch.unibas.dmi.dbis.cs108.casono.server.network.command.execution.CommandHandler< - ch.unibas.dmi.dbis.cs108.casono.server.app.commands.game.fold - .PlayerFoldRequest>) - new ch.unibas.dmi.dbis.cs108.casono.server.app.commands.game.fold - .PlayerFoldHandler( + PlayerFoldRequest.class, + (CommandHandler) + new PlayerFoldHandler( responseDispatcher, userRegistry, context.lobbyManager())); // GET_LOBBY_STATUS registration - parserDispatcher.register( - "GET_LOBBY_STATUS", - new ch.unibas.dmi.dbis.cs108.casono.server.app.commands.lobby.get_lobby_status - .GetLobbyStatusParser()); + parserDispatcher.register("GET_LOBBY_STATUS", new GetLobbyStatusParser()); commandRouter.register( - ch.unibas.dmi.dbis.cs108.casono.server.app.commands.lobby.get_lobby_status - .GetLobbyStatusRequest.class, - (ch.unibas.dmi.dbis.cs108.casono.server.network.command.execution.CommandHandler< - ch.unibas.dmi.dbis.cs108.casono.server.app.commands.lobby - .get_lobby_status.GetLobbyStatusRequest>) - new ch.unibas.dmi.dbis.cs108.casono.server.app.commands.lobby - .get_lobby_status.GetLobbyStatusHandler( + GetLobbyStatusRequest.class, + (CommandHandler) + new GetLobbyStatusHandler( responseDispatcher, context.lobbyManager(), userRegistry)); // CREATE_LOBBY registration - parserDispatcher.register( - "CREATE_LOBBY", - new ch.unibas.dmi.dbis.cs108.casono.server.app.commands.lobby.create_lobby - .CreateLobbyParser()); + parserDispatcher.register("CREATE_LOBBY", new CreateLobbyParser()); commandRouter.register( - ch.unibas.dmi.dbis.cs108.casono.server.app.commands.lobby.create_lobby - .CreateLobbyRequest.class, - (ch.unibas.dmi.dbis.cs108.casono.server.network.command.execution.CommandHandler< - ch.unibas.dmi.dbis.cs108.casono.server.app.commands.lobby - .create_lobby.CreateLobbyRequest>) - new ch.unibas.dmi.dbis.cs108.casono.server.app.commands.lobby.create_lobby - .CreateLobbyHandler( + CreateLobbyRequest.class, + (CommandHandler) + new CreateLobbyHandler( responseDispatcher, context.lobbyManager(), context.sessionManager())); // JOIN_LOBBY registration - parserDispatcher.register( - "JOIN_LOBBY", - new ch.unibas.dmi.dbis.cs108.casono.server.app.commands.lobby.join_lobby - .JoinLobbyParser()); + parserDispatcher.register("JOIN_LOBBY", new JoinLobbyParser()); commandRouter.register( - ch.unibas.dmi.dbis.cs108.casono.server.app.commands.lobby.join_lobby - .JoinLobbyRequest.class, - (ch.unibas.dmi.dbis.cs108.casono.server.network.command.execution.CommandHandler< - ch.unibas.dmi.dbis.cs108.casono.server.app.commands.lobby.join_lobby - .JoinLobbyRequest>) - new ch.unibas.dmi.dbis.cs108.casono.server.app.commands.lobby.join_lobby - .JoinLobbyHandler( + JoinLobbyRequest.class, + (CommandHandler) + new JoinLobbyHandler( responseDispatcher, context.lobbyManager(), userRegistry)); // START_GAME registration - parserDispatcher.register( - "START_GAME", - new ch.unibas.dmi.dbis.cs108.casono.server.app.commands.lobby.start_game - .StartGameParser()); + parserDispatcher.register("START_GAME", new StartGameParser()); commandRouter.register( - ch.unibas.dmi.dbis.cs108.casono.server.app.commands.lobby.start_game - .StartGameRequest.class, - (ch.unibas.dmi.dbis.cs108.casono.server.network.command.execution.CommandHandler< - ch.unibas.dmi.dbis.cs108.casono.server.app.commands.lobby.start_game - .StartGameRequest>) - new ch.unibas.dmi.dbis.cs108.casono.server.app.commands.lobby.start_game - .StartGameHandler( + StartGameRequest.class, + (CommandHandler) + new StartGameHandler( responseDispatcher, context.lobbyManager(), userRegistry)); } } -- 2.52.0