feature: added code refactoring changes for 2378 (iluwatar#2379)

* fix:added code refactoring changes for 2378

* fix:added code refactoring changes for 2378

* build fix for 2378

* fix: updated pom.xml files for 2378 issue

* fix:build fix for 2378 issue

Co-authored-by: aparna <[email protected]>

Author: Ap284

collecting-parameter/pom.xml

@@ -1,30 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    This project is licensed under the MIT license. Module model-view-viewmodel is using ZK framework licensed under LGPL (see lgpl-3.0.txt).
-
-    The MIT License
-    Copyright © 2014-2022 Ilkka Seppälä
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of this software and associated documentation files (the "Software"), to deal
-    in the Software without restriction, including without limitation the rights
-    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-    copies of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in
-    all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-    THE SOFTWARE.
-
--->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>java-design-patterns</artifactId>

collecting-parameter/src/main/java/com/iluwatar/collectingparameter/App.java

@@ -1,27 +1,3 @@
-/*
- * This project is licensed under the MIT license. Module model-view-viewmodel is using ZK framework licensed under LGPL (see lgpl-3.0.txt).
- *
- * The MIT License
- * Copyright © 2014-2022 Ilkka Seppälä
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
 package com.iluwatar.collectingparameter;
 
 import java.util.LinkedList;

collecting-parameter/src/main/java/com/iluwatar/collectingparameter/PrinterItem.java

@@ -31,4 +31,4 @@ public PrinterItem(PaperSizes paperSize, int pageCount, boolean isDoubleSided, b
     this.isDoubleSided = isDoubleSided;
 
   }
-}
+}

collecting-parameter/src/test/java/com/iluwatar/collectingparameter/AppTest.java

@@ -1,27 +1,3 @@
-/*
- * This project is licensed under the MIT license. Module model-view-viewmodel is using ZK framework licensed under LGPL (see lgpl-3.0.txt).
- *
- * The MIT License
- * Copyright © 2014-2022 Ilkka Seppälä
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
 package com.iluwatar.collectingparameter;
 
 import org.junit.jupiter.api.Test;

collection-pipeline/src/main/java/com/iluwatar/collectionpipeline/FunctionalProgramming.java

@@ -56,7 +56,7 @@ private FunctionalProgramming() {
   public static List<String> getModelsAfter2000(List<Car> cars) {
     return cars.stream().filter(car -> car.getYear() > 2000)
         .sorted(Comparator.comparing(Car::getYear))
-        .map(Car::getModel).collect(Collectors.toList());
+        .map(Car::getModel).toList();
   }
 
   /**
@@ -78,6 +78,6 @@ public static Map<Category, List<Car>> getGroupingOfCarsByCategory(List<Car> car
   public static List<Car> getSedanCarsOwnedSortedByDate(List<Person> persons) {
     return persons.stream().map(Person::getCars).flatMap(List::stream)
         .filter(car -> Category.SEDAN.equals(car.getCategory()))
-        .sorted(Comparator.comparing(Car::getYear)).collect(Collectors.toList());
+        .sorted(Comparator.comparing(Car::getYear)).toList();
   }
 }

combinator/pom.xml

@@ -27,7 +27,7 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <parent>
+    <parent>
     <groupId>com.iluwatar</groupId>
     <artifactId>java-design-patterns</artifactId>
     <version>1.26.0-SNAPSHOT</version>

converter/src/main/java/com/iluwatar/converter/Converter.java

@@ -27,7 +27,6 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.function.Function;
-import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
 
 /**
@@ -74,7 +73,7 @@ public final T convertFromEntity(final U entity) {
    *     with the conversion function
    */
   public final List<U> createFromDtos(final Collection<T> dtos) {
-    return dtos.stream().map(this::convertFromDto).collect(Collectors.toList());
+    return dtos.stream().map(this::convertFromDto).toList();
   }
 
   /**
@@ -85,7 +84,7 @@ public final List<U> createFromDtos(final Collection<T> dtos) {
    *     with the conversion function
    */
   public final List<T> createFromEntities(final Collection<U> entities) {
-    return entities.stream().map(this::convertFromEntity).collect(Collectors.toList());
+    return entities.stream().map(this::convertFromEntity).toList();
   }
 
 }

data-transfer-object/src/main/java/com/iluwatar/datatransfer/product/ProductResource.java

@@ -25,7 +25,6 @@
 package com.iluwatar.datatransfer.product;
 
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * The resource class which serves product information. This class act as server in the demo. Which
@@ -54,7 +53,7 @@ public List<ProductDto.Response.Private> getAllProductsForAdmin() {
             .map(p -> new ProductDto.Response.Private().setId(p.getId()).setName(p.getName())
                     .setCost(p.getCost())
                     .setPrice(p.getPrice()))
-            .collect(Collectors.toList());
+            .toList();
   }
 
   /**
@@ -67,7 +66,7 @@ public List<ProductDto.Response.Public> getAllProductsForCustomer() {
             .stream()
             .map(p -> new ProductDto.Response.Public().setId(p.getId()).setName(p.getName())
                     .setPrice(p.getPrice()))
-            .collect(Collectors.toList());
+            .toList();
   }
 
   /**

fanout-fanin/src/main/java/com/iluwatar/fanout/fanin/App.java

@@ -26,7 +26,6 @@
 
 import java.util.Arrays;
 import java.util.List;
-import java.util.stream.Collectors;
 
 import lombok.extern.slf4j.Slf4j;
 
@@ -62,7 +61,7 @@ public static void main(String[] args) {
     LOGGER.info("Numbers to be squared and get sum --> {}", numbers);
 
     final List<SquareNumberRequest> requests =
-        numbers.stream().map(SquareNumberRequest::new).collect(Collectors.toList());
+        numbers.stream().map(SquareNumberRequest::new).toList();
 
     var consumer = new Consumer(0L);
 

fanout-fanin/src/main/java/com/iluwatar/fanout/fanin/FanOutFanIn.java

@@ -28,7 +28,6 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-import java.util.stream.Collectors;
 
 /**
  * FanOutFanIn class processes long running requests, when any of the processes gets over, result is
@@ -54,7 +53,7 @@ public static Long fanOutFanIn(
             .map(
                 request ->
                     CompletableFuture.runAsync(() -> request.delayedSquaring(consumer), service))
-            .collect(Collectors.toList());
+            .toList();
 
     CompletableFuture.allOf(futures.toArray(new CompletableFuture[0])).join();
 

fanout-fanin/src/test/java/com/iluwatar/fanout/fanin/FanOutFanInTest.java

@@ -29,7 +29,6 @@
 
 import java.util.Arrays;
 import java.util.List;
-import java.util.stream.Collectors;
 
 class FanOutFanInTest {
 
@@ -38,7 +37,7 @@ void fanOutFanInTest() {
     final List<Long> numbers = Arrays.asList(1L, 3L, 4L, 7L, 8L);
 
     final List<SquareNumberRequest> requests =
-        numbers.stream().map(SquareNumberRequest::new).collect(Collectors.toList());
+        numbers.stream().map(SquareNumberRequest::new).toList();
 
     final Consumer consumer = new Consumer(0L);
 

filterer/src/main/java/com/iluwatar/filterer/threat/SimpleProbabilisticThreatAwareSystem.java

@@ -76,7 +76,7 @@ private List<ProbableThreat> filteredItems(
       final Predicate<? super ProbableThreat> predicate) {
     return this.threats.stream()
         .filter(predicate)
-        .collect(Collectors.toUnmodifiableList());
+        .toList();
   }
 
 }

filterer/src/main/java/com/iluwatar/filterer/threat/SimpleThreatAwareSystem.java

@@ -74,8 +74,7 @@ private ThreatAwareSystem filteredGroup(Predicate<? super Threat> predicate) {
 
   private List<Threat> filteredItems(Predicate<? super Threat> predicate) {
     return this.issues.stream()
-        .filter(predicate)
-        .collect(Collectors.toUnmodifiableList());
+            .filter(predicate).toList();
   }
 
 }

flux/src/test/java/com/iluwatar/flux/dispatcher/DispatcherTest.java

@@ -39,7 +39,6 @@
 import com.iluwatar.flux.action.MenuAction;
 import com.iluwatar.flux.action.MenuItem;
 import com.iluwatar.flux.store.Store;
-import java.util.stream.Collectors;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
@@ -90,12 +89,12 @@ void testMenuItemSelected() {
     final var menuActions = actions.stream()
         .filter(a -> a.getType().equals(ActionType.MENU_ITEM_SELECTED))
         .map(a -> (MenuAction) a)
-        .collect(Collectors.toList());
+        .toList();
 
     final var contentActions = actions.stream()
         .filter(a -> a.getType().equals(ActionType.CONTENT_CHANGED))
         .map(a -> (ContentAction) a)
-        .collect(Collectors.toList());
+        .toList();
 
     assertEquals(2, menuActions.size());
     assertEquals(1, menuActions.stream().map(MenuAction::getMenuItem).filter(MenuItem.HOME::equals)

layers/src/main/java/com/iluwatar/layers/service/CakeBakingServiceImpl.java

@@ -38,7 +38,6 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import java.util.stream.Collectors;
 import org.springframework.context.support.AbstractApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.stereotype.Service;
@@ -62,7 +61,7 @@ public void bakeNewCake(CakeInfo cakeInfo) throws CakeBakingException {
     var allToppings = getAvailableToppingEntities();
     var matchingToppings =
         allToppings.stream().filter(t -> t.getName().equals(cakeInfo.cakeToppingInfo.name))
-            .collect(Collectors.toList());
+            .toList();
     if (matchingToppings.isEmpty()) {
       throw new CakeBakingException(String.format("Topping %s is not available",
           cakeInfo.cakeToppingInfo.name));

leader-election/src/main/java/com/iluwatar/leaderelection/AbstractMessageManager.java

@@ -24,9 +24,7 @@
  */
 package com.iluwatar.leaderelection;
 
-import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * Abstract class of all the message manager classes.
@@ -56,13 +54,13 @@ protected Instance findNextInstance(int currentId) {
         .stream()
         .filter((i) -> i > currentId && instanceMap.get(i).isAlive())
         .sorted()
-        .collect(Collectors.toList());
+        .toList();
     if (candidateList.isEmpty()) {
       var index = instanceMap.keySet()
           .stream()
           .filter((i) -> instanceMap.get(i).isAlive())
           .sorted()
-          .collect(Collectors.toList())
+          .toList()
           .get(0);
       result = instanceMap.get(index);
     } else {

leader-election/src/main/java/com/iluwatar/leaderelection/bully/BullyMessageManager.java

@@ -30,7 +30,6 @@
 import com.iluwatar.leaderelection.MessageType;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * Implementation of BullyMessageManager.
@@ -115,7 +114,7 @@ private List<Integer> findElectionCandidateInstanceList(int currentId) {
     return instanceMap.keySet()
         .stream()
         .filter((i) -> i < currentId && instanceMap.get(i).isAlive())
-        .collect(Collectors.toList());
+        .toList();
   }
 
 }

leader-election/src/main/java/com/iluwatar/leaderelection/ring/RingInstance.java

@@ -28,7 +28,6 @@
 import com.iluwatar.leaderelection.Message;
 import com.iluwatar.leaderelection.MessageManager;
 import java.util.Arrays;
-import java.util.stream.Collectors;
 import lombok.extern.slf4j.Slf4j;
 
 /**
@@ -88,7 +87,7 @@ protected void handleElectionMessage(Message message) {
     var candidateList = Arrays.stream(content.trim().split(","))
         .map(Integer::valueOf)
         .sorted()
-        .collect(Collectors.toList());
+        .toList();
     if (candidateList.contains(localId)) {
       var newLeaderId = candidateList.get(0);
       LOGGER.info(INSTANCE + localId + " - New leader should be " + newLeaderId + ".");

serialized-entity/pom.xml

@@ -1,30 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    This project is licensed under the MIT license. Module model-view-viewmodel is using ZK framework licensed under LGPL (see lgpl-3.0.txt).
-
-    The MIT License
-    Copyright © 2014-2022 Ilkka Seppälä
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of this software and associated documentation files (the "Software"), to deal
-    in the Software without restriction, including without limitation the rights
-    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-    copies of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in
-    all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-    THE SOFTWARE.
-
--->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>

serialized-entity/src/main/java/com/iluwatar/serializedentity/App.java

@@ -1,4 +1,6 @@
 /*
+ * This project is licensed under the MIT license. Module model-view-viewmodel is using ZK framework licensed under LGPL (see lgpl-3.0.txt).
+ *
  * The MIT License
  * Copyright © 2014-2022 Ilkka Seppälä
  *
@@ -125,4 +127,4 @@ private static DataSource createDataSource() {
     dataSource.setURL(DB_URL);
     return dataSource;
   }
-}
+}

serialized-entity/src/main/java/com/iluwatar/serializedentity/Country.java

@@ -1,4 +1,6 @@
 /*
+ * This project is licensed under the MIT license. Module model-view-viewmodel is using ZK framework licensed under LGPL (see lgpl-3.0.txt).
+ *
  * The MIT License
  * Copyright © 2014-2022 Ilkka Seppälä
  *