diff --git a/pom.xml b/pom.xml index 9c9ad8b5..5a708662 100644 --- a/pom.xml +++ b/pom.xml @@ -90,6 +90,25 @@ true + + com.diffplug.spotless + spotless-maven-plugin + 2.44.1 + + + + + + + + + + check + + compile + + + diff --git a/src/main/java/com/pivovarit/collectors/AsyncParallelCollector.java b/src/main/java/com/pivovarit/collectors/AsyncParallelCollector.java index a5d572e6..f5723ad3 100644 --- a/src/main/java/com/pivovarit/collectors/AsyncParallelCollector.java +++ b/src/main/java/com/pivovarit/collectors/AsyncParallelCollector.java @@ -1,5 +1,15 @@ package com.pivovarit.collectors; +import static com.pivovarit.collectors.BatchingSpliterator.batching; +import static com.pivovarit.collectors.BatchingSpliterator.partitioned; +import static com.pivovarit.collectors.Preconditions.requireValidExecutor; +import static com.pivovarit.collectors.Preconditions.requireValidParallelism; +import static java.util.Objects.requireNonNull; +import static java.util.concurrent.CompletableFuture.allOf; +import static java.util.concurrent.CompletableFuture.supplyAsync; +import static java.util.stream.Collectors.collectingAndThen; +import static java.util.stream.Collectors.toList; + import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -16,16 +26,6 @@ import java.util.stream.Collector; import java.util.stream.Stream; -import static com.pivovarit.collectors.BatchingSpliterator.batching; -import static com.pivovarit.collectors.BatchingSpliterator.partitioned; -import static com.pivovarit.collectors.Preconditions.requireValidExecutor; -import static com.pivovarit.collectors.Preconditions.requireValidParallelism; -import static java.util.Objects.requireNonNull; -import static java.util.concurrent.CompletableFuture.allOf; -import static java.util.concurrent.CompletableFuture.supplyAsync; -import static java.util.stream.Collectors.collectingAndThen; -import static java.util.stream.Collectors.toList; - /** * @author Grzegorz Piwowarek */ diff --git a/src/main/java/com/pivovarit/collectors/BatchingSpliterator.java b/src/main/java/com/pivovarit/collectors/BatchingSpliterator.java index 8910795c..b8bb967b 100644 --- a/src/main/java/com/pivovarit/collectors/BatchingSpliterator.java +++ b/src/main/java/com/pivovarit/collectors/BatchingSpliterator.java @@ -1,5 +1,9 @@ package com.pivovarit.collectors; +import static java.util.stream.Stream.empty; +import static java.util.stream.Stream.of; +import static java.util.stream.StreamSupport.stream; + import java.util.ArrayList; import java.util.List; import java.util.Spliterator; @@ -7,10 +11,6 @@ import java.util.function.Function; import java.util.stream.Stream; -import static java.util.stream.Stream.empty; -import static java.util.stream.Stream.of; -import static java.util.stream.StreamSupport.stream; - /** * @author Grzegorz Piwowarek */ diff --git a/src/main/java/com/pivovarit/collectors/CompletionOrderSpliterator.java b/src/main/java/com/pivovarit/collectors/CompletionOrderSpliterator.java index 7bd76466..96209444 100644 --- a/src/main/java/com/pivovarit/collectors/CompletionOrderSpliterator.java +++ b/src/main/java/com/pivovarit/collectors/CompletionOrderSpliterator.java @@ -55,5 +55,3 @@ public int characteristics() { return SIZED | IMMUTABLE | NONNULL; } } - - diff --git a/src/main/java/com/pivovarit/collectors/Dispatcher.java b/src/main/java/com/pivovarit/collectors/Dispatcher.java index b9ff37ff..e4a0798e 100644 --- a/src/main/java/com/pivovarit/collectors/Dispatcher.java +++ b/src/main/java/com/pivovarit/collectors/Dispatcher.java @@ -1,5 +1,7 @@ package com.pivovarit.collectors; +import static com.pivovarit.collectors.Preconditions.requireValidExecutor; + import java.util.concurrent.BlockingQueue; import java.util.concurrent.CompletableFuture; import java.util.concurrent.Executor; @@ -14,8 +16,6 @@ import java.util.function.Function; import java.util.function.Supplier; -import static com.pivovarit.collectors.Preconditions.requireValidExecutor; - /** * @author Grzegorz Piwowarek */ diff --git a/src/main/java/com/pivovarit/collectors/FutureCollectors.java b/src/main/java/com/pivovarit/collectors/FutureCollectors.java index 2ae218c5..416ef388 100644 --- a/src/main/java/com/pivovarit/collectors/FutureCollectors.java +++ b/src/main/java/com/pivovarit/collectors/FutureCollectors.java @@ -1,12 +1,12 @@ package com.pivovarit.collectors; +import static java.util.stream.Collectors.toList; + import java.util.List; import java.util.concurrent.CompletableFuture; import java.util.stream.Collector; import java.util.stream.Collectors; -import static java.util.stream.Collectors.toList; - /** * @author Grzegorz Piwowarek */ diff --git a/src/main/java/com/pivovarit/collectors/ParallelStreamCollector.java b/src/main/java/com/pivovarit/collectors/ParallelStreamCollector.java index b6b510e8..668e8a04 100644 --- a/src/main/java/com/pivovarit/collectors/ParallelStreamCollector.java +++ b/src/main/java/com/pivovarit/collectors/ParallelStreamCollector.java @@ -1,5 +1,16 @@ package com.pivovarit.collectors; +import static com.pivovarit.collectors.BatchingSpliterator.batching; +import static com.pivovarit.collectors.BatchingSpliterator.partitioned; +import static com.pivovarit.collectors.CompletionStrategy.ordered; +import static com.pivovarit.collectors.CompletionStrategy.unordered; +import static com.pivovarit.collectors.Preconditions.requireValidExecutor; +import static com.pivovarit.collectors.Preconditions.requireValidParallelism; +import static java.util.Collections.emptySet; +import static java.util.Objects.requireNonNull; +import static java.util.stream.Collectors.collectingAndThen; +import static java.util.stream.Collectors.toList; + import java.util.ArrayList; import java.util.Collection; import java.util.EnumSet; @@ -14,17 +25,6 @@ import java.util.stream.Collector; import java.util.stream.Stream; -import static com.pivovarit.collectors.BatchingSpliterator.batching; -import static com.pivovarit.collectors.BatchingSpliterator.partitioned; -import static com.pivovarit.collectors.CompletionStrategy.ordered; -import static com.pivovarit.collectors.CompletionStrategy.unordered; -import static com.pivovarit.collectors.Preconditions.requireValidExecutor; -import static com.pivovarit.collectors.Preconditions.requireValidParallelism; -import static java.util.Collections.emptySet; -import static java.util.Objects.requireNonNull; -import static java.util.stream.Collectors.collectingAndThen; -import static java.util.stream.Collectors.toList; - /** * @author Grzegorz Piwowarek */ diff --git a/src/main/java/com/pivovarit/collectors/package-info.java b/src/main/java/com/pivovarit/collectors/package-info.java index 68e88d6d..26b35692 100644 --- a/src/main/java/com/pivovarit/collectors/package-info.java +++ b/src/main/java/com/pivovarit/collectors/package-info.java @@ -2,4 +2,3 @@ * The {@link com.pivovarit.collectors} package contains all internal components backing the {@link com.pivovarit.collectors.ParallelCollectors} APIs */ package com.pivovarit.collectors; - diff --git a/src/test/java/com/pivovarit/collectors/ArchitectureTest.java b/src/test/java/com/pivovarit/collectors/ArchitectureTest.java index c62db185..ab16ec29 100644 --- a/src/test/java/com/pivovarit/collectors/ArchitectureTest.java +++ b/src/test/java/com/pivovarit/collectors/ArchitectureTest.java @@ -1,14 +1,14 @@ package com.pivovarit.collectors; +import static com.tngtech.archunit.core.domain.JavaModifier.FINAL; +import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.classes; +import static com.tngtech.archunit.library.dependencies.SlicesRuleDefinition.slices; + import com.tngtech.archunit.core.importer.ImportOption; import com.tngtech.archunit.junit.AnalyzeClasses; import com.tngtech.archunit.junit.ArchTest; import com.tngtech.archunit.lang.ArchRule; -import static com.tngtech.archunit.core.domain.JavaModifier.FINAL; -import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.classes; -import static com.tngtech.archunit.library.dependencies.SlicesRuleDefinition.slices; - @AnalyzeClasses(packages = "com.pivovarit", importOptions = ImportOption.DoNotIncludeTests.class) class ArchitectureTest { diff --git a/src/test/java/com/pivovarit/collectors/BatchingSpliteratorTest.java b/src/test/java/com/pivovarit/collectors/BatchingSpliteratorTest.java index 40354290..a0f75b9f 100644 --- a/src/test/java/com/pivovarit/collectors/BatchingSpliteratorTest.java +++ b/src/test/java/com/pivovarit/collectors/BatchingSpliteratorTest.java @@ -1,14 +1,13 @@ package com.pivovarit.collectors; -import org.junit.jupiter.api.Test; +import static com.pivovarit.collectors.BatchingSpliterator.partitioned; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; import java.util.Arrays; import java.util.List; import java.util.stream.IntStream; - -import static com.pivovarit.collectors.BatchingSpliterator.partitioned; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatThrownBy; +import org.junit.jupiter.api.Test; class BatchingSpliteratorTest { diff --git a/src/test/java/com/pivovarit/collectors/CompletionOrderSpliteratorTest.java b/src/test/java/com/pivovarit/collectors/CompletionOrderSpliteratorTest.java index 3457515e..6583f607 100644 --- a/src/test/java/com/pivovarit/collectors/CompletionOrderSpliteratorTest.java +++ b/src/test/java/com/pivovarit/collectors/CompletionOrderSpliteratorTest.java @@ -1,8 +1,10 @@ package com.pivovarit.collectors; -import org.junit.jupiter.api.Test; +import static java.util.Arrays.asList; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.awaitility.Awaitility.await; -import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.Optional; @@ -11,11 +13,7 @@ import java.util.concurrent.CompletionException; import java.util.function.Consumer; import java.util.stream.StreamSupport; - -import static java.util.Arrays.asList; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatThrownBy; -import static org.awaitility.Awaitility.await; +import org.junit.jupiter.api.Test; class CompletionOrderSpliteratorTest { diff --git a/src/test/java/com/pivovarit/collectors/FutureCollectorsTest.java b/src/test/java/com/pivovarit/collectors/FutureCollectorsTest.java index d541a77a..2a557c7d 100644 --- a/src/test/java/com/pivovarit/collectors/FutureCollectorsTest.java +++ b/src/test/java/com/pivovarit/collectors/FutureCollectorsTest.java @@ -1,6 +1,8 @@ package com.pivovarit.collectors; -import org.junit.jupiter.api.Test; +import static java.util.stream.Collectors.toList; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertTimeout; import java.time.Duration; import java.util.Arrays; @@ -9,10 +11,7 @@ import java.util.concurrent.CompletionException; import java.util.concurrent.Executors; import java.util.stream.IntStream; - -import static java.util.stream.Collectors.toList; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertTimeout; +import org.junit.jupiter.api.Test; class FutureCollectorsTest { diff --git a/src/test/java/com/pivovarit/collectors/benchmark/BatchedVsNonBatchedBenchmark.java b/src/test/java/com/pivovarit/collectors/benchmark/BatchedVsNonBatchedBenchmark.java index 6b4a1453..38f0443c 100644 --- a/src/test/java/com/pivovarit/collectors/benchmark/BatchedVsNonBatchedBenchmark.java +++ b/src/test/java/com/pivovarit/collectors/benchmark/BatchedVsNonBatchedBenchmark.java @@ -1,6 +1,12 @@ package com.pivovarit.collectors.benchmark; +import static java.util.stream.Collectors.toList; + import com.pivovarit.collectors.ParallelCollectors; +import java.util.List; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.stream.IntStream; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.Level; import org.openjdk.jmh.annotations.Param; @@ -10,13 +16,6 @@ import org.openjdk.jmh.annotations.TearDown; import org.openjdk.jmh.runner.RunnerException; -import java.util.List; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.stream.IntStream; - -import static java.util.stream.Collectors.toList; - public class BatchedVsNonBatchedBenchmark { @State(Scope.Benchmark) diff --git a/src/test/java/com/pivovarit/collectors/benchmark/Benchmarks.java b/src/test/java/com/pivovarit/collectors/benchmark/Benchmarks.java index 1c2ecbe3..af5264d8 100644 --- a/src/test/java/com/pivovarit/collectors/benchmark/Benchmarks.java +++ b/src/test/java/com/pivovarit/collectors/benchmark/Benchmarks.java @@ -1,12 +1,11 @@ package com.pivovarit.collectors.benchmark; +import java.nio.file.Path; import org.openjdk.jmh.results.format.ResultFormatType; import org.openjdk.jmh.runner.Runner; import org.openjdk.jmh.runner.RunnerException; import org.openjdk.jmh.runner.options.OptionsBuilder; -import java.nio.file.Path; - final class Benchmarks { private Benchmarks() { diff --git a/src/test/java/com/pivovarit/collectors/test/BasicParallelismTest.java b/src/test/java/com/pivovarit/collectors/test/BasicParallelismTest.java index 894aec97..0308f6fc 100644 --- a/src/test/java/com/pivovarit/collectors/test/BasicParallelismTest.java +++ b/src/test/java/com/pivovarit/collectors/test/BasicParallelismTest.java @@ -1,18 +1,17 @@ package com.pivovarit.collectors.test; -import com.pivovarit.collectors.TestUtils; -import org.junit.jupiter.api.DynamicTest; -import org.junit.jupiter.api.TestFactory; +import static com.pivovarit.collectors.test.Factory.allBounded; +import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; +import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat; +import com.pivovarit.collectors.TestUtils; import java.time.Duration; import java.util.List; import java.util.function.Supplier; import java.util.stream.IntStream; import java.util.stream.Stream; - -import static com.pivovarit.collectors.test.Factory.allBounded; -import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; -import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat; +import org.junit.jupiter.api.DynamicTest; +import org.junit.jupiter.api.TestFactory; class BasicParallelismTest { diff --git a/src/test/java/com/pivovarit/collectors/test/BasicProcessingTest.java b/src/test/java/com/pivovarit/collectors/test/BasicProcessingTest.java index 29aa4c62..93502f44 100644 --- a/src/test/java/com/pivovarit/collectors/test/BasicProcessingTest.java +++ b/src/test/java/com/pivovarit/collectors/test/BasicProcessingTest.java @@ -1,15 +1,5 @@ package com.pivovarit.collectors.test; -import org.junit.jupiter.api.DynamicTest; -import org.junit.jupiter.api.TestFactory; - -import java.util.List; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.atomic.AtomicLong; -import java.util.stream.IntStream; -import java.util.stream.Stream; - import static com.pivovarit.collectors.TestUtils.returnWithDelay; import static com.pivovarit.collectors.test.Factory.all; import static com.pivovarit.collectors.test.Factory.allOrdered; @@ -20,6 +10,15 @@ import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat; import static org.awaitility.Awaitility.await; +import java.util.List; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.atomic.AtomicLong; +import java.util.stream.IntStream; +import java.util.stream.Stream; +import org.junit.jupiter.api.DynamicTest; +import org.junit.jupiter.api.TestFactory; + class BasicProcessingTest { @TestFactory diff --git a/src/test/java/com/pivovarit/collectors/test/BatchingTest.java b/src/test/java/com/pivovarit/collectors/test/BatchingTest.java index 8d3283bd..22ab5e1b 100644 --- a/src/test/java/com/pivovarit/collectors/test/BatchingTest.java +++ b/src/test/java/com/pivovarit/collectors/test/BatchingTest.java @@ -1,19 +1,18 @@ package com.pivovarit.collectors.test; -import com.pivovarit.collectors.ParallelCollectors; -import org.junit.jupiter.api.DynamicTest; -import org.junit.jupiter.api.TestFactory; - -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.ConcurrentSkipListSet; -import java.util.stream.Stream; - import static com.pivovarit.collectors.test.Factory.GenericCollector.limitedCollector; import static com.pivovarit.collectors.test.Factory.e; import static java.util.stream.Collectors.collectingAndThen; import static java.util.stream.Collectors.toList; import static org.assertj.core.api.Assertions.assertThat; +import com.pivovarit.collectors.ParallelCollectors; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ConcurrentSkipListSet; +import java.util.stream.Stream; +import org.junit.jupiter.api.DynamicTest; +import org.junit.jupiter.api.TestFactory; + class BatchingTest { private static Stream>> allBatching() { return Stream.of( diff --git a/src/test/java/com/pivovarit/collectors/test/ExceptionHandlingTest.java b/src/test/java/com/pivovarit/collectors/test/ExceptionHandlingTest.java index e64faa05..b84c3e75 100644 --- a/src/test/java/com/pivovarit/collectors/test/ExceptionHandlingTest.java +++ b/src/test/java/com/pivovarit/collectors/test/ExceptionHandlingTest.java @@ -1,18 +1,17 @@ package com.pivovarit.collectors.test; -import org.junit.jupiter.api.DynamicTest; -import org.junit.jupiter.api.TestFactory; +import static com.pivovarit.collectors.TestUtils.incrementAndThrow; +import static com.pivovarit.collectors.test.Factory.all; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; import java.util.List; import java.util.concurrent.CompletionException; import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.IntStream; import java.util.stream.Stream; - -import static com.pivovarit.collectors.TestUtils.incrementAndThrow; -import static com.pivovarit.collectors.test.Factory.all; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatThrownBy; +import org.junit.jupiter.api.DynamicTest; +import org.junit.jupiter.api.TestFactory; class ExceptionHandlingTest { diff --git a/src/test/java/com/pivovarit/collectors/test/ExecutorPollutionTest.java b/src/test/java/com/pivovarit/collectors/test/ExecutorPollutionTest.java index 0e9f385d..41a3b2da 100644 --- a/src/test/java/com/pivovarit/collectors/test/ExecutorPollutionTest.java +++ b/src/test/java/com/pivovarit/collectors/test/ExecutorPollutionTest.java @@ -1,15 +1,14 @@ package com.pivovarit.collectors.test; -import org.junit.jupiter.api.DynamicTest; -import org.junit.jupiter.api.TestFactory; +import static com.pivovarit.collectors.test.Factory.boundedCollectors; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Stream; - -import static com.pivovarit.collectors.test.Factory.boundedCollectors; +import org.junit.jupiter.api.DynamicTest; +import org.junit.jupiter.api.TestFactory; class ExecutorPollutionTest { diff --git a/src/test/java/com/pivovarit/collectors/test/ExecutorValidationTest.java b/src/test/java/com/pivovarit/collectors/test/ExecutorValidationTest.java index 758d298a..6e53b28c 100644 --- a/src/test/java/com/pivovarit/collectors/test/ExecutorValidationTest.java +++ b/src/test/java/com/pivovarit/collectors/test/ExecutorValidationTest.java @@ -1,18 +1,17 @@ package com.pivovarit.collectors.test; -import com.pivovarit.collectors.ParallelCollectors; -import org.junit.jupiter.api.DynamicTest; -import org.junit.jupiter.api.TestFactory; +import static com.pivovarit.collectors.test.Factory.GenericCollector.executorCollector; +import static java.util.stream.Collectors.collectingAndThen; +import static java.util.stream.Collectors.toList; +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import com.pivovarit.collectors.ParallelCollectors; import java.util.concurrent.SynchronousQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Stream; - -import static com.pivovarit.collectors.test.Factory.GenericCollector.executorCollector; -import static java.util.stream.Collectors.collectingAndThen; -import static org.assertj.core.api.Assertions.assertThatThrownBy; -import static java.util.stream.Collectors.toList; +import org.junit.jupiter.api.DynamicTest; +import org.junit.jupiter.api.TestFactory; class ExecutorValidationTest { diff --git a/src/test/java/com/pivovarit/collectors/test/Factory.java b/src/test/java/com/pivovarit/collectors/test/Factory.java index 3dedb723..b2082131 100644 --- a/src/test/java/com/pivovarit/collectors/test/Factory.java +++ b/src/test/java/com/pivovarit/collectors/test/Factory.java @@ -1,7 +1,13 @@ package com.pivovarit.collectors.test; -import com.pivovarit.collectors.ParallelCollectors; +import static com.pivovarit.collectors.ParallelCollectors.Batching.parallel; +import static com.pivovarit.collectors.test.Factory.GenericCollector.advancedCollector; +import static com.pivovarit.collectors.test.Factory.GenericCollector.collector; +import static com.pivovarit.collectors.test.Factory.GenericCollector.limitedCollector; +import static java.util.stream.Collectors.collectingAndThen; +import static java.util.stream.Collectors.toList; +import com.pivovarit.collectors.ParallelCollectors; import java.util.List; import java.util.concurrent.CompletableFuture; import java.util.concurrent.Executor; @@ -10,13 +16,6 @@ import java.util.stream.Collector; import java.util.stream.Stream; -import static com.pivovarit.collectors.ParallelCollectors.Batching.parallel; -import static com.pivovarit.collectors.test.Factory.GenericCollector.advancedCollector; -import static com.pivovarit.collectors.test.Factory.GenericCollector.collector; -import static com.pivovarit.collectors.test.Factory.GenericCollector.limitedCollector; -import static java.util.stream.Collectors.collectingAndThen; -import static java.util.stream.Collectors.toList; - final class Factory { private Factory() { diff --git a/src/test/java/com/pivovarit/collectors/test/NonBlockingTest.java b/src/test/java/com/pivovarit/collectors/test/NonBlockingTest.java index bb4195d5..984aeed9 100644 --- a/src/test/java/com/pivovarit/collectors/test/NonBlockingTest.java +++ b/src/test/java/com/pivovarit/collectors/test/NonBlockingTest.java @@ -1,12 +1,5 @@ package com.pivovarit.collectors.test; -import com.pivovarit.collectors.ParallelCollectors; -import org.junit.jupiter.api.DynamicTest; -import org.junit.jupiter.api.TestFactory; - -import java.time.Duration; -import java.util.stream.Stream; - import static com.pivovarit.collectors.TestUtils.returnWithDelay; import static com.pivovarit.collectors.test.Factory.GenericCollector.asyncCollector; import static com.pivovarit.collectors.test.Factory.e; @@ -15,6 +8,12 @@ import static java.util.stream.Collectors.toList; import static org.junit.jupiter.api.Assertions.assertTimeoutPreemptively; +import com.pivovarit.collectors.ParallelCollectors; +import java.time.Duration; +import java.util.stream.Stream; +import org.junit.jupiter.api.DynamicTest; +import org.junit.jupiter.api.TestFactory; + class NonBlockingTest { private static Stream>> allAsync() { diff --git a/src/test/java/com/pivovarit/collectors/test/ParallelismValidationTest.java b/src/test/java/com/pivovarit/collectors/test/ParallelismValidationTest.java index 7f05704c..a7b35d8e 100644 --- a/src/test/java/com/pivovarit/collectors/test/ParallelismValidationTest.java +++ b/src/test/java/com/pivovarit/collectors/test/ParallelismValidationTest.java @@ -1,13 +1,12 @@ package com.pivovarit.collectors.test; -import org.junit.jupiter.api.DynamicTest; -import org.junit.jupiter.api.TestFactory; - -import java.util.stream.Stream; - import static com.pivovarit.collectors.test.Factory.allBounded; import static org.assertj.core.api.Assertions.assertThatThrownBy; +import java.util.stream.Stream; +import org.junit.jupiter.api.DynamicTest; +import org.junit.jupiter.api.TestFactory; + class ParallelismValidationTest { @TestFactory diff --git a/src/test/java/com/pivovarit/collectors/test/RejectedExecutionHandlingTest.java b/src/test/java/com/pivovarit/collectors/test/RejectedExecutionHandlingTest.java index e00267eb..6a1a0b0f 100644 --- a/src/test/java/com/pivovarit/collectors/test/RejectedExecutionHandlingTest.java +++ b/src/test/java/com/pivovarit/collectors/test/RejectedExecutionHandlingTest.java @@ -1,15 +1,5 @@ package com.pivovarit.collectors.test; -import com.pivovarit.collectors.ParallelCollectors; -import com.pivovarit.collectors.TestUtils; -import org.junit.jupiter.api.DynamicTest; -import org.junit.jupiter.api.TestFactory; - -import java.util.concurrent.CompletionException; -import java.util.concurrent.LinkedBlockingQueue; -import java.util.concurrent.ThreadPoolExecutor; -import java.util.stream.Stream; - import static com.pivovarit.collectors.test.Factory.GenericCollector.executorCollector; import static java.time.Duration.ofMillis; import static java.util.concurrent.TimeUnit.MILLISECONDS; @@ -19,6 +9,15 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.junit.jupiter.api.Assertions.assertTimeoutPreemptively; +import com.pivovarit.collectors.ParallelCollectors; +import com.pivovarit.collectors.TestUtils; +import java.util.concurrent.CompletionException; +import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.stream.Stream; +import org.junit.jupiter.api.DynamicTest; +import org.junit.jupiter.api.TestFactory; + class RejectedExecutionHandlingTest { private static Stream>> allWithCustomExecutors() { diff --git a/src/test/java/com/pivovarit/collectors/test/StreamingTest.java b/src/test/java/com/pivovarit/collectors/test/StreamingTest.java index 148164a4..a1f24ec4 100644 --- a/src/test/java/com/pivovarit/collectors/test/StreamingTest.java +++ b/src/test/java/com/pivovarit/collectors/test/StreamingTest.java @@ -1,15 +1,5 @@ package com.pivovarit.collectors.test; -import com.pivovarit.collectors.ParallelCollectors; -import org.junit.jupiter.api.DynamicTest; -import org.junit.jupiter.api.TestFactory; - -import java.time.Duration; -import java.util.List; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.stream.IntStream; -import java.util.stream.Stream; - import static com.pivovarit.collectors.TestUtils.returnWithDelay; import static com.pivovarit.collectors.test.Factory.GenericCollector.streamingCollector; import static com.pivovarit.collectors.test.Factory.e; @@ -20,6 +10,15 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; +import com.pivovarit.collectors.ParallelCollectors; +import java.time.Duration; +import java.util.List; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.stream.IntStream; +import java.util.stream.Stream; +import org.junit.jupiter.api.DynamicTest; +import org.junit.jupiter.api.TestFactory; + class StreamingTest { private static Stream>> allStreaming() {