From eefcd101357f3fe31f83de18aeb1a4b04507781b Mon Sep 17 00:00:00 2001 From: Lars Simon Winzer Date: Tue, 12 May 2026 12:59:13 +0200 Subject: [PATCH 1/3] Refactor: Short logger names for classes in server-side packages --- .../java/ch/unibas/dmi/dbis/cs108/casono/server/ServerApp.java | 2 +- .../server/app/commands/lobby/join_lobby/JoinLobbyHandler.java | 3 ++- .../dbis/cs108/casono/server/domain/lobby/LobbyCleanupJob.java | 3 ++- .../dbis/cs108/casono/server/domain/user/UserCleanupJob.java | 2 +- .../dmi/dbis/cs108/casono/server/domain/user/UserFactory.java | 2 +- .../dmi/dbis/cs108/casono/server/network/NetworkManager.java | 2 +- .../casono/server/network/sessions/SessionDisconnectJob.java | 2 +- .../cs108/casono/server/network/sessions/SessionManager.java | 2 +- .../cs108/casono/server/network/sessions/SessionReader.java | 2 +- .../cs108/casono/server/network/sessions/SessionWriter.java | 2 +- 10 files changed, 12 insertions(+), 10 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 a9a46c7..51e022d 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 @@ -99,7 +99,7 @@ public class ServerApp { public static void start(String arg) { int port = Integer.parseInt(arg); - Logger logger = LogManager.getLogger(ServerApp.class); + Logger logger = LogManager.getLogger(ServerApp.class.getSimpleName()); logger.info("Starting server at port {}", port); EventBus eventBus = new EventBus(); diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/lobby/join_lobby/JoinLobbyHandler.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/lobby/join_lobby/JoinLobbyHandler.java index 169b027..e557c3c 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/lobby/join_lobby/JoinLobbyHandler.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/lobby/join_lobby/JoinLobbyHandler.java @@ -23,7 +23,8 @@ import org.apache.logging.log4j.Logger; public class JoinLobbyHandler extends CommandHandler { private final LobbyManager lobbyManager; private final UserRegistry userRegistry; - private static final Logger LOGGER = LogManager.getLogger(JoinLobbyHandler.class); + private static final Logger LOGGER = + LogManager.getLogger(JoinLobbyHandler.class.getSimpleName()); /** * Create a new {@link JoinLobbyHandler}. diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/domain/lobby/LobbyCleanupJob.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/domain/lobby/LobbyCleanupJob.java index 47c0413..713993c 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/domain/lobby/LobbyCleanupJob.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/domain/lobby/LobbyCleanupJob.java @@ -14,7 +14,8 @@ import org.apache.logging.log4j.Logger; /** Periodically removes expired empty lobbies and notifies connected sessions. */ public class LobbyCleanupJob implements Runnable { - private static final Logger LOGGER = LogManager.getLogger(LobbyCleanupJob.class); + private static final Logger LOGGER = + LogManager.getLogger(LobbyCleanupJob.class.getSimpleName()); private final LobbyManager lobbyManager; private final SessionManager sessionManager; diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/domain/user/UserCleanupJob.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/domain/user/UserCleanupJob.java index 32cfbb4..9b520ab 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/domain/user/UserCleanupJob.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/domain/user/UserCleanupJob.java @@ -15,7 +15,7 @@ public class UserCleanupJob implements Runnable { private final Duration reconnectThreshold; public UserCleanupJob(UserRegistry registry, Duration reconnectThreshold) { - this.logger = LogManager.getLogger(UserCleanupJob.class); + this.logger = LogManager.getLogger(UserCleanupJob.class.getSimpleName()); this.registry = registry; this.reconnectThreshold = reconnectThreshold; } diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/domain/user/UserFactory.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/domain/user/UserFactory.java index 0a41b0c..30f232a 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/domain/user/UserFactory.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/domain/user/UserFactory.java @@ -9,7 +9,7 @@ import org.apache.logging.log4j.Logger; public class UserFactory { private final UserRegistry registry; private final AtomicInteger anonymousCounter = new AtomicInteger(1); - private static final Logger LOGGER = LogManager.getLogger(UserFactory.class); + private static final Logger LOGGER = LogManager.getLogger(UserFactory.class.getSimpleName()); /** * Creates a new UserFactory backed by the given registry. diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/NetworkManager.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/NetworkManager.java index 83a39d3..65e3780 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/NetworkManager.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/NetworkManager.java @@ -26,7 +26,7 @@ public class NetworkManager implements Runnable { */ public NetworkManager(Integer port, SessionManager sessionManager, CommandRouter router) { this.port = port; - this.logger = LogManager.getLogger(NetworkManager.class); + this.logger = LogManager.getLogger(NetworkManager.class.getSimpleName()); this.thread = new Thread(this, "networkManager"); this.running = true; this.sessionManager = sessionManager; diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/sessions/SessionDisconnectJob.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/sessions/SessionDisconnectJob.java index 6fd481d..04e90cc 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/sessions/SessionDisconnectJob.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/sessions/SessionDisconnectJob.java @@ -15,7 +15,7 @@ public class SessionDisconnectJob implements Runnable { public SessionDisconnectJob( SessionManager sessionManager, EventBus eventBus, Duration timeoutThreshold) { - this.logger = LogManager.getLogger(SessionDisconnectJob.class); + this.logger = LogManager.getLogger(SessionDisconnectJob.class.getSimpleName()); this.sessionManager = sessionManager; this.eventBus = eventBus; this.timeoutThreshold = timeoutThreshold; 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 569b828..1797668 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 @@ -24,7 +24,7 @@ public class SessionManager { public SessionManager(EventBus eventBus, CommandParserDispatcher dispatcher) { this.sessions = new ConcurrentHashMap<>(); this.eventBus = eventBus; - this.logger = LogManager.getLogger(SessionManager.class); + this.logger = LogManager.getLogger(SessionManager.class.getSimpleName()); this.dispatcher = dispatcher; } 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 4d5e353..585cd54 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 @@ -41,7 +41,7 @@ public class SessionReader implements Runnable { this.router = session.getRouter(); this.logger = LogManager.getLogger( - SessionReader.class.toString() + "-" + session.getId().value()); + SessionReader.class.getSimpleName() + "-" + session.getId().value()); } @Override 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 c59abb3..20c11e0 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 @@ -18,7 +18,7 @@ public class SessionWriter implements Runnable { this.queue = session.getResponseQueue(); this.logger = LogManager.getLogger( - SessionReader.class.toString() + "-" + session.getId().value()); + SessionReader.class.getSimpleName() + "-" + session.getId().value()); } public void run() { From 28aad75930bb06c4dc88b40db3b74b23761af84e Mon Sep 17 00:00:00 2001 From: Lars Simon Winzer Date: Tue, 12 May 2026 12:59:32 +0200 Subject: [PATCH 2/3] Refactor: Short logger names for classes in client-side session package --- .../ch/unibas/dmi/dbis/cs108/casono/client/ClientApp.java | 2 +- .../dmi/dbis/cs108/casono/client/chat/ChatController.java | 4 ++-- .../dmi/dbis/cs108/casono/client/network/ChatClient.java | 2 +- .../dmi/dbis/cs108/casono/client/network/ClientService.java | 2 +- .../ui/gameui/gameuicomponents/CasinoBrowserController.java | 3 ++- .../ui/gameui/gameuicomponents/HighscoreViewController.java | 3 ++- .../client/ui/gameui/gameuicomponents/NotebookController.java | 3 ++- .../client/ui/gameui/gameuicomponents/SettingsController.java | 3 ++- .../client/ui/gameui/gameuicomponents/TaskbarController.java | 3 ++- .../casono/client/ui/lobbyui/CasinomainuiController.java | 3 ++- .../casono/client/ui/lobbyui/LobbyButtonGridManager.java | 3 ++- 11 files changed, 19 insertions(+), 12 deletions(-) diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ClientApp.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ClientApp.java index 897b487..024775d 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ClientApp.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ClientApp.java @@ -15,7 +15,7 @@ import org.apache.logging.log4j.Logger; */ public class ClientApp { - private static final Logger LOGGER = LogManager.getLogger(ClientApp.class); + private static final Logger LOGGER = LogManager.getLogger(ClientApp.class.getSimpleName()); /** Shared client connection used when a username is provided at startup. */ private static volatile ClientService sharedClientService; diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatController.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatController.java index 58fb787..4d19dcd 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatController.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatController.java @@ -88,7 +88,7 @@ public class ChatController { chatModelMap = new LinkedHashMap<>(); localUserList = new ArrayList<>(); this.chatBoxController = new ChatBoxController(username, this); - this.logger = LogManager.getLogger(ChatController.class); + this.logger = LogManager.getLogger(ChatController.class.getSimpleName()); this.serverEventListener = this::handleServerEvent; this.activeChatControllers = new HashMap<>(); @@ -124,7 +124,7 @@ public class ChatController { chatModelMap = new LinkedHashMap<>(); localUserList = new ArrayList<>(); this.chatBoxController = new ChatBoxController(username, this); - this.logger = LogManager.getLogger(ChatController.class); + this.logger = LogManager.getLogger(ChatController.class.getSimpleName()); this.serverEventListener = this::handleServerEvent; this.activeChatControllers = new HashMap<>(); diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ChatClient.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ChatClient.java index d46ce22..c20d244 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ChatClient.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ChatClient.java @@ -26,7 +26,7 @@ public class ChatClient implements ChatClientInterface { */ public ChatClient(ClientService clientService) { this.clientService = clientService; - this.logger = LogManager.getLogger(ChatClient.class); + this.logger = LogManager.getLogger(ChatClient.class.getSimpleName()); } /** 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 2ab6f0c..9c0ffdd 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 @@ -60,7 +60,7 @@ public class ClientService { public ClientService(String ip, int port) { this.idGenerator = new AtomicInteger(0); - this.logger = LogManager.getLogger(ClientService.class); + this.logger = LogManager.getLogger(ClientService.class.getSimpleName()); this.offlineMode = false; diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/gameui/gameuicomponents/CasinoBrowserController.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/gameui/gameuicomponents/CasinoBrowserController.java index 6a360a3..c915ab2 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/gameui/gameuicomponents/CasinoBrowserController.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/gameui/gameuicomponents/CasinoBrowserController.java @@ -68,7 +68,8 @@ public class CasinoBrowserController { private static final CookieManager COOKIE_MANAGER = new CookieManager(null, CookiePolicy.ACCEPT_ORIGINAL_SERVER); - private static final Logger LOGGER = LogManager.getLogger(CasinoBrowserController.class); + private static final Logger LOGGER = + LogManager.getLogger(CasinoBrowserController.class.getSimpleName()); private static final ObservableList URL_SUGGESTIONS = FXCollections.observableArrayList(TRUSTED_DOMAINS); diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/gameui/gameuicomponents/HighscoreViewController.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/gameui/gameuicomponents/HighscoreViewController.java index e395b68..9045b81 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/gameui/gameuicomponents/HighscoreViewController.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/gameui/gameuicomponents/HighscoreViewController.java @@ -14,7 +14,8 @@ import org.apache.logging.log4j.Logger; /** Controller for the highscore popup window. */ public class HighscoreViewController { - private static final Logger LOGGER = LogManager.getLogger(HighscoreViewController.class); + private static final Logger LOGGER = + LogManager.getLogger(HighscoreViewController.class.getSimpleName()); @FXML private ListView highscoreList; @FXML private Label statusLabel; diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/gameui/gameuicomponents/NotebookController.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/gameui/gameuicomponents/NotebookController.java index c1dead5..b8da88a 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/gameui/gameuicomponents/NotebookController.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/gameui/gameuicomponents/NotebookController.java @@ -18,7 +18,8 @@ import org.apache.logging.log4j.Logger; */ public class NotebookController { - private static final Logger LOGGER = LogManager.getLogger(NotebookController.class); + private static final Logger LOGGER = + LogManager.getLogger(NotebookController.class.getSimpleName()); @FXML private VBox notebook; @FXML private ScrollPane tipsContent; diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/gameui/gameuicomponents/SettingsController.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/gameui/gameuicomponents/SettingsController.java index 8ccf30b..ea837d5 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/gameui/gameuicomponents/SettingsController.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/gameui/gameuicomponents/SettingsController.java @@ -15,7 +15,8 @@ import org.apache.logging.log4j.Logger; */ public class SettingsController { - private static final Logger LOGGER = LogManager.getLogger(SettingsController.class); + private static final Logger LOGGER = + LogManager.getLogger(SettingsController.class.getSimpleName()); @FXML private VBox settingsBox; @FXML private RadioButton themeStandard; diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/gameui/gameuicomponents/TaskbarController.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/gameui/gameuicomponents/TaskbarController.java index 2a6dbae..4de45f9 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/gameui/gameuicomponents/TaskbarController.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/gameui/gameuicomponents/TaskbarController.java @@ -39,7 +39,8 @@ import org.apache.logging.log4j.Logger; */ public class TaskbarController { - private static final Logger LOGGER = LogManager.getLogger(TaskbarController.class); + private static final Logger LOGGER = + LogManager.getLogger(TaskbarController.class.getSimpleName()); @FXML private HBox taskbar; @FXML private TextField taskbarInput; diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/lobbyui/CasinomainuiController.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/lobbyui/CasinomainuiController.java index 518b8cf..7557ac9 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/lobbyui/CasinomainuiController.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/lobbyui/CasinomainuiController.java @@ -30,7 +30,8 @@ import org.apache.logging.log4j.Logger; /** Controller for the Casono main UI lobby. Handles UI initialization and user actions. */ public class CasinomainuiController { - private static final Logger LOGGER = LogManager.getLogger(CasinomainuiController.class); + private static final Logger LOGGER = + LogManager.getLogger(CasinomainuiController.class.getSimpleName()); @FXML private AnchorPane rootPane; @FXML private Label titleLabel; diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/lobbyui/LobbyButtonGridManager.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/lobbyui/LobbyButtonGridManager.java index c2c5163..6d0db59 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/lobbyui/LobbyButtonGridManager.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/lobbyui/LobbyButtonGridManager.java @@ -34,7 +34,8 @@ public class LobbyButtonGridManager { private static final int MAX_BUTTONS = 8; private static final int GUEST_ID_LENGTH = 8; - private static final Logger LOGGER = LogManager.getLogger(LobbyButtonGridManager.class); + private static final Logger LOGGER = + LogManager.getLogger(LobbyButtonGridManager.class.getSimpleName()); private static final String BUTTON_FALLBACK_IMAGE = "/images/lobbypictures/error.png"; From 0be59681e4ae015daec3f042772b452d3c303726 Mon Sep 17 00:00:00 2001 From: Lars Simon Winzer Date: Tue, 12 May 2026 12:59:52 +0200 Subject: [PATCH 3/3] Refactor: Short logger name for application entry point --- src/main/java/ch/unibas/dmi/dbis/cs108/casono/Main.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/Main.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/Main.java index 04046b2..9bbd40a 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/Main.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/Main.java @@ -52,7 +52,7 @@ public final class Main { } private static void printUsage() { - Logger logger = LogManager.getLogger(Main.class); + Logger logger = LogManager.getLogger(Main.class.getSimpleName()); logger.fatal( """ Usage: