Добавлен соединяющий класс AppController

Author: paledmi-java

Test.class

@@ -0,0 +1 @@
+public class Test { public static void main(String[] a) {} }

Test.java

@@ -18,4 +18,14 @@ dependencies {
 
 test {
     useJUnitPlatform()
-}
+}
+
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(21)
+    }
+}
+
+tasks.withType(JavaCompile).configureEach {
+    options.release.set(21)
+}

build.gradle

@@ -1,6 +1,6 @@
 package dto;
 
-public final class Client { //DTO
+public final class Client {
     private final String name;
     private final String phoneNumber;
     private final int idNumber;
@@ -48,4 +48,13 @@ public String getPhoneNumber() {
     public int getIdNumber() {
         return idNumber;
     }
+
+    @Override
+    public String toString() {
+        return "Client{" +
+                "name='" + name + '\'' +
+                ", phoneNumber='" + phoneNumber + '\'' +
+                ", idNumber=" + idNumber +
+                '}';
+    }
 }

src/main/java/ClientSortingSystem.java

@@ -0,0 +1,7 @@
+package enums;
+
+public enum Field {
+    NAME,
+    ID_NUMBER,
+    PHONE_NUMBER
+}

src/main/java/dto/Client.java

@@ -1,7 +1,8 @@
 package input;
 
-import java.util.*;
-import java.util.function.Consumer;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
 import java.util.stream.Stream;
 
 /**
@@ -128,7 +129,7 @@ public Stream<T> stream() {
      * @param collection коллекция, содержащая элементы для добавления
      * @return {@code true} если эта коллекция изменилась в результате вызова
      */
-    public boolean addAll(Collection<? extends T> collection) {
+    public boolean addAll(CustomCollection<? extends T> collection) {
         // Проверяем, что переданная коллекция не null и не пустая
         if (collection == null || collection.isEmpty()) {
             // Возвращаем false, так как нечего добавлять

src/main/java/enums/Field.java

@@ -23,6 +23,7 @@
  * @see CustomCollection
  * @see Client
  */
+
 public class InputManager {
     private ClientInputStrategy currentStrategy;
 

src/main/java/input/CustomCollection.java

@@ -5,13 +5,7 @@
 import java.util.Comparator;
 import java.util.List;
 
-public class MergeSortStrategy implements SortingStrategy {
-
-    @Override
-    public void sort(List<Client> clients) {
-        Comparator<Client> comparator = createDefaultComparator();
-        sortWithComparator(clients, comparator);
-    }
+public abstract class AbstractMergeSortStrategy implements SortingStrategy {
 
     public void sortWithComparator(List<Client> clients, Comparator<Client> comparator) {
         if (clients == null || clients.size() <= 1) {
@@ -23,27 +17,9 @@ public void sortWithComparator(List<Client> clients, Comparator<Client> comparat
 
     @Override
     public String getStrategyName() {
-        return "Merge Sort (сортировка слиянием)";
+        return "Abstract Merge Sort (сортировка слиянием)";
     }
 
-    private Comparator<Client> createDefaultComparator() {
-        return new Comparator<Client>() {
-            @Override
-            public int compare(Client client1, Client client2) {
-                int nameComparison = client1.getName().compareTo(client2.getName());
-                if (nameComparison != 0) {
-                    return nameComparison;
-                }
-
-                int idComparison = Integer.compare(client1.getIdNumber(), client2.getIdNumber());
-                if (idComparison != 0) {
-                    return idComparison;
-                }
-
-                return client1.getPhoneNumber().compareTo(client2.getPhoneNumber());
-            }
-        };
-    }
     private void mergeSort(List<Client> clients, int left, int right,
                            Comparator<Client> comparator) {
 
@@ -100,7 +76,6 @@ private void merge(List<Client> clients, int left, int mid, int right,
         }
     }
 
-    @Override
     public void sortEvenValuesOnly(List<Client> clients, Comparator<Client> comparator) {
         if (clients == null || clients.isEmpty()) {
             return;

src/main/java/input/InputManager.java

@@ -0,0 +1,39 @@
+package sorting;
+
+import dto.Client;
+
+import java.util.Comparator;
+import java.util.List;
+
+public class MergeSortDefaultStrategy extends AbstractMergeSortStrategy{
+
+    @Override
+    public void sort(List<Client> clients) {
+        Comparator<Client> comparator = createDefaultComparator();
+        sortWithComparator(clients, comparator);
+    }
+
+    private Comparator<Client> createDefaultComparator() {
+        return new Comparator<Client>() {
+            @Override
+            public int compare(Client client1, Client client2) {
+                int nameComparison = client1.getName().compareTo(client2.getName());
+                if (nameComparison != 0) {
+                    return nameComparison;
+                }
+
+                int idComparison = Integer.compare(client1.getIdNumber(), client2.getIdNumber());
+                if (idComparison != 0) {
+                    return idComparison;
+                }
+
+                return client1.getPhoneNumber().compareTo(client2.getPhoneNumber());
+            }
+        };
+    }
+
+    @Override
+    public String getStrategyName() {
+        return "Merge Sort Default Strategy (сортировка по имени -> ID -> телефону)";
+    }
+}