TD-5: Cleanup and Finalizing

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

@@ -44,8 +44,7 @@ public class GameSession {
             Player player,
             PlayerMoneyCallback moneyCallback,
             PlayerHitpointsCallback hitpointsCallback,
-        EnemiesChangedCallback enemyCallback
+            EnemiesChangedCallback enemyCallback) {
-    ) {
         this.player = player;
         this.moneyCallback = moneyCallback;
         this.hitpointsCallback = hitpointsCallback;
@@ -76,8 +75,7 @@ public class GameSession {
             enemyCallback.call(
                     player,
                     newEnemies.toArray(new Enemy[newEnemies.size()]),
-                changedEnemies.toArray(new Enemy[changedEnemies.size()])
+                    changedEnemies.toArray(new Enemy[changedEnemies.size()]));
-            );
         }
     }
 

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

@@ -55,8 +55,7 @@ public class Match {
             Player player,
             PlayerMoneyCallback moneyCallback,
             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

@@ -61,8 +61,7 @@ public class MatchService {
             Player player,
             PlayerMoneyCallback moneyCallback,
             PlayerHitpointsCallback hitpointsCallback,
-        EnemiesChangedCallback enemyCallback
+            EnemiesChangedCallback enemyCallback) {
-    ) {
         Match match = playerMatches.get(player);
         match.connectPlayer(player, moneyCallback, hitpointsCallback, enemyCallback);
         Optional<GameSession> optionalPlayerSession = match.getPlayerGameSession(player);

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 {
 
@@ -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

@@ -26,7 +26,6 @@ public class InvalidPlacementMessage extends JsonMessage {
         return Map.of(
                 "x", factory.numberNode(this.x),
                 "y", factory.numberNode(this.y),
-                   "reason", factory.textNode(this.reason.getJsonName())
+                "reason", factory.textNode(this.reason.getJsonName()));
-               );
     }
 }