Client and Server are ready, only refactoring remains

Author: MansurovB-source

Programming on Java Lab №6/src/Client/Client.java

@@ -21,6 +21,10 @@ public class Client {
     ByteBuffer byteBuffer = ByteBuffer.allocate(10240);
     byte[] bytes;
 
+    public Client(int PORT) {
+        this.PORT = PORT;
+    }
+
     public void sendRequest(Request request) {
         try {
             ByteArrayOutputStream baos;
@@ -40,10 +44,16 @@ public void sendRequest(Request request) {
                     for (int i = 0; i < read; i++) {
                         bytes[i] = byteBuffer.get(i);
                     }
-                    System.out.println(bytes.toString());
+                    ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
+                    ObjectInputStream ois = new ObjectInputStream(bais);
+                    System.out.println((String) ois.readObject());
                 }
+            } catch (ClassNotFoundException e) {
+                e.printStackTrace();
             } finally {
-                oos.close();
+                if (oos != null) {
+                    oos.close();
+                }
             }
         }catch (ConnectionException e) {
             System.out.println("Ошибка подключения к серверу");
@@ -53,7 +63,7 @@ public void sendRequest(Request request) {
         }
     }
 
-    public SocketChannel connect(InetSocketAddress inetSocketAddress) throws ConnectionException {
+    private SocketChannel connect(InetSocketAddress inetSocketAddress) throws ConnectionException {
         int countReconnect = 0;
         SocketChannel socketChannel;
         try {

Programming on Java Lab №6/src/Client/CommandManager.java

@@ -20,6 +20,10 @@
  * @author Behruz Mansurov
  */
 public class RequestSender {
+    public static void main(String[] args) {
+        RequestSender requestSender = new RequestSender(5555);
+        requestSender.parser();
+    }
     private boolean exit = false;
     private final Client sender;
     public RequestSender(int PORT) {

Programming on Java Lab №6/src/Client/RequestSender.java

@@ -18,16 +18,39 @@ public class Request implements Serializable {
     private String request;
     private Worker worker;
     private File file;
-    private int id;
+    private long id;
     private ZonedDateTime startdate;
     private Organization organization;
 
+    public Request(String request) {
+        this.request = request;
+    }
 
     public Request(String request, Worker worker) {
         this.request = request;
         this.worker = worker;
     }
 
+    public Request(String request, Organization organization) {
+        this.request = request;
+        this.organization = organization;
+    }
+
+    public Request(String request, ZonedDateTime startdate) {
+        this.request = request;
+        this.startdate = startdate;
+    }
+
+    public Request(String request, long id) {
+        this.request = request;
+        this.id = id;
+    }
+
+    public Request(String request, File file) {
+        this.request = request;
+        this.file = file;
+    }
+
     public String getRequest() {
         return request;
     }
@@ -40,7 +63,7 @@ public File getFile() {
         return file;
     }
 
-    public int getId() {
+    public long getId() {
         return id;
     }
 
@@ -52,23 +75,4 @@ public Organization getOrganization() {
         return organization;
     }
 
-    public Request(String request, Organization organization) {
-        this.request = request;
-        this.organization = organization;
-    }
-
-    public Request(String request, ZonedDateTime startdate) {
-        this.request = request;
-        this.startdate = startdate;
-    }
-
-    public Request(String request, int id) {
-        this.request = request;
-        this.id = id;
-    }
-
-    public Request(String request, File file) {
-        this.request = request;
-        this.file = file;
-    }
 }

Programming on Java Lab №6/src/Client/ServerConnect.java

@@ -4,11 +4,10 @@
 import Common.Data.Worker;
 import Common.Request;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
+import java.io.*;
 import java.net.Socket;
+import java.nio.ByteBuffer;
+import java.nio.channels.SocketChannel;
 import java.time.ZonedDateTime;
 
 /**
@@ -17,24 +16,25 @@
  * @author Behruz Mansurov
  */
 public class RequestHandler {
-    private final Socket socket;
+    private final SocketChannel socket;
     private final WorkerManager workerManager;
     private Request request;
     String command;
     Worker worker;
     File file;
-    int id;
+    long id;
     ZonedDateTime startdate;
     Organization organization;
 
-    public RequestHandler(Socket socket, WorkerManager workerManager) {
+    public RequestHandler(SocketChannel socket, WorkerManager workerManager) {
         this.socket = socket;
         this.workerManager = workerManager;
     }
 
     public void handler() {
-        try(ObjectInputStream ois = new ObjectInputStream(socket.getInputStream());
-            ObjectOutputStream oos = new ObjectOutputStream(socket.getOutputStream())) {
+        try(ObjectInputStream ois = new ObjectInputStream(socket.socket().getInputStream());
+        ByteArrayOutputStream bais = new ByteArrayOutputStream();
+        ObjectOutputStream oos = new ObjectOutputStream(bais)) {
             try {
                 request = (Request) ois.readObject();
             } catch (ClassNotFoundException e) {
@@ -48,48 +48,52 @@ public void handler() {
             organization = request.getOrganization();
             switch (command) {
                 case "help":
-                    oos.writeUTF(workerManager.help());
+                    oos.writeObject(workerManager.help());
                     break;
                 case "info":
-                    oos.writeUTF(workerManager.info());
+                    oos.writeObject(workerManager.info());
                     break;
                 case "show":
-                    oos.writeUTF(workerManager.show());
+                    oos.writeObject(workerManager.show());
                     break;
                 case "add":
-                    oos.writeUTF(workerManager.add(worker));
+                    oos.writeObject(workerManager.add(worker));
                     break;
                 case "update_by_id":
-                    oos.writeUTF(workerManager.updateById(id, id));
+                    oos.writeObject(workerManager.updateById(id, id));
                     break;
                 case "remove_by_id":
-                    oos.writeUTF(workerManager.removeById(id));
+                    oos.writeObject(workerManager.removeById(id));
                     break;
                 case "clear":
-                    oos.writeUTF(workerManager.clear());
+                    oos.writeObject(workerManager.clear());
                     break;
                 case "save_server":
                     workerManager.save();
                     break;
                 case "remove_first":
-                    oos.writeUTF(workerManager.removeFirst());
+                    oos.writeObject(workerManager.removeFirst());
                     break;
                 case "remove_last":
-                    oos.writeUTF(workerManager.removeLast());
+                    oos.writeObject(workerManager.removeLast());
                     break;
                 case "shuffle":
-                    oos.writeUTF(workerManager.shuffle());
+                    oos.writeObject(workerManager.shuffle());
                     break;
                 case "remove_any_by_start_date":
-                    oos.writeUTF(workerManager.removeAnyByStartDate(startdate));
+                    oos.writeObject(workerManager.removeAnyByStartDate(startdate));
                     break;
                 case "max_by_id":
-                    oos.writeUTF(workerManager.maxById());
+                    oos.writeObject(workerManager.maxById());
                     break;
                 case "count_less_than_organization":
-                    oos.writeUTF(workerManager.countLessThanOrganization(organization));
+                    oos.writeObject(workerManager.countLessThanOrganization(organization));
                     break;
             }
+            ByteBuffer byteBuffer = ByteBuffer.allocate(bais.size());
+            byteBuffer.put(bais.toByteArray());
+            byteBuffer.flip();
+            socket.write(byteBuffer);
         } catch (IOException e) {
             e.printStackTrace();
         } finally {