Fix: Final code restoration and import cleanup

Co-authored-by: Copilot <copilot@github.com>

src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/gameui/CasinoGameUI.java

@@ -1,5 +1,6 @@
 package ch.unibas.dmi.dbis.cs108.casono.client.ui.gameui;
 
+import ch.unibas.dmi.dbis.cs108.casono.client.ClientApp;
 import ch.unibas.dmi.dbis.cs108.casono.client.game.GameService;
 import ch.unibas.dmi.dbis.cs108.casono.client.game.PlayerId;
 import ch.unibas.dmi.dbis.cs108.casono.client.network.ClientService;
@@ -77,8 +78,7 @@ public class CasinoGameUI extends Application {
     public void start(Stage stage) throws IOException {
 
         if (clientService == null) {
-            clientService =
+            clientService = ClientApp.getSharedClientService();
-                    ch.unibas.dmi.dbis.cs108.casono.client.ClientApp.getSharedClientService();
         }
         if (clientService == null) {
             throw new IllegalStateException(
@@ -90,8 +90,7 @@ public class CasinoGameUI extends Application {
         String effectiveUsername = normalize(username);
 
         if (effectiveUsername == null) {
-            effectiveUsername =
+            effectiveUsername = normalize(ClientApp.getSharedUsername());
-                    normalize(ch.unibas.dmi.dbis.cs108.casono.client.ClientApp.getSharedUsername());
         }
 
         if (effectiveUsername == null) {
@@ -105,7 +104,7 @@ public class CasinoGameUI extends Application {
                         + "', injectedUsername='"
                         + username
                         + "', sharedUsername='"
-                        + ch.unibas.dmi.dbis.cs108.casono.client.ClientApp.getSharedUsername()
+                        + ClientApp.getSharedUsername()
                         + "', hasClientService="
                         + (clientService != null));
 

src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/lobbyui/CasinomainuiController.java

@@ -55,9 +55,9 @@ public class CasinomainuiController {
     }
 
     /**
-     * Initializes the UI components and sets default values. If a shared {@link
+     * Initializes the UI components and sets default values. If a shared {@link ClientService}
-     * ch.unibas.dmi.dbis.cs108.casono.client.network.ClientService} exists (created at application
+     * exists (created at application start), the controller reuses it so the connection remains
-     * start), the controller reuses it so the connection remains open and already-logged-in.
+     * open and already-logged-in.
      */
     @FXML
     public void initialize() {

src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/lobbyui/LobbyButtonGridManager.java

@@ -1,7 +1,9 @@
 package ch.unibas.dmi.dbis.cs108.casono.client.ui.lobbyui;
 
+import ch.unibas.dmi.dbis.cs108.casono.client.ClientApp;
 import ch.unibas.dmi.dbis.cs108.casono.client.network.ClientService;
 import ch.unibas.dmi.dbis.cs108.casono.client.network.LobbyClient;
+import ch.unibas.dmi.dbis.cs108.casono.client.ui.gameui.CasinoGameUI;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.command.parsing.RequestParameter;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -553,14 +555,10 @@ public class LobbyButtonGridManager {
                     try {
                         var cs = lobbyClient.getClientService();
 
-                        ch.unibas.dmi.dbis.cs108.casono.client.ui.gameui.CasinoGameUI
+                        CasinoGameUI.setClientService(cs);
-                                .setClientService(cs);
+                        CasinoGameUI.setLobbyId(lobbyId);
-                        ch.unibas.dmi.dbis.cs108.casono.client.ui.gameui.CasinoGameUI.setLobbyId(
-                                lobbyId);
 
-                        String username =
+                        String username = ClientApp.getSharedUsername();
-                                ch.unibas.dmi.dbis.cs108.casono.client.ClientApp
-                                        .getSharedUsername();
                         if (username == null || username.isBlank()) {
                             username =
                                     "Guest-"
@@ -570,11 +568,9 @@ public class LobbyButtonGridManager {
                                                     .toString()
                                                     .substring(0, GUEST_ID_LENGTH);
                         }
-                        ch.unibas.dmi.dbis.cs108.casono.client.ui.gameui.CasinoGameUI.setUsername(
+                        CasinoGameUI.setUsername(username);
-                                username);
 
-                        new ch.unibas.dmi.dbis.cs108.casono.client.ui.gameui.CasinoGameUI()
+                        new CasinoGameUI().start(gameStage);
-                                .start(gameStage);
 
                     } catch (Exception e) {
                         LOGGER.error("Game UI failed: {}", e.getMessage());

src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/game/bet/PlayerBetHandler.java

@@ -4,6 +4,7 @@ import ch.unibas.dmi.dbis.cs108.casono.server.domain.game.GameController;
 import ch.unibas.dmi.dbis.cs108.casono.server.domain.game.player.PlayerId;
 import ch.unibas.dmi.dbis.cs108.casono.server.domain.lobby.LobbyId;
 import ch.unibas.dmi.dbis.cs108.casono.server.domain.lobby.LobbyManager;
+import ch.unibas.dmi.dbis.cs108.casono.server.domain.user.User;
 import ch.unibas.dmi.dbis.cs108.casono.server.domain.user.UserRegistry;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.command.execution.CommandHandler;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.ErrorResponse;
@@ -58,8 +59,7 @@ public class PlayerBetHandler extends CommandHandler<PlayerBetRequest> {
             return;
         }
 
-        Optional<ch.unibas.dmi.dbis.cs108.casono.server.domain.user.User> opt =
+        Optional<User> opt = userRegistry.getBySessionId(request.getSessionId());
-                userRegistry.getBySessionId(request.getSessionId());
         if (opt.isEmpty()) {
             responseDispatcher.dispatch(
                     new ErrorResponse(request.getContext(), "NOT_LOGGED_IN", "User not logged in"));

src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/game/call/PlayerCallHandler.java

@@ -4,6 +4,7 @@ import ch.unibas.dmi.dbis.cs108.casono.server.domain.game.GameController;
 import ch.unibas.dmi.dbis.cs108.casono.server.domain.game.player.PlayerId;
 import ch.unibas.dmi.dbis.cs108.casono.server.domain.lobby.LobbyId;
 import ch.unibas.dmi.dbis.cs108.casono.server.domain.lobby.LobbyManager;
+import ch.unibas.dmi.dbis.cs108.casono.server.domain.user.User;
 import ch.unibas.dmi.dbis.cs108.casono.server.domain.user.UserRegistry;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.command.execution.CommandHandler;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.ErrorResponse;
@@ -46,8 +47,7 @@ public class PlayerCallHandler extends CommandHandler<PlayerCallRequest> {
      */
     @Override
     public void execute(PlayerCallRequest request) {
-        Optional<ch.unibas.dmi.dbis.cs108.casono.server.domain.user.User> opt =
+        Optional<User> opt = userRegistry.getBySessionId(request.getSessionId());
-                userRegistry.getBySessionId(request.getSessionId());
         if (opt.isEmpty()) {
             responseDispatcher.dispatch(
                     new ErrorResponse(request.getContext(), "NOT_LOGGED_IN", "User not logged in"));

src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/game/fold/PlayerFoldHandler.java

@@ -4,6 +4,7 @@ import ch.unibas.dmi.dbis.cs108.casono.server.domain.game.GameController;
 import ch.unibas.dmi.dbis.cs108.casono.server.domain.game.player.PlayerId;
 import ch.unibas.dmi.dbis.cs108.casono.server.domain.lobby.LobbyId;
 import ch.unibas.dmi.dbis.cs108.casono.server.domain.lobby.LobbyManager;
+import ch.unibas.dmi.dbis.cs108.casono.server.domain.user.User;
 import ch.unibas.dmi.dbis.cs108.casono.server.domain.user.UserRegistry;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.command.execution.CommandHandler;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.ErrorResponse;
@@ -46,8 +47,7 @@ public class PlayerFoldHandler extends CommandHandler<PlayerFoldRequest> {
      */
     @Override
     public void execute(PlayerFoldRequest request) {
-        Optional<ch.unibas.dmi.dbis.cs108.casono.server.domain.user.User> opt =
+        Optional<User> opt = userRegistry.getBySessionId(request.getSessionId());
-                userRegistry.getBySessionId(request.getSessionId());
         if (opt.isEmpty()) {
             responseDispatcher.dispatch(
                     new ErrorResponse(request.getContext(), "NOT_LOGGED_IN", "User not logged in"));

src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/game/raise/PlayerRaiseHandler.java

@@ -4,6 +4,7 @@ import ch.unibas.dmi.dbis.cs108.casono.server.domain.game.GameController;
 import ch.unibas.dmi.dbis.cs108.casono.server.domain.game.player.PlayerId;
 import ch.unibas.dmi.dbis.cs108.casono.server.domain.lobby.LobbyId;
 import ch.unibas.dmi.dbis.cs108.casono.server.domain.lobby.LobbyManager;
+import ch.unibas.dmi.dbis.cs108.casono.server.domain.user.User;
 import ch.unibas.dmi.dbis.cs108.casono.server.domain.user.UserRegistry;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.command.execution.CommandHandler;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.ErrorResponse;
@@ -60,8 +61,7 @@ public class PlayerRaiseHandler extends CommandHandler<PlayerRaiseRequest> {
             return;
         }
 
-        Optional<ch.unibas.dmi.dbis.cs108.casono.server.domain.user.User> opt =
+        Optional<User> opt = userRegistry.getBySessionId(request.getSessionId());
-                userRegistry.getBySessionId(request.getSessionId());
         if (opt.isEmpty()) {
             responseDispatcher.dispatch(
                     new ErrorResponse(request.getContext(), "NOT_LOGGED_IN", "User not logged in"));

src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/lobby/get_lobby_list/GetLobbyListHandler.java

@@ -1,5 +1,6 @@
 package ch.unibas.dmi.dbis.cs108.casono.server.app.commands.lobby.get_lobby_list;
 
+import ch.unibas.dmi.dbis.cs108.casono.server.domain.lobby.Lobby;
 import ch.unibas.dmi.dbis.cs108.casono.server.domain.lobby.LobbyManager;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.command.execution.CommandHandler;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.dispatcher.ResponseDispatcher;
@@ -21,8 +22,7 @@ public class GetLobbyListHandler extends CommandHandler<GetLobbyListRequest> {
 
     @Override
     public void execute(GetLobbyListRequest request) {
-        Collection<ch.unibas.dmi.dbis.cs108.casono.server.domain.lobby.Lobby> l =
+        Collection<Lobby> l = lobbyManager.getAllLobbies();
-                lobbyManager.getAllLobbies();
         responseDispatcher.dispatch(new GetLobbyListResponse(request.getContext(), l));
     }
 }

src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/lobby/start_game/StartGameHandler.java

@@ -11,6 +11,7 @@ import ch.unibas.dmi.dbis.cs108.casono.server.domain.game.state.GameState;
 import ch.unibas.dmi.dbis.cs108.casono.server.domain.lobby.Lobby;
 import ch.unibas.dmi.dbis.cs108.casono.server.domain.lobby.LobbyId;
 import ch.unibas.dmi.dbis.cs108.casono.server.domain.lobby.LobbyManager;
+import ch.unibas.dmi.dbis.cs108.casono.server.domain.user.User;
 import ch.unibas.dmi.dbis.cs108.casono.server.domain.user.UserRegistry;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.command.execution.CommandHandler;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.ErrorResponse;
@@ -38,8 +39,7 @@ public class StartGameHandler extends CommandHandler<StartGameRequest> {
 
     @Override
     public void execute(StartGameRequest request) {
-        Optional<ch.unibas.dmi.dbis.cs108.casono.server.domain.user.User> opt =
+        Optional<User> opt = userRegistry.getBySessionId(request.getSessionId());
-                userRegistry.getBySessionId(request.getSessionId());
         if (opt.isEmpty()) {
             // Guard: UserLoggedInCheck should normally handle this
             responseDispatcher.dispatch(

src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/send_message/SendMessageHandler.java

@@ -5,6 +5,7 @@ import ch.unibas.dmi.dbis.cs108.casono.client.chat.Message;
 import ch.unibas.dmi.dbis.cs108.casono.server.domain.lobby.Lobby;
 import ch.unibas.dmi.dbis.cs108.casono.server.domain.lobby.LobbyId;
 import ch.unibas.dmi.dbis.cs108.casono.server.domain.lobby.LobbyManager;
+import ch.unibas.dmi.dbis.cs108.casono.server.domain.user.User;
 import ch.unibas.dmi.dbis.cs108.casono.server.domain.user.UserRegistry;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.command.execution.CommandHandler;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.OkResponse;
@@ -40,8 +41,7 @@ public class SendMessageHandler extends CommandHandler<SendMessageRequest> {
     @Override
     public void execute(SendMessageRequest request) {
         Message message = request.getMessage();
-        Optional<ch.unibas.dmi.dbis.cs108.casono.server.domain.user.User> senderUser =
+        Optional<User> senderUser = userRegistry.getBySessionId(request.getSessionId());
-                userRegistry.getBySessionId(request.getSessionId());
         if (senderUser.isPresent()) {
             message.sender = senderUser.get().getName();
         }

src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/lobbyui/LobbyButtonGridManagerTest.java

@@ -1,6 +1,7 @@
 package ch.unibas.dmi.dbis.cs108.casono.client.ui.lobbyui;
 
 import ch.unibas.dmi.dbis.cs108.casono.client.network.ClientService;
+import ch.unibas.dmi.dbis.cs108.casono.client.network.TestServer;
 import javafx.scene.layout.GridPane;
 import org.junit.jupiter.api.*;
 
@@ -8,15 +9,14 @@ class LobbyButtonGridManagerTest {
     LobbyButtonGridManager gridManager;
     LobbyButtonTranslationManager translationManager;
     GridPane gridPane;
-    ch.unibas.dmi.dbis.cs108.casono.client.network.TestServer testServer;
+    TestServer testServer;
 
     @BeforeEach
     void setUp() throws Exception {
         gridPane = new GridPane();
         translationManager = LobbyButtonTranslationManager.getInstance();
         translationManager.getButtonIdToLobbyId().clear();
-        // Start an in-process test server and connect a real ClientService to it.
+        testServer = new TestServer();
-        testServer = new ch.unibas.dmi.dbis.cs108.casono.client.network.TestServer();
         String host = "127.0.0.1";
         int port = testServer.getPort();
         ClientService clientService = new ClientService(host, port);