diff --git a/core-java-modules/core-java-lambdas-2/pom.xml b/core-java-modules/core-java-lambdas-2/pom.xml index 6251c8f0c233..b71a18c8999c 100644 --- a/core-java-modules/core-java-lambdas-2/pom.xml +++ b/core-java-modules/core-java-lambdas-2/pom.xml @@ -1,7 +1,7 @@ + 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"> 4.0.0 core-java-lambdas-2 jar @@ -13,4 +13,12 @@ 0.0.1-SNAPSHOT + + + org.apache.commons + commons-lang3 + ${commons-lang3.version} + + + \ No newline at end of file diff --git a/core-java-modules/core-java-streams-simple/src/main/java/com/baeldung/streams/minmaxbygroup/OrderItem.java b/core-java-modules/core-java-lambdas-2/src/main/java/com/baeldung/minmaxbygroup/OrderItem.java similarity index 93% rename from core-java-modules/core-java-streams-simple/src/main/java/com/baeldung/streams/minmaxbygroup/OrderItem.java rename to core-java-modules/core-java-lambdas-2/src/main/java/com/baeldung/minmaxbygroup/OrderItem.java index 94b0252e709f..7c61022123d9 100644 --- a/core-java-modules/core-java-streams-simple/src/main/java/com/baeldung/streams/minmaxbygroup/OrderItem.java +++ b/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; diff --git a/core-java-modules/core-java-streams-simple/src/main/java/com/baeldung/streams/minmaxbygroup/OrderItemCategory.java b/core-java-modules/core-java-lambdas-2/src/main/java/com/baeldung/minmaxbygroup/OrderItemCategory.java similarity index 67% rename from core-java-modules/core-java-streams-simple/src/main/java/com/baeldung/streams/minmaxbygroup/OrderItemCategory.java rename to core-java-modules/core-java-lambdas-2/src/main/java/com/baeldung/minmaxbygroup/OrderItemCategory.java index b5c29802613d..bbf68f531f1f 100644 --- a/core-java-modules/core-java-streams-simple/src/main/java/com/baeldung/streams/minmaxbygroup/OrderItemCategory.java +++ b/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, diff --git a/core-java-modules/core-java-streams-simple/src/main/java/com/baeldung/streams/minmaxbygroup/OrderProcessor.java b/core-java-modules/core-java-lambdas-2/src/main/java/com/baeldung/minmaxbygroup/OrderProcessor.java similarity index 94% rename from core-java-modules/core-java-streams-simple/src/main/java/com/baeldung/streams/minmaxbygroup/OrderProcessor.java rename to core-java-modules/core-java-lambdas-2/src/main/java/com/baeldung/minmaxbygroup/OrderProcessor.java index a5c1f5e590e8..044f3d8a9537 100644 --- a/core-java-modules/core-java-streams-simple/src/main/java/com/baeldung/streams/minmaxbygroup/OrderProcessor.java +++ b/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 { diff --git a/core-java-modules/core-java-streams-simple/src/test/java/com/baeldung/streams/minmaxbygroup/OrderProcessorUnitTest.java b/core-java-modules/core-java-lambdas-2/src/test/java/com/baeldung/minmaxbygroup/OrderProcessorUnitTest.java similarity index 97% rename from core-java-modules/core-java-streams-simple/src/test/java/com/baeldung/streams/minmaxbygroup/OrderProcessorUnitTest.java rename to core-java-modules/core-java-lambdas-2/src/test/java/com/baeldung/minmaxbygroup/OrderProcessorUnitTest.java index 8aa0417e1eda..4a7c309aa5ee 100644 --- a/core-java-modules/core-java-streams-simple/src/test/java/com/baeldung/streams/minmaxbygroup/OrderProcessorUnitTest.java +++ b/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; diff --git a/core-java-modules/core-java-streams-7/pom.xml b/core-java-modules/core-java-streams-7/pom.xml index 39cb2e46aa0b..489a228d1e07 100644 --- a/core-java-modules/core-java-streams-7/pom.xml +++ b/core-java-modules/core-java-streams-7/pom.xml @@ -13,6 +13,14 @@ 0.0.1-SNAPSHOT + + + org.apache.commons + commons-lang3 + ${commons-lang3.version} + + + core-java-streams-7 diff --git a/core-java-modules/core-java-streams-simple/src/main/java/com/baeldung/streams/groupingby/BlogPost.java b/core-java-modules/core-java-streams-7/src/main/java/com/baeldung/streams/groupingby/BlogPost.java similarity index 100% rename from core-java-modules/core-java-streams-simple/src/main/java/com/baeldung/streams/groupingby/BlogPost.java rename to core-java-modules/core-java-streams-7/src/main/java/com/baeldung/streams/groupingby/BlogPost.java diff --git a/core-java-modules/core-java-streams-simple/src/main/java/com/baeldung/streams/groupingby/BlogPostType.java b/core-java-modules/core-java-streams-7/src/main/java/com/baeldung/streams/groupingby/BlogPostType.java similarity index 100% rename from core-java-modules/core-java-streams-simple/src/main/java/com/baeldung/streams/groupingby/BlogPostType.java rename to core-java-modules/core-java-streams-7/src/main/java/com/baeldung/streams/groupingby/BlogPostType.java diff --git a/core-java-modules/core-java-streams-simple/src/main/java/com/baeldung/streams/groupingby/Tuple.java b/core-java-modules/core-java-streams-7/src/main/java/com/baeldung/streams/groupingby/Tuple.java similarity index 100% rename from core-java-modules/core-java-streams-simple/src/main/java/com/baeldung/streams/groupingby/Tuple.java rename to core-java-modules/core-java-streams-7/src/main/java/com/baeldung/streams/groupingby/Tuple.java diff --git a/core-java-modules/core-java-streams-simple/src/main/java/com/baeldung/streams/parallel/BenchmarkRunner.java b/core-java-modules/core-java-streams-7/src/main/java/com/baeldung/streams/parallel/BenchmarkRunner.java similarity index 100% rename from core-java-modules/core-java-streams-simple/src/main/java/com/baeldung/streams/parallel/BenchmarkRunner.java rename to core-java-modules/core-java-streams-7/src/main/java/com/baeldung/streams/parallel/BenchmarkRunner.java diff --git a/core-java-modules/core-java-streams-simple/src/main/java/com/baeldung/streams/parallel/DifferentSourceSplitting.java b/core-java-modules/core-java-streams-7/src/main/java/com/baeldung/streams/parallel/DifferentSourceSplitting.java similarity index 100% rename from core-java-modules/core-java-streams-simple/src/main/java/com/baeldung/streams/parallel/DifferentSourceSplitting.java rename to core-java-modules/core-java-streams-7/src/main/java/com/baeldung/streams/parallel/DifferentSourceSplitting.java index 9ad569df30da..bf6621cd40ac 100644 --- a/core-java-modules/core-java-streams-simple/src/main/java/com/baeldung/streams/parallel/DifferentSourceSplitting.java +++ b/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 arrayListOfNumbers = new ArrayList<>(); diff --git a/core-java-modules/core-java-streams-simple/src/main/java/com/baeldung/streams/parallel/FileSearchCost.java b/core-java-modules/core-java-streams-7/src/main/java/com/baeldung/streams/parallel/FileSearchCost.java similarity index 100% rename from core-java-modules/core-java-streams-simple/src/main/java/com/baeldung/streams/parallel/FileSearchCost.java rename to core-java-modules/core-java-streams-7/src/main/java/com/baeldung/streams/parallel/FileSearchCost.java diff --git a/core-java-modules/core-java-streams-simple/src/main/java/com/baeldung/streams/parallel/MemoryLocalityCosts.java b/core-java-modules/core-java-streams-7/src/main/java/com/baeldung/streams/parallel/MemoryLocalityCosts.java similarity index 100% rename from core-java-modules/core-java-streams-simple/src/main/java/com/baeldung/streams/parallel/MemoryLocalityCosts.java rename to core-java-modules/core-java-streams-7/src/main/java/com/baeldung/streams/parallel/MemoryLocalityCosts.java index bc5cbf491b31..2bb94fb887e9 100644 --- a/core-java-modules/core-java-streams-simple/src/main/java/com/baeldung/streams/parallel/MemoryLocalityCosts.java +++ b/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]; diff --git a/core-java-modules/core-java-streams-simple/src/main/java/com/baeldung/streams/parallel/MergingCosts.java b/core-java-modules/core-java-streams-7/src/main/java/com/baeldung/streams/parallel/MergingCosts.java similarity index 100% rename from core-java-modules/core-java-streams-simple/src/main/java/com/baeldung/streams/parallel/MergingCosts.java rename to core-java-modules/core-java-streams-7/src/main/java/com/baeldung/streams/parallel/MergingCosts.java index a9919dbe7240..6ba427dab8c2 100644 --- a/core-java-modules/core-java-streams-simple/src/main/java/com/baeldung/streams/parallel/MergingCosts.java +++ b/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 arrayListOfNumbers = new ArrayList<>(); diff --git a/core-java-modules/core-java-streams-simple/src/main/java/com/baeldung/streams/parallel/ParallelStream.java b/core-java-modules/core-java-streams-7/src/main/java/com/baeldung/streams/parallel/ParallelStream.java similarity index 100% rename from core-java-modules/core-java-streams-simple/src/main/java/com/baeldung/streams/parallel/ParallelStream.java rename to core-java-modules/core-java-streams-7/src/main/java/com/baeldung/streams/parallel/ParallelStream.java diff --git a/core-java-modules/core-java-streams-simple/src/main/java/com/baeldung/streams/parallel/SequentialStream.java b/core-java-modules/core-java-streams-7/src/main/java/com/baeldung/streams/parallel/SequentialStream.java similarity index 100% rename from core-java-modules/core-java-streams-simple/src/main/java/com/baeldung/streams/parallel/SequentialStream.java rename to core-java-modules/core-java-streams-7/src/main/java/com/baeldung/streams/parallel/SequentialStream.java diff --git a/core-java-modules/core-java-streams-simple/src/main/java/com/baeldung/streams/parallel/SplittingCosts.java b/core-java-modules/core-java-streams-7/src/main/java/com/baeldung/streams/parallel/SplittingCosts.java similarity index 100% rename from core-java-modules/core-java-streams-simple/src/main/java/com/baeldung/streams/parallel/SplittingCosts.java rename to core-java-modules/core-java-streams-7/src/main/java/com/baeldung/streams/parallel/SplittingCosts.java index d1e878df1f75..bd32e1ae499d 100644 --- a/core-java-modules/core-java-streams-simple/src/main/java/com/baeldung/streams/parallel/SplittingCosts.java +++ b/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 diff --git a/core-java-modules/core-java-streams-simple/src/main/java/com/baeldung/streams/reduce/application/Application.java b/core-java-modules/core-java-streams-7/src/main/java/com/baeldung/streams/reduce/application/Application.java similarity index 100% rename from core-java-modules/core-java-streams-simple/src/main/java/com/baeldung/streams/reduce/application/Application.java rename to core-java-modules/core-java-streams-7/src/main/java/com/baeldung/streams/reduce/application/Application.java index 2ea91edddd75..aab5aceab3e3 100644 --- a/core-java-modules/core-java-streams-simple/src/main/java/com/baeldung/streams/reduce/application/Application.java +++ b/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) { diff --git a/core-java-modules/core-java-streams-simple/src/main/java/com/baeldung/streams/reduce/benchmarks/JMHStreamReduceBenchMark.java b/core-java-modules/core-java-streams-7/src/main/java/com/baeldung/streams/reduce/benchmarks/JMHStreamReduceBenchMark.java similarity index 99% rename from core-java-modules/core-java-streams-simple/src/main/java/com/baeldung/streams/reduce/benchmarks/JMHStreamReduceBenchMark.java rename to core-java-modules/core-java-streams-7/src/main/java/com/baeldung/streams/reduce/benchmarks/JMHStreamReduceBenchMark.java index 3c11643bcea6..fafa0073aaef 100644 --- a/core-java-modules/core-java-streams-simple/src/main/java/com/baeldung/streams/reduce/benchmarks/JMHStreamReduceBenchMark.java +++ b/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 { diff --git a/core-java-modules/core-java-streams-simple/src/main/java/com/baeldung/streams/reduce/entities/Rating.java b/core-java-modules/core-java-streams-7/src/main/java/com/baeldung/streams/reduce/entities/Rating.java similarity index 100% rename from core-java-modules/core-java-streams-simple/src/main/java/com/baeldung/streams/reduce/entities/Rating.java rename to core-java-modules/core-java-streams-7/src/main/java/com/baeldung/streams/reduce/entities/Rating.java diff --git a/core-java-modules/core-java-streams-simple/src/main/java/com/baeldung/streams/reduce/entities/Review.java b/core-java-modules/core-java-streams-7/src/main/java/com/baeldung/streams/reduce/entities/Review.java similarity index 100% rename from core-java-modules/core-java-streams-simple/src/main/java/com/baeldung/streams/reduce/entities/Review.java rename to core-java-modules/core-java-streams-7/src/main/java/com/baeldung/streams/reduce/entities/Review.java diff --git a/core-java-modules/core-java-streams-simple/src/main/java/com/baeldung/streams/reduce/entities/User.java b/core-java-modules/core-java-streams-7/src/main/java/com/baeldung/streams/reduce/entities/User.java similarity index 100% rename from core-java-modules/core-java-streams-simple/src/main/java/com/baeldung/streams/reduce/entities/User.java rename to core-java-modules/core-java-streams-7/src/main/java/com/baeldung/streams/reduce/entities/User.java diff --git a/core-java-modules/core-java-streams-simple/src/main/java/com/baeldung/streams/reduce/utilities/NumberUtils.java b/core-java-modules/core-java-streams-7/src/main/java/com/baeldung/streams/reduce/utilities/NumberUtils.java similarity index 100% rename from core-java-modules/core-java-streams-simple/src/main/java/com/baeldung/streams/reduce/utilities/NumberUtils.java rename to core-java-modules/core-java-streams-7/src/main/java/com/baeldung/streams/reduce/utilities/NumberUtils.java diff --git a/core-java-modules/core-java-streams-simple/src/test/java/com/baeldung/streams/groupingby/JavaGroupingByCollectorUnitTest.java b/core-java-modules/core-java-streams-7/src/test/java/com/baeldung/streams/groupingby/JavaGroupingByCollectorUnitTest.java similarity index 100% rename from core-java-modules/core-java-streams-simple/src/test/java/com/baeldung/streams/groupingby/JavaGroupingByCollectorUnitTest.java rename to core-java-modules/core-java-streams-7/src/test/java/com/baeldung/streams/groupingby/JavaGroupingByCollectorUnitTest.java index be5d176c5036..968617e8de20 100644 --- a/core-java-modules/core-java-streams-simple/src/test/java/com/baeldung/streams/groupingby/JavaGroupingByCollectorUnitTest.java +++ b/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; diff --git a/core-java-modules/core-java-streams-simple/src/test/java/com/baeldung/streams/parallel/ForkJoinUnitTest.java b/core-java-modules/core-java-streams-7/src/test/java/com/baeldung/streams/parallel/ForkJoinUnitTest.java similarity index 100% rename from core-java-modules/core-java-streams-simple/src/test/java/com/baeldung/streams/parallel/ForkJoinUnitTest.java rename to core-java-modules/core-java-streams-7/src/test/java/com/baeldung/streams/parallel/ForkJoinUnitTest.java index f9aab8ed6cbc..cb4216705a99 100644 --- a/core-java-modules/core-java-streams-simple/src/test/java/com/baeldung/streams/parallel/ForkJoinUnitTest.java +++ b/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 { diff --git a/core-java-modules/core-java-streams-simple/src/test/java/com/baeldung/streams/reduce/StreamReduceManualTest.java b/core-java-modules/core-java-streams-7/src/test/java/com/baeldung/streams/reduce/StreamReduceManualTest.java similarity index 100% rename from core-java-modules/core-java-streams-simple/src/test/java/com/baeldung/streams/reduce/StreamReduceManualTest.java rename to core-java-modules/core-java-streams-7/src/test/java/com/baeldung/streams/reduce/StreamReduceManualTest.java diff --git a/core-java-modules/core-java-streams-simple/src/test/java/com/baeldung/streams/reduce/StreamReduceUnitTest.java b/core-java-modules/core-java-streams-7/src/test/java/com/baeldung/streams/reduce/StreamReduceUnitTest.java similarity index 100% rename from core-java-modules/core-java-streams-simple/src/test/java/com/baeldung/streams/reduce/StreamReduceUnitTest.java rename to core-java-modules/core-java-streams-7/src/test/java/com/baeldung/streams/reduce/StreamReduceUnitTest.java index 009dd2ee37df..6148bbed423b 100644 --- a/core-java-modules/core-java-streams-simple/src/test/java/com/baeldung/streams/reduce/StreamReduceUnitTest.java +++ b/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 { diff --git a/core-java-modules/core-java-streams-simple/src/test/java/com/baeldung/streams/flatmap/map/Java8MapAndFlatMapUnitTest.java b/core-java-modules/core-java-streams-maps/src/test/java/com/baeldung/streams/flatmap/map/Java8MapAndFlatMapUnitTest.java similarity index 99% rename from core-java-modules/core-java-streams-simple/src/test/java/com/baeldung/streams/flatmap/map/Java8MapAndFlatMapUnitTest.java rename to core-java-modules/core-java-streams-maps/src/test/java/com/baeldung/streams/flatmap/map/Java8MapAndFlatMapUnitTest.java index 6de0f733513a..54a378c7516e 100644 --- a/core-java-modules/core-java-streams-simple/src/test/java/com/baeldung/streams/flatmap/map/Java8MapAndFlatMapUnitTest.java +++ b/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 { diff --git a/core-java-modules/core-java-streams-simple/src/test/java/com/baeldung/streams/map/StreamMapUnitTest.java b/core-java-modules/core-java-streams-maps/src/test/java/com/baeldung/streams/map/StreamMapUnitTest.java similarity index 100% rename from core-java-modules/core-java-streams-simple/src/test/java/com/baeldung/streams/map/StreamMapUnitTest.java rename to core-java-modules/core-java-streams-maps/src/test/java/com/baeldung/streams/map/StreamMapUnitTest.java index c493ed903de4..b52efa18ce2f 100644 --- a/core-java-modules/core-java-streams-simple/src/test/java/com/baeldung/streams/map/StreamMapUnitTest.java +++ b/core-java-modules/core-java-streams-maps/src/test/java/com/baeldung/streams/map/StreamMapUnitTest.java @@ -1,7 +1,7 @@ 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; @@ -9,8 +9,8 @@ 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 { diff --git a/core-java-modules/core-java-streams-simple/pom.xml b/core-java-modules/core-java-streams-simple/pom.xml index a3855e20c53b..ade7e626adc3 100644 --- a/core-java-modules/core-java-streams-simple/pom.xml +++ b/core-java-modules/core-java-streams-simple/pom.xml @@ -19,11 +19,6 @@ throwing-function ${throwing-function.version} - - org.apache.commons - commons-lang3 - ${commons-lang3.version} - diff --git a/core-java-modules/core-java-streams-simple/src/test/java/com/baeldung/streams/filter/StreamFilterUnitTest.java b/core-java-modules/core-java-streams-simple/src/test/java/com/baeldung/streams/filter/StreamFilterUnitTest.java index c18f5c8181a2..ab859963bdbe 100644 --- a/core-java-modules/core-java-streams-simple/src/test/java/com/baeldung/streams/filter/StreamFilterUnitTest.java +++ b/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;