Merge remote-tracking branch 'origin/PavelLeonovTeamLead' into NikitaUdinDev

Author: Никита

build.gradle

@@ -21,11 +21,16 @@ test {
 }
 
 java {
-    toolchain {
-        languageVersion = JavaLanguageVersion.of(21)
-    }
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
 }
 
 tasks.withType(JavaCompile).configureEach {
-    options.release.set(21)
+    options.encoding = 'UTF-8'
+}
+
+task run(type: JavaExec) {
+    classpath = sourceSets.main.runtimeClasspath
+    mainClass = 'App'
+    standardInput = System.in
 }

savedData.txt

@@ -0,0 +1,21 @@
+Client{name='Альберт Большаков', phoneNumber='+79141544234', idNumber=795}
+Client{name='Антон Германович Федосеев', phoneNumber='+79512917697', idNumber=47}
+Client{name='Белозерова Ольга', phoneNumber='+79132151876', idNumber=906}
+Client{name='Большакова Маргарита', phoneNumber='+79600176461', idNumber=358}
+Client{name='Виктория Гущина', phoneNumber='+79660851640', idNumber=872}
+Client{name='Даниил Маслов', phoneNumber='+79769435383', idNumber=861}
+Client{name='Денисова Юлия', phoneNumber='+79395588731', idNumber=328}
+Client{name='Елисеев Денис Егорович', phoneNumber='+79569043128', idNumber=762}
+Client{name='Кира Денисовна Гордеева', phoneNumber='+79369345223', idNumber=97}
+Client{name='Комарова Дарья Макаровна', phoneNumber='+79009560450', idNumber=538}
+Client{name='Лобанов Вячеслав Васильевич', phoneNumber='+79633737514', idNumber=122}
+Client{name='Марина Альбертовна Белова', phoneNumber='+79111698201', idNumber=942}
+Client{name='Матвей Горбунов', phoneNumber='+79544728055', idNumber=172}
+Client{name='Матвей Григорьевич Ефремов', phoneNumber='+79467628131', idNumber=266}
+Client{name='Осипов Степан Макарович', phoneNumber='+79600704787', idNumber=290}
+Client{name='Савина Лариса Дмитриевна', phoneNumber='+79024370933', idNumber=22}
+Client{name='Смирнов Никита Лаврентьевич', phoneNumber='+79956621645', idNumber=691}
+Client{name='Соколова Татьяна', phoneNumber='+79988936291', idNumber=758}
+Client{name='Чернов Борис Геннадьевич', phoneNumber='+79574148315', idNumber=697}
+Client{name='Ярослав Георгиевич Максимов', phoneNumber='+79171026484', idNumber=964}
+

src/main/java/input/CustomCollection.java

@@ -39,6 +39,14 @@ public class CustomCollection<T> implements CollectionInterface<T> {
     /** Количество фактически хранящихся элементов в коллекции. */
     private int size;
 
+    public Object[] getElements() {
+        return elements;
+    }
+
+    public int getSize() {
+        return size;
+    }
+
     public CustomCollection() {
         this.elements = new Object[DEFAULT_CAPACITY];
     }

src/main/java/output/FileDataWriter.java

@@ -0,0 +1,22 @@
+package output;
+
+import java.io.*;
+
+public class FileDataWriter {
+
+    private final File file = new File("savedData.txt");
+
+    public void writeDataToFile(String data){
+        try {
+            file.createNewFile();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+
+        try(Writer writer = new BufferedWriter(new FileWriter(file, true))){
+            writer.append(data);
+        } catch (Exception e){
+            e.printStackTrace();
+        }
+    }
+}

src/main/java/sorting/AbstractMergeSortStrategy.java

@@ -78,8 +78,11 @@ private void merge(CustomCollection<Client> clients, int left, int mid, int righ
         }
     }
 
+    @Override
     public void sortEvenValuesOnly(CustomCollection<Client> clients) {
-        sortEvenValuesOnly(clients, getComparator());
+        // Компаратор для сортировки по idNumber в натуральном порядке (по возрастанию)
+        Comparator<Client> idComparator = Comparator.comparing(Client::getIdNumber);
+        sortEvenValuesOnly(clients, idComparator);
     }
 
     public void sortEvenValuesOnly(CustomCollection<Client> clients, Comparator<Client> comparator) {
@@ -105,7 +108,7 @@ public void sortEvenValuesOnly(CustomCollection<Client> clients, Comparator<Clie
             return;
         }
 
-        // Сортируем только элементы с четными значениями
+        // Сортируем только элементы с четными значениями по idNumber в натуральном порядке
         sortWithComparator(evenClients, comparator);
 
         // Возвращаем отсортированные элементы на исходные позиции

src/main/java/userInterface/AppController.java

@@ -4,6 +4,7 @@
 import enums.Field;
 import input.CustomCollection;
 import input.InputManager;
+import output.FileDataWriter;
 import sorting.MergeSortDefaultStrategy;
 import sorting.MergeSortDynamicStrategy;
 import sorting.SortingManager;
@@ -15,43 +16,49 @@ public class AppController {
     private final InputManager inputManager = new InputManager();
     private final CustomCollection<Client> fullList = new CustomCollection<>();
     private final SortingManager sortingManager = new SortingManager();
+    private final FileDataWriter fileDataWriter = new FileDataWriter();
+    ConcurrentCounter concurrentCounter = new ConcurrentCounter();
 
     public void startDefaultSorting(){
         sortingManager.setStrategy(new MergeSortDefaultStrategy());
         sortingManager.getCurrentStrategy().sort(fullList);
-        showAllClients();
+        showAndWriteAllClients();
     }
 
     public void startEvenIdsSorting(){
         sortingManager.setStrategy(new MergeSortDefaultStrategy());
         sortingManager.getCurrentStrategy().sortEvenValuesOnly(fullList);
-        showAllClients();
+        showAndWriteAllClients();
     }
 
     public void startDynamicSorting(Field field){
         sortingManager.setStrategy(new MergeSortDynamicStrategy(field, true));
         sortingManager.getCurrentStrategy().sort(fullList);
-        showAllClients();
+        showAndWriteAllClients();
     }
 
     public CustomCollection<Client> getFullList() {
         return fullList;
     }
 
-    public void showAllClients(){
+    public void showAndWriteAllClients(){
         for(Client client : fullList){
             System.out.println(client);
+            fileDataWriter.writeDataToFile(client + "\n");
         }
+        fileDataWriter.writeDataToFile("\n");
     }
 
     public void startFileReaderStrategy(String path){
         inputManager.setStrategy(inputManager.createFileStrategy(path));
         try {
             CustomCollection<Client> fromFileList = inputManager.loadData();
+            int countOfAlexes = concurrentCounter.countAlexes(fromFileList);
             fullList.addAll(fromFileList);
             for(Client client : fromFileList){
                 System.out.println(client);
             }
+            System.out.println("Добавлено Алексеев: " + countOfAlexes);
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
@@ -61,10 +68,12 @@ public void startManualInputStrategy(){
         inputManager.setStrategy(inputManager.createManualStrategy());
         try {
             CustomCollection<Client> manualList = inputManager.loadData();
+            int countOfAlexes = concurrentCounter.countAlexes(manualList);
             fullList.addAll(manualList);
             for(Client client : manualList){
                 System.out.println(client);
             }
+            System.out.println("Добавлено Алексеев: " + countOfAlexes);
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
@@ -74,10 +83,12 @@ public void startRandomDataStrategy(int count){
         inputManager.setStrategy(inputManager.createRandomStrategy(count));
         try {
             CustomCollection<Client> randomList = inputManager.loadData();
+            int countOfAlexes = concurrentCounter.countAlexes(randomList);
             fullList.addAll(randomList);
             for(Client client : randomList){
                 System.out.println(client);
             }
+            System.out.println("Добавлено Алексеев: " + countOfAlexes);
         } catch (IOException e) {
             throw new RuntimeException(e);
         }

src/main/java/userInterface/ConcurrentCounter.java

@@ -0,0 +1,50 @@
+package userInterface;
+
+import dto.Client;
+import input.CustomCollection;
+
+import java.util.concurrent.*;
+
+public class ConcurrentCounter {
+
+    public int countAlexes(CustomCollection<Client> clients){
+        CustomCollection<Client> clients1 = new CustomCollection<>();
+        CustomCollection<Client> clients2 = new CustomCollection<>();
+
+        for (int i = 0; i < clients.size()/2 ; i++){
+            clients1.add(clients.get(i));
+        }
+
+        for (int i = clients.size()/2; i < clients.size(); i++){
+            clients2.add(clients.get(i));
+        }
+
+        ExecutorService executorService = Executors.newFixedThreadPool(2);
+
+        Future<Long> count1 = executorService.submit(new Callable<Long>() {
+            @Override
+            public Long call() throws Exception {
+                return clients1.stream().filter(c-> c.getName().contains("Алексей")).count();
+            }
+        });
+
+        Future<Long> count2 = executorService.submit(new Callable<Long>() {
+            @Override
+            public Long call() throws Exception {
+                return clients2.stream().filter(c-> c.getName().contains("Алексей")).count();
+            }
+        });
+
+        executorService.shutdown();
+
+        try {
+            long result = count1.get() + count2.get();
+            return Math.toIntExact(result);
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        } catch (ExecutionException e) {
+            throw new RuntimeException(e);
+        }
+
+    }
+}