diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml new file mode 100644 index 0000000..c9cdc65 --- /dev/null +++ b/.idea/dataSources.xml @@ -0,0 +1,12 @@ + + + + + postgresql + true + org.postgresql.Driver + jdbc:postgresql://localhost:5432/postgres + $ProjectFileDir$ + + + \ No newline at end of file diff --git a/.idea/sqldialects.xml b/.idea/sqldialects.xml new file mode 100644 index 0000000..82a2a99 --- /dev/null +++ b/.idea/sqldialects.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/Lab5Client/build/classes/java/main/client/Lab5Client.class b/Lab5Client/build/classes/java/main/client/Lab5Client.class index e826611..e3dd504 100644 Binary files a/Lab5Client/build/classes/java/main/client/Lab5Client.class and b/Lab5Client/build/classes/java/main/client/Lab5Client.class differ diff --git a/Lab5Client/build/classes/java/main/client/commandline/CommandLineHandlerClient$ConnectionCommand.class b/Lab5Client/build/classes/java/main/client/commandline/CommandLineHandlerClient$ConnectionCommand.class deleted file mode 100644 index 9ae6679..0000000 Binary files a/Lab5Client/build/classes/java/main/client/commandline/CommandLineHandlerClient$ConnectionCommand.class and /dev/null differ diff --git a/Lab5Client/build/classes/java/main/client/commandline/CommandLineHandlerClient.class b/Lab5Client/build/classes/java/main/client/commandline/CommandLineHandlerClient.class index 9f77ccb..9963777 100644 Binary files a/Lab5Client/build/classes/java/main/client/commandline/CommandLineHandlerClient.class and b/Lab5Client/build/classes/java/main/client/commandline/CommandLineHandlerClient.class differ diff --git a/Lab5Client/build/classes/java/main/client/commandline/pdcommands/AddCommand.class b/Lab5Client/build/classes/java/main/client/commandline/pdcommands/AddCommand.class deleted file mode 100644 index 0adcc08..0000000 Binary files a/Lab5Client/build/classes/java/main/client/commandline/pdcommands/AddCommand.class and /dev/null differ diff --git a/Lab5Client/build/classes/java/main/client/commandline/pdcommands/AddIfMaxCommand.class b/Lab5Client/build/classes/java/main/client/commandline/pdcommands/AddIfMaxCommand.class deleted file mode 100644 index 956116d..0000000 Binary files a/Lab5Client/build/classes/java/main/client/commandline/pdcommands/AddIfMaxCommand.class and /dev/null differ diff --git a/Lab5Client/build/classes/java/main/client/commandline/pdcommands/AddIfMinCommand.class b/Lab5Client/build/classes/java/main/client/commandline/pdcommands/AddIfMinCommand.class deleted file mode 100644 index fb1261b..0000000 Binary files a/Lab5Client/build/classes/java/main/client/commandline/pdcommands/AddIfMinCommand.class and /dev/null differ diff --git a/Lab5Client/build/classes/java/main/client/commandline/pdcommands/ClearCommand.class b/Lab5Client/build/classes/java/main/client/commandline/pdcommands/ClearCommand.class deleted file mode 100644 index ad26f3e..0000000 Binary files a/Lab5Client/build/classes/java/main/client/commandline/pdcommands/ClearCommand.class and /dev/null differ diff --git a/Lab5Client/build/classes/java/main/client/commandline/pdcommands/FilterContainsNameCommand.class b/Lab5Client/build/classes/java/main/client/commandline/pdcommands/FilterContainsNameCommand.class deleted file mode 100644 index 39ce1ac..0000000 Binary files a/Lab5Client/build/classes/java/main/client/commandline/pdcommands/FilterContainsNameCommand.class and /dev/null differ diff --git a/Lab5Client/build/classes/java/main/client/commandline/pdcommands/InfoCommand.class b/Lab5Client/build/classes/java/main/client/commandline/pdcommands/InfoCommand.class deleted file mode 100644 index ab753cb..0000000 Binary files a/Lab5Client/build/classes/java/main/client/commandline/pdcommands/InfoCommand.class and /dev/null differ diff --git a/Lab5Client/build/classes/java/main/client/commandline/pdcommands/PrintFieldDescendingLocationCommand.class b/Lab5Client/build/classes/java/main/client/commandline/pdcommands/PrintFieldDescendingLocationCommand.class deleted file mode 100644 index b16a9fb..0000000 Binary files a/Lab5Client/build/classes/java/main/client/commandline/pdcommands/PrintFieldDescendingLocationCommand.class and /dev/null differ diff --git a/Lab5Client/build/classes/java/main/client/commandline/pdcommands/RemoveByIdCommand.class b/Lab5Client/build/classes/java/main/client/commandline/pdcommands/RemoveByIdCommand.class deleted file mode 100644 index b593c6e..0000000 Binary files a/Lab5Client/build/classes/java/main/client/commandline/pdcommands/RemoveByIdCommand.class and /dev/null differ diff --git a/Lab5Client/build/classes/java/main/client/commandline/pdcommands/ShowCommand.class b/Lab5Client/build/classes/java/main/client/commandline/pdcommands/ShowCommand.class deleted file mode 100644 index 62bf0eb..0000000 Binary files a/Lab5Client/build/classes/java/main/client/commandline/pdcommands/ShowCommand.class and /dev/null differ diff --git a/Lab5Client/build/classes/java/main/client/commandline/pdcommands/SumOfHeightCommand.class b/Lab5Client/build/classes/java/main/client/commandline/pdcommands/SumOfHeightCommand.class deleted file mode 100644 index 118da85..0000000 Binary files a/Lab5Client/build/classes/java/main/client/commandline/pdcommands/SumOfHeightCommand.class and /dev/null differ diff --git a/Lab5Client/build/classes/java/main/client/commandline/pdcommands/UpdateCommand.class b/Lab5Client/build/classes/java/main/client/commandline/pdcommands/UpdateCommand.class deleted file mode 100644 index 2d68187..0000000 Binary files a/Lab5Client/build/classes/java/main/client/commandline/pdcommands/UpdateCommand.class and /dev/null differ diff --git a/Lab5Client/build/classes/java/main/client/net/UDPClient.class b/Lab5Client/build/classes/java/main/client/net/UDPClient.class index a3a55f0..838886a 100644 Binary files a/Lab5Client/build/classes/java/main/client/net/UDPClient.class and b/Lab5Client/build/classes/java/main/client/net/UDPClient.class differ diff --git a/Lab5Client/build/docs/javadoc/allclasses-frame.html b/Lab5Client/build/docs/javadoc/allclasses-frame.html index 76d4a56..b825b12 100644 --- a/Lab5Client/build/docs/javadoc/allclasses-frame.html +++ b/Lab5Client/build/docs/javadoc/allclasses-frame.html @@ -11,20 +11,9 @@

All Classes

diff --git a/Lab5Client/build/docs/javadoc/allclasses-noframe.html b/Lab5Client/build/docs/javadoc/allclasses-noframe.html index f810dff..03cda0a 100644 --- a/Lab5Client/build/docs/javadoc/allclasses-noframe.html +++ b/Lab5Client/build/docs/javadoc/allclasses-noframe.html @@ -11,20 +11,9 @@

All Classes

diff --git a/Lab5Client/build/docs/javadoc/client/Lab5Client.html b/Lab5Client/build/docs/javadoc/client/Lab5Client.html index daa84de..549c38a 100644 --- a/Lab5Client/build/docs/javadoc/client/Lab5Client.html +++ b/Lab5Client/build/docs/javadoc/client/Lab5Client.html @@ -131,6 +131,10 @@ extends java.lang.Object static java.util.logging.Logger LOGGER  + +static UDPClient +UDP  + @@ -192,12 +196,21 @@ extends java.lang.Object - diff --git a/Lab5Client/build/docs/javadoc/client/commandline/CommandLineHandlerClient.ConnectionCommand.html b/Lab5Client/build/docs/javadoc/client/commandline/CommandLineHandlerClient.ConnectionCommand.html deleted file mode 100644 index 56d1f1d..0000000 --- a/Lab5Client/build/docs/javadoc/client/commandline/CommandLineHandlerClient.ConnectionCommand.html +++ /dev/null @@ -1,311 +0,0 @@ - - - - - -CommandLineHandlerClient.ConnectionCommand (Lab5Client 3.0 API) - - - - - - - -
- - -
Skip navigation links
- - - - -
-
- - - -
- -
-
- - -
- - -
- - -
-
client.commandline
-

Class CommandLineHandlerClient.ConnectionCommand

-
-
- -
- -
-
- -
-
- -
-
- - -
- - -
Skip navigation links
- - - - -
-
- - - -
- -
-
- - -
- - -
- - - diff --git a/Lab5Client/build/docs/javadoc/client/commandline/CommandLineHandlerClient.html b/Lab5Client/build/docs/javadoc/client/commandline/CommandLineHandlerClient.html index c9f935c..116e666 100644 --- a/Lab5Client/build/docs/javadoc/client/commandline/CommandLineHandlerClient.html +++ b/Lab5Client/build/docs/javadoc/client/commandline/CommandLineHandlerClient.html @@ -17,7 +17,7 @@ catch(err) { } //--> -var methods = {"i0":10,"i1":10,"i2":9}; +var methods = {"i0":10,"i1":9,"i2":9}; var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; @@ -48,7 +48,7 @@ var activeTableTab = "activeTableTab";
@@ -177,8 +177,8 @@ extends Method and Description -boolean -validate(java.lang.String[] args)  +CommandResult +execute(java.lang.Object[] args) 
  • @@ -226,16 +226,16 @@ extends + @@ -267,7 +267,7 @@ extends
    • Frames
      • diff --git a/Lab5Core/build/docs/javadoc/common/commandline/Executable.html b/Lab5Core/build/docs/javadoc/common/commandline/Executable.html deleted file mode 100644 index 567bd86..0000000 --- a/Lab5Core/build/docs/javadoc/common/commandline/Executable.html +++ /dev/null @@ -1,228 +0,0 @@ - - - - - -Executable (Lab5Core 3.0 API) - - - - - - - -
      - - -
      Skip navigation links
      - - - - -
      -
      - - - -
      - -
      -
      -
        -
      • Summary: 
        • -
      • Nested | 
        • -
      • Field | 
        • -
      • Constr | 
        • -
      • Method
        • -
      -
        -
      • Detail: 
        • -
      • Field | 
        • -
      • Constr | 
        • -
      • Method
        • -
      -
      - - -
      - - -
      -
      common.commandline
      -

      Interface Executable

      -
      -
      -
      -
        -
      • -
        -
        All Superinterfaces:
        -
        java.io.Serializable
        -
        -
        -
        Functional Interface:
        -
        This is a functional interface and can therefore be used as the assignment target for a lambda expression or method reference.
        -
        -
        -
        -
        @FunctionalInterface
-public interface Executable
-extends java.io.Serializable
        -
        • -
      -
      -
      - -
      -
      -
        -
      • - - -
        • -
      -
      -
      - - -
      - - -
      Skip navigation links
      - - - - -
      -
      - - - -
      - -
      -
      -
        -
      • Summary: 
        • -
      • Nested | 
        • -
      • Field | 
        • -
      • Constr | 
        • -
      • Method
        • -
      -
        -
      • Detail: 
        • -
      • Field | 
        • -
      • Constr | 
        • -
      • Method
        • -
      -
      - - -
      - - - diff --git a/Lab5Core/build/docs/javadoc/common/commandline/Executables.html b/Lab5Core/build/docs/javadoc/common/commandline/Executables.html deleted file mode 100644 index df05f37..0000000 --- a/Lab5Core/build/docs/javadoc/common/commandline/Executables.html +++ /dev/null @@ -1,482 +0,0 @@ - - - - - -Executables (Lab5Core 3.0 API) - - - - - - - -
      - - -
      Skip navigation links
      - - - - -
      -
      - - - -
      - -
      -
      - - -
      - - -
      - - -
      -
      common.commandline
      -

      Enum Executables

      -
      -
      -
        -
      • java.lang.Object
        • -
      • -
          -
        • java.lang.Enum<Executables>
          • -
        • -
            -
          • common.commandline.Executables
            • -
          -
          • -
        -
        • -
      -
      -
        -
      • -
        -
        All Implemented Interfaces:
        -
        java.io.Serializable, java.lang.Comparable<Executables>
        -
        -
        -
        -
        public enum Executables
-extends java.lang.Enum<Executables>
        -
        • -
      -
      -
      - -
      -
      -
        -
      • - - - - - -
          -
        • - - -

          Method Detail

          - - - -
            -
          • -

            values

            -
            public static Executables[] values()
            -
            Returns an array containing the constants of this enum type, in -the order they are declared. This method may be used to iterate -over the constants as follows: -
            -for (Executables c : Executables.values())
-    System.out.println(c);
-
            -
            -
            Returns:
            -
            an array containing the constants of this enum type, in the order they are declared
            -
            -
            • -
          - - - -
            -
          • -

            valueOf

            -
            public static Executables valueOf(java.lang.String name)
            -
            Returns the enum constant of this type with the specified name. -The string must match exactly an identifier used to declare an -enum constant in this type. (Extraneous whitespace characters are -not permitted.)
            -
            -
            Parameters:
            -
            name - the name of the enum constant to be returned.
            -
            Returns:
            -
            the enum constant with the specified name
            -
            Throws:
            -
            java.lang.IllegalArgumentException - if this enum type has no constant with the specified name
            -
            java.lang.NullPointerException - if the argument is null
            -
            -
            • -
          -
          • -
        -
        • -
      -
      -
      - - -
      - - -
      Skip navigation links
      - - - - -
      -
      - - - -
      - -
      -
      - - -
      - - -
      - - - diff --git a/Lab5Core/build/docs/javadoc/common/commandline/LongStrings.html b/Lab5Core/build/docs/javadoc/common/commandline/LongStrings.html index cf7e0c9..9b0e4ea 100644 --- a/Lab5Core/build/docs/javadoc/common/commandline/LongStrings.html +++ b/Lab5Core/build/docs/javadoc/common/commandline/LongStrings.html @@ -47,8 +47,8 @@ var activeTableTab = "activeTableTab";
  • Frames
    • @@ -306,8 +306,8 @@ not permitted.)
  • Frames
    • diff --git a/Lab5Core/build/docs/javadoc/common/commandline/package-frame.html b/Lab5Core/build/docs/javadoc/common/commandline/package-frame.html index 85b7bb8..8b2107c 100644 --- a/Lab5Core/build/docs/javadoc/common/commandline/package-frame.html +++ b/Lab5Core/build/docs/javadoc/common/commandline/package-frame.html @@ -10,20 +10,16 @@

    common.commandline

    -

    Interfaces

    -

    Classes

    Enums

    Exceptions

    diff --git a/Lab5Core/build/docs/javadoc/common/commandline/package-summary.html b/Lab5Core/build/docs/javadoc/common/commandline/package-summary.html index d66bec8..3d1388a 100644 --- a/Lab5Core/build/docs/javadoc/common/commandline/package-summary.html +++ b/Lab5Core/build/docs/javadoc/common/commandline/package-summary.html @@ -42,7 +42,7 @@
    • Frames
      • @@ -73,21 +73,6 @@
      • - - - - - - - - - - - - -
        Interface Summary 
        InterfaceDescription
        Executable 
        -
        • -
      • @@ -117,6 +102,10 @@ + + + +
        Class Summary 
        CommandRegistry.HelpCommand  
        PlaceHolder<T> 
        • @@ -129,10 +118,6 @@ -Executables -  - - LongStrings   @@ -185,7 +170,7 @@
        diff --git a/Lab5Core/build/libs/Lab5Core-3.0.jar b/Lab5Core/build/libs/Lab5Core-3.0.jar index 782c6e9..0decdb3 100644 Binary files a/Lab5Core/build/libs/Lab5Core-3.0.jar and b/Lab5Core/build/libs/Lab5Core-3.0.jar differ diff --git a/Lab5Core/build/tmp/compileJava/previous-compilation-data.bin b/Lab5Core/build/tmp/compileJava/previous-compilation-data.bin index d55c28a..776361d 100644 Binary files a/Lab5Core/build/tmp/compileJava/previous-compilation-data.bin and b/Lab5Core/build/tmp/compileJava/previous-compilation-data.bin differ diff --git a/Lab5Core/build/tmp/javadoc/javadoc.options b/Lab5Core/build/tmp/javadoc/javadoc.options index 6f34354..559023d 100644 --- a/Lab5Core/build/tmp/javadoc/javadoc.options +++ b/Lab5Core/build/tmp/javadoc/javadoc.options @@ -5,19 +5,32 @@ -notimestamp -quiet -windowtitle 'Lab5Core 3.0 API' -'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\src\\main\\java\\common\\collection\\PeopleDatabase.java' +'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\src\\main\\java\\common\\collection\\PeopleCollection.java' 'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\src\\main\\java\\common\\commandline\\Command.java' 'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\src\\main\\java\\common\\commandline\\CommandLineHandler.java' 'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\src\\main\\java\\common\\commandline\\CommandRegistry.java' -'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\src\\main\\java\\common\\commandline\\Executable.java' -'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\src\\main\\java\\common\\commandline\\Executables.java' +'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\src\\main\\java\\common\\commandline\\commands\\LogInCommand.java' +'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\src\\main\\java\\common\\commandline\\commands\\SignUpCommand.java' 'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\src\\main\\java\\common\\commandline\\LongStrings.java' +'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\src\\main\\java\\common\\commandline\\pdcommands\\AddCommand.java' +'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\src\\main\\java\\common\\commandline\\pdcommands\\AddIfMaxCommand.java' +'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\src\\main\\java\\common\\commandline\\pdcommands\\AddIfMinCommand.java' +'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\src\\main\\java\\common\\commandline\\pdcommands\\ClearCommand.java' +'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\src\\main\\java\\common\\commandline\\pdcommands\\FilterContainsNameCommand.java' +'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\src\\main\\java\\common\\commandline\\pdcommands\\InfoCommand.java' 'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\src\\main\\java\\common\\commandline\\pdcommands\\PeopleDatabaseCommand.java' 'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\src\\main\\java\\common\\commandline\\pdcommands\\PeopleDatabaseCommands.java' +'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\src\\main\\java\\common\\commandline\\pdcommands\\PrintFieldDescendingLocationCommand.java' +'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\src\\main\\java\\common\\commandline\\pdcommands\\RemoveByIdCommand.java' +'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\src\\main\\java\\common\\commandline\\pdcommands\\ShowCommand.java' +'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\src\\main\\java\\common\\commandline\\pdcommands\\SumOfHeightCommand.java' +'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\src\\main\\java\\common\\commandline\\pdcommands\\UpdateCommand.java' +'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\src\\main\\java\\common\\commandline\\PlaceHolder.java' 'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\src\\main\\java\\common\\commandline\\response\\CommandResult.java' 'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\src\\main\\java\\common\\commandline\\response\\DefaultResponse.java' 'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\src\\main\\java\\common\\commandline\\response\\PeopleDatabaseResponse.java' 'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\src\\main\\java\\common\\commandline\\response\\Response.java' +'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\src\\main\\java\\common\\commandline\\response\\SqlResponse.java' 'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\src\\main\\java\\common\\data\\Color.java' 'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\src\\main\\java\\common\\data\\Coordinates.java' 'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\src\\main\\java\\common\\data\\Country.java' diff --git a/Lab5Core/src/main/java/common/collection/PeopleCollection.java b/Lab5Core/src/main/java/common/collection/PeopleCollection.java index 26dfcc2..e3c19e7 100644 --- a/Lab5Core/src/main/java/common/collection/PeopleCollection.java +++ b/Lab5Core/src/main/java/common/collection/PeopleCollection.java @@ -14,9 +14,9 @@ public class PeopleCollection { private final static String TYPE = "TreeSet"; @Getter - private NavigableSet collection = Collections.synchronizedNavigableSet(new TreeSet<>()); + private final NavigableSet collection = Collections.synchronizedNavigableSet(new TreeSet<>()); @Getter - private LocalDate initDate = LocalDate.now(); + private final LocalDate initDate = LocalDate.now(); public String info() { return String.format("Тип коллекции: %s \n" + diff --git a/Lab5Core/src/main/java/common/commandline/Command.java b/Lab5Core/src/main/java/common/commandline/Command.java index 46f6c59..7b1f490 100644 --- a/Lab5Core/src/main/java/common/commandline/Command.java +++ b/Lab5Core/src/main/java/common/commandline/Command.java @@ -2,7 +2,6 @@ package common.commandline; import common.commandline.response.CommandResult; import lombok.Getter; -import lombok.Setter; import java.io.Serializable; @@ -12,10 +11,6 @@ public abstract class Command implements Serializable { protected final String alias; protected final String description; protected final boolean clientOnly; - @Setter - protected Executable executable; - - protected Object[] args; public Command(String alias, boolean clientOnly, String description) { this.alias = alias; @@ -23,14 +18,9 @@ public abstract class Command implements Serializable { this.description = description; } - public Command(String alias, boolean clientOnly, String description, Executable executable) { - this(alias, clientOnly, description); - this.executable = executable; + public Object[] validate(String[] args) { + return new Object[]{}; } - public abstract boolean validate(String[] args); - - public CommandResult executeOnClient() { - return executable.execute(args); - } + public abstract CommandResult execute(Object[] args); } diff --git a/Lab5Core/src/main/java/common/commandline/CommandLineHandler.java b/Lab5Core/src/main/java/common/commandline/CommandLineHandler.java index d2a33a9..03ccfb7 100644 --- a/Lab5Core/src/main/java/common/commandline/CommandLineHandler.java +++ b/Lab5Core/src/main/java/common/commandline/CommandLineHandler.java @@ -4,6 +4,8 @@ import common.commandline.response.CommandResult; import common.commandline.response.DefaultResponse; import common.commandline.response.Response; import common.util.UtilFunctions; +import lombok.Getter; +import lombok.Setter; import java.io.*; import java.util.Deque; @@ -22,6 +24,8 @@ import java.util.function.Predicate; */ public abstract class CommandLineHandler { + @Setter @Getter + private static String user = "lab7"; protected static CommandLineHandler instance; protected final Deque inputs = new LinkedList<>(); @@ -30,8 +34,7 @@ public abstract class CommandLineHandler { protected BufferedReader reader = new BufferedReader(new InputStreamReader(System.in)); protected boolean isActive = false; - protected CommandLineHandler() { - clearScreen(); + { CommandRegistry.registerCommands(new ExitCommand(), new HistoryCommand(), new ExecuteScriptCommand()); } @@ -51,7 +54,7 @@ public abstract class CommandLineHandler { } while (this.isActive); } - protected static void clearScreen() { + public static void clearScreen() { try { if (System.getProperty("os.name").contains("Windows")) new ProcessBuilder("cmd", "/c", "cls").inheritIO().start().waitFor(); @@ -65,7 +68,7 @@ public abstract class CommandLineHandler { } protected void input() { - String line = awaitInput("lab5>", "Что-то пошло не так").toLowerCase(Locale.ROOT); + String line = awaitInput(user + ">").toLowerCase(Locale.ROOT); String[] split = line.split("\\s+"); String alias = split[0]; String[] args = new String[]{}; @@ -86,6 +89,10 @@ public abstract class CommandLineHandler { return isActive; } + public String awaitInput(String msg) { + return awaitInput(msg, "Что-то пошло не так"); + } + /** * Метод, ожидающий ввода из потока ввода {@link #reader reader} и возвращающий результат, * печатает запрос msg перед ожиданием данных (если их вводит пользователь), @@ -154,6 +161,23 @@ public abstract class CommandLineHandler { return transform.apply(result); } + public String awaitPassword(String msg) { + Console console = System.console(); + if (console == null) { + System.err.println("Не удалось получить консоль"); + System.exit(-1); + } + do { + System.out.print(msg + " "); + char[] input = console.readPassword(); + if (input == null || input.length == 0) { + System.err.println("Пароль не может быть пустым"); + continue; + } + return new String(input); + } while (true); + } + public void addNewInput(Reader reader, String filePath) { if (this.fileNames.contains(filePath)) { System.err.println("Замечена рекурсия, отмена смены потока"); @@ -172,103 +196,81 @@ public abstract class CommandLineHandler { this.reader = new BufferedReader(reader); } - public CommandResult executeScript(String fileName) { - return executeScript(new Object[]{ fileName }); - } - - private CommandResult executeScript(Object[] args) { - String fileName = (String) args[0]; - File file = new File(fileName); - if (!file.exists() || file.isDirectory()) { - Response response = DefaultResponse.FILE_NOT_FOUND; - return new CommandResult(response.getMsg(), response); - } - - Reader streamReader; - try { - streamReader = new InputStreamReader(new FileInputStream(file)); - } catch (FileNotFoundException e) { - Response response = DefaultResponse.UNKNOWN; - return new CommandResult(response.getMsg(), response); - } - addNewInput(streamReader, fileName); - Response response = DefaultResponse.OK; - return new CommandResult(response.getMsg(), response); - } - - public CommandResult history() { - return history(new Object[]{}); - } - - public CommandResult history(int amount) { - return history(new Object[]{ amount }); - } - - private CommandResult history (Object[] args) { - int lines = args.length > 0 ? (int) args[0] : 6; - int start = lines < history.size() ? history.size() - lines : 0; - StringBuilder result = new StringBuilder("История последних команд:\n"); - for (int i = start; i < history.size(); i++) - result.append(history.get(i)).append("\n"); - return new CommandResult(result.toString(), DefaultResponse.OK); - } - - public CommandResult exit() { - return exit(new Object[]{}); - } - - private CommandResult exit(Object[] args) { - isActive = false; - return new CommandResult("Выход из программы...", DefaultResponse.OK); - } - public class ExitCommand extends Command { public ExitCommand() { super("exit", true, "exit : завершить программу (без сохранения в файл)"); - this.executable = CommandLineHandler.this::exit; } @Override - public boolean validate(String[] args) { - return true; + public CommandResult execute(Object[] args) { + isActive = false; + return new CommandResult("Выход из программы...", DefaultResponse.OK); } } public class HistoryCommand extends Command { public HistoryCommand() { super("history", true, "history [count] : вывести последние count введенных команд, по умолчанию count равен 6"); - this.executable = CommandLineHandler.this::history; } @Override - public boolean validate(String[] args) { + public Object[] validate(String[] args) { Integer value = 6; - this.args = new Object[]{ value }; + Object[] newArgs = new Object[]{ value }; if (args.length > 0) { value = UtilFunctions.intOrNull(args[0]); if (value != null) { - this.args = new Object[]{ value }; - return true; - } else return false; + newArgs = new Object[]{ value }; + return newArgs; + } else return null; } - return true; + return newArgs; + } + + @Override + public CommandResult execute(Object[] args) { + int lines = args.length > 0 ? (int) args[0] : 6; + int start = lines < history.size() ? history.size() - lines : 0; + StringBuilder result = new StringBuilder("История последних команд:\n"); + for (int i = start; i < history.size(); i++) + result.append(history.get(i)).append("\n"); + return new CommandResult(result.toString(), DefaultResponse.OK); } } public class ExecuteScriptCommand extends Command { public ExecuteScriptCommand() { super("execute_script", true, "execute_script {file_name} : считать и исполнить скрипт из указанного файла. В скрипте содержатся команды в таком же виде, в котором их вводит пользователь в интерактивном режиме."); - this.executable = CommandLineHandler.this::executeScript; } @Override - public boolean validate(String[] args) { + public Object[] validate(String[] args) { if (args.length < 1) { System.err.println("Недостаточно данных"); - return false; + return null; } - this.args = args; - return true; + return args; + } + + @Override + public CommandResult execute(Object[] args) { + String fileName = (String) args[0]; + File file = new File(fileName); + if (!file.exists() || file.isDirectory()) { + Response response = DefaultResponse.FILE_NOT_FOUND; + return new CommandResult(response.getMsg(), response); + } + + Reader streamReader; + try { + streamReader = new InputStreamReader(new FileInputStream(file)); + } catch (FileNotFoundException e) { + Response response = DefaultResponse.UNKNOWN; + return new CommandResult(response.getMsg(), response); + } + addNewInput(streamReader, fileName); + Response response = DefaultResponse.OK; + return new CommandResult(response.getMsg(), response); } } diff --git a/Lab5Core/src/main/java/common/commandline/CommandRegistry.java b/Lab5Core/src/main/java/common/commandline/CommandRegistry.java index efe9d62..c72ecb6 100644 --- a/Lab5Core/src/main/java/common/commandline/CommandRegistry.java +++ b/Lab5Core/src/main/java/common/commandline/CommandRegistry.java @@ -71,21 +71,18 @@ public final class CommandRegistry { public static class HelpCommand extends Command { public HelpCommand() { - super("help", true, "help : вывести справку по доступным командам", - args -> { - StringBuilder result = new StringBuilder(LongStrings.LINE.getValue() + "\n\n"); - for (Command c : COMMANDS.values()) { - String desc = c.getDescription(); - if (desc != null) result.append(desc).append("\n\n"); - } - result.append(LongStrings.LINE.getValue()); - return new CommandResult(result.toString(), DefaultResponse.OK); - }); + super("help", true, "help : вывести справку по доступным командам"); } @Override - public boolean validate(String[] args) { - return true; + public CommandResult execute(Object[] args) { + StringBuilder result = new StringBuilder(LongStrings.LINE.getValue() + "\n\n"); + for (Command c : COMMANDS.values()) { + String desc = c.getDescription(); + if (desc != null) result.append(desc).append("\n\n"); + } + result.append(LongStrings.LINE.getValue()); + return new CommandResult(result.toString(), DefaultResponse.OK); } } } diff --git a/Lab5Core/src/main/java/common/commandline/Executable.java b/Lab5Core/src/main/java/common/commandline/Executable.java deleted file mode 100644 index bffad8a..0000000 --- a/Lab5Core/src/main/java/common/commandline/Executable.java +++ /dev/null @@ -1,10 +0,0 @@ -package common.commandline; - -import common.commandline.response.CommandResult; - -import java.io.Serializable; - -@FunctionalInterface -public interface Executable extends Serializable { - CommandResult execute(Object[] args); -} diff --git a/Lab5Core/src/main/java/common/commandline/Executables.java b/Lab5Core/src/main/java/common/commandline/Executables.java deleted file mode 100644 index 07687ea..0000000 --- a/Lab5Core/src/main/java/common/commandline/Executables.java +++ /dev/null @@ -1,121 +0,0 @@ -package common.commandline; - -import common.collection.PeopleCollection; -import common.commandline.response.CommandResult; -import common.commandline.response.DefaultResponse; -import common.commandline.response.PeopleDatabaseResponse; -import common.commandline.response.Response; -import common.data.Person; - -import java.util.Collections; -import java.util.Optional; - -public enum Executables { - ADD(args -> { - PeopleCollection peopleCollection = (PeopleCollection) args[0]; - Person person = (Person) args[1]; - boolean success = peopleCollection.getCollection().add(person); - Response response = PeopleDatabaseResponse.FAILED_TO_ADD; - if (success) response = DefaultResponse.OK; - return new CommandResult(response.getMsg(), response); - }), - - ADD_IF_MAX(args -> { - PeopleCollection peopleCollection = (PeopleCollection) args[0]; - Person person = (Person) args[1]; - Person last = peopleCollection.getCollection().last(); - if (person.compareTo(last) > 0) return ADD.executable.execute(args); - Response response = PeopleDatabaseResponse.FAILED_TO_ADD; - return new CommandResult(response.getMsg(), response); - }), - - ADD_IF_MIN(args -> { - PeopleCollection peopleCollection = (PeopleCollection) args[0]; - Person person = (Person) args[1]; - Person first = peopleCollection.getCollection().first(); - if (person.compareTo(first) < 0) return ADD.executable.execute(args); - Response response = PeopleDatabaseResponse.FAILED_TO_ADD; - return new CommandResult(response.getMsg(), response); - }), - - CLEAR(args -> { - PeopleCollection peopleCollection = (PeopleCollection) args[0]; - peopleCollection.getCollection().clear(); - Response response = DefaultResponse.OK; - return new CommandResult(response.getMsg(), response); - }), - - FILTER_CONTAINS_NAME(args -> { - PeopleCollection peopleCollection = (PeopleCollection) args[0]; - String name = (String) args[1]; - StringBuilder result = new StringBuilder("Список людей, в имени которых содержится " + name + ":\n"); - peopleCollection.getCollection() - .stream() - .filter(p -> p.getName().contains(name)) - .forEach(p -> result.append(p.formatted()).append("\n")); - return new CommandResult(result.toString(), DefaultResponse.OK); - }), - - INFO(args -> { - PeopleCollection peopleCollection = (PeopleCollection) args[0]; - return new CommandResult(peopleCollection.info(), DefaultResponse.OK); - }), - - PRINT_FIELD_DESCENDING_LOCATION(args -> { - PeopleCollection peopleCollection = (PeopleCollection) args[0]; - StringBuilder result = new StringBuilder("Список локаций в порядке убывания:\n"); - peopleCollection.getCollection() - .stream() - .map(Person::getLocation) - .sorted(Collections.reverseOrder()) - .forEach(loc -> result.append(loc).append("\n")); - return new CommandResult(result.toString(), DefaultResponse.OK); - }), - - REMOVE_BY_ID(args -> { - PeopleCollection peopleCollection = (PeopleCollection) args[0]; - long id = (long) args[1]; - boolean success = peopleCollection.getCollection().removeIf(p -> p.getId().equals(id)); - Response response = success ? DefaultResponse.OK : PeopleDatabaseResponse.ELEMENT_NOT_FOUND; - return new CommandResult(response.getMsg(), response); - }), - - SHOW(args -> { - PeopleCollection peopleCollection = (PeopleCollection) args[0]; - StringBuilder result = new StringBuilder("Элементы коллекции:\n"); - peopleCollection.getCollection().forEach(p -> result.append(p.formatted())); - return new CommandResult(result.toString(), DefaultResponse.OK); - }), - - SUM_OF_HEIGHT(args -> { - PeopleCollection peopleCollection = (PeopleCollection) args[0]; - String sum = "Сумма ростов всех людей в коллекции - " + peopleCollection.getCollection() - .stream() - .mapToInt(p -> p.getHeight() == null ? 0 : p.getHeight()) - .sum(); - return new CommandResult(sum, DefaultResponse.OK); - }), - - UPDATE(args -> { - PeopleCollection peopleCollection = (PeopleCollection) args[0]; - long id = (long) args[1]; - Person person = (Person) args[2]; - Optional optionalPerson = peopleCollection.getCollection() - .stream() - .filter(p -> p.getId().equals(id)) - .findFirst(); - Response response = PeopleDatabaseResponse.ELEMENT_NOT_FOUND; - if (!optionalPerson.isPresent()) return new CommandResult(response.getMsg(), response); - Person oldPerson = optionalPerson.get(); - CommandResult result = REMOVE_BY_ID.executable.execute(new Object[]{peopleCollection, id }); - if (result.getResponse() != DefaultResponse.OK) return result; - oldPerson.update(person); - return ADD.executable.execute(new Object[]{peopleCollection, oldPerson }); - }); - - public final Executable executable; - - Executables(Executable executable) { - this.executable = executable; - } -} diff --git a/Lab5Core/src/main/java/common/commandline/PlaceHolder.java b/Lab5Core/src/main/java/common/commandline/PlaceHolder.java new file mode 100644 index 0000000..b8ece7c --- /dev/null +++ b/Lab5Core/src/main/java/common/commandline/PlaceHolder.java @@ -0,0 +1,37 @@ +package common.commandline; + +import java.io.Serializable; + +public class PlaceHolder implements Serializable { + + private final Class clazz; + + protected PlaceHolder(Class clazz) { + this.clazz = clazz; + } + + public static PlaceHolder of(Class clazz) { + return new PlaceHolder<>(clazz); + } + + public Class getExpectedClass() { + return clazz; + } + + public static Object[] replacePlaceHoldersWith(Object[] args, Object... replaceWith) { + Object[] result = new Object[args.length]; + for (int i = 0; i < args.length; i++) { + Object obj = args[i]; + result[i] = obj; + if (!(obj instanceof PlaceHolder)) continue; + PlaceHolder placeHolder = (PlaceHolder) obj; + for (Object replace : replaceWith) { + if (placeHolder.clazz.isAssignableFrom(replace.getClass())) { + result[i] = replace; + break; + } + } + } + return result; + } +} diff --git a/Lab5Core/src/main/java/common/commandline/commands/LogInCommand.java b/Lab5Core/src/main/java/common/commandline/commands/LogInCommand.java new file mode 100644 index 0000000..7f7938c --- /dev/null +++ b/Lab5Core/src/main/java/common/commandline/commands/LogInCommand.java @@ -0,0 +1,49 @@ +package common.commandline.commands; + +import common.commandline.Command; +import common.commandline.PlaceHolder; +import common.commandline.response.CommandResult; +import common.commandline.response.Response; +import common.commandline.response.SqlResponse; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; + +public class LogInCommand extends Command { + + public LogInCommand() { + super("login", false, "login"); + } + + @Override + public Object[] validate(String[] args) { + return new Object[]{args[0], args[1], PlaceHolder.of(Connection.class)}; + } + + @Override + public CommandResult execute(Object[] args) { + String login = (String) args[0]; + String password = (String) args[1]; + Connection connection = (Connection) args[2]; + Response response; + try { + PreparedStatement statement = connection.prepareStatement( + "SELECT COUNT(1) FROM users " + + "WHERE login = ? AND password = ?;" + ); + statement.setString(1, login); + statement.setString(2, password); + ResultSet result = statement.executeQuery(); + result.next(); + boolean authorize = result.getInt(1) > 0; + response = authorize ? SqlResponse.OK : SqlResponse.WRONG_CREDENTIALS; + connection.commit(); + } catch (SQLException e) { + e.printStackTrace(); + response = SqlResponse.UNKNOWN; + } + return new CommandResult(response.getMsg(), response); + } +} diff --git a/Lab5Core/src/main/java/common/commandline/commands/SignUpCommand.java b/Lab5Core/src/main/java/common/commandline/commands/SignUpCommand.java new file mode 100644 index 0000000..ef095b3 --- /dev/null +++ b/Lab5Core/src/main/java/common/commandline/commands/SignUpCommand.java @@ -0,0 +1,48 @@ +package common.commandline.commands; + +import common.commandline.Command; +import common.commandline.PlaceHolder; +import common.commandline.response.CommandResult; +import common.commandline.response.Response; +import common.commandline.response.SqlResponse; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.SQLException; + +public class SignUpCommand extends Command { + + public SignUpCommand() { + super("signup", false, "signup"); + } + + @Override + public Object[] validate(String[] args) { + return new Object[]{args[0], args[1], PlaceHolder.of(Connection.class)}; + } + + @Override + public CommandResult execute(Object[] args) { + String login = (String) args[0]; + String password = (String) args[1]; + Connection connection = (Connection) args[2]; + Response response; + try { + PreparedStatement statement = connection.prepareStatement( + "INSERT INTO users (login, password) " + + "VALUES(?, ?);" + ); + statement.setString(1, login); + statement.setString(2, password); + statement.executeUpdate(); + response = SqlResponse.OK; + connection.commit(); + } catch (SQLException e) { + String state = e.getSQLState(); + e.printStackTrace(); + if (state.equals("23505")) response = SqlResponse.LOGIN_EXISTS; + else response = SqlResponse.UNKNOWN; + } + return new CommandResult(response.getMsg(), response); + } +} diff --git a/Lab5Core/src/main/java/common/commandline/pdcommands/AddCommand.java b/Lab5Core/src/main/java/common/commandline/pdcommands/AddCommand.java new file mode 100644 index 0000000..7288100 --- /dev/null +++ b/Lab5Core/src/main/java/common/commandline/pdcommands/AddCommand.java @@ -0,0 +1,73 @@ +package common.commandline.pdcommands; + +import common.collection.PeopleCollection; +import common.commandline.CommandLineHandler; +import common.commandline.PlaceHolder; +import common.commandline.response.CommandResult; +import common.commandline.response.DefaultResponse; +import common.commandline.response.Response; +import common.commandline.response.SqlResponse; +import common.data.Person; +import common.util.UtilFunctions; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; + +public class AddCommand extends PeopleDatabaseCommand { + public AddCommand() { + super("add", false, "add : добавить новый элемент в коллекцию"); + } + + protected AddCommand(String alias, String description) { + super(alias, false, description); + } + + @Override + public Object[] validate(String[] args) { + return new Object[]{CommandLineHandler.getUser(), PeopleDatabaseCommands.createPerson(), PlaceHolder.of(PeopleCollection.class), PlaceHolder.of(Connection.class)}; + } + + @Override + public CommandResult execute(Object[] args) { + String owner = (String) args[0]; + Person person = (Person) args[1]; + PeopleCollection peopleCollection = (PeopleCollection) args[2]; + Connection connection = (Connection) args[3]; + long id; + try { + PreparedStatement statement = connection.prepareStatement( + "SELECT insert_person(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);" + ); + statement.setString(1, person.getName()); + statement.setFloat(2, person.getCoordinates().getX()); + statement.setFloat(3, person.getCoordinates().getY()); + statement.setInt(4, person.getHeight()); + statement.setString(5, person.getPassportID()); + statement.setString(6, UtilFunctions.allLowerFirstCapital(person.getEyeColor().name())); + statement.setString(7, UtilFunctions.allLowerFirstCapital(person.getNationality().name())); + statement.setString(8, person.getLocation().getName()); + statement.setDouble(9, person.getLocation().getX()); + statement.setFloat(10, person.getLocation().getY()); + statement.setLong(11, person.getLocation().getZ()); + statement.setString(12, owner); + ResultSet result = statement.executeQuery(); + result.next(); + id = result.getLong(1); + connection.commit(); + } catch (SQLException e) { + e.printStackTrace(); + Response response = SqlResponse.UNKNOWN; + return new CommandResult(response.getMsg(), response); + } + if (id <= 0) { + Response response = SqlResponse.NOT_FOUND; + return new CommandResult(response.getMsg(), response); + } + person.setId(id); + peopleCollection.getCollection().add(person); + Response response = DefaultResponse.OK; + return new CommandResult(response.getMsg(), response); + } +} diff --git a/Lab5Core/src/main/java/common/commandline/pdcommands/AddIfMaxCommand.java b/Lab5Core/src/main/java/common/commandline/pdcommands/AddIfMaxCommand.java new file mode 100644 index 0000000..464e407 --- /dev/null +++ b/Lab5Core/src/main/java/common/commandline/pdcommands/AddIfMaxCommand.java @@ -0,0 +1,28 @@ +package common.commandline.pdcommands; + +import common.collection.PeopleCollection; +import common.commandline.response.CommandResult; +import common.commandline.response.PeopleDatabaseResponse; +import common.commandline.response.Response; +import common.data.Person; + +public class AddIfMaxCommand extends PeopleDatabaseCommand { + public AddIfMaxCommand() { + super("add_if_max", false, "add_if_max : добавить новый элемент в коллекцию, если его значение превышает значение наибольшего элемента этой коллекции"); + } + + @Override + public Object[] validate(String[] args) { + return new AddCommand().validate(args); + } + + @Override + public CommandResult execute(Object[] args) { + Person person = (Person) args[1]; + PeopleCollection peopleCollection = (PeopleCollection) args[2]; + Person last = peopleCollection.getCollection().last(); + if (person.compareTo(last) > 0) return new AddCommand().execute(args); + Response response = PeopleDatabaseResponse.FAILED_TO_ADD; + return new CommandResult(response.getMsg(), response); + } +} diff --git a/Lab5Core/src/main/java/common/commandline/pdcommands/AddIfMinCommand.java b/Lab5Core/src/main/java/common/commandline/pdcommands/AddIfMinCommand.java new file mode 100644 index 0000000..7630792 --- /dev/null +++ b/Lab5Core/src/main/java/common/commandline/pdcommands/AddIfMinCommand.java @@ -0,0 +1,28 @@ +package common.commandline.pdcommands; + +import common.collection.PeopleCollection; +import common.commandline.response.CommandResult; +import common.commandline.response.PeopleDatabaseResponse; +import common.commandline.response.Response; +import common.data.Person; + +public class AddIfMinCommand extends PeopleDatabaseCommand { + public AddIfMinCommand() { + super("add_if_min", false, "add_if_min : добавить новый элемент в коллекцию, если его значение меньше, чем у наименьшего элемента этой коллекции"); + } + + @Override + public Object[] validate(String[] args) { + return new AddCommand().validate(args); + } + + @Override + public CommandResult execute(Object[] args) { + Person person = (Person) args[1]; + PeopleCollection peopleCollection = (PeopleCollection) args[2]; + Person first = peopleCollection.getCollection().last(); + if (person.compareTo(first) < 0) return new AddCommand().execute(args); + Response response = PeopleDatabaseResponse.FAILED_TO_ADD; + return new CommandResult(response.getMsg(), response); + } +} diff --git a/Lab5Core/src/main/java/common/commandline/pdcommands/ClearCommand.java b/Lab5Core/src/main/java/common/commandline/pdcommands/ClearCommand.java new file mode 100644 index 0000000..544dafa --- /dev/null +++ b/Lab5Core/src/main/java/common/commandline/pdcommands/ClearCommand.java @@ -0,0 +1,48 @@ +package common.commandline.pdcommands; + +import common.collection.PeopleCollection; +import common.commandline.CommandLineHandler; +import common.commandline.PlaceHolder; +import common.commandline.response.CommandResult; +import common.commandline.response.DefaultResponse; +import common.commandline.response.Response; +import common.commandline.response.SqlResponse; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.SQLException; + +public class ClearCommand extends PeopleDatabaseCommand { + public ClearCommand() { + super("clear", false, "clear : очистить коллекцию"); + } + + @Override + public Object[] validate(String[] args) { + return new Object[]{CommandLineHandler.getUser(), PlaceHolder.of(PeopleCollection.class), PlaceHolder.of(Connection.class)}; + } + + @Override + public CommandResult execute(Object[] args) { + String owner = (String) args[0]; + PeopleCollection peopleCollection = (PeopleCollection) args[1]; + Connection connection = (Connection) args[2]; + try { + PreparedStatement statement = connection.prepareStatement( + "DELETE FROM people " + + "USING users " + + "WHERE users.id = owner_id AND login = ?;" + ); + statement.setString(1, owner); + statement.executeUpdate(); + connection.commit(); + } catch (SQLException e) { + e.printStackTrace(); + Response response = SqlResponse.UNKNOWN; + return new CommandResult(response.getMsg(), response); + } + peopleCollection.getCollection().removeIf(p -> p.getOwner().equals(owner)); + Response response = DefaultResponse.OK; + return new CommandResult(response.getMsg(), response); + } +} \ No newline at end of file diff --git a/Lab5Core/src/main/java/common/commandline/pdcommands/FilterContainsNameCommand.java b/Lab5Core/src/main/java/common/commandline/pdcommands/FilterContainsNameCommand.java new file mode 100644 index 0000000..97ed416 --- /dev/null +++ b/Lab5Core/src/main/java/common/commandline/pdcommands/FilterContainsNameCommand.java @@ -0,0 +1,33 @@ +package common.commandline.pdcommands; + +import common.collection.PeopleCollection; +import common.commandline.PlaceHolder; +import common.commandline.response.CommandResult; +import common.commandline.response.DefaultResponse; + +public class FilterContainsNameCommand extends PeopleDatabaseCommand { + public FilterContainsNameCommand() { + super("filter_contains_name", false, "filter_contains_name {name} : вывести элементы, значение поля name которых содержит заданную подстроку"); + } + + @Override + public Object[] validate(String[] args) { + if (args.length < 1) { + System.err.println("Недостаточно данных"); + return null; + } + return new Object[]{ args[0], PlaceHolder.of(PeopleCollection.class)}; + } + + @Override + public CommandResult execute(Object[] args) { + String name = (String) args[0]; + PeopleCollection peopleCollection = (PeopleCollection) args[1]; + StringBuilder result = new StringBuilder("Список людей, в имени которых содержится " + name + ":\n"); + peopleCollection.getCollection() + .stream() + .filter(p -> p.getName().contains(name)) + .forEach(p -> result.append(p.formatted()).append("\n")); + return new CommandResult(result.toString(), DefaultResponse.OK); + } +} diff --git a/Lab5Core/src/main/java/common/commandline/pdcommands/InfoCommand.java b/Lab5Core/src/main/java/common/commandline/pdcommands/InfoCommand.java new file mode 100644 index 0000000..ed52098 --- /dev/null +++ b/Lab5Core/src/main/java/common/commandline/pdcommands/InfoCommand.java @@ -0,0 +1,23 @@ +package common.commandline.pdcommands; + +import common.collection.PeopleCollection; +import common.commandline.PlaceHolder; +import common.commandline.response.CommandResult; +import common.commandline.response.DefaultResponse; + +public class InfoCommand extends PeopleDatabaseCommand { + public InfoCommand() { + super("info", false, "info : вывести в стандартный поток вывода информацию о коллекции (тип, дата инициализации, количество элементов и т.д.)"); + } + + @Override + public Object[] validate(String[] args) { + return new Object[]{PlaceHolder.of(PeopleCollection.class)}; + } + + @Override + public CommandResult execute(Object[] args) { + PeopleCollection peopleCollection = (PeopleCollection) args[0]; + return new CommandResult(peopleCollection.info(), DefaultResponse.OK); + } +} diff --git a/Lab5Core/src/main/java/common/commandline/pdcommands/PeopleDatabaseCommand.java b/Lab5Core/src/main/java/common/commandline/pdcommands/PeopleDatabaseCommand.java index dddcfe1..7fa5548 100644 --- a/Lab5Core/src/main/java/common/commandline/pdcommands/PeopleDatabaseCommand.java +++ b/Lab5Core/src/main/java/common/commandline/pdcommands/PeopleDatabaseCommand.java @@ -1,25 +1,15 @@ package common.commandline.pdcommands; import common.commandline.Command; -import common.commandline.Executable; -import common.commandline.response.CommandResult; import common.util.UtilFunctions; public abstract class PeopleDatabaseCommand extends Command { - public PeopleDatabaseCommand(String alias, boolean clientOnly, String description, Executable executable) { - super(alias, clientOnly, description, executable); - } public PeopleDatabaseCommand(String alias, boolean clientOnly, String description) { super(alias, clientOnly, description); } - public CommandResult executeOnClient() { - args[0] = PeopleDatabaseCommands.peopleCollection; - return super.executeOnClient(); - } - - public static boolean validateIdCommand(String[] args) { + public static boolean validateId(String[] args) { if (args.length < 1) { System.err.println("Недостаточно данных"); return false; diff --git a/Lab5Core/src/main/java/common/commandline/pdcommands/PeopleDatabaseCommands.java b/Lab5Core/src/main/java/common/commandline/pdcommands/PeopleDatabaseCommands.java index e519d88..4c18a91 100644 --- a/Lab5Core/src/main/java/common/commandline/pdcommands/PeopleDatabaseCommands.java +++ b/Lab5Core/src/main/java/common/commandline/pdcommands/PeopleDatabaseCommands.java @@ -24,15 +24,15 @@ public final class PeopleDatabaseCommands { public static Person createPerson() { System.out.println("Создание нового объекта класса Person"); - String name = CMD.awaitInput("Введите имя:", "Введите непустую строку", - input -> !input.isEmpty()); - Integer height = CMD.awaitInput("Введите рост:", "Введите целое число, большее нуля", + String name = CMD.awaitInput("Введите имя:", "Введите 1-50 символов", + input -> !input.isEmpty() && input.length() <= 50); + Integer height = CMD.awaitInput("Введите рост:", "Введите целое число в диапазоне [1; 2 147 483 647] или ничего", input -> { Integer result = UtilFunctions.intOrNull(input); return result != null && result > 0 || input.isEmpty(); }, input -> input.isEmpty() ? null : Integer.parseInt(input)); - String passportID = CMD.awaitInput("Введите номер паспорта:", "Введите минимум 8 символов", - input -> input.length() >= 8 || input.isEmpty(), input -> input.isEmpty() ? null : input); + String passportID = CMD.awaitInput("Введите номер паспорта:", "Введите 8-50 символов или ничего", + input -> (input.length() >= 8 && input.length() <= 50) || input.isEmpty(), input -> input.isEmpty() ? null : input); Color eyeColor = CMD.awaitInput("Введите цвет глаз " + COLORS + ":", "Введите один из предложенных цветов", input -> UtilFunctions.enumOrNull(input.toUpperCase(Locale.ROOT), Color.class) != null, input -> Color.valueOf(input.toUpperCase(Locale.ROOT))); @@ -41,27 +41,27 @@ public final class PeopleDatabaseCommands { input -> Country.valueOf(input.toUpperCase(Locale.ROOT))); Location location = createLocation(); Coordinates coordinates = createCoordinates(); - return new Person(name, coordinates, height, passportID, eyeColor, nationality, location); + return new Person(name, coordinates, height, passportID, eyeColor, nationality, location, CommandLineHandler.getUser()); } public static Location createLocation() { System.out.println("Создание нового объекта класса Location"); - double x = CMD.awaitInput("Введите x:", "Введите дробное число", + double x = CMD.awaitInput("Введите x:", "Введите дробное число типа double", input -> UtilFunctions.doubleOrNull(input) != null, Double::parseDouble); - float y = CMD.awaitInput("Введите y:", "Введите дробное число", + float y = CMD.awaitInput("Введите y:", "Введите дробное число типа float", input -> UtilFunctions.floatOrNull(input) != null, Float::parseFloat); - long z = CMD.awaitInput("Введите z:", "Введите целое число", + long z = CMD.awaitInput("Введите z:", "Введите целое число типа long", input -> UtilFunctions.longOrNull(input) != null, Long::parseLong); - String name = CMD.awaitInput("Введите название:", "Строка не может быть пустой", - input -> true, input -> input.isEmpty() ? null : input); + String name = CMD.awaitInput("Введите название:", "Введите 1-50 символов или ничего", + input -> input.length() <= 50, input -> input.isEmpty() ? null : input); return new Location(x, y, z, name); } public static Coordinates createCoordinates() { System.out.println("Создание нового объекта класса Coordinates"); - float x = CMD.awaitInput("Введите x:", "Введите дробное число", + float x = CMD.awaitInput("Введите x:", "Введите дробное число типа float", input -> UtilFunctions.floatOrNull(input) != null, Float::parseFloat); - float y = CMD.awaitInput("Введите y:", "Введите дробное число, большее -816", + float y = CMD.awaitInput("Введите y:", "Введите дробное число типа float, большее -816", input -> { Float result = UtilFunctions.floatOrNull(input); return result != null && result > -816F; diff --git a/Lab5Core/src/main/java/common/commandline/pdcommands/PrintFieldDescendingLocationCommand.java b/Lab5Core/src/main/java/common/commandline/pdcommands/PrintFieldDescendingLocationCommand.java new file mode 100644 index 0000000..b2f3308 --- /dev/null +++ b/Lab5Core/src/main/java/common/commandline/pdcommands/PrintFieldDescendingLocationCommand.java @@ -0,0 +1,32 @@ +package common.commandline.pdcommands; + +import common.collection.PeopleCollection; +import common.commandline.PlaceHolder; +import common.commandline.response.CommandResult; +import common.commandline.response.DefaultResponse; +import common.data.Person; + +import java.util.Collections; + +public class PrintFieldDescendingLocationCommand extends PeopleDatabaseCommand { + public PrintFieldDescendingLocationCommand() { + super("print_field_descending_location", false, "print_field_descending_location : вывести значения поля location всех элементов в порядке убывания"); + } + + @Override + public Object[] validate(String[] args) { + return new Object[]{PlaceHolder.of(PeopleCollection.class)}; + } + + @Override + public CommandResult execute(Object[] args) { + PeopleCollection peopleCollection = (PeopleCollection) args[0]; + StringBuilder result = new StringBuilder("Список локаций в порядке убывания:\n"); + peopleCollection.getCollection() + .stream() + .map(Person::getLocation) + .sorted(Collections.reverseOrder()) + .forEach(loc -> result.append(loc).append("\n")); + return new CommandResult(result.toString(), DefaultResponse.OK); + } +} diff --git a/Lab5Core/src/main/java/common/commandline/pdcommands/RemoveByIdCommand.java b/Lab5Core/src/main/java/common/commandline/pdcommands/RemoveByIdCommand.java new file mode 100644 index 0000000..e7694f9 --- /dev/null +++ b/Lab5Core/src/main/java/common/commandline/pdcommands/RemoveByIdCommand.java @@ -0,0 +1,55 @@ +package common.commandline.pdcommands; + +import common.collection.PeopleCollection; +import common.commandline.CommandLineHandler; +import common.commandline.PlaceHolder; +import common.commandline.response.*; +import common.util.UtilFunctions; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.SQLException; + +public class RemoveByIdCommand extends PeopleDatabaseCommand { + public RemoveByIdCommand() { + super("remove_by_id", false, "remove_by_id {id} : удалить элемент из коллекции по его {id}"); + } + + @Override + public Object[] validate(String[] args) { + if (PeopleDatabaseCommand.validateId(args)) { + Long id = UtilFunctions.longOrNull(args[0]); + return new Object[]{id, CommandLineHandler.getUser(), PlaceHolder.of(PeopleCollection.class), PlaceHolder.of(Connection.class)}; + } + return null; + } + + @Override + public CommandResult execute(Object[] args) { + long id = (long) args[0]; + String owner = (String) args[1]; + PeopleCollection peopleCollection = (PeopleCollection) args[2]; + Connection connection = (Connection) args[3]; + Response response; + try { + PreparedStatement statement = connection.prepareStatement( + "DELETE FROM people USING users " + + "WHERE users.id = owner_id AND people.id = ? AND (login = ? OR is_admin);" + ); + statement.setLong(1, id); + statement.setString(2, owner); + int result = statement.executeUpdate(); + response = result > 0 ? SqlResponse.OK : SqlResponse.NOT_FOUND; + connection.commit(); + } catch (SQLException e) { + e.printStackTrace(); + response = SqlResponse.UNKNOWN; + return new CommandResult(response.getMsg(), response); + } + if (response == SqlResponse.OK) + peopleCollection.getCollection().removeIf(p -> p.getId().equals(id)); + String msg = response == SqlResponse.NOT_FOUND ? + "Человека с таким id не существует, либо вы не имеете права на его модификацию" : response.getMsg(); + return new CommandResult(msg, response); + } +} diff --git a/Lab5Core/src/main/java/common/commandline/pdcommands/ShowCommand.java b/Lab5Core/src/main/java/common/commandline/pdcommands/ShowCommand.java new file mode 100644 index 0000000..531700f --- /dev/null +++ b/Lab5Core/src/main/java/common/commandline/pdcommands/ShowCommand.java @@ -0,0 +1,25 @@ +package common.commandline.pdcommands; + +import common.collection.PeopleCollection; +import common.commandline.PlaceHolder; +import common.commandline.response.CommandResult; +import common.commandline.response.DefaultResponse; + +public class ShowCommand extends PeopleDatabaseCommand { + public ShowCommand() { + super("show", false, "show : вывести в стандартный поток вывода все элементы коллекции в строковом представлении"); + } + + @Override + public Object[] validate(String[] args) { + return new Object[]{PlaceHolder.of(PeopleCollection.class)}; + } + + @Override + public CommandResult execute(Object[] args) { + PeopleCollection peopleCollection = (PeopleCollection) args[0]; + StringBuilder result = new StringBuilder("Элементы коллекции:\n"); + peopleCollection.getCollection().forEach(p -> result.append(p.formatted())); + return new CommandResult(result.toString(), DefaultResponse.OK); + } +} diff --git a/Lab5Core/src/main/java/common/commandline/pdcommands/SumOfHeightCommand.java b/Lab5Core/src/main/java/common/commandline/pdcommands/SumOfHeightCommand.java new file mode 100644 index 0000000..814955c --- /dev/null +++ b/Lab5Core/src/main/java/common/commandline/pdcommands/SumOfHeightCommand.java @@ -0,0 +1,27 @@ +package common.commandline.pdcommands; + +import common.collection.PeopleCollection; +import common.commandline.PlaceHolder; +import common.commandline.response.CommandResult; +import common.commandline.response.DefaultResponse; + +public class SumOfHeightCommand extends PeopleDatabaseCommand { + public SumOfHeightCommand() { + super("sum_of_height", false, "sum_of_height : вывести сумму значений поля height для всех элементов коллекции"); + } + + @Override + public Object[] validate(String[] args) { + return new Object[]{PlaceHolder.of(PeopleCollection.class)}; + } + + @Override + public CommandResult execute(Object[] args) { + PeopleCollection peopleCollection = (PeopleCollection) args[0]; + String sum = "Сумма ростов всех людей в коллекции - " + peopleCollection.getCollection() + .stream() + .mapToInt(p -> p.getHeight() == null ? 0 : p.getHeight()) + .sum(); + return new CommandResult(sum, DefaultResponse.OK); + } +} diff --git a/Lab5Core/src/main/java/common/commandline/pdcommands/UpdateCommand.java b/Lab5Core/src/main/java/common/commandline/pdcommands/UpdateCommand.java new file mode 100644 index 0000000..acaa7c8 --- /dev/null +++ b/Lab5Core/src/main/java/common/commandline/pdcommands/UpdateCommand.java @@ -0,0 +1,81 @@ +package common.commandline.pdcommands; + +import common.collection.PeopleCollection; +import common.commandline.CommandLineHandler; +import common.commandline.PlaceHolder; +import common.commandline.response.CommandResult; +import common.commandline.response.Response; +import common.commandline.response.SqlResponse; +import common.data.Person; +import common.util.UtilFunctions; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.Optional; + +public class UpdateCommand extends PeopleDatabaseCommand { + public UpdateCommand() { + super("update", false, "update {id} : обновить значение элемента коллекции, {id} которого равен заданному"); + } + + @Override + public Object[] validate(String[] args) { + if (PeopleDatabaseCommand.validateId(args)) { + Long id = UtilFunctions.longOrNull(args[0]); + return new Object[]{id, CommandLineHandler.getUser(), PeopleDatabaseCommands.createPerson(), PlaceHolder.of(PeopleCollection.class), PlaceHolder.of(Connection.class)}; + } + return null; + } + + @Override + public CommandResult execute(Object[] args) { + long id = (long) args[0]; + String owner = (String) args[1]; + Person person = (Person) args[2]; + PeopleCollection peopleCollection = (PeopleCollection) args[3]; + Connection connection = (Connection) args[4]; + Response response; + boolean success; + try { + PreparedStatement statement = connection.prepareStatement( + "SELECT update_person(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);" + ); + statement.setLong(1, id); + statement.setString(2, person.getName()); + statement.setFloat(3, person.getCoordinates().getX()); + statement.setFloat(4, person.getCoordinates().getY()); + statement.setInt(5, person.getHeight()); + statement.setString(6, person.getPassportID()); + statement.setString(7, UtilFunctions.allLowerFirstCapital(person.getEyeColor().name())); + statement.setString(8, UtilFunctions.allLowerFirstCapital(person.getNationality().name())); + statement.setString(9, person.getLocation().getName()); + statement.setDouble(10, person.getLocation().getX()); + statement.setFloat(11, person.getLocation().getY()); + statement.setLong(12, person.getLocation().getZ()); + statement.setString(13, owner); + ResultSet result = statement.executeQuery(); + result.next(); + success = result.getBoolean(1); + response = SqlResponse.OK; + connection.commit(); + } catch (SQLException e) { + e.printStackTrace(); + response = SqlResponse.UNKNOWN; + return new CommandResult(response.getMsg(), response); + } + if (!success) { + response = SqlResponse.NOT_FOUND; + String msg = "Элемент не найден, либо у вас недостаточно прав на его изменение"; + return new CommandResult(msg, response); + } + Optional optionalPerson = peopleCollection.getCollection() + .stream() + .filter(p -> p.getId().equals(id)) + .findFirst(); + Person oldPerson = optionalPerson.get(); + oldPerson.update(person); + return new CommandResult(response.getMsg(), response); + } +} diff --git a/Lab5Core/src/main/java/common/commandline/response/DefaultResponse.java b/Lab5Core/src/main/java/common/commandline/response/DefaultResponse.java index 16cb780..696cb3d 100644 --- a/Lab5Core/src/main/java/common/commandline/response/DefaultResponse.java +++ b/Lab5Core/src/main/java/common/commandline/response/DefaultResponse.java @@ -8,7 +8,7 @@ public enum DefaultResponse implements Response { SERVER_ERROR("Ошибка при связи по сетевому каналу"), CLASS_NOT_FOUND("Класс не найден"), TYPE_ERROR("Получен ответ не того типа"), - HOST_NOT_FOUND("Хоста не существует"), + HOST_NOT_FOUND("Сервер не найден"), UNKNOWN("Неизвестная ошибка"); private final String msg; diff --git a/Lab5Core/src/main/java/common/commandline/response/SqlResponse.java b/Lab5Core/src/main/java/common/commandline/response/SqlResponse.java new file mode 100644 index 0000000..8f1ba7d --- /dev/null +++ b/Lab5Core/src/main/java/common/commandline/response/SqlResponse.java @@ -0,0 +1,23 @@ +package common.commandline.response; + +public enum SqlResponse implements Response { + + OK("Запрос успешно выполнен"), + LOGIN_EXISTS("Не удалось зарегистрироваться, пользователь существует"), + WRONG_CREDENTIALS("Логин или пароль неверны, повторите попытку"), + NO_CHANGES("Никаких изменений не было внесено"), + NO_PERMISSION("Недостаточно прав для изменения элемента"), + NOT_FOUND("Элемент не найден"), + UNKNOWN("Непредвиденная ошибка при работе с базой данных"); + + private final String msg; + + SqlResponse(String msg) { + this.msg = msg; + } + + @Override + public String getMsg() { + return msg; + } +} diff --git a/Lab5Core/src/main/java/common/data/Person.java b/Lab5Core/src/main/java/common/data/Person.java index c3ca981..f9569f4 100644 --- a/Lab5Core/src/main/java/common/data/Person.java +++ b/Lab5Core/src/main/java/common/data/Person.java @@ -49,6 +49,7 @@ public class Person implements Comparable, Serializable { * Местоположение человека, может быть null */ private Location location; + private String owner; /** * Конструктор с параметрами @@ -61,11 +62,12 @@ public class Person implements Comparable, Serializable { * @param eyeColor Цвет глаз человека * @param nationality Национальность человека * @param location Местоположение человека + * @param owner Создатель человека * * @throws NullPointerException Если name, coordinates, eyeColor или nationality являются null */ public Person(long id, @NonNull String name, @NonNull Coordinates coordinates, Integer height, String passportID, - @NonNull Color eyeColor, @NonNull Country nationality, Location location) { + @NonNull Color eyeColor, @NonNull Country nationality, Location location, String owner) { this.id = id; this.creationDate = LocalDate.now(); this.location = location; @@ -75,11 +77,12 @@ public class Person implements Comparable, Serializable { this.name = name; this.height = height; this.passportID = passportID; + this.owner = owner; } public Person(@NonNull String name, @NonNull Coordinates coordinates, Integer height, String passportID, - @NonNull Color eyeColor, @NonNull Country nationality, Location location) { - this(0, name, coordinates, height, passportID, eyeColor, nationality, location); + @NonNull Color eyeColor, @NonNull Country nationality, Location location, String owner) { + this(0, name, coordinates, height, passportID, eyeColor, nationality, location, owner); } /** @@ -113,10 +116,11 @@ public class Person implements Comparable, Serializable { "\t\tZ: %s\n" + "\tКоординаты:\n" + "\t\tX: %s\n" + - "\t\tY: %s\n", + "\t\tY: %s\n" + + "\tСоздатель: %s\n", id, name, creationDate, height, passportID, eyeColor, nationality, location.getName(), location.getX(), location.getY(), location.getZ(), - coordinates.getX(), coordinates.getY()); + coordinates.getX(), coordinates.getY(), owner); } /** diff --git a/Lab5Core/src/main/java/common/util/UtilFunctions.java b/Lab5Core/src/main/java/common/util/UtilFunctions.java index ebc9713..1506e21 100644 --- a/Lab5Core/src/main/java/common/util/UtilFunctions.java +++ b/Lab5Core/src/main/java/common/util/UtilFunctions.java @@ -1,6 +1,7 @@ package common.util; import java.util.Date; +import java.util.Locale; import java.util.logging.ConsoleHandler; import java.util.logging.LogRecord; import java.util.logging.Logger; @@ -61,11 +62,23 @@ public final class UtilFunctions { } } + public static Object[] appendObjects(Object[] array, Object... objects) { + int newSize = array.length + objects.length; + Object[] newArray = new Object[newSize]; + System.arraycopy(array, 0, newArray, 0, array.length); + System.arraycopy(objects, 0, newArray, array.length, objects.length); + return newArray; + } + public static Logger getLogger(Class clazz, String mainLoggerName) { changeLoggerFormat(mainLoggerName); return Logger.getLogger(clazz.getName()); } + public static String allLowerFirstCapital(String str) { + return str.substring(0, 1).toUpperCase(Locale.ROOT) + str.substring(1).toLowerCase(Locale.ROOT); + } + private static void changeLoggerFormat(String mainLoggerName) { Logger mainLogger = Logger.getLogger(mainLoggerName); mainLogger.setUseParentHandlers(false); diff --git a/Lab5Server/build/classes/java/main/server/Lab5Server.class b/Lab5Server/build/classes/java/main/server/Lab5Server.class index cd71454..39d8d95 100644 Binary files a/Lab5Server/build/classes/java/main/server/Lab5Server.class and b/Lab5Server/build/classes/java/main/server/Lab5Server.class differ diff --git a/Lab5Server/build/classes/java/main/server/commandline/CommandLineHandlerServer.class b/Lab5Server/build/classes/java/main/server/commandline/CommandLineHandlerServer.class index 1f545a5..534ac4e 100644 Binary files a/Lab5Server/build/classes/java/main/server/commandline/CommandLineHandlerServer.class and b/Lab5Server/build/classes/java/main/server/commandline/CommandLineHandlerServer.class differ diff --git a/Lab5Server/build/classes/java/main/server/net/UDPServer.class b/Lab5Server/build/classes/java/main/server/net/UDPServer.class index 9b15d36..f75086d 100644 Binary files a/Lab5Server/build/classes/java/main/server/net/UDPServer.class and b/Lab5Server/build/classes/java/main/server/net/UDPServer.class differ diff --git a/Lab5Server/build/docs/javadoc/index-all.html b/Lab5Server/build/docs/javadoc/index-all.html index b515cab..924c97b 100644 --- a/Lab5Server/build/docs/javadoc/index-all.html +++ b/Lab5Server/build/docs/javadoc/index-all.html @@ -110,6 +110,8 @@
         
        Lab5Server() - Constructor for class server.Lab5Server
         
        +
        loadFromDatabase() - Method in class server.net.UDPServer
        +
         
        LOGGER - Static variable in class server.Lab5Server
         
        @@ -126,7 +128,7 @@

        R

        -
        receive(PeopleDatabase) - Method in class server.net.UDPServer
        +
        receive() - Method in class server.net.UDPServer
         
        diff --git a/Lab5Server/build/docs/javadoc/server/commandline/CommandLineHandlerServer.html b/Lab5Server/build/docs/javadoc/server/commandline/CommandLineHandlerServer.html index 342a641..8517b38 100644 --- a/Lab5Server/build/docs/javadoc/server/commandline/CommandLineHandlerServer.html +++ b/Lab5Server/build/docs/javadoc/server/commandline/CommandLineHandlerServer.html @@ -177,7 +177,7 @@ extends common.commandline.CommandLineHandler

        Methods inherited from class common.commandline.CommandLineHandler

        -addNewInput, awaitInput, awaitInput, awaitInput, clearScreen, executeScript, exit, getInstance, history, history, input, isActive, removeInput, start, updateHistory +addNewInput, awaitInput, awaitInput, awaitInput, awaitInput, awaitPassword, clearScreen, getInstance, getUser, input, isActive, removeInput, setUser, start, updateHistory
      - + + + +
        +
      • +

        receive

        +
        public void receive()
        +
        • +
      +
      • -

        receive

        -
        public void receive(common.collection.PeopleDatabase peopleDatabase)
        +

        loadFromDatabase

        +
        public common.collection.PeopleCollection loadFromDatabase()
+                                                    throws java.sql.SQLException
        +
        +
        Throws:
        +
        java.sql.SQLException
        +
      diff --git a/Lab5Server/build/libs/Lab5Server-3.0.jar b/Lab5Server/build/libs/Lab5Server-3.0.jar index c8bfc90..12a4ea0 100644 Binary files a/Lab5Server/build/libs/Lab5Server-3.0.jar and b/Lab5Server/build/libs/Lab5Server-3.0.jar differ diff --git a/Lab5Server/build/tmp/compileJava/previous-compilation-data.bin b/Lab5Server/build/tmp/compileJava/previous-compilation-data.bin index 2e9aabd..b0d89d6 100644 Binary files a/Lab5Server/build/tmp/compileJava/previous-compilation-data.bin and b/Lab5Server/build/tmp/compileJava/previous-compilation-data.bin differ diff --git a/Lab5Server/src/main/java/server/Lab5Server.java b/Lab5Server/src/main/java/server/Lab5Server.java index 838d023..33509f5 100644 --- a/Lab5Server/src/main/java/server/Lab5Server.java +++ b/Lab5Server/src/main/java/server/Lab5Server.java @@ -1,6 +1,5 @@ package server; -import common.collection.PeopleCollection; import common.commandline.CommandLineHandler; import common.commandline.pdcommands.PeopleDatabaseCommands; import common.net.ConnectionProperties; @@ -8,27 +7,38 @@ import common.util.UtilFunctions; import server.commandline.CommandLineHandlerServer; import server.net.UDPServer; +import java.sql.SQLException; import java.util.logging.Logger; public class Lab5Server { public final static Logger LOGGER = UtilFunctions.getLogger(Lab5Server.class, "server"); + static { + CommandLineHandler.clearScreen(); + } + public static void main(String[] args) { - PeopleCollection peopleCollection = new PeopleCollection(); CommandLineHandler cmd = CommandLineHandlerServer.getServerCommandLine(); - PeopleDatabaseCommands.peopleCollection = peopleCollection; UDPServer udp = new UDPServer(ConnectionProperties.getPort(), LOGGER); udp.connect(); - Runtime.getRuntime().addShutdownHook(new Thread()); + try { + PeopleDatabaseCommands.peopleCollection = udp.loadFromDatabase(); + } catch (SQLException e) { + e.printStackTrace(); + LOGGER.severe("Ошибка при получении коллекции из базы данных"); + } + + // Runtime.getRuntime().addShutdownHook(new Thread()); + + Thread conThread = new Thread(() -> { + while (true) + udp.receive(); + }); + conThread.setDaemon(true); + conThread.start(); cmd.start(); - - Thread thread = new Thread(() -> { - while (cmd.isActive()) - udp.receive(peopleCollection); - }); - thread.start(); } } diff --git a/Lab5Server/src/main/java/server/commandline/CommandLineHandlerServer.java b/Lab5Server/src/main/java/server/commandline/CommandLineHandlerServer.java index 4faf10a..5639330 100644 --- a/Lab5Server/src/main/java/server/commandline/CommandLineHandlerServer.java +++ b/Lab5Server/src/main/java/server/commandline/CommandLineHandlerServer.java @@ -15,7 +15,7 @@ public class CommandLineHandlerServer extends CommandLineHandler { } public static CommandLineHandler getServerCommandLine() { - instance = new CommandLineHandlerServer(); + if (instance == null) instance = new CommandLineHandlerServer(); return instance; } @@ -25,9 +25,9 @@ public class CommandLineHandlerServer extends CommandLineHandler { System.err.println("Неизвестная команда " + alias + ", напишите help для отображения всех существующих команд"); return; } - boolean argsValid = command.validate(args); - if (!argsValid) return; - CommandResult result = command.executeOnClient(); + Object[] objArgs = command.validate(args); + if (objArgs == null) return; + CommandResult result = command.execute(objArgs); PrintStream ps = result.getResponse() == DefaultResponse.OK ? System.out : System.err; ps.println(result.getValue()); updateHistory(alias); diff --git a/Lab5Server/src/main/java/server/net/UDPServer.java b/Lab5Server/src/main/java/server/net/UDPServer.java index 743abfd..682875d 100644 --- a/Lab5Server/src/main/java/server/net/UDPServer.java +++ b/Lab5Server/src/main/java/server/net/UDPServer.java @@ -1,18 +1,25 @@ package server.net; import common.collection.PeopleCollection; -import common.commandline.Executable; +import common.commandline.Command; +import common.commandline.CommandLineHandler; +import common.commandline.PlaceHolder; import common.commandline.response.CommandResult; import common.commandline.response.DefaultResponse; import common.commandline.response.Response; +import common.data.*; import common.net.ConnectionProperties; -import server.sql.SQLQueries; +import common.util.UtilFunctions; +import server.commandline.CommandLineHandlerServer; import java.io.*; import java.net.*; import java.sql.*; +import java.util.Locale; import java.util.logging.Logger; +import static common.commandline.pdcommands.PeopleDatabaseCommands.peopleCollection; + public class UDPServer { private final int port; @@ -33,35 +40,41 @@ public class UDPServer { socket = new DatagramSocket(port); logger.info("Подключение установлено"); } catch (SocketException e) { + e.printStackTrace(); logger.severe("Не удалось установить соединение, порт занят"); } } while (socket == null); logger.info("Подключаемся к базе данных..."); + checkDriver(); + DriverManager.setLoginTimeout(5); + connectDatabase(); + } + + private void checkDriver() { try { Class.forName("org.postgresql.Driver"); } catch (ClassNotFoundException e) { + e.printStackTrace(); logger.severe("Драйвер JDBC для базы данных PostgreSQL не найден"); System.exit(-1); } - DriverManager.setLoginTimeout(5); + } + + private void connectDatabase() { String url = ConnectionProperties.getDbURL(); + CommandLineHandler cmd = CommandLineHandlerServer.getServerCommandLine(); do { - Console console = System.console(); - if (console == null) { - logger.severe("Не удалось получить консоль"); - System.exit(-1); - } - String user = console.readLine("Введите логин: "); - char[] passwordBuff = console.readPassword("Ввелите пароль: "); - String password = passwordBuff == null ? null : new String(passwordBuff); + String user = cmd.awaitInput("Введите логин:"); + String password = cmd.awaitPassword("Введите пароль:"); try { - if (user == null || password == null) logger.severe("Логин или пароль неверны, повторите попытку"); - else db_connection = DriverManager.getConnection(url, user, password); + db_connection = DriverManager.getConnection(url, user, password); db_connection.setAutoCommit(false); } catch (SQLTimeoutException e) { - logger.severe("Не удалось установить соединение с базой данных, время ожидание превышено"); + e.printStackTrace(); + logger.severe("Не удалось установить соединение с базой данных, превышено время ожидания"); System.exit(-1); } catch (SQLException e) { + e.printStackTrace(); handleSqlException(e); } } while (db_connection == null); @@ -75,6 +88,9 @@ public class UDPServer { } else if (cause instanceof ConnectException) { logger.severe("Не удалось установить соединение с базой данных, хост бд или порт не корректны"); System.exit(-1); + } else if (cause instanceof SocketTimeoutException) { + logger.severe("Не удалось установить соединение с базой данных, превышено время ожидания"); + System.exit(-1); } else { String firstLine = e.getMessage().split("\n")[0]; if (firstLine.contains("database")) { @@ -101,52 +117,82 @@ public class UDPServer { DatagramPacket request = new DatagramPacket(buffer, buffer.length, address, port); socket.send(request); } catch (SocketTimeoutException e) { + e.printStackTrace(); logger.severe("Не удалось отправить данные клиенту, клиент не отвечает"); return; } catch (IOException e) { + e.printStackTrace(); logger.severe("Не удалось отправить данные клиенту, неполадки в соединении"); return; } logger.info("Результат отправлен клиенту"); } - public void receive(PeopleCollection peopleCollection) { + public void receive() { logger.info("Ожидаем отправки данных от клиента..."); byte[] buffer = new byte[BUFFER_SIZE]; DatagramPacket request = new DatagramPacket(buffer, buffer.length); CommandResult result; try (ByteArrayInputStream byteInputStream = new ByteArrayInputStream(buffer)) { socket.receive(request); - logger.info("Данные получены, выполняем команду..."); + logger.info("Данные получены, десериализуем..."); ObjectInputStream objectInputStream = new ObjectInputStream(byteInputStream); - Executable command = (Executable) objectInputStream.readObject(); + Command command = (Command) objectInputStream.readObject(); Object[] args = (Object[]) objectInputStream.readObject(); objectInputStream.close(); - String query = SQLQueries.getQueryByExecutable(command); - boolean dbUpdated = updateDatabase(query); - if (args[0] == null) args[0] = peopleCollection; + args = PlaceHolder.replacePlaceHoldersWith(args, peopleCollection, db_connection); + logger.info(String.format("Выполняется команда %s", command.getAlias())); result = command.execute(args); } catch (IOException e) { - logger.severe("Не удалось преобразовать полученные данные, данные были повреждены во время передачи"); - Response response = DefaultResponse.SERVER_ERROR; - result = new CommandResult(response.getMsg(), response); + e.printStackTrace(); + result = onReceiveException("Не удалось преобразовать полученные данные, данные были повреждены во время передачи", + DefaultResponse.SERVER_ERROR); } catch (ClassNotFoundException e) { e.printStackTrace(); - logger.severe("Не удалось преобразовать полученные данные, классов полученных объектов не существует"); - Response response = DefaultResponse.CLASS_NOT_FOUND; - result = new CommandResult(response.getMsg(), response); + result = onReceiveException("Не удалось преобразовать полученные данные, классов полученных объектов не существует", + DefaultResponse.CLASS_NOT_FOUND); } catch (ClassCastException e) { - logger.severe("Не удалось преобразовать полученные данные, ожидались объекты другого типа"); - Response response = DefaultResponse.TYPE_ERROR; - result = new CommandResult(response.getMsg(), response); + e.printStackTrace(); + result = onReceiveException("Не удалось преобразовать полученные данные, ожидались объекты другого типа", + DefaultResponse.TYPE_ERROR); } - logger.info("Команда выполнена, сохраняем и отправляем результат клиенту..."); + logger.info(String.format("Команда выполнена с результатом %s, сохраняем и отправляем результат клиенту...", result.getResponse().toString())); send(result, request.getAddress(), request.getPort()); } - public static boolean updateDatabase(String query) { - PreparedStatement statement = db_connection.prepareStatement(query); - statement.setQueryTimeout(5); + private CommandResult onReceiveException(String msg, Response response) { + logger.severe(msg); + return new CommandResult(response.getMsg(), response); + } + public PeopleCollection loadFromDatabase() throws SQLException { + PeopleCollection peopleCollection = new PeopleCollection(); + logger.info("Получаем коллекцию из базы данных..."); + PreparedStatement statement = db_connection.prepareStatement( + "SELECT people.id, people.name, coordinates.x, coordinates.y, height, passport, " + + "colors.name, countries.name, locations.x, locations.y, locations.z, locations.name, login FROM people " + + "JOIN coordinates ON coordinates.id = coordinates_id " + + "JOIN locations ON locations.id = location_id " + + "JOIN colors ON colors.id = color_id " + + "JOIN countries ON countries.id = country_id " + + "JOIN users ON users.id = owner_id;" + ); + ResultSet result = statement.executeQuery(); + while (result.next()) { + long id = result.getLong(1); + String name = result.getString(2); + Coordinates coordinates = new Coordinates(result.getFloat(3), result.getFloat(4)); + Integer height = result.getInt(5); + String passport = result.getString(6); + Color color = UtilFunctions.enumOrNull(result.getString(7).toUpperCase(Locale.ROOT), Color.class); + Country country = UtilFunctions.enumOrNull(result.getString(8).toUpperCase(Locale.ROOT), Country.class); + Location location = new Location(result.getDouble(9), result.getFloat(10), result.getLong(11), result.getString(12)); + String owner = result.getString(13); + Person person = new Person(id, name, coordinates, height, passport, color, country, location, owner); + peopleCollection.getCollection().add(person); + logger.info("Добавлен человек " + person); + } + logger.info("Коллекция успешно получена"); + return peopleCollection; } } diff --git a/Lab5Server/src/main/java/server/sql/QuerySetup.java b/Lab5Server/src/main/java/server/sql/QuerySetup.java deleted file mode 100644 index ab2f4a9..0000000 --- a/Lab5Server/src/main/java/server/sql/QuerySetup.java +++ /dev/null @@ -1,8 +0,0 @@ -package server.sql; - -import java.sql.PreparedStatement; - -@FunctionalInterface -public interface QuerySetup { - void setup(PreparedStatement statement, String[] data); -} diff --git a/Lab5Server/src/main/java/server/sql/SQLQueries.java b/Lab5Server/src/main/java/server/sql/SQLQueries.java deleted file mode 100644 index beb666c..0000000 --- a/Lab5Server/src/main/java/server/sql/SQLQueries.java +++ /dev/null @@ -1,34 +0,0 @@ -package server.sql; - -import common.commandline.Executable; -import common.commandline.Executables; - -import java.util.HashMap; -import java.util.Map; - -public enum SQLQueries { - INSERT_PERSON("SELECT insert_person(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", (statement, data) -> { - statement.setString(1, data[1]); - }), - UPDATE_PERSON(""), - INSERT_USER(""); - - private static final Map EXECUTABLE_SQL_QUERIES_MAP = new HashMap<>(); - - static { - EXECUTABLE_SQL_QUERIES_MAP.put(Executables.ADD.executable, INSERT_PERSON.query); - EXECUTABLE_SQL_QUERIES_MAP.put(Executables.UPDATE.executable, UPDATE_PERSON.query); - } - - public final String query; - public final QuerySetup setup; - - SQLQueries(String query, QuerySetup setup) { - this.query = query; - this.setup = setup; - } - - public static String getQueryByExecutable(Executable executable) { - return EXECUTABLE_SQL_QUERIES_MAP.get(executable); - } -}