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

paledmi-java · paledmi-java · commit e97f0c65264a · 2025-12-23T14:51:33.000+04:00
diff --git a/Test.class b/Test.class
diff --git a/Test.java b/Test.java
@@ -0,0 +1 @@
+public class Test { public static void main(String[] a) {} }
diff --git a/build.gradle b/build.gradle
@@ -18,4 +18,14 @@ dependencies {
 
 test {
     useJUnitPlatform()
-}
+}
+
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(21)
+    }
+}
+
+tasks.withType(JavaCompile).configureEach {
+    options.release.set(21)
+}
diff --git a/src/main/java/ClientSortingSystem.java b/src/main/java/ClientSortingSystem.java
diff --git a/src/main/java/dto/Client.java b/src/main/java/dto/Client.java
@@ -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 +
+                '}';
+    }
 }
diff --git a/src/main/java/enums/Field.java b/src/main/java/enums/Field.java
@@ -0,0 +1,7 @@
+package enums;
+
+public enum Field {
+    NAME,
+    ID_NUMBER,
+    PHONE_NUMBER
+}
diff --git a/src/main/java/input/CustomCollection.java b/src/main/java/input/CustomCollection.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, так как нечего добавлять
diff --git a/src/main/java/input/InputManager.java b/src/main/java/input/InputManager.java
@@ -23,6 +23,7 @@
  * @see CustomCollection
  * @see Client
  */
+
 public class InputManager {
     private ClientInputStrategy currentStrategy;
 
diff --git a/src/main/java/sorting/AbstractMergeSortStrategy.java b/src/main/java/sorting/AbstractMergeSortStrategy.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;
diff --git a/src/main/java/sorting/MergeSortDefaultStrategy.java b/src/main/java/sorting/MergeSortDefaultStrategy.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 -> телефону)";
+    }
+}
diff --git a/src/main/java/sorting/MergeSortDynamicStrategy.java b/src/main/java/sorting/MergeSortDynamicStrategy.java
@@ -0,0 +1,40 @@
+package sorting;
+
+import dto.Client;
+import enums.Field;
+
+import java.util.Comparator;
+import java.util.List;
+
+public class MergeSortDynamicStrategy extends AbstractMergeSortStrategy{
+    private final Field field;
+    private final boolean ascending;
+
+    public MergeSortDynamicStrategy(Field field, boolean ascending) {
+        this.field = field;
+        this.ascending = ascending;
+    }
+
+    @Override
+    public void sort(List<Client> clients) {
+        Comparator<Client> comparator = createComparatorForField();
+        if (!ascending) {
+            comparator = comparator.reversed();
+        }
+        sortWithComparator(clients, comparator);
+    }
+
+    public Comparator<Client> createComparatorForField(){
+        return switch (field){
+            case NAME -> Comparator.comparing(Client :: getName);
+            case ID_NUMBER -> Comparator.comparing(Client :: getIdNumber);
+            case PHONE_NUMBER -> Comparator.comparing(Client :: getPhoneNumber);
+            default -> throw new IllegalArgumentException("Неизвестное поле: " + field);
+        };
+    }
+
+    @Override
+    public String getStrategyName() {
+        return "Dynamic Merge Sort (Динамическая сортировка по: " + field + ")";
+    }
+}
diff --git a/src/main/java/sorting/SortingStrategy.java b/src/main/java/sorting/SortingStrategy.java
@@ -8,7 +8,5 @@ public interface SortingStrategy {
 
 
     void sort(List<Client> clients);
-    void sortWithComparator(List<Client> clients, Comparator<Client> comparator);
-    void sortEvenValuesOnly(List<Client> clients, Comparator<Client> comparator);
     String getStrategyName();
 }
diff --git a/src/main/java/userInterface/AppController.java b/src/main/java/userInterface/AppController.java
@@ -0,0 +1,65 @@
+package userInterface;
+
+import dto.Client;
+import input.CustomCollection;
+import input.InputManager;
+import input.Strategy.FileReaderStrategy;
+import input.Strategy.ManualInputReaderStrategy;
+import input.Strategy.RandomDataGeneratorStrategy;
+
+import java.io.IOException;
+
+public class AppController {
+
+    private final InputManager inputManager = new InputManager();
+    private final CustomCollection<Client> fullList = new CustomCollection<>();
+
+    public CustomCollection<Client> getFullList() {
+        return fullList;
+    }
+
+    public void showAllClientsInDefaultOrder(){
+        for(Client client : fullList){
+            System.out.println(client);
+        }
+    }
+
+    public void startFileReaderStrategy(String path){
+        inputManager.setStrategy(new FileReaderStrategy(path));
+        try {
+            CustomCollection<Client> fromFileList = inputManager.loadData();
+            fullList.addAll(fromFileList);
+            for(Client client : fromFileList){
+                System.out.println(client);
+            }
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public void startManualInputStrategy(){
+        inputManager.setStrategy(new ManualInputReaderStrategy());
+        try {
+            CustomCollection<Client> manualList = inputManager.loadData();
+            fullList.addAll(manualList);
+            for(Client client : manualList){
+                System.out.println(client);
+            }
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public void startRandomDataStrategy(int count){
+        inputManager.setStrategy(new RandomDataGeneratorStrategy(count));
+        try {
+            CustomCollection<Client> randomList = inputManager.loadData();
+            for(Client client : randomList){
+                System.out.println(client);
+            }
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+
+    }
+}
diff --git a/src/main/java/userInterface/MenuManager.java b/src/main/java/userInterface/MenuManager.java
@@ -4,7 +4,7 @@
 
 public class MenuManager implements Printable {
 
-
+    AppController appController = new AppController();
     private final Scanner scanner = new Scanner(System.in);
     private boolean running = true;
 
@@ -226,6 +226,7 @@ private void sortPhoneByOperatorCode(){
     private void fillManually(){
         System.out.println("Выбран способ ввода данных вручную");
         System.out.println("Введите данные...");
+        appController.startManualInputStrategy();
         System.out.println("Данные успешно сохранены");
 
     }
@@ -234,18 +235,21 @@ private void fillFromFile(){
         System.out.println("Выбран способ ввода данных из файла\n");
         System.out.println("Введите путь к файлу: ");
         String filePath = scanner.nextLine().trim();
+        appController.startFileReaderStrategy(filePath);
         System.out.println("Загрузка из файла: " + filePath);
 
     }
 
     private void fillRandom(){
         System.out.println("Выбран способ ввода случайных данных");
         int count = inputLengthOfValue("Сколько записей создать? ", 10);
+        appController.startRandomDataStrategy(count);
         System.out.println("Создано: " + count + " записей");
     }
 
     private void printDefaultOrder(){
         System.out.println("Список клиентов");
+        appController.showAllClientsInDefaultOrder();
     }
 
     private void exitByChoice(){
diff --git a/src/main/java/userInterface/Printable.java b/src/main/java/userInterface/Printable.java
@@ -5,7 +5,7 @@ public interface Printable {
     default void printMainMenu(){
         System.out.println(
                 "1) Наполнить клиентскую базу\n" +
-                        "2) Показать параметры сортировки" +
+                        "2) Показать параметры сортировки\n" +
                             "0) Выход"
         );
     }
@@ -15,7 +15,7 @@ default void printFillingDatabaseMenu(){
                 "Заполнить базу данных: \n" +
                         "1) Ручной ввод\n" +
                         "2) Файлом\n" +
-                        "3) Случайный набор" +
+                        "3) Случайный набор\n" +
                         "0) Возврат в главное меню"
         );
     }
@@ -26,7 +26,7 @@ default void printSortingMenu(){
                         "1) Отображать клиентов в порядке по умолчанию\n" +
                         "2) Сортировать по имени\n" +
                         "3) Сортировать по ID\n" +
-                        "4) Сортировать по номеру телефона" +
+                        "4) Сортировать по номеру телефона\n" +
                         "0) Возврат в главное меню"
         );
     }

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+public class Test { public static void main(String[] a) {} }`