Add CommandResult class

Author: Korako2

collection.csv

@@ -0,0 +1 @@
+id,bandName,x,y,creationDate,numberOfParticipants,albumsCount,description,genre,personName,height,eyeColor,hairColor,nationality,personX,personY,personZ

src/main/java/client/Client.java

@@ -85,7 +85,7 @@ public boolean requestToServer(UserInputManager userInputManager) throws IOExcep
                         out.println(response.getResponseBody());
                     } else {
                         ArgObjectForClient argObject = new ArgObjectForClient(clientCommandsManager, request.getArgsOfCommand(), null);
-                        out.println(request.getCommand().execute(argObject));
+                        out.println(request.getCommand().execute(argObject).getResult());
                     }
                 } catch (IllegalArgumentException e) {
                     out.println(e.getMessage());

src/main/java/client/IOutils/fileUtils/FileCollectionInitializer.java

@@ -29,7 +29,7 @@ public HashSet<MusicBand> initializeCollection(Iterable<CSVRecord> records) thro
             if (!objectValidation.checkObject(OneMusicBand)) {
                 return null;
             }
-        } //todo
+        }
         return musicBands;
     }
 
@@ -49,9 +49,11 @@ public MusicBand createMusicBand(CSVRecord record) throws ParseException {
         long albumsCount = Long.parseLong(record.get("albumsCount"));
         String description = record.get("description");
         MusicGenre genre = MusicGenre.valueOf(record.get("genre").toUpperCase());
+
         Coordinates coordinates = createCoordinates(record);
         Person person = createPerson(record);
         MusicBandBuilder musicBandBuilder = new MusicBandBuilder();
+
         return musicBandBuilder.setId(id)
                 .setName(bandName)
                 .setAlbumsCount(albumsCount)

src/main/java/client/IOutils/fileUtils/FileManager.java

@@ -35,23 +35,19 @@ public HashSet<MusicBand> readCollection(String file) throws IOException, ParseE
      * @throws IOException in case of errors in writing to the file.
      */
     public void writeCollection(String fileName, HashSet<MusicBand> musicBands) throws IOException {
-        FileOutputStream fileOutputStream = null;
+        FileOutputStream fileOutputStream;
         try {
             fileOutputStream = new FileOutputStream(fileName);
         } catch (FileNotFoundException e) {
-            throw new FileNotFoundException("File is a directory or cannot be opened for any other reason.");
-        } catch (SecurityException e) {
-            throw new SecurityException("???");
-        } finally {
-            fileOutputStream.close();
-        } //todo
+            throw new FileNotFoundException("File is accessible.");
+        }
         byte[] buffer = ("id,bandName,x,y,creationDate,numberOfParticipants,albumsCount,description,genre,personName," +
                 "height,eyeColor,hairColor,nationality,personX,personY,personZ\n").getBytes();
         fileOutputStream.write(buffer, 0, buffer.length);
         for (MusicBand i : musicBands) {
             buffer = (i.getStringToSaveInFile() + "\n").getBytes();
             fileOutputStream.write(buffer, 0, buffer.length);
         }
-
+        fileOutputStream.close();
     }
 }

src/main/java/client/commands/ExecuteScript.java

@@ -4,6 +4,8 @@
 import client.IOutils.UserInputManager;
 import client.commands.commandsUtils.ArgObjectForClient;
 import sharedClasses.commands.Command;
+import sharedClasses.commands.commandsUtils.CommandResult;
+import sharedClasses.messageUtils.ResponseCode;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -27,40 +29,36 @@ public ExecuteScript(Client client) {
         fileNames = new HashSet<>();
     }
 
-    public String execute(ArgObjectForClient argObject) {
+    public CommandResult execute(ArgObjectForClient argObject) {
         UserInputManager inputFromFile;
         try {
             FileReader fileReader = new FileReader(argObject.getArgs()[1]);
             inputFromFile = new UserInputManager(argObject.getClientCommandManager(), new Scanner(fileReader),
                     false, new PrintStream(System.out));
         } catch (FileNotFoundException e) {
-            return "Wrong file";
+            return new CommandResult("Wrong file", ResponseCode.ERROR);
         }
         File script = new File(argObject.getArgs()[1]);
         if (!fileNames.add(script.getAbsolutePath())) {
-            return "There is a loop in scripts! Execute_script wasn't executed, it was skipped.";
+            return new CommandResult("There is a loop in scripts! Execute_script wasn't executed, it was skipped.", ResponseCode.ERROR);
         }
         String result = "Script in file " + argObject.getArgs()[1] + " was executed";
         boolean resultOfRequest;
         do {
             try {
                 resultOfRequest = client.requestToServer(inputFromFile);
             } catch (NoSuchElementException e) {
-                result = e.getMessage() + " (wrong input of command/object in script).";
-                resultOfRequest = false;
+                return new CommandResult(e.getMessage() + " (wrong input of command/object in script).", ResponseCode.ERROR);
             } catch (NumberFormatException e) {
-                result = e.getMessage() + " (wrong input of object in script).";
-                resultOfRequest = false;
+                return new CommandResult(e.getMessage() + " (wrong input of object in script).", ResponseCode.ERROR);
             } catch (IllegalArgumentException e) {
-                result = e.getMessage() + " (in script detected some unknown command)";
-                resultOfRequest = false;
+                return new CommandResult(e.getMessage() + " (in script detected some unknown command)", ResponseCode.ERROR);
             } catch (Exception e) {
-                result = "Some exception during script execution: " + e.getMessage();
-                resultOfRequest = false;
+                return new CommandResult("Some exception during script execution: " + e.getMessage(), ResponseCode.ERROR);
             }
         } while (resultOfRequest);
         fileNames.remove(script.getAbsolutePath());
-        return result;
+        return new CommandResult(result, ResponseCode.OK);
     }
 }
 

src/main/java/client/commands/Help.java

@@ -2,6 +2,8 @@
 
 import client.commands.commandsUtils.ArgObjectForClient;
 import sharedClasses.commands.Command;
+import sharedClasses.commands.commandsUtils.CommandResult;
+import sharedClasses.messageUtils.ResponseCode;
 
 /**
  * Class for displaying help on available commands.
@@ -12,7 +14,7 @@ public Help() {
     }
 
     @Override
-    public String execute(ArgObjectForClient argObject) {
-        return (argObject.getClientCommandManager()).getCommandsDescription();
+    public CommandResult execute(ArgObjectForClient argObject) {
+        return new CommandResult(argObject.getClientCommandManager().getCommandsDescription(), ResponseCode.OK);
     }
 }

src/main/java/client/commands/History.java

@@ -2,6 +2,8 @@
 
 import client.commands.commandsUtils.ArgObjectForClient;
 import sharedClasses.commands.Command;
+import sharedClasses.commands.commandsUtils.CommandResult;
+import sharedClasses.messageUtils.ResponseCode;
 
 import java.util.LinkedList;
 
@@ -13,12 +15,12 @@ public History() {
         super(false, 0, "HISTORY", "output the last 11 commands (without their arguments)", false);
     }
 
-    public String execute(ArgObjectForClient argObject) {
+    public CommandResult execute(ArgObjectForClient argObject) {
         LinkedList<String> history = (argObject.getClientCommandManager()).getHistory();
         StringBuilder result = new StringBuilder();
         for (String name : history) {
             result.append(name).append("\n");
         }
-        return result.substring(0, result.toString().length() - 1);
+        return new CommandResult(result.substring(0, result.toString().length() - 1), ResponseCode.OK);
     }
 }

src/main/java/client/connectionUtils/AddressValidation.java

@@ -21,16 +21,20 @@ public class AddressValidation {
      * A method for checking the host and port.
      * @return true if the host and port are entered correctly; otherwise false.
      */
-    public boolean checkAddress() { //todo проверка port?
+    public boolean checkAddress() {
         if (hostAndPort.length != 2) {
             out.println("Invalid input format. Specify host and port separated by a space after the jar-file name.");
             return false;
         }
         try {
             port = Integer.parseInt(hostAndPort[1]);
             host = hostAndPort[0];
+            if (port <=0 || port >65535) {
+                out.println("Wrong number for port");
+                return false;
+            }
         } catch (NumberFormatException e) {
-            out.println("port -  an integer number than or equal to zero.");
+            out.println("Port -  an integer number than or equal to zero.");
             return false;
         }
         return true;

src/main/java/server/Server.java

@@ -2,7 +2,8 @@
 
 import lombok.RequiredArgsConstructor;
 import server.collectionUtil.CollectionManager;
-import server.commands.ArgObjectForServer;
+import server.commandsUtils.ArgObjectForServer;
+import sharedClasses.commands.commandsUtils.CommandResult;
 import sharedClasses.messageUtils.Request;
 import sharedClasses.messageUtils.Response;
 
@@ -53,24 +54,25 @@ private void openServerSocket() throws IOException {
     private void saveIfExit() throws IOException {
         try {
             collectionManager.saveCollection();
-            exit();
+            LOGGER.log(Level.INFO, "The collection was saved");
         } catch (FileNotFoundException e) {
             LOGGER.log(Level.SEVERE, "This file wasn't found");
         } catch (SecurityException e) {
             LOGGER.log(Level.SEVERE, "Write access to the file is denied");
         } catch (IOException e) {
-            LOGGER.log(Level.SEVERE, "Some I/O errors occur");
+            e.printStackTrace();
+            LOGGER.log(Level.SEVERE, "Some I/O errors occur: " + e.getMessage());
         }
-        LOGGER.log(Level.INFO, "The collection was saved");
+        exit();
         run();
     }
 
-    private void exit() throws IOException {
+    private void exit() {
         try {
             if (serverSocket != null) {
                 serverSocket.close();
             }
-            LOGGER.log(Level.INFO, "The connection with the client is broken.");
+            LOGGER.log(Level.INFO, "The connection with the client closed.");
 
         } catch (IOException e) {
             LOGGER.log(Level.INFO, "Error when completing the connection with the client.");
@@ -92,8 +94,8 @@ private boolean processClientRequest(Socket clientSocket) throws IOException, Cl
             do {
                 request = (Request) clientReader.readObject();
                 ArgObjectForServer argObject = new ArgObjectForServer(collectionManager, request.getArgsOfCommand(), request.getMusicBand());
-                //CommandResult c = request.getCommand().execute(argObject);
-                response = new Response("OK", request.getCommand().execute(argObject)); //todo разные коды возврата
+                CommandResult commandResult = request.getCommand().execute(argObject);
+                response = new Response(commandResult.getResponseCode(), commandResult.getResult());
                 clientWriter.writeObject(response);
                 if (request.getCommand().getName().equals("EXIT")) {
                     return false;

src/main/java/server/commands/Save.java

@@ -1,4 +1,4 @@
-package server.commands;
+package server.commandsUtils;
 
 import lombok.Getter;
 import server.collectionUtil.CollectionManager;

src/main/java/server/commands/ArgObjectForServer.java renamed to src/main/java/server/commandsUtils/ArgObjectForServer.java

@@ -1,7 +1,9 @@
 package sharedClasses.commands;
 
 import server.collectionUtil.CollectionManager;
-import server.commands.ArgObjectForServer;
+import server.commandsUtils.ArgObjectForServer;
+import sharedClasses.commands.commandsUtils.CommandResult;
+import sharedClasses.messageUtils.ResponseCode;
 
 /**
  * A class for adding a new item to the collection.
@@ -11,10 +13,10 @@ public Add() {
         super(true, 0, "ADD", "output help for available commands", true);
     }
 
-    public String execute(ArgObjectForServer argObject) {
+    public CommandResult execute(ArgObjectForServer argObject) {
         CollectionManager collectionManager = argObject.getCollectionManager();
         argObject.getMusicBand().setId(collectionManager.generateId());
         collectionManager.add(argObject.getMusicBand());
-        return "Music band was added.";
+        return new CommandResult("Music band was added.", ResponseCode.OK);
     }
 }

src/main/java/sharedClasses/commands/Add.java

@@ -1,6 +1,8 @@
 package sharedClasses.commands;
 
-import server.commands.ArgObjectForServer;
+import server.commandsUtils.ArgObjectForServer;
+import sharedClasses.commands.commandsUtils.CommandResult;
+import sharedClasses.messageUtils.ResponseCode;
 
 /**
  * A class for adding an item to a collection if its albumsCount field is less than the minimum inside the collection.
@@ -10,12 +12,12 @@ public AddIfMin() {
         super(true, 0, "ADD_IF_MIN", " add a new element to the collection if its value is less than the smallest element of this collection", true);
     }
 
-    public String execute(ArgObjectForServer argObject) {
+    public CommandResult execute(ArgObjectForServer argObject) {
         String result = "This band wasn't added because it has too much albums";
         if (argObject.getMusicBand().compareTo(argObject.getCollectionManager().getMinObject()) < 0) {
             argObject.getCollectionManager().add(argObject.getMusicBand());
             result = "Music band was added.";
         }
-        return result;
+        return new CommandResult(result, ResponseCode.OK);
     }
 }

src/main/java/sharedClasses/commands/AddIfMin.java

@@ -1,6 +1,8 @@
 package sharedClasses.commands;
 
-import server.commands.ArgObjectForServer;
+import server.commandsUtils.ArgObjectForServer;
+import sharedClasses.commands.commandsUtils.CommandResult;
+import sharedClasses.messageUtils.ResponseCode;
 
 /**
  * A class for cleaning the collection.
@@ -11,8 +13,8 @@ public Clear() {
         super(false, 0, "CLEAR", "to clear the collection", true);
     }
 
-    public String execute(ArgObjectForServer argObject) {
+    public CommandResult execute(ArgObjectForServer argObject) {
         argObject.getCollectionManager().clear();
-        return "Collection is empty now!";
+        return new CommandResult("Collection is empty now!", ResponseCode.OK);
     }
 }

src/main/java/sharedClasses/commands/Clear.java

@@ -3,6 +3,7 @@
 import sharedClasses.commands.commandsUtils.ArgObject;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
+import sharedClasses.commands.commandsUtils.CommandResult;
 
 import java.io.Serializable;
 
@@ -29,6 +30,6 @@ public abstract class Command<T> implements Serializable {
      * @param argObject an object for storing command arguments {@link ArgObject}.
      * @return the result of the command execution.
      */
-    public abstract String execute(T argObject);
+    public abstract CommandResult execute(T argObject);
 
 }

src/main/java/sharedClasses/commands/Command.java

@@ -1,6 +1,8 @@
 package sharedClasses.commands;
 
-import server.commands.ArgObjectForServer;
+import server.commandsUtils.ArgObjectForServer;
+import sharedClasses.commands.commandsUtils.CommandResult;
+import sharedClasses.messageUtils.ResponseCode;
 
 /**
  * A class for terminating a program.
@@ -10,7 +12,7 @@ public Exit() {
         super(false, 0, "EXIT", "terminate the program (without saving to a file)", true);
     }
 
-    public String execute(ArgObjectForServer argObject) {
-        return "Program is finishing...:(";
+    public CommandResult execute(ArgObjectForServer argObject) {
+        return new CommandResult("Program is finishing.", ResponseCode.OK);
     }
 }