Use spotless to enforce formatting rules (#994)

pom.xml

@@ -90,6 +90,25 @@
                 <extensions>true</extensions>
             </plugin>
 
+            <plugin>
+                <groupId>com.diffplug.spotless</groupId>
+                <artifactId>spotless-maven-plugin</artifactId>
+                <version>2.44.1</version>
+                <configuration>
+                    <java>
+                        <removeUnusedImports/>
+                        <importOrder/>
+                    </java>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                        <phase>compile</phase>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 

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
  */

src/main/java/com/pivovarit/collectors/BatchingSpliterator.java

@@ -1,16 +1,16 @@
 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;
 import java.util.function.Consumer;
 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
  */

src/main/java/com/pivovarit/collectors/CompletionOrderSpliterator.java

@@ -55,5 +55,3 @@ public int characteristics() {
         return SIZED | IMMUTABLE | NONNULL;
     }
 }
-
-

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
  */

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
  */

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
  */

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;
-

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 {
 

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 {
 

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 {
 

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 {
 

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)

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() {

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 {
 

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

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<Factory.GenericCollector<Factory.CollectorFactoryWithParallelism<Integer, Integer>>> allBatching() {
         return Stream.of(

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 {