Skip to content

Commit 23e3786

Browse files
authored
Use spotless to enforce/verify formatting conventions (#2985)
to reduce potential discussion surface
1 parent 82740ac commit 23e3786

File tree

140 files changed

+225
-323
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

140 files changed

+225
-323
lines changed

pom.xml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ We use these goals frequently to keep the dependencies and plugins up-to-date:
7575
<maven.release.version>3.1.1</maven.release.version>
7676
<maven.versions.version>2.18.0</maven.versions.version>
7777
<maven.surefire.version>3.5.2</maven.surefire.version>
78+
<spotless.version>2.44.2</spotless.version>
7879
<maven.source.version>3.3.1</maven.source.version>
7980
<maven.exec.version>3.5.0</maven.exec.version>
8081
<moditect.version>1.2.2.Final</moditect.version>
@@ -437,6 +438,41 @@ We use these goals frequently to keep the dependencies and plugins up-to-date:
437438
</build>
438439
</profile>
439440

441+
<profile>
442+
<id>spotless</id>
443+
<activation>
444+
<jdk>[11,)</jdk>
445+
</activation>
446+
<build>
447+
<plugins>
448+
<plugin>
449+
<groupId>com.diffplug.spotless</groupId>
450+
<artifactId>spotless-maven-plugin</artifactId>
451+
<version>${spotless.version}</version>
452+
<configuration>
453+
<java>
454+
<removeUnusedImports/>
455+
<importOrder>
456+
<order>,\#</order>
457+
</importOrder>
458+
<endWithNewline/>
459+
</java>
460+
</configuration>
461+
<executions>
462+
<execution>
463+
<goals>
464+
<goal>check</goal>
465+
</goals>
466+
<phase>compile</phase>
467+
</execution>
468+
</executions>
469+
</plugin>
470+
471+
</plugins>
472+
</build>
473+
</profile>
474+
475+
440476
<!-- A profile for eliminating eclipse m2e warnings -->
441477
<profile>
442478
<id>eclipse-m2e</id>

vavr/src/main/java/io/vavr/$.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@
1818
*/
1919
package io.vavr;
2020

21+
import io.vavr.collection.List;
22+
import io.vavr.concurrent.Future;
2123
import io.vavr.control.Either;
24+
import io.vavr.control.Option;
2225
import io.vavr.control.Try;
2326
import io.vavr.control.Validation;
2427
import io.vavr.match.annotation.Patterns;
2528
import io.vavr.match.annotation.Unapply;
26-
import io.vavr.collection.List;
27-
import io.vavr.concurrent.Future;
28-
import io.vavr.control.Option;
2929

3030
/**
3131
* <strong>INTERNAL TYPE - turned to io.vavr.Patterns by vavr-match annotation processor.</strong>

vavr/src/main/java/io/vavr/Lazy.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import io.vavr.collection.Seq;
2323
import io.vavr.collection.Vector;
2424
import io.vavr.control.Option;
25-
2625
import java.io.IOException;
2726
import java.io.ObjectOutputStream;
2827
import java.io.Serializable;

vavr/src/main/java/io/vavr/PartialFunction.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
package io.vavr;
2020

2121
import io.vavr.control.Option;
22-
2322
import java.util.function.Function;
2423

2524
/**

vavr/src/main/java/io/vavr/Predicates.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020

2121
import io.vavr.collection.Iterator;
2222
import io.vavr.collection.List;
23-
2423
import java.util.Objects;
2524
import java.util.function.Predicate;
2625

vavr/src/main/java/io/vavr/Value.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
*/
1919
package io.vavr;
2020

21+
import io.vavr.collection.*;
2122
import io.vavr.collection.Array;
2223
import io.vavr.collection.CharSeq;
2324
import io.vavr.collection.HashMap;
@@ -27,7 +28,6 @@
2728
import io.vavr.collection.LinkedHashSet;
2829
import io.vavr.collection.List;
2930
import io.vavr.collection.Map;
30-
import io.vavr.collection.*;
3131
import io.vavr.collection.PriorityQueue;
3232
import io.vavr.collection.Queue;
3333
import io.vavr.collection.Set;
@@ -37,12 +37,10 @@
3737
import io.vavr.collection.TreeMap;
3838
import io.vavr.collection.TreeSet;
3939
import io.vavr.collection.Vector;
40-
import io.vavr.concurrent.Future;
4140
import io.vavr.control.Either;
4241
import io.vavr.control.Option;
4342
import io.vavr.control.Try;
4443
import io.vavr.control.Validation;
45-
4644
import java.io.PrintStream;
4745
import java.io.PrintWriter;
4846
import java.util.*;

vavr/src/main/java/io/vavr/collection/AbstractMultimap.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import io.vavr.Tuple;
2222
import io.vavr.Tuple2;
2323
import io.vavr.control.Option;
24-
2524
import java.io.Serializable;
2625
import java.util.Collection;
2726
import java.util.Comparator;

vavr/src/main/java/io/vavr/collection/AbstractQueue.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import io.vavr.Tuple;
2222
import io.vavr.Tuple2;
2323
import io.vavr.control.Option;
24-
2524
import java.util.NoSuchElementException;
2625
import java.util.Objects;
2726
import java.util.function.Consumer;

vavr/src/main/java/io/vavr/collection/Array.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import io.vavr.collection.ArrayModule.Combinations;
2323
import io.vavr.collection.JavaConverters.ListView;
2424
import io.vavr.control.Option;
25-
2625
import java.io.Serializable;
2726
import java.util.*;
2827
import java.util.function.*;

vavr/src/main/java/io/vavr/collection/BitMappedTrie.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
import java.util.function.Function;
2424
import java.util.function.Predicate;
2525

26-
import static java.util.function.Function.identity;
2726
import static io.vavr.collection.ArrayType.obj;
2827
import static io.vavr.collection.Collections.withSize;
2928
import static io.vavr.collection.NodeModifier.COPY_NODE;
3029
import static io.vavr.collection.NodeModifier.IDENTITY;
30+
import static java.util.function.Function.identity;
3131

3232
/**
3333
* A `bit-mapped trie` is a very wide and shallow tree (for integer indices the depth will be `≤6`).

0 commit comments

Comments
 (0)