wth is going on???

Author: NF-coder

programming/sem2/lab5_v2/src/main/java/client/commands/implementations/Info.java

@@ -21,6 +21,6 @@ public final void execute(HashMap<String, String> args, Engine engine) throws Ex
                 )
         );
         NetworkResponseDTO nmr = engine.networkManager.receive();
-        System.out.println(nmr);
+        System.out.println(nmr.result());
     }
 }

programming/sem2/lab5_v2/src/main/java/client/commands/implementations/Show.java

@@ -6,6 +6,7 @@
 import shared.objects.NetworkRequestDTO;
 import shared.objects.NetworkResponseDTO;
 
+import java.util.Arrays;
 import java.util.HashMap;
 
 public class Show extends BasicCommand {

programming/sem2/lab5_v2/src/main/java/client/network/NetworkManager.java

@@ -4,6 +4,7 @@
 import shared.objects.NetworkResponseDTO;
 
 import java.io.*;
+import java.util.Arrays;
 
 public class NetworkManager {
     INetworkDriver driver;
@@ -22,7 +23,7 @@ public void send(Object obj) throws IOException{
                 this.serialize(obj)
         );
     }
-    public NetworkResponseDTO receive() throws IOException, ClassNotFoundException{
+    public NetworkResponseDTO<byte[]> receive() throws IOException, ClassNotFoundException{
         return this.deserialize(
                 this.driver.receive()
         );
@@ -35,17 +36,16 @@ private byte[] serialize(Object obj) throws IOException {
         oos.close();
         return bos.toByteArray();
     }
-    private NetworkResponseDTO deserialize(byte[] bytes) throws IOException, ClassNotFoundException {
+    private NetworkResponseDTO<byte[]> deserialize(byte[] bytes) throws IOException, ClassNotFoundException {
         //if (bytes == null) return null;
-        System.out.println(bytes);
-        for (byte b: bytes){
-            System.out.print(b + " ");
-        }
+        //System.out.println(Arrays.toString(bytes));
+        //for (byte b: bytes) System.out.print(b + " ");
+
         InputStream is = new ByteArrayInputStream(bytes);
         ObjectInputStream ois = new ObjectInputStream(is);
 
-        NetworkResponseDTO cached = (NetworkResponseDTO) ois.readObject();
-        System.out.println(cached);
+        NetworkResponseDTO<byte[]> cached = (NetworkResponseDTO<byte[]>) ois.readObject();
+        //System.out.println(cached);
         return cached;
     }
 }

programming/sem2/lab5_v2/src/main/java/client/network/drivers/UDPDriver.java

@@ -15,7 +15,7 @@ public class UDPDriver implements INetworkDriver {
     DatagramChannel channel;
     SocketAddress myAddr;
     SocketAddress targetAddr;
-    private final int PACKET_SIZE = 1024;
+    private final int PACKET_SIZE = 4096;
     private final int DATA_SIZE = PACKET_SIZE - 1;
 
     public UDPDriver(int myPort, int targetPort) {
@@ -40,15 +40,15 @@ public void send(byte[] data) throws IOException {
     public byte[] receive() throws IOException{
         ByteBuffer buf = ByteBuffer.allocate(DATA_SIZE);
 
-        System.out.println("receiving...");
-        System.out.println(buf);
+        //System.out.println("receiving...");
+        //System.out.println(buf);
 
         SocketAddress addr = channel.receive(buf);
 
-        System.out.println("received: " + addr);
+        //System.out.println("received: " + addr);
 
         if (addr != null) {
-            System.out.println("receive buffer dump");
+            //System.out.println("receive buffer dump");
             return buf.array();
         }
         return null;

programming/sem2/lab5_v2/src/main/java/server/core/Engine.java

@@ -12,11 +12,11 @@
 import server.storage.collection.drivers.IStructDriver;
 import shared.objects.NetworkRequestDTO;
 
-public class Engine {
+public class Engine <S,D> {
 
     private final CommandFactory commandFactory;
-    private final ResponseFactory responseFactory;
-    private final RequestFactory requestFactory;
+    private final ResponseFactory<S> responseFactory;
+    private final RequestFactory<D> requestFactory;
 
     private final ExecutorService commandExecutor;
     private final ExecutorService sendExecutor;
@@ -26,7 +26,7 @@ public Engine(
             ExecutorService receiveExecutor,
             ExecutorService sendExecutor,
             ExecutorService commandExecutor,
-            INetworkSerializers networkSerializer,
+            INetworkSerializers<S,D> networkSerializer,
             IStructDriver structDriver
     ) {
         try {
@@ -37,8 +37,8 @@ public Engine(
         this.sendExecutor = sendExecutor;
 
         this.commandFactory = new CommandFactory(structDriver);
-        this.responseFactory = new ResponseFactory(networkDriver, networkSerializer);
-        this.requestFactory = new RequestFactory(networkDriver, networkSerializer, receiveExecutor, this);
+        this.responseFactory = new ResponseFactory<>(networkDriver, networkSerializer::serialize);
+        this.requestFactory = new RequestFactory<>(networkDriver, networkSerializer::deserialize, receiveExecutor, this);
     }
     public void start(){
         this.requestFactory.run();

programming/sem2/lab5_v2/src/main/java/server/core/factories/CommandFactory.java

@@ -3,10 +3,12 @@
 import java.util.HashMap;
 import java.util.concurrent.CompletableFuture;
 
+import org.json.JSONObject;
 import server.network.container.NetworkContainer;
 import server.storage.collection.drivers.IStructDriver;
 import server.storage.commands.CommandsManager;
 import shared.objects.NetworkRequestDTO;
+import shared.objects.NetworkResponseDTO;
 
 public class CommandFactory {
     private final CommandsManager commandsManager;
@@ -17,7 +19,7 @@ public CommandFactory(IStructDriver structDriver) {
         );
     }
 
-    public CompletableFuture<NetworkContainer<HashMap<String,String>>> run(
+    public CompletableFuture<NetworkContainer<JSONObject>> run(
             NetworkContainer<NetworkRequestDTO> data
     ) {
         return commandsManager.run(

programming/sem2/lab5_v2/src/main/java/server/core/factories/RequestFactory.java

@@ -5,15 +5,16 @@
 import server.core.Engine;
 import server.network.drivers.INetworkDriver;
 import server.network.managers.ReceiveManager;
+import server.network.serializers.INetworkDeserialize;
 import server.network.serializers.INetworkSerializers;
 
-public class RequestFactory {
-    private final ReceiveManager receiveManager;
+public class RequestFactory<T> {
+    private final ReceiveManager<T> receiveManager;
     private final ExecutorService executor;
     private final Engine engine;
 
-    public RequestFactory(INetworkDriver networkDriver, INetworkSerializers serializer, ExecutorService executor, Engine engine) {
-        this.receiveManager = new ReceiveManager(
+    public RequestFactory(INetworkDriver networkDriver, INetworkDeserialize<T> serializer, ExecutorService executor, Engine engine) {
+        this.receiveManager = new ReceiveManager<>(
                 networkDriver,
                 serializer
         );

programming/sem2/lab5_v2/src/main/java/server/core/factories/ResponseFactory.java

@@ -1,31 +1,33 @@
 package server.core.factories;
 
+import org.json.JSONObject;
 import server.network.container.NetworkContainer;
 import server.network.drivers.INetworkDriver;
 import server.network.managers.SendManager;
+import server.network.serializers.INetworkSerialize;
 import server.network.serializers.INetworkSerializers;
 import shared.objects.NetworkResponseDTO;
 
 import java.util.HashMap;
 import java.util.concurrent.CompletableFuture;
 
-public class ResponseFactory {
-    private final SendManager sendManager;
+public class ResponseFactory<T> {
+    private final SendManager<T> sendManager;
 
-    public ResponseFactory(INetworkDriver networkDriver, INetworkSerializers serializer) {
-        this.sendManager = new SendManager(
+    public ResponseFactory(INetworkDriver networkDriver, INetworkSerialize<T> serializer) {
+        this.sendManager = new SendManager<>(
                 networkDriver,
                 serializer
         );
     }
 
     public CompletableFuture<Void> run(
-            NetworkContainer<HashMap<String,String>> data
+            NetworkContainer<NetworkResponseDTO<T>> data
     ) {
         return CompletableFuture.supplyAsync(
                 () -> new NetworkContainer<>(
                     data.socketAddress(),
-                    new NetworkResponseDTO(data.data())
+                    new NetworkResponseDTO<>(data.data().toString())
                 )
         ).thenCompose(
                 sendManager::call

programming/sem2/lab5_v2/src/main/java/server/network/drivers/implementations/UDPDriver.java

@@ -14,7 +14,7 @@ public class UDPDriver implements INetworkDriver {
     DatagramChannel channel;
     int port;
     SocketAddress addr;
-    private final int PACKET_SIZE = 1024;
+    private final int PACKET_SIZE = 4096;
     private final int DATA_SIZE = PACKET_SIZE - 1;
 
     public UDPDriver(int port) {

programming/sem2/lab5_v2/src/main/java/server/network/managers/ReceiveManager.java

@@ -2,22 +2,25 @@
 
 import java.io.IOException;
 import java.util.concurrent.CompletableFuture;
+import java.util.function.Function;
 
 import server.network.container.NetworkContainer;
 import server.network.drivers.INetworkDriver;
+import server.network.serializers.INetworkDeserialize;
+import server.network.serializers.INetworkSerialize;
 import server.network.serializers.INetworkSerializers;
 import shared.objects.NetworkRequestDTO;
 
-public class ReceiveManager {
+public class ReceiveManager<T>{
     private final INetworkDriver driver;
-    private final INetworkSerializers serializer;
+    private final INetworkDeserialize<T> serializer;
 
-    public ReceiveManager(INetworkDriver driver, INetworkSerializers serializer) {
+    public ReceiveManager(INetworkDriver driver, INetworkDeserialize<T> serializer) {
         this.driver = driver;
         this.serializer = serializer;
     }
 
-    public CompletableFuture<NetworkContainer<NetworkRequestDTO>> call() throws IOException, ClassNotFoundException {
+    public CompletableFuture<NetworkContainer<T>> call() throws IOException, ClassNotFoundException {
         return CompletableFuture.supplyAsync(
                 () -> {
                     try {
@@ -32,7 +35,7 @@ public CompletableFuture<NetworkContainer<NetworkRequestDTO>> call() throws IOEx
                     try {
                         return new NetworkContainer<>(
                                 res.socketAddress(),
-                                this.serializer.deserialize(
+                                this.serializer.apply(
                                         res.data()
                                 ));
                     } catch (IOException | ClassNotFoundException e) {