From 3f4ff22cea110f7f8123d50215f52b1a49525d87 Mon Sep 17 00:00:00 2001
From: Morph01 <145839520+Morph01@users.noreply.github.com>
Date: Tue, 1 Apr 2025 13:55:31 +0200
Subject: [PATCH] refactor: better client structure

---
 .../main/java/clientserver/client/Client.java | 21 ++++++++-----------
 .../main/java/clientserver/server/Server.java |  7 +++++++
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/clientserver/client/Client.java b/app/src/main/java/clientserver/client/Client.java
index 7d2a486..5186eeb 100644
--- a/app/src/main/java/clientserver/client/Client.java
+++ b/app/src/main/java/clientserver/client/Client.java
@@ -38,6 +38,10 @@ public class Client {
         return this.serverPort;
     }
 
+    public void setServerPort(int port) {
+        this.serverPort = port;
+    }
+
     public String getPseudo() {
         return this.pseudo;
     }
@@ -68,11 +72,11 @@ public class Client {
         }
 
         System.out.println("Enter the port of the server :");
-        client.serverPort = scan.nextInt();
+        client.setServerPort(scan.nextInt());
         scan.close();
 
         if (socketClient != null && client.serverAddress != null) {
-            Server.sendMessage(socketClient, client.getPseudo(), client.serverAddress, client.serverPort);
+            Server.sendMessage(socketClient, client.getPseudo(), client.serverAddress, client.getServerPort());
             System.out.println("New connection request sent");
         }
 
@@ -110,16 +114,9 @@ public class Client {
             // connexion avec le server
             Client client = createAndConfigureClient(socketClient);
 
-            // 3 - Recevoir
-            byte[] receivedData = new byte[1024]; // tampon de réception
-            DatagramPacket receivedPacket = new DatagramPacket(
-                    receivedData,
-                    receivedData.length);
-            socketClient.receive(receivedPacket);
-            String reponse = new String(
-                    receivedPacket.getData(),
-                    0,
-                    receivedPacket.getLength());
+            // // 3 - Recevoir
+            DatagramPacket receivedPacket = Server.receivedPacket(socketClient);
+            String reponse = Server.packetToMessage(receivedPacket);
 
             if (reponse.startsWith("PORT:")) {
                 int newClientHandlerPort = Integer.parseInt(reponse.substring(5));
diff --git a/app/src/main/java/clientserver/server/Server.java b/app/src/main/java/clientserver/server/Server.java
index 1dfa20b..5a8b192 100644
--- a/app/src/main/java/clientserver/server/Server.java
+++ b/app/src/main/java/clientserver/server/Server.java
@@ -56,6 +56,13 @@ public class Server {
         }
     }
 
+    public static String packetToMessage(DatagramPacket packet) {
+        return new String(
+                packet.getData(),
+                0,
+                packet.getLength());
+    }
+
     public static void sendMessage(
             DatagramSocket socket,
             String message,