fixed some bugs, added some methods and ShutdownHook

Author: MansurovB-source

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

@@ -56,6 +56,7 @@ public void parser() {
                         sender.sendRequest(new Request(userCommand[0], userInputParser.inputId()));
                         break;
                     case "exit":
+                        sender.sendRequest(new Request(userCommand[0]));
                         exit = true;
                         break;
                     case "remove_any_by_start_date":

Programming on Java Lab №6/src/Server/RequestHandler.java

@@ -28,6 +28,7 @@ public class RequestHandler implements Runnable{
     public RequestHandler(SocketChannel socket, WorkerManager workerManager) {
         this.socket = socket;
         this.workerManager = workerManager;
+
     }
 
     public void run() {
@@ -68,7 +69,9 @@ public void run() {
                     oos.writeObject(workerManager.clear());
                     break;
                 case "save_server":
+                case "exit":
                     workerManager.save();
+                    oos.writeObject("Коллекция сохранена в файл на сервере");
                     break;
                 case "remove_first":
                     oos.writeObject(workerManager.removeFirst());

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

@@ -7,6 +7,7 @@
 import java.net.Socket;
 import java.nio.channels.ServerSocketChannel;
 import java.nio.channels.SocketChannel;
+import java.util.Scanner;
 
 /**
  * Created by IntelliJ IDEA.
@@ -29,7 +30,6 @@ public static void main(String[] args) {
             System.out.println("Что пошло не так");
             System.out.println(e.getMessage());
         }
-
         try (ServerSocketChannel serverSocket = ServerSocketChannel.open()) {
             serverSocket.bind(new InetSocketAddress(PORT));
             System.out.println("Сервер запущен");
@@ -39,11 +39,13 @@ public static void main(String[] args) {
                 System.out.println("Подключён клиент:" + "" +
                         "\n\taddr = " + client.getLocalAddress() + ".");
                 new Thread(new RequestHandler(client, workerManager)).start();
-
             }
         } catch (IOException e) {
             System.out.println("Не смогли подключится данному порту");
             e.printStackTrace();
         }
+
+        Runtime.getRuntime().addShutdownHook(new Thread(workerManager != null ? workerManager::save : null));
     }
+
 }

Programming on Java Lab №6/src/Server/WorkerManager.java

@@ -135,7 +135,7 @@ public String clear() {
 
     public void save() {
         String stringBuilder = gson.toJson(workerList);
-        try (BufferedOutputStream bos = new BufferedOutputStream(new FileOutputStream("Common.Common.Data.json"))) {
+        try (BufferedOutputStream bos = new BufferedOutputStream(new FileOutputStream("Data.json"))) {
             byte[] buffer = stringBuilder.getBytes();
             bos.write(buffer, 0, buffer.length);
         } catch (IOException e) {