Skip to content

Commit d6412c8

Browse files
pivovaritpivovarit
committed
Apply semantic sort to import ordering
1 parent dc9074f commit d6412c8

22 files changed

+116
-114
lines changed

‎pom.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,9 @@
9797
<configuration>
9898
<java>
9999
<removeUnusedImports/>
100-
<importOrder/>
100+
<importOrder>
101+
<order>,\#</order>
102+
</importOrder>
101103
<endWithNewline/>
102104
</java>
103105
</configuration>

‎src/main/java/com/pivovarit/collectors/AsyncParallelCollector.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,5 @@
11
package com.pivovarit.collectors;
22

3-
import static com.pivovarit.collectors.BatchingSpliterator.batching;
4-
import static com.pivovarit.collectors.BatchingSpliterator.partitioned;
5-
import static com.pivovarit.collectors.Preconditions.requireValidExecutor;
6-
import static com.pivovarit.collectors.Preconditions.requireValidParallelism;
7-
import static java.util.Objects.requireNonNull;
8-
import static java.util.concurrent.CompletableFuture.allOf;
9-
import static java.util.concurrent.CompletableFuture.supplyAsync;
10-
import static java.util.stream.Collectors.collectingAndThen;
11-
import static java.util.stream.Collectors.toList;
12-
133
import java.util.ArrayList;
144
import java.util.Collection;
155
import java.util.Collections;
@@ -26,6 +16,16 @@
2616
import java.util.stream.Collector;
2717
import java.util.stream.Stream;
2818

19+
import static com.pivovarit.collectors.BatchingSpliterator.batching;
20+
import static com.pivovarit.collectors.BatchingSpliterator.partitioned;
21+
import static com.pivovarit.collectors.Preconditions.requireValidExecutor;
22+
import static com.pivovarit.collectors.Preconditions.requireValidParallelism;
23+
import static java.util.Objects.requireNonNull;
24+
import static java.util.concurrent.CompletableFuture.allOf;
25+
import static java.util.concurrent.CompletableFuture.supplyAsync;
26+
import static java.util.stream.Collectors.collectingAndThen;
27+
import static java.util.stream.Collectors.toList;
28+
2929
/**
3030
* @author Grzegorz Piwowarek
3131
*/

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
package com.pivovarit.collectors;
22

3-
import static java.util.stream.Stream.empty;
4-
import static java.util.stream.Stream.of;
5-
import static java.util.stream.StreamSupport.stream;
6-
73
import java.util.ArrayList;
84
import java.util.List;
95
import java.util.Spliterator;
106
import java.util.function.Consumer;
117
import java.util.function.Function;
128
import java.util.stream.Stream;
139

10+
import static java.util.stream.Stream.empty;
11+
import static java.util.stream.Stream.of;
12+
import static java.util.stream.StreamSupport.stream;
13+
1414
/**
1515
* @author Grzegorz Piwowarek
1616
*/

‎src/main/java/com/pivovarit/collectors/Dispatcher.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package com.pivovarit.collectors;
22

3-
import static com.pivovarit.collectors.Preconditions.requireValidExecutor;
4-
53
import java.util.concurrent.BlockingQueue;
64
import java.util.concurrent.CompletableFuture;
75
import java.util.concurrent.Executor;
@@ -16,6 +14,8 @@
1614
import java.util.function.Function;
1715
import java.util.function.Supplier;
1816

17+
import static com.pivovarit.collectors.Preconditions.requireValidExecutor;
18+
1919
/**
2020
* @author Grzegorz Piwowarek
2121
*/

‎src/main/java/com/pivovarit/collectors/FutureCollectors.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package com.pivovarit.collectors;
22

3-
import static java.util.stream.Collectors.toList;
4-
53
import java.util.List;
64
import java.util.concurrent.CompletableFuture;
75
import java.util.stream.Collector;
86
import java.util.stream.Collectors;
97

8+
import static java.util.stream.Collectors.toList;
9+
1010
/**
1111
* @author Grzegorz Piwowarek
1212
*/

‎src/main/java/com/pivovarit/collectors/ParallelStreamCollector.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,5 @@
11
package com.pivovarit.collectors;
22

3-
import static com.pivovarit.collectors.BatchingSpliterator.batching;
4-
import static com.pivovarit.collectors.BatchingSpliterator.partitioned;
5-
import static com.pivovarit.collectors.CompletionStrategy.ordered;
6-
import static com.pivovarit.collectors.CompletionStrategy.unordered;
7-
import static com.pivovarit.collectors.Preconditions.requireValidExecutor;
8-
import static com.pivovarit.collectors.Preconditions.requireValidParallelism;
9-
import static java.util.Collections.emptySet;
10-
import static java.util.Objects.requireNonNull;
11-
import static java.util.stream.Collectors.collectingAndThen;
12-
import static java.util.stream.Collectors.toList;
13-
143
import java.util.ArrayList;
154
import java.util.Collection;
165
import java.util.EnumSet;
@@ -25,6 +14,17 @@
2514
import java.util.stream.Collector;
2615
import java.util.stream.Stream;
2716

17+
import static com.pivovarit.collectors.BatchingSpliterator.batching;
18+
import static com.pivovarit.collectors.BatchingSpliterator.partitioned;
19+
import static com.pivovarit.collectors.CompletionStrategy.ordered;
20+
import static com.pivovarit.collectors.CompletionStrategy.unordered;
21+
import static com.pivovarit.collectors.Preconditions.requireValidExecutor;
22+
import static com.pivovarit.collectors.Preconditions.requireValidParallelism;
23+
import static java.util.Collections.emptySet;
24+
import static java.util.Objects.requireNonNull;
25+
import static java.util.stream.Collectors.collectingAndThen;
26+
import static java.util.stream.Collectors.toList;
27+
2828
/**
2929
* @author Grzegorz Piwowarek
3030
*/

‎src/test/java/com/pivovarit/collectors/ArchitectureTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package com.pivovarit.collectors;
22

3-
import static com.tngtech.archunit.core.domain.JavaModifier.FINAL;
4-
import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.classes;
5-
import static com.tngtech.archunit.library.dependencies.SlicesRuleDefinition.slices;
6-
73
import com.tngtech.archunit.core.importer.ImportOption;
84
import com.tngtech.archunit.junit.AnalyzeClasses;
95
import com.tngtech.archunit.junit.ArchTest;
106
import com.tngtech.archunit.lang.ArchRule;
117

8+
import static com.tngtech.archunit.core.domain.JavaModifier.FINAL;
9+
import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.classes;
10+
import static com.tngtech.archunit.library.dependencies.SlicesRuleDefinition.slices;
11+
1212
@AnalyzeClasses(packages = "com.pivovarit", importOptions = ImportOption.DoNotIncludeTests.class)
1313
class ArchitectureTest {
1414

‎src/test/java/com/pivovarit/collectors/BatchingSpliteratorTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package com.pivovarit.collectors;
22

3-
import static com.pivovarit.collectors.BatchingSpliterator.partitioned;
4-
import static org.assertj.core.api.Assertions.assertThat;
5-
import static org.assertj.core.api.Assertions.assertThatThrownBy;
6-
73
import java.util.Arrays;
84
import java.util.List;
95
import java.util.stream.IntStream;
106
import org.junit.jupiter.api.Test;
117

8+
import static com.pivovarit.collectors.BatchingSpliterator.partitioned;
9+
import static org.assertj.core.api.Assertions.assertThat;
10+
import static org.assertj.core.api.Assertions.assertThatThrownBy;
11+
1212
class BatchingSpliteratorTest {
1313

1414
@Test

‎src/test/java/com/pivovarit/collectors/CompletionOrderSpliteratorTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
package com.pivovarit.collectors;
22

3-
import static java.util.Arrays.asList;
4-
import static org.assertj.core.api.Assertions.assertThat;
5-
import static org.assertj.core.api.Assertions.assertThatThrownBy;
6-
import static org.awaitility.Awaitility.await;
7-
83
import java.util.Collections;
94
import java.util.List;
105
import java.util.Optional;
@@ -15,6 +10,11 @@
1510
import java.util.stream.StreamSupport;
1611
import org.junit.jupiter.api.Test;
1712

13+
import static java.util.Arrays.asList;
14+
import static org.assertj.core.api.Assertions.assertThat;
15+
import static org.assertj.core.api.Assertions.assertThatThrownBy;
16+
import static org.awaitility.Awaitility.await;
17+
1818
class CompletionOrderSpliteratorTest {
1919

2020
@Test

‎src/test/java/com/pivovarit/collectors/FutureCollectorsTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
package com.pivovarit.collectors;
22

3-
import static java.util.stream.Collectors.toList;
4-
import static org.assertj.core.api.Assertions.assertThat;
5-
import static org.junit.jupiter.api.Assertions.assertTimeout;
6-
73
import java.time.Duration;
84
import java.util.Arrays;
95
import java.util.List;
@@ -13,6 +9,10 @@
139
import java.util.stream.IntStream;
1410
import org.junit.jupiter.api.Test;
1511

12+
import static java.util.stream.Collectors.toList;
13+
import static org.assertj.core.api.Assertions.assertThat;
14+
import static org.junit.jupiter.api.Assertions.assertTimeout;
15+
1616
class FutureCollectorsTest {
1717

1818
@Test

‎src/test/java/com/pivovarit/collectors/benchmark/BatchedVsNonBatchedBenchmark.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package com.pivovarit.collectors.benchmark;
22

3-
import static java.util.stream.Collectors.toList;
4-
53
import com.pivovarit.collectors.ParallelCollectors;
64
import java.util.List;
75
import java.util.concurrent.ExecutorService;
@@ -16,6 +14,8 @@
1614
import org.openjdk.jmh.annotations.TearDown;
1715
import org.openjdk.jmh.runner.RunnerException;
1816

17+
import static java.util.stream.Collectors.toList;
18+
1919
public class BatchedVsNonBatchedBenchmark {
2020

2121
@State(Scope.Benchmark)

‎src/test/java/com/pivovarit/collectors/test/BasicParallelismTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
package com.pivovarit.collectors.test;
22

3-
import static com.pivovarit.collectors.test.Factory.allBounded;
4-
import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
5-
import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
6-
73
import com.pivovarit.collectors.TestUtils;
84
import java.time.Duration;
95
import java.util.List;
@@ -13,6 +9,10 @@
139
import org.junit.jupiter.api.DynamicTest;
1410
import org.junit.jupiter.api.TestFactory;
1511

12+
import static com.pivovarit.collectors.test.Factory.allBounded;
13+
import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
14+
import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
15+
1616
class BasicParallelismTest {
1717

1818
@TestFactory

‎src/test/java/com/pivovarit/collectors/test/BasicProcessingTest.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
package com.pivovarit.collectors.test;
22

3+
import java.util.List;
4+
import java.util.concurrent.CountDownLatch;
5+
import java.util.concurrent.atomic.AtomicInteger;
6+
import java.util.concurrent.atomic.AtomicLong;
7+
import java.util.stream.IntStream;
8+
import java.util.stream.Stream;
9+
import org.junit.jupiter.api.DynamicTest;
10+
import org.junit.jupiter.api.TestFactory;
11+
312
import static com.pivovarit.collectors.TestUtils.returnWithDelay;
413
import static com.pivovarit.collectors.test.Factory.all;
514
import static com.pivovarit.collectors.test.Factory.allOrdered;
@@ -10,15 +19,6 @@
1019
import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
1120
import static org.awaitility.Awaitility.await;
1221

13-
import java.util.List;
14-
import java.util.concurrent.CountDownLatch;
15-
import java.util.concurrent.atomic.AtomicInteger;
16-
import java.util.concurrent.atomic.AtomicLong;
17-
import java.util.stream.IntStream;
18-
import java.util.stream.Stream;
19-
import org.junit.jupiter.api.DynamicTest;
20-
import org.junit.jupiter.api.TestFactory;
21-
2222
class BasicProcessingTest {
2323

2424
@TestFactory

‎src/test/java/com/pivovarit/collectors/test/BatchingTest.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
package com.pivovarit.collectors.test;
22

3-
import static com.pivovarit.collectors.test.Factory.GenericCollector.limitedCollector;
4-
import static com.pivovarit.collectors.test.Factory.e;
5-
import static java.util.stream.Collectors.collectingAndThen;
6-
import static java.util.stream.Collectors.toList;
7-
import static org.assertj.core.api.Assertions.assertThat;
8-
93
import com.pivovarit.collectors.ParallelCollectors;
104
import java.util.concurrent.CompletableFuture;
115
import java.util.concurrent.ConcurrentSkipListSet;
126
import java.util.stream.Stream;
137
import org.junit.jupiter.api.DynamicTest;
148
import org.junit.jupiter.api.TestFactory;
159

10+
import static com.pivovarit.collectors.test.Factory.GenericCollector.limitedCollector;
11+
import static com.pivovarit.collectors.test.Factory.e;
12+
import static java.util.stream.Collectors.collectingAndThen;
13+
import static java.util.stream.Collectors.toList;
14+
import static org.assertj.core.api.Assertions.assertThat;
15+
1616
class BatchingTest {
1717
private static Stream<Factory.GenericCollector<Factory.CollectorFactoryWithParallelism<Integer, Integer>>> allBatching() {
1818
return Stream.of(

‎src/test/java/com/pivovarit/collectors/test/ExceptionHandlingTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
package com.pivovarit.collectors.test;
22

3-
import static com.pivovarit.collectors.TestUtils.incrementAndThrow;
4-
import static com.pivovarit.collectors.test.Factory.all;
5-
import static org.assertj.core.api.Assertions.assertThat;
6-
import static org.assertj.core.api.Assertions.assertThatThrownBy;
7-
83
import java.util.List;
94
import java.util.concurrent.CompletionException;
105
import java.util.concurrent.atomic.AtomicInteger;
@@ -13,6 +8,11 @@
138
import org.junit.jupiter.api.DynamicTest;
149
import org.junit.jupiter.api.TestFactory;
1510

11+
import static com.pivovarit.collectors.TestUtils.incrementAndThrow;
12+
import static com.pivovarit.collectors.test.Factory.all;
13+
import static org.assertj.core.api.Assertions.assertThat;
14+
import static org.assertj.core.api.Assertions.assertThatThrownBy;
15+
1616
class ExceptionHandlingTest {
1717

1818
@TestFactory

‎src/test/java/com/pivovarit/collectors/test/ExecutorPollutionTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package com.pivovarit.collectors.test;
22

3-
import static com.pivovarit.collectors.test.Factory.boundedCollectors;
4-
53
import java.util.concurrent.CompletableFuture;
64
import java.util.concurrent.LinkedBlockingQueue;
75
import java.util.concurrent.ThreadPoolExecutor;
@@ -10,6 +8,8 @@
108
import org.junit.jupiter.api.DynamicTest;
119
import org.junit.jupiter.api.TestFactory;
1210

11+
import static com.pivovarit.collectors.test.Factory.boundedCollectors;
12+
1313
class ExecutorPollutionTest {
1414

1515
@TestFactory

‎src/test/java/com/pivovarit/collectors/test/ExecutorValidationTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
package com.pivovarit.collectors.test;
22

3-
import static com.pivovarit.collectors.test.Factory.GenericCollector.executorCollector;
4-
import static java.util.stream.Collectors.collectingAndThen;
5-
import static java.util.stream.Collectors.toList;
6-
import static org.assertj.core.api.Assertions.assertThatThrownBy;
7-
83
import com.pivovarit.collectors.ParallelCollectors;
94
import java.util.concurrent.SynchronousQueue;
105
import java.util.concurrent.ThreadPoolExecutor;
@@ -13,6 +8,11 @@
138
import org.junit.jupiter.api.DynamicTest;
149
import org.junit.jupiter.api.TestFactory;
1510

11+
import static com.pivovarit.collectors.test.Factory.GenericCollector.executorCollector;
12+
import static java.util.stream.Collectors.collectingAndThen;
13+
import static java.util.stream.Collectors.toList;
14+
import static org.assertj.core.api.Assertions.assertThatThrownBy;
15+
1616

1717
class ExecutorValidationTest {
1818

‎src/test/java/com/pivovarit/collectors/test/Factory.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,5 @@
11
package com.pivovarit.collectors.test;
22

3-
import static com.pivovarit.collectors.ParallelCollectors.Batching.parallel;
4-
import static com.pivovarit.collectors.test.Factory.GenericCollector.advancedCollector;
5-
import static com.pivovarit.collectors.test.Factory.GenericCollector.collector;
6-
import static com.pivovarit.collectors.test.Factory.GenericCollector.limitedCollector;
7-
import static java.util.stream.Collectors.collectingAndThen;
8-
import static java.util.stream.Collectors.toList;
9-
103
import com.pivovarit.collectors.ParallelCollectors;
114
import java.util.List;
125
import java.util.concurrent.CompletableFuture;
@@ -16,6 +9,13 @@
169
import java.util.stream.Collector;
1710
import java.util.stream.Stream;
1811

12+
import static com.pivovarit.collectors.ParallelCollectors.Batching.parallel;
13+
import static com.pivovarit.collectors.test.Factory.GenericCollector.advancedCollector;
14+
import static com.pivovarit.collectors.test.Factory.GenericCollector.collector;
15+
import static com.pivovarit.collectors.test.Factory.GenericCollector.limitedCollector;
16+
import static java.util.stream.Collectors.collectingAndThen;
17+
import static java.util.stream.Collectors.toList;
18+
1919
final class Factory {
2020

2121
private Factory() {

0 commit comments

Comments
 (0)