TD-5: Cleanup and Finalizing

src/main/java/de/towerdefence/server/game/GameSession.java

@@ -41,11 +41,10 @@ public class GameSession {
     private long lastSpawn = Instant.now().toEpochMilli();
 
     public GameSession(
-        Player player,
+            Player player,
-        PlayerMoneyCallback moneyCallback,
+            PlayerMoneyCallback moneyCallback,
-        PlayerHitpointsCallback hitpointsCallback,
+            PlayerHitpointsCallback hitpointsCallback,
-        EnemiesChangedCallback enemyCallback
+            EnemiesChangedCallback enemyCallback) {
-    ) {
         this.player = player;
         this.moneyCallback = moneyCallback;
         this.hitpointsCallback = hitpointsCallback;
@@ -74,16 +73,15 @@ public class GameSession {
 
         if (newEnemies.size() > 0 || changedEnemies.size() > 0) {
             enemyCallback.call(
-                player,
+                    player,
-                newEnemies.toArray(new Enemy[newEnemies.size()]),
+                    newEnemies.toArray(new Enemy[newEnemies.size()]),
-                changedEnemies.toArray(new Enemy[changedEnemies.size()])
+                    changedEnemies.toArray(new Enemy[changedEnemies.size()]));
-            );
         }
     }
 
     private boolean shouldSpawn() {
         return lastSpawn + WAVE_SPAWN_DELAY < Instant.now().toEpochMilli()
-               && enemies[WAVE_SPAWN.x][WAVE_SPAWN.y] == null;
+                && enemies[WAVE_SPAWN.x][WAVE_SPAWN.y] == null;
     }
 
     private List<Enemy> moveEnemies() {
@@ -98,11 +96,11 @@ public class GameSession {
                 }
                 AStar a = new AStar((Vector2i pos) -> {
                     return pos.x >= 0
-                    && pos.x < MAP_SIZE.x
+                            && pos.x < MAP_SIZE.x
-                    && pos.y >= 0
+                            && pos.y >= 0
-                    && pos.y < MAP_SIZE.y
+                            && pos.y < MAP_SIZE.y
-                    && (towers[pos.x] == null || towers[pos.x][pos.y] == null)
+                            && (towers[pos.x] == null || towers[pos.x][pos.y] == null)
-                    && (enemies[pos.x] == null || enemies[pos.x][pos.y] != null);
+                            && (enemies[pos.x] == null || enemies[pos.x][pos.y] != null);
                 });
                 Vector2i next;
                 try {

src/main/java/de/towerdefence/server/game/pathfinding/AStar.java

@@ -92,12 +92,9 @@ public class AStar {
         if (!walkable.call(pos)) {
             return;
         }
-        accumulator.add(
+        accumulator.add(new PathNode(
-            new PathNode(
                 right,
                 nextCost,
-                right.gridDistance(target) + nextCost
+                right.gridDistance(target) + nextCost));
-            )
-        );
     }
 }

src/main/java/de/towerdefence/server/match/Match.java

@@ -52,11 +52,10 @@ public class Match {
     }
 
     public void connectPlayer(
-        Player player,
+            Player player,
-        PlayerMoneyCallback moneyCallback,
+            PlayerMoneyCallback moneyCallback,
-        PlayerHitpointsCallback hitpointsCallback,
+            PlayerHitpointsCallback hitpointsCallback,
-        EnemiesChangedCallback enemyCallback
+            EnemiesChangedCallback enemyCallback) {
-    ) {
         boolean isPlayer1 = player1.equals(player);
         boolean isPlayer2 = player2.equals(player);
         if (!isPlayer1 && !isPlayer2) {

src/main/java/de/towerdefence/server/match/MatchService.java

@@ -58,11 +58,10 @@ public class MatchService {
     }
 
     public void playerConnected(
-        Player player,
+            Player player,
-        PlayerMoneyCallback moneyCallback,
+            PlayerMoneyCallback moneyCallback,
-        PlayerHitpointsCallback hitpointsCallback,
+            PlayerHitpointsCallback hitpointsCallback,
-        EnemiesChangedCallback enemyCallback
+            EnemiesChangedCallback enemyCallback) {
-    ) {
         Match match = playerMatches.get(player);
         match.connectPlayer(player, moneyCallback, hitpointsCallback, enemyCallback);
         Optional<GameSession> optionalPlayerSession = match.getPlayerGameSession(player);
@@ -86,13 +85,13 @@ public class MatchService {
         }
         GameSession opponentSession = optionalOpponentSession.get();
         ScheduledFuture<?> moneyTask = scheduler.scheduleAtFixedRate(
-        () -> {
+                () -> {
-            playerSession.addMoney(3);
+                    playerSession.addMoney(3);
-            opponentSession.addMoney(3);
+                    opponentSession.addMoney(3);
-        },
+                },
-        5,
+                5,
-        5,
+                5,
-        TimeUnit.SECONDS);
+                TimeUnit.SECONDS);
         moneyTasks.put(match, moneyTask);
     }
 }

src/main/java/de/towerdefence/server/server/channels/match/MatchWebsocketHandler.java

@@ -1,6 +1,16 @@
 package de.towerdefence.server.server.channels.match;
 
+import java.io.IOException;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.springframework.web.socket.CloseStatus;
+import org.springframework.web.socket.TextMessage;
+import org.springframework.web.socket.WebSocketSession;
+
 import com.fasterxml.jackson.databind.ObjectMapper;
+
 import de.towerdefence.server.game.Enemy;
 import de.towerdefence.server.game.exeptions.InvalidPlacementException;
 import de.towerdefence.server.match.MatchService;
@@ -16,13 +26,6 @@ import de.towerdefence.server.server.channels.match.placing.RequestTowerPlacingM
 import de.towerdefence.server.server.channels.match.placing.TowerPlacedMessage;
 import de.towerdefence.server.session.Channel;
 import de.towerdefence.server.session.SessionsService;
-import java.io.IOException;
-import java.util.Map;
-import java.util.Objects;
-import java.util.concurrent.ConcurrentHashMap;
-import org.springframework.web.socket.CloseStatus;
-import org.springframework.web.socket.TextMessage;
-import org.springframework.web.socket.WebSocketSession;
 
 public class MatchWebsocketHandler extends JsonWebsocketHandler {
 
@@ -40,10 +43,10 @@ public class MatchWebsocketHandler extends JsonWebsocketHandler {
         super.afterConnectionEstablished(session);
         playerSessions.put(sessionPlayers.get(session), session);
         matchService.playerConnected(
-            sessionPlayers.get(session),
+                sessionPlayers.get(session),
-            this::onPlayerMoneyChanged,
+                this::onPlayerMoneyChanged,
-            this::onPlayerHitpointsChanged,
+                this::onPlayerHitpointsChanged,
-            this::onEnemiesChanged
+                this::onEnemiesChanged
         );
     }
 
@@ -74,7 +77,7 @@ public class MatchWebsocketHandler extends JsonWebsocketHandler {
         WebSocketSession session = playerSessions.get(player);
         try {
             new EnemyUpdateMessage(newEnemies, changedEnemies).send(session);
-        } catch (IOException ignored) {
+        }catch(IOException ignored){
         }
     }
 
@@ -83,8 +86,8 @@ public class MatchWebsocketHandler extends JsonWebsocketHandler {
         try {
             String payload = message.getPayload();
             if (!Objects.equals(
-                        objectMapper.readTree(payload).get("$id").asText(),
+                    objectMapper.readTree(payload).get("$id").asText(),
-                        RequestTowerPlacingMessage.MESSAGE_ID)) {
+                    RequestTowerPlacingMessage.MESSAGE_ID)) {
                 this.closeSession(session, CloseStatus.BAD_DATA);
                 return;
             }
@@ -92,16 +95,20 @@ public class MatchWebsocketHandler extends JsonWebsocketHandler {
         } catch (IOException ignored) {
             this.closeSession(session, CloseStatus.BAD_DATA);
         }
+
     }
 
-    private void handleRequestTowerPlacingMessage(WebSocketSession session, String payload)
+    private void handleRequestTowerPlacingMessage(
-    throws IOException {
+            WebSocketSession session,
-        RequestTowerPlacingMessage msg =
+            String payload) throws IOException {
-        objectMapper.readValue(payload, RequestTowerPlacingMessage.class);
+        RequestTowerPlacingMessage msg = objectMapper.readValue(payload, RequestTowerPlacingMessage.class);
         Player opponent;
         try {
-            opponent =
+            opponent = this.matchService.placeTower(
-            this.matchService.placeTower(this.sessionPlayers.get(session), msg.getX(), msg.getY());
+                    this.sessionPlayers.get(session),
+                    msg.getX(),
+                    msg.getY()
+            );
         } catch (InvalidPlacementException exception) {
             new InvalidPlacementMessage(msg.getX(), msg.getY(), exception.getReason()).send(session);
             return;

src/main/java/de/towerdefence/server/server/channels/match/placing/InvalidPlacementMessage.java

@@ -24,9 +24,8 @@ public class InvalidPlacementMessage extends JsonMessage {
     @Override
     protected Map<String, JsonNode> getData(JsonNodeFactory factory) {
         return Map.of(
-                   "x", factory.numberNode(this.x),
+                "x", factory.numberNode(this.x),
-                   "y", factory.numberNode(this.y),
+                "y", factory.numberNode(this.y),
-                   "reason", factory.textNode(this.reason.getJsonName())
+                "reason", factory.textNode(this.reason.getJsonName()));
-               );
     }
 }

src/main/java/de/towerdefence/server/server/channels/match/placing/TowerPlacedMessage.java

@@ -22,9 +22,9 @@ public class TowerPlacedMessage extends JsonMessage {
     @Override
     protected Map<String, JsonNode> getData(JsonNodeFactory factory) {
         return Map.of(
-                   "x", factory.numberNode(this.x),
+            "x", factory.numberNode(this.x),
-                   "y", factory.numberNode(this.y),
+            "y", factory.numberNode(this.y),
-                   "map", factory.textNode(this.map.getJsonName())
+            "map", factory.textNode(this.map.getJsonName())
-               );
+        );
     }
 }