Fix race conditions and code cleanup

germandilio · Jun 1, 2022 · 3605447 · 3605447
1 parent ea608d7
commit 3605447
Show file tree

Hide file tree

Showing 20 changed files with 87 additions and 49 deletions.
diff --git a/src/main/java/ru/hse/germandilio/tetris/client/application/TetrisApplication.java b/src/main/java/ru/hse/germandilio/tetris/client/application/TetrisApplication.java
@@ -45,7 +45,7 @@ public void start(Stage stage) throws IOException {
             // prompt for registration on start
             manager.registration();
 
-        } catch(Exception ex) {
+        } catch (Exception ex) {
             System.out.println("Poo-pi-poop. Something went wrong.");
         }
     }

diff --git a/src/main/java/ru/hse/germandilio/tetris/client/controllers/ActionProvider.java b/src/main/java/ru/hse/germandilio/tetris/client/controllers/ActionProvider.java
@@ -1,13 +1,13 @@
 package ru.hse.germandilio.tetris.client.controllers;
 
 import ru.hse.germandilio.tetris.client.model.ViewGameResult;
-import ru.hse.germandilio.tetris.shared.GameResult;
 
 import java.util.List;
 
 public interface ActionProvider {
     /**
      * Swot to user top list result
+     *
      * @param results list og game session results
      */
     void showTopResults(List<ViewGameResult> results);
@@ -29,6 +29,7 @@ public interface ActionProvider {
 
     /**
      * Place brick that was sent by server.
+     *
      * @param brick Brick to place
      */
     void placeBrick(boolean[][] brick);

diff --git a/src/main/java/ru/hse/germandilio/tetris/client/controllers/GameManager.java b/src/main/java/ru/hse/germandilio/tetris/client/controllers/GameManager.java
@@ -1,12 +1,12 @@
 package ru.hse.germandilio.tetris.client.controllers;
 
 import javafx.application.Platform;
-import ru.hse.germandilio.tetris.client.model.ViewGameResult;
 import ru.hse.germandilio.tetris.client.model.GameSessionStats;
+import ru.hse.germandilio.tetris.client.model.ViewGameResult;
 import ru.hse.germandilio.tetris.client.model.client.Client;
 import ru.hse.germandilio.tetris.client.model.gameboard.GameBoard;
-import ru.hse.germandilio.tetris.shared.commands.CommandsAPI;
 import ru.hse.germandilio.tetris.server.clienthandling.CommandSender;
+import ru.hse.germandilio.tetris.shared.commands.CommandsAPI;
 
 import java.net.UnknownHostException;
 import java.util.List;

diff --git a/src/main/java/ru/hse/germandilio/tetris/client/controllers/TetrisViewController.java b/src/main/java/ru/hse/germandilio/tetris/client/controllers/TetrisViewController.java
@@ -149,13 +149,7 @@ public void run() {
                 currentSessionStopwatch.setText(convertTime(seconds));
 
                 // send leave game command
-                String bricksPlaced = Integer.toString(stats.getBricksPlaced());
-                String sessionTime = Long.toString(stats.getGameSessionDuration());
-                String command = CommandsAPI.buildCommand(CommandsAPI.LEAVE_GAME,
-                        bricksPlaced,
-                        sessionTime);
-
-                gameManager.sendCommand(command);
+                endGame();
             }
         };
         timer.schedule(closeSession, time * 1000);
@@ -513,7 +507,7 @@ private void setupWithoutResultsAlert(Alert alertToSetup) {
         String clientStats = "Фигур: " + stats.getBricksPlaced() + ". Время в игре: "
                 + convertTime(stats.getGameSessionDuration()) + "\n";
 
-        alertToSetup.setHeaderText("Вы:\n" + clientStats+ "Победитель: " + stats.getName());
+        alertToSetup.setHeaderText("Вы:\n" + clientStats + "Победитель: " + stats.getName());
     }
 
     private void setupWithResultsAlert(Alert alertToSetup) {

diff --git a/src/main/java/ru/hse/germandilio/tetris/client/model/GameSessionStats.java b/src/main/java/ru/hse/germandilio/tetris/client/model/GameSessionStats.java
@@ -126,5 +126,7 @@ public void reset() {
         opponentGameDuration = 0L;
         opponentBricksPlaced = 0;
         winnerName = null;
+
+        hasEndedGame = false;
     }
 }
diff --git a/src/main/java/ru/hse/germandilio/tetris/client/model/client/Client.java b/src/main/java/ru/hse/germandilio/tetris/client/model/client/Client.java
@@ -2,8 +2,8 @@
 
 import ru.hse.germandilio.tetris.client.controllers.ActionProvider;
 import ru.hse.germandilio.tetris.client.model.GameSessionStats;
-import ru.hse.germandilio.tetris.shared.commands.CommandsAPI;
 import ru.hse.germandilio.tetris.server.clienthandling.CommandSender;
+import ru.hse.germandilio.tetris.shared.commands.CommandsAPI;
 
 import java.io.*;
 import java.net.Socket;

diff --git a/src/main/java/ru/hse/germandilio/tetris/client/model/client/ClientCommandHandler.java b/src/main/java/ru/hse/germandilio/tetris/client/model/client/ClientCommandHandler.java
@@ -1,11 +1,13 @@
 package ru.hse.germandilio.tetris.client.model.client;
 
 import ru.hse.germandilio.tetris.client.controllers.ActionProvider;
-import ru.hse.germandilio.tetris.client.model.ViewGameResult;
 import ru.hse.germandilio.tetris.client.model.GameSessionStats;
+import ru.hse.germandilio.tetris.client.model.ViewGameResult;
 import ru.hse.germandilio.tetris.shared.commands.CommandsAPI;
 
-import java.time.*;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.ZoneOffset;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -22,7 +24,7 @@ public ClientCommandHandler(ActionProvider gameManager, GameSessionStats userSta
     }
 
     public void handle(CommandsAPI command, List<String> arguments) {
-        switch(command) {
+        switch (command) {
             case CONNECTED -> hasConnected();
             case WAITING_FOR_NEW_GAME -> waitForNewGame();
             case START_GAME -> startGame(arguments);
@@ -117,6 +119,7 @@ private void waitForNewGame() {
 
     /**
      * Convert {@code String} represented brick to boolean matrix.
+     *
      * @param brickString {@code String} represented brick
      * @return Matrix 3x3 of booleans.
      */
@@ -134,6 +137,7 @@ private boolean[][] convertBrick(char[] brickString) {
 
     /**
      * Replace all internal symbols to white spaces.
+     *
      * @param string {@code String} where replace.
      * @return {@code String} natural view.
      */

diff --git a/src/main/java/ru/hse/germandilio/tetris/server/Server.java b/src/main/java/ru/hse/germandilio/tetris/server/Server.java
@@ -32,7 +32,7 @@ public Server(int maxClients, long maxTime) throws IOException {
 
     public void launch() {
         new Thread(() -> {
-            try(socket) {
+            try (socket) {
                 ForkJoinPool executor = new ForkJoinPool();
 
                 // accept all clients
@@ -51,7 +51,7 @@ public void launch() {
                         executor.execute(handler);
                     }
                 }
-            } catch(IllegalArgumentException | IOException ex) {
+            } catch (IllegalArgumentException | IOException ex) {
                 System.out.println("Cannot accept clients. Server will shut down.");
             }
         }).start();

diff --git a/src/main/java/ru/hse/germandilio/tetris/server/bricks/Brick.java b/src/main/java/ru/hse/germandilio/tetris/server/bricks/Brick.java
@@ -5,12 +5,14 @@
 public interface Brick {
     /**
      * Internal matrix that represents 3x3 brick.
+     *
      * @return List of all brick rotations.
      */
     List<boolean[][]> getMatrix();
 
     /**
      * Number of available rotations.
+     *
      * @return {@code Integer} numbner.
      */
     int getRotationsCount();

diff --git a/src/main/java/ru/hse/germandilio/tetris/server/clienthandling/CommandHandler.java b/src/main/java/ru/hse/germandilio/tetris/server/clienthandling/CommandHandler.java
@@ -1,11 +1,16 @@
 package ru.hse.germandilio.tetris.server.clienthandling;
 
-import ru.hse.germandilio.tetris.shared.commands.CommandsAPI;
 import ru.hse.germandilio.tetris.server.game.GameManager;
+import ru.hse.germandilio.tetris.shared.commands.CommandsAPI;
 
+import java.time.Instant;
+import java.time.ZoneOffset;
 import java.util.List;
+import java.util.concurrent.locks.ReentrantLock;
 
 public class CommandHandler {
+    private static final ReentrantLock ENTRANCE_LOCK = new ReentrantLock();
+
     private final GameManager serverGame;
     private final Connection connection;
 
@@ -15,7 +20,7 @@ public CommandHandler(GameManager serverGame, Connection clientConnection) {
     }
 
     public void handle(CommandsAPI command, List<String> arguments) {
-        switch(command) {
+        switch (command) {
             case STARTING_GAME -> startingClientGame(arguments);
             case GET_NEXT_BRICK -> sendBrick(arguments);
             case LEAVE_GAME -> clientLeavingGame(arguments);
@@ -53,22 +58,31 @@ private void sendBrick(List<String> arguments) {
     }
 
     private void clientLeavingGame(List<String> arguments) {
-        // save client game session configuration
-        int brickPlaced = Integer.parseInt(arguments.get(0));
-        connection.setBrickPlaced(brickPlaced);
+        var endSessionDateTime = Instant.now().atZone(ZoneOffset.UTC).toLocalDateTime();
+
+        ENTRANCE_LOCK.lock();
+        try {
+            // save client game session configuration
+            int brickPlaced = Integer.parseInt(arguments.get(0));
+            connection.setBrickPlaced(brickPlaced);
+
+            long duration = Long.parseLong(arguments.get(1));
+            connection.setGameSessionDuration(duration);
 
-        long duration = Long.parseLong(arguments.get(1));
-        connection.setGameSessionDuration(duration);
+            connection.setEndTime(endSessionDateTime);
 
-        // send waiting for end game
-        serverGame.sendWaitingEndGame(connection);
+            // send waiting for end game
+            serverGame.sendWaitingEndGame(connection);
 
-        // save to database game session results
-        serverGame.saveGameSessionResults(connection);
+            // save to database game session results
+            serverGame.saveGameSessionResults(connection);
 
-        // if game ready to end send end_game on clients
-        if (serverGame.readyToEndGame()) {
-            serverGame.endGame(connection);
+            // if game ready to end send end_game on clients
+            if (serverGame.readyToEndGame()) {
+                serverGame.endGame(connection);
+            }
+        } finally {
+            ENTRANCE_LOCK.unlock();
         }
     }
 

diff --git a/src/main/java/ru/hse/germandilio/tetris/server/clienthandling/CommandSender.java b/src/main/java/ru/hse/germandilio/tetris/server/clienthandling/CommandSender.java
@@ -3,12 +3,14 @@
 public interface CommandSender {
     /**
      * Send command.
+     *
      * @param command {@code String} represented command.
      */
     void sendCommand(String command);
 
     /**
      * Close listening socket and/or thread.
+     *
      * @throws Exception on closing
      */
     void close() throws Exception;

diff --git a/src/main/java/ru/hse/germandilio/tetris/server/clienthandling/Connection.java b/src/main/java/ru/hse/germandilio/tetris/server/clienthandling/Connection.java
@@ -2,6 +2,8 @@
 
 import ru.hse.germandilio.tetris.client.controllers.IReset;
 
+import java.time.LocalDateTime;
+
 public class Connection implements IReset {
     private final int id;
 
@@ -10,6 +12,7 @@ public class Connection implements IReset {
     private String name;
     private long gameSessionDuration;
     private int brickPlaced;
+    private LocalDateTime endTime;
 
     private boolean hasEndedGame = false;
 
@@ -57,5 +60,15 @@ public void reset() {
         gameSessionDuration = 0L;
         brickPlaced = 0;
         hasEndedGame = false;
+
+        endTime = null;
+    }
+
+    public LocalDateTime getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(LocalDateTime endTime) {
+        this.endTime = endTime;
     }
 }
diff --git a/src/main/java/ru/hse/germandilio/tetris/server/control/ConsoleHandler.java b/src/main/java/ru/hse/germandilio/tetris/server/control/ConsoleHandler.java
@@ -21,16 +21,16 @@ public int getClientsNumber() {
 
             if (scanner.hasNextInt()) {
                 amount = scanner.nextInt();
-            }
-            else if (scanner.hasNext()){
+            } else if (scanner.hasNext()) {
                 scanner.next();
                 amount = -1;
             } else {
                 break;
             }
         }
 
-        return amount;    }
+        return amount;
+    }
 
     @Override
     public long getTimeout() {
@@ -41,8 +41,7 @@ public long getTimeout() {
 
             if (scanner.hasNextLong()) {
                 timeout = scanner.nextLong();
-            }
-            else if (scanner.hasNext()){
+            } else if (scanner.hasNext()) {
                 scanner.next();
                 timeout = -1;
             } else {

diff --git a/src/main/java/ru/hse/germandilio/tetris/server/control/InputHandler.java b/src/main/java/ru/hse/germandilio/tetris/server/control/InputHandler.java
@@ -3,12 +3,14 @@
 public interface InputHandler {
     /**
      * Get max number of clients can connect to server.
+     *
      * @return int
      */
     int getClientsNumber();
 
     /**
      * Get timeout when all clients will be notified with predefined event.
+     *
      * @return long
      */
     long getTimeout();

diff --git a/src/main/java/ru/hse/germandilio/tetris/server/control/ServerManager.java b/src/main/java/ru/hse/germandilio/tetris/server/control/ServerManager.java
@@ -32,7 +32,7 @@ public void launch() {
         } catch (IllegalStateException ex) {
             System.out.println(ex.getMessage());
             return;
-        } catch(Exception ex) {
+        } catch (Exception ex) {
             System.out.println("Poo-pi-poop. Something went wrong.");
             return;
         }

diff --git a/src/main/java/ru/hse/germandilio/tetris/server/database/DataProvider.java b/src/main/java/ru/hse/germandilio/tetris/server/database/DataProvider.java
@@ -1,8 +1,8 @@
 package ru.hse.germandilio.tetris.server.database;
 
 import ru.hse.germandilio.tetris.shared.GameResult;
-import java.sql.SQLException;
 
+import java.sql.SQLException;
 import java.util.List;
 
 public interface DataProvider {

diff --git a/src/main/java/ru/hse/germandilio/tetris/server/database/GameSessionsDatabase.java b/src/main/java/ru/hse/germandilio/tetris/server/database/GameSessionsDatabase.java
@@ -4,9 +4,7 @@
 import ru.hse.germandilio.tetris.shared.GameResult;
 
 import java.sql.SQLException;
-import java.time.Instant;
 import java.time.LocalTime;
-import java.time.ZoneOffset;
 import java.util.List;
 
 public class GameSessionsDatabase {
@@ -24,11 +22,10 @@ public GameSessionsDatabase() {
 
     public void saveSession(Connection client) {
         // Creating game result object
-        var endSessionDateTime = Instant.now().atZone(ZoneOffset.UTC).toLocalDateTime();
         var gameDuration = LocalTime.ofSecondOfDay(client.getGameSessionDuration());
 
         try {
-            var sessionResult = new GameResult(client.getName(), endSessionDateTime, client.getBrickPlaced(), gameDuration);
+            var sessionResult = new GameResult(client.getName(), client.getEndTime(), client.getBrickPlaced(), gameDuration);
             gameSessionsDataProvider.save(sessionResult);
         } catch (SQLException e) {
             throw new RuntimeException("Cannot save game session result", e);

diff --git a/src/main/java/ru/hse/germandilio/tetris/server/game/GameManager.java b/src/main/java/ru/hse/germandilio/tetris/server/game/GameManager.java
@@ -5,22 +5,28 @@
 
 public interface GameManager {
     Connection playerConnected(CommandSender clientHandler);
+
     void disconnectPlayer(Connection client);
 
     void setName(Connection client, String name);
 
     void sendWaitingStartGame(Connection client);
+
     void sendWaitingEndGame(Connection client);
 
     void sendNextBrick(Connection client, int indexInSequence);
 
     boolean readyToStartGame();
+
     void startGame(Connection client);
 
     boolean readyToEndGame();
+
     void endGame(Connection client);
+
     void sendEndGameWithoutResults(Connection client);
 
     void saveGameSessionResults(Connection client);
+
     void getTopSessions(Connection client, int topNumber);
 }