From 137baa6a474521c98b8b6a80dddf0fc27f77f66f Mon Sep 17 00:00:00 2001
From: Bas de Jong <basdejong2002@live.nl>
Date: Tue, 16 Sep 2025 11:44:44 +0200
Subject: [PATCH] move parsing

---
 .../backend/tictactoe/TicTacToeServer.java    | 73 ++++++++++++-------
 .../server/frontend/ServerConnection.java     |  2 +-
 2 files changed, 47 insertions(+), 28 deletions(-)

diff --git a/src/main/java/org/toop/server/backend/tictactoe/TicTacToeServer.java b/src/main/java/org/toop/server/backend/tictactoe/TicTacToeServer.java
index 705977b..51aa8f0 100644
--- a/src/main/java/org/toop/server/backend/tictactoe/TicTacToeServer.java
+++ b/src/main/java/org/toop/server/backend/tictactoe/TicTacToeServer.java
@@ -7,6 +7,8 @@ import java.io.IOException;
 import java.io.ObjectStreamException;
 import java.net.Socket;
 import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 
 public class TicTacToeServer extends TcpServer {
 
@@ -34,35 +36,52 @@ public class TicTacToeServer extends TcpServer {
         }
     }
 
-    @FunctionalInterface
-    public interface TicTacToeCommand {
-        Object execute(TicTacToe game, String[] args);
+    private static class ParsedCommand {
+        public TicTacToeServerCommand command;
+        public ArrayList<Object> arguments;
+        public boolean isValidCommand;
+        public String errorMessage;
+        public String originalCommand;
+
+        ParsedCommand(String receivedCommand) {
+
+            if (receivedCommand.isEmpty()) {
+                this.command = null;
+                this.arguments = null;
+                this.isValidCommand = false;
+                this.errorMessage = "The received command is empty";
+                this.originalCommand = receivedCommand;
+                return;
+            }
+
+            String[] segments = receivedCommand.split(" ");
+            if (segments[0].isEmpty()) {
+                this.command = null;
+                this.arguments = null;
+                this.isValidCommand = false;
+                this.errorMessage = "The received command is empty or couldn't be split";
+                this.originalCommand = receivedCommand;
+                return;
+            };
+
+            TicTacToeServerCommand commandEnum = TicTacToeServerCommand.getCommand(segments[0]);
+            switch (commandEnum) {
+                case MOVE -> {
+                    if (segments.length == 2 && !segments[1].isEmpty()) {
+                        ParsedCommand toReturn = new ParsedCommand(commandEnum, new ArrayList<Object>(1));
+                        toReturn.arguments.add(segments[1]);
+                    }
+                }
+                case
+            }
+
+            this.command = command;
+            this.arguments = arguments;
+        }
+
     }
 
-    private TicTacToeCommand parseCommand(String command) {
-        if (command.isEmpty()) {
-            try {
-                wait(250); // TODO: Magic number
-                return null;
-            } catch (InterruptedException e) {
-                logger.error("Interrupted", e);
-                throw new RuntimeException(e); // TODO: Maybe not throw it.
-            }
-        }
-
-        String[] segments = command.split(" ");
-        if (segments[0].isEmpty()) return null;
-
-        TicTacToeServerCommand commandEnum = TicTacToeServerCommand.getCommand(segments[0]);
-        switch (commandEnum) {
-            case MOVE -> {
-                if (segments.length > 1 && !segments[1].isEmpty()) return null;
-                try {
-                    int parsedInteger = Integer.parseInt(segments[1]);
-                    if (this.game.validateMove(parsedInteger)) return this.game.playMove(parsedInteger);
-                };
-            }
-        }
+    private ParsedCommand parseCommand(String command) {
 
     }
 
diff --git a/src/main/java/org/toop/server/frontend/ServerConnection.java b/src/main/java/org/toop/server/frontend/ServerConnection.java
index bee53a0..296b703 100644
--- a/src/main/java/org/toop/server/frontend/ServerConnection.java
+++ b/src/main/java/org/toop/server/frontend/ServerConnection.java
@@ -13,7 +13,7 @@ import java.util.concurrent.*;
 
 public final class ServerConnection implements Runnable {
 
-    private static final Logger logger = LogManager.getLogger(Main.class);
+    private static final Logger logger = LogManager.getLogger(ServerConnection.class);
 
     private final BlockingQueue<String> commandQueue = new LinkedBlockingQueue<>();
     private final ExecutorService executor = Executors.newFixedThreadPool(2);