[JAVA-48024]

core-java-modules/core-java-lambdas-2/pom.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
+         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>
     <artifactId>core-java-lambdas-2</artifactId>
     <packaging>jar</packaging>
@@ -13,4 +13,12 @@
         <version>0.0.1-SNAPSHOT</version>
     </parent>
 
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>${commons-lang3.version}</version>
+        </dependency>
+    </dependencies>
+
 </project>

core-java-modules/core-java-streams-simple/src/main/java/com/baeldung/streams/minmaxbygroup/OrderItem.java → core-java-modules/core-java-lambdas-2/src/main/java/com/baeldung/minmaxbygroup/OrderItem.java

@@ -1,4 +1,4 @@
-package com.baeldung.streams.minmaxbygroup;
+package com.baeldung.minmaxbygroup;
 
 public class OrderItem {
   private Long id;

core-java-modules/core-java-streams-simple/src/main/java/com/baeldung/streams/minmaxbygroup/OrderItemCategory.java → core-java-modules/core-java-lambdas-2/src/main/java/com/baeldung/minmaxbygroup/OrderItemCategory.java

@@ -1,4 +1,4 @@
-package com.baeldung.streams.minmaxbygroup;
+package com.baeldung.minmaxbygroup;
 
 public enum OrderItemCategory {
   BOOKS,

core-java-modules/core-java-streams-simple/src/main/java/com/baeldung/streams/minmaxbygroup/OrderProcessor.java → core-java-modules/core-java-lambdas-2/src/main/java/com/baeldung/minmaxbygroup/OrderProcessor.java

@@ -1,9 +1,10 @@
-package com.baeldung.streams.minmaxbygroup;
+package com.baeldung.minmaxbygroup;
 
 import java.util.DoubleSummaryStatistics;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
+
 import org.apache.commons.lang3.tuple.Pair;
 
 public class OrderProcessor {

core-java-modules/core-java-streams-simple/src/test/java/com/baeldung/streams/minmaxbygroup/OrderProcessorUnitTest.java → core-java-modules/core-java-lambdas-2/src/test/java/com/baeldung/minmaxbygroup/OrderProcessorUnitTest.java

@@ -1,10 +1,11 @@
-package com.baeldung.streams.minmaxbygroup;
+package com.baeldung.minmaxbygroup;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+
 import org.apache.commons.lang3.tuple.Pair;
 import org.junit.jupiter.api.Test;
 

core-java-modules/core-java-streams-7/pom.xml

@@ -13,6 +13,14 @@
         <version>0.0.1-SNAPSHOT</version>
     </parent>
 
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>${commons-lang3.version}</version>
+        </dependency>
+    </dependencies>
+
     <build>
         <finalName>core-java-streams-7</finalName>
         <resources>

core-java-modules/core-java-streams-simple/src/main/java/com/baeldung/streams/parallel/DifferentSourceSplitting.java → core-java-modules/core-java-streams-7/src/main/java/com/baeldung/streams/parallel/DifferentSourceSplitting.java

@@ -1,16 +1,16 @@
 package com.baeldung.streams.parallel;
 
-import org.openjdk.jmh.annotations.Benchmark;
-import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.Mode;
-import org.openjdk.jmh.annotations.OutputTimeUnit;
-
 import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.IntStream;
 
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+
 public class DifferentSourceSplitting {
 
     private static final List<Integer> arrayListOfNumbers = new ArrayList<>();

core-java-modules/core-java-streams-simple/src/main/java/com/baeldung/streams/parallel/MemoryLocalityCosts.java → core-java-modules/core-java-streams-7/src/main/java/com/baeldung/streams/parallel/MemoryLocalityCosts.java

@@ -1,14 +1,14 @@
 package com.baeldung.streams.parallel;
 
+import java.util.Arrays;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.IntStream;
+
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.OutputTimeUnit;
 
-import java.util.Arrays;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.IntStream;
-
 public class MemoryLocalityCosts {
 
     private static final int[] intArray = new int[1_000_000];

core-java-modules/core-java-streams-simple/src/main/java/com/baeldung/streams/parallel/MergingCosts.java → core-java-modules/core-java-streams-7/src/main/java/com/baeldung/streams/parallel/MergingCosts.java

@@ -1,16 +1,16 @@
 package com.baeldung.streams.parallel;
 
-import org.openjdk.jmh.annotations.Benchmark;
-import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.Mode;
-import org.openjdk.jmh.annotations.OutputTimeUnit;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+
 public class MergingCosts {
 
     private static final List<Integer> arrayListOfNumbers = new ArrayList<>();

core-java-modules/core-java-streams-simple/src/main/java/com/baeldung/streams/parallel/SplittingCosts.java → core-java-modules/core-java-streams-7/src/main/java/com/baeldung/streams/parallel/SplittingCosts.java

@@ -1,13 +1,13 @@
 package com.baeldung.streams.parallel;
 
+import java.util.concurrent.TimeUnit;
+import java.util.stream.IntStream;
+
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.OutputTimeUnit;
 
-import java.util.concurrent.TimeUnit;
-import java.util.stream.IntStream;
-
 public class SplittingCosts {
 
     @Benchmark

core-java-modules/core-java-streams-simple/src/main/java/com/baeldung/streams/reduce/application/Application.java → core-java-modules/core-java-streams-7/src/main/java/com/baeldung/streams/reduce/application/Application.java

@@ -1,10 +1,10 @@
 package com.baeldung.streams.reduce.application;
 
-import com.baeldung.streams.reduce.entities.User;
-
 import java.util.Arrays;
 import java.util.List;
 
+import com.baeldung.streams.reduce.entities.User;
+
 public class Application {
 
     public static void main(String[] args) {

core-java-modules/core-java-streams-simple/src/main/java/com/baeldung/streams/reduce/benchmarks/JMHStreamReduceBenchMark.java → core-java-modules/core-java-streams-7/src/main/java/com/baeldung/streams/reduce/benchmarks/JMHStreamReduceBenchMark.java

@@ -1,8 +1,8 @@
 package com.baeldung.streams.reduce.benchmarks;
 
-import com.baeldung.streams.reduce.entities.User;
 import java.util.ArrayList;
 import java.util.List;
+
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Mode;
@@ -13,6 +13,8 @@
 import org.openjdk.jmh.runner.options.Options;
 import org.openjdk.jmh.runner.options.OptionsBuilder;
 
+import com.baeldung.streams.reduce.entities.User;
+
 @State(Scope.Thread)
 @BenchmarkMode(Mode.AverageTime)
 public class JMHStreamReduceBenchMark {

core-java-modules/core-java-streams-simple/src/test/java/com/baeldung/streams/groupingby/JavaGroupingByCollectorUnitTest.java → core-java-modules/core-java-streams-7/src/test/java/com/baeldung/streams/groupingby/JavaGroupingByCollectorUnitTest.java

@@ -2,17 +2,17 @@
 
 import static java.util.Comparator.comparingInt;
 import static java.util.stream.Collectors.averagingInt;
+import static java.util.stream.Collectors.collectingAndThen;
 import static java.util.stream.Collectors.counting;
 import static java.util.stream.Collectors.groupingBy;
 import static java.util.stream.Collectors.groupingByConcurrent;
-import static java.util.stream.Collectors.collectingAndThen;
-import static java.util.stream.Collectors.toMap;
 import static java.util.stream.Collectors.joining;
 import static java.util.stream.Collectors.mapping;
 import static java.util.stream.Collectors.maxBy;
 import static java.util.stream.Collectors.summarizingInt;
 import static java.util.stream.Collectors.summingInt;
 import static java.util.stream.Collectors.toList;
+import static java.util.stream.Collectors.toMap;
 import static java.util.stream.Collectors.toSet;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.offset;

core-java-modules/core-java-streams-simple/src/test/java/com/baeldung/streams/parallel/ForkJoinUnitTest.java → core-java-modules/core-java-streams-7/src/test/java/com/baeldung/streams/parallel/ForkJoinUnitTest.java

@@ -1,13 +1,13 @@
 package com.baeldung.streams.parallel;
 
-import org.junit.jupiter.api.Test;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ForkJoinPool;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.jupiter.api.Test;
 
 class ForkJoinUnitTest {
 

core-java-modules/core-java-streams-simple/src/test/java/com/baeldung/streams/reduce/StreamReduceUnitTest.java → core-java-modules/core-java-streams-7/src/test/java/com/baeldung/streams/reduce/StreamReduceUnitTest.java

@@ -2,13 +2,13 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import com.baeldung.streams.reduce.entities.User;
-import com.baeldung.streams.reduce.utilities.NumberUtils;
+import java.util.Arrays;
+import java.util.List;
 
 import org.junit.jupiter.api.Test;
 
-import java.util.Arrays;
-import java.util.List;
+import com.baeldung.streams.reduce.entities.User;
+import com.baeldung.streams.reduce.utilities.NumberUtils;
 
 class StreamReduceUnitTest {
 

core-java-modules/core-java-streams-simple/src/test/java/com/baeldung/streams/flatmap/map/Java8MapAndFlatMapUnitTest.java → core-java-modules/core-java-streams-maps/src/test/java/com/baeldung/streams/flatmap/map/Java8MapAndFlatMapUnitTest.java

@@ -1,7 +1,7 @@
 package com.baeldung.streams.flatmap.map;
 
+import static java.util.Arrays.asList;
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -10,8 +10,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import static java.util.Arrays.asList;
-
+import org.junit.jupiter.api.Test;
 
 class Java8MapAndFlatMapUnitTest {
 

core-java-modules/core-java-streams-simple/src/test/java/com/baeldung/streams/map/StreamMapUnitTest.java → core-java-modules/core-java-streams-maps/src/test/java/com/baeldung/streams/map/StreamMapUnitTest.java

@@ -1,16 +1,16 @@
 package com.baeldung.streams.map;
 
-import org.junit.Before;
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import org.junit.Before;
+import org.junit.Test;
 
 public class StreamMapUnitTest {
 

core-java-modules/core-java-streams-simple/pom.xml

@@ -19,11 +19,6 @@
             <artifactId>throwing-function</artifactId>
             <version>${throwing-function.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>${commons-lang3.version}</version>
-        </dependency>
     </dependencies>
 
     <build>

core-java-modules/core-java-streams-simple/src/test/java/com/baeldung/streams/filter/StreamFilterUnitTest.java

@@ -4,7 +4,6 @@
 import com.pivovarit.function.ThrowingPredicate;
 import com.pivovarit.function.exception.WrappedException;
 
-import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;