Skip to content

Commit

Permalink
[spike] use spotless to enforce/verify formatting conventions
Browse files Browse the repository at this point in the history
  • Loading branch information
pivovarit committed Feb 2, 2025
1 parent 8c5f9f8 commit 22928dc
Show file tree
Hide file tree
Showing 170 changed files with 572 additions and 686 deletions.
20 changes: 20 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ We use these goals frequently to keep the dependencies and plugins up-to-date:
<maven.release.version>3.1.1</maven.release.version>
<maven.versions.version>2.18.0</maven.versions.version>
<maven.surefire.version>3.5.2</maven.surefire.version>
<spotless.version>2.44.2</spotless.version>
<maven.source.version>3.3.1</maven.source.version>
<maven.exec.version>3.5.0</maven.exec.version>
<moditect.version>1.2.2.Final</moditect.version>
Expand Down Expand Up @@ -134,6 +135,25 @@ We use these goals frequently to keep the dependencies and plugins up-to-date:
<artifactId>maven-install-plugin</artifactId>
<version>${maven.install.version}</version>
</plugin>
<plugin>
<groupId>com.diffplug.spotless</groupId>
<artifactId>spotless-maven-plugin</artifactId>
<version>${spotless.version}</version>
<configuration>
<java>
<removeUnusedImports/>
<importOrder/>
</java>
</configuration>
<executions>
<execution>
<goals>
<goal>check</goal>
</goals>
<phase>compile</phase>
</execution>
</executions>
</plugin>
</plugins>
<pluginManagement>
<plugins>
Expand Down
6 changes: 3 additions & 3 deletions vavr/src/main/java/io/vavr/$.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@
*/
package io.vavr;

import io.vavr.collection.List;
import io.vavr.concurrent.Future;
import io.vavr.control.Either;
import io.vavr.control.Option;
import io.vavr.control.Try;
import io.vavr.control.Validation;
import io.vavr.match.annotation.Patterns;
import io.vavr.match.annotation.Unapply;
import io.vavr.collection.List;
import io.vavr.concurrent.Future;
import io.vavr.control.Option;

/**
* <strong>INTERNAL TYPE - turned to io.vavr.Patterns by vavr-match annotation processor.</strong>
Expand Down
4 changes: 2 additions & 2 deletions vavr/src/main/java/io/vavr/CheckedConsumer.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@
*/
package io.vavr;

import static io.vavr.CheckedConsumerModule.sneakyThrow;

import java.util.Objects;
import java.util.function.Consumer;

import static io.vavr.CheckedConsumerModule.sneakyThrow;

/**
* A consumer that may throw, equivalent to {@linkplain java.util.function.Consumer}.
*
Expand Down
4 changes: 2 additions & 2 deletions vavr/src/main/java/io/vavr/CheckedPredicate.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
*/
package io.vavr;

import java.util.function.Predicate;

import static io.vavr.CheckedPredicateModule.sneakyThrow;

import java.util.function.Predicate;

/**
* A {@linkplain java.util.function.Predicate} which may throw.
*
Expand Down
1 change: 0 additions & 1 deletion vavr/src/main/java/io/vavr/Lazy.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import io.vavr.collection.Seq;
import io.vavr.collection.Vector;
import io.vavr.control.Option;

import java.io.IOException;
import java.io.ObjectOutputStream;
import java.io.Serializable;
Expand Down
1 change: 0 additions & 1 deletion vavr/src/main/java/io/vavr/PartialFunction.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
package io.vavr;

import io.vavr.control.Option;

import java.util.function.Function;

/**
Expand Down
1 change: 0 additions & 1 deletion vavr/src/main/java/io/vavr/Predicates.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@

import io.vavr.collection.Iterator;
import io.vavr.collection.List;

import java.util.Objects;
import java.util.function.Predicate;

Expand Down
8 changes: 3 additions & 5 deletions vavr/src/main/java/io/vavr/Value.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@
*/
package io.vavr;

import static io.vavr.API.*;

import io.vavr.collection.*;
import io.vavr.collection.Array;
import io.vavr.collection.CharSeq;
import io.vavr.collection.HashMap;
Expand All @@ -27,7 +30,6 @@
import io.vavr.collection.LinkedHashSet;
import io.vavr.collection.List;
import io.vavr.collection.Map;
import io.vavr.collection.*;
import io.vavr.collection.PriorityQueue;
import io.vavr.collection.Queue;
import io.vavr.collection.Set;
Expand All @@ -37,12 +39,10 @@
import io.vavr.collection.TreeMap;
import io.vavr.collection.TreeSet;
import io.vavr.collection.Vector;
import io.vavr.concurrent.Future;
import io.vavr.control.Either;
import io.vavr.control.Option;
import io.vavr.control.Try;
import io.vavr.control.Validation;

import java.io.PrintStream;
import java.io.PrintWriter;
import java.util.*;
Expand All @@ -52,8 +52,6 @@
import java.util.stream.Collector;
import java.util.stream.StreamSupport;

import static io.vavr.API.*;

/**
* Functional programming is all about values and transformation of values using functions. The {@code Value}
* type reflects the values in a functional setting. It can be seen as the result of a partial function application.
Expand Down
5 changes: 2 additions & 3 deletions vavr/src/main/java/io/vavr/collection/AbstractMultimap.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,17 @@
*/
package io.vavr.collection;

import static io.vavr.API.Tuple;

import io.vavr.Tuple;
import io.vavr.Tuple2;
import io.vavr.control.Option;

import java.io.Serializable;
import java.util.Collection;
import java.util.Comparator;
import java.util.Objects;
import java.util.function.*;

import static io.vavr.API.Tuple;

/**
* An {@link Multimap} implementation (not intended to be public).
*
Expand Down
1 change: 0 additions & 1 deletion vavr/src/main/java/io/vavr/collection/AbstractQueue.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import io.vavr.Tuple;
import io.vavr.Tuple2;
import io.vavr.control.Option;

import java.util.NoSuchElementException;
import java.util.Objects;
import java.util.function.Consumer;
Expand Down
11 changes: 5 additions & 6 deletions vavr/src/main/java/io/vavr/collection/Array.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,20 @@
*/
package io.vavr.collection;

import static io.vavr.collection.JavaConverters.ChangePolicy.IMMUTABLE;
import static io.vavr.collection.JavaConverters.ChangePolicy.MUTABLE;
import static java.util.Arrays.copyOf;
import static java.util.Arrays.sort;

import io.vavr.*;
import io.vavr.collection.ArrayModule.Combinations;
import io.vavr.collection.JavaConverters.ListView;
import io.vavr.control.Option;

import java.io.Serializable;
import java.util.*;
import java.util.function.*;
import java.util.stream.Collector;

import static io.vavr.collection.JavaConverters.ChangePolicy.IMMUTABLE;
import static io.vavr.collection.JavaConverters.ChangePolicy.MUTABLE;
import static java.util.Arrays.copyOf;
import static java.util.Arrays.sort;

/**
* Array is a Traversable wrapper for {@code Object[]} containing elements of type {@code T}.
*
Expand Down
12 changes: 6 additions & 6 deletions vavr/src/main/java/io/vavr/collection/BitMappedTrie.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@
*/
package io.vavr.collection;

import java.io.Serializable;
import java.util.NoSuchElementException;
import java.util.function.Function;
import java.util.function.Predicate;

import static java.util.function.Function.identity;
import static io.vavr.collection.ArrayType.obj;
import static io.vavr.collection.Collections.withSize;
import static io.vavr.collection.NodeModifier.COPY_NODE;
import static io.vavr.collection.NodeModifier.IDENTITY;
import static java.util.function.Function.identity;

import java.io.Serializable;
import java.util.NoSuchElementException;
import java.util.function.Function;
import java.util.function.Predicate;

/**
* A `bit-mapped trie` is a very wide and shallow tree (for integer indices the depth will be `≤6`).
Expand Down
3 changes: 1 addition & 2 deletions vavr/src/main/java/io/vavr/collection/BitSet.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,9 @@

import io.vavr.Function1;
import io.vavr.PartialFunction;
import io.vavr.Tuple3;
import io.vavr.Tuple2;
import io.vavr.Tuple3;
import io.vavr.control.Option;

import java.io.Serializable;
import java.util.ArrayList;
import java.util.Comparator;
Expand Down
7 changes: 3 additions & 4 deletions vavr/src/main/java/io/vavr/collection/CharSeq.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,13 @@
*/
package io.vavr.collection;

import static io.vavr.collection.JavaConverters.ChangePolicy.IMMUTABLE;
import static io.vavr.collection.JavaConverters.ChangePolicy.MUTABLE;

import io.vavr.*;
import io.vavr.collection.CharSeqModule.Combinations;
import io.vavr.collection.JavaConverters.ListView;
import io.vavr.control.Option;

import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.nio.charset.Charset;
Expand All @@ -32,9 +34,6 @@
import java.util.regex.PatternSyntaxException;
import java.util.stream.Collector;

import static io.vavr.collection.JavaConverters.ChangePolicy.IMMUTABLE;
import static io.vavr.collection.JavaConverters.ChangePolicy.MUTABLE;

/**
* The CharSeq (read: character sequence) collection essentially is a rich String wrapper having all operations
* we know from the functional Vavr collections.
Expand Down
1 change: 0 additions & 1 deletion vavr/src/main/java/io/vavr/collection/Collections.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import io.vavr.collection.JavaConverters.ChangePolicy;
import io.vavr.collection.JavaConverters.ListView;
import io.vavr.control.Option;

import java.util.*;
import java.util.function.*;
import java.util.stream.Collector;
Expand Down
1 change: 0 additions & 1 deletion vavr/src/main/java/io/vavr/collection/Foldable.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
package io.vavr.collection;

import io.vavr.control.Option;

import java.util.NoSuchElementException;
import java.util.Objects;
import java.util.function.BiFunction;
Expand Down
11 changes: 5 additions & 6 deletions vavr/src/main/java/io/vavr/collection/HashArrayMappedTrie.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,18 @@
*/
package io.vavr.collection;

import static io.vavr.collection.HashArrayMappedTrieModule.Action.PUT;
import static io.vavr.collection.HashArrayMappedTrieModule.Action.REMOVE;
import static java.lang.Integer.bitCount;
import static java.util.Arrays.copyOf;

import io.vavr.Tuple;
import io.vavr.Tuple2;
import io.vavr.collection.HashArrayMappedTrieModule.EmptyNode;
import io.vavr.control.Option;

import java.io.Serializable;
import java.util.Objects;

import static java.lang.Integer.bitCount;
import static java.util.Arrays.copyOf;
import static io.vavr.collection.HashArrayMappedTrieModule.Action.PUT;
import static io.vavr.collection.HashArrayMappedTrieModule.Action.REMOVE;

/**
* An immutable <a href="https://en.wikipedia.org/wiki/Hash_array_mapped_trie">Hash array mapped trie (HAMT)</a>.
*
Expand Down
1 change: 0 additions & 1 deletion vavr/src/main/java/io/vavr/collection/HashMap.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import io.vavr.Tuple;
import io.vavr.Tuple2;
import io.vavr.control.Option;

import java.io.Serializable;
import java.util.ArrayList;
import java.util.Comparator;
Expand Down
1 change: 0 additions & 1 deletion vavr/src/main/java/io/vavr/collection/HashMultimap.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
package io.vavr.collection;

import io.vavr.Tuple2;

import java.io.Serializable;
import java.util.ArrayList;
import java.util.Comparator;
Expand Down
1 change: 0 additions & 1 deletion vavr/src/main/java/io/vavr/collection/HashSet.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@

import io.vavr.*;
import io.vavr.control.Option;

import java.io.*;
import java.util.ArrayList;
import java.util.Comparator;
Expand Down
3 changes: 1 addition & 2 deletions vavr/src/main/java/io/vavr/collection/IndexedSeq.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,9 @@
package io.vavr.collection;

import io.vavr.PartialFunction;
import io.vavr.Tuple3;
import io.vavr.Tuple2;
import io.vavr.Tuple3;
import io.vavr.control.Option;

import java.util.Comparator;
import java.util.NoSuchElementException;
import java.util.Objects;
Expand Down
17 changes: 8 additions & 9 deletions vavr/src/main/java/io/vavr/collection/Iterator.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,25 +18,24 @@
*/
package io.vavr.collection;

import static io.vavr.collection.IteratorModule.BigDecimalHelper.areEqual;
import static io.vavr.collection.IteratorModule.BigDecimalHelper.asDecimal;
import static io.vavr.collection.IteratorModule.CachedIterator;
import static io.vavr.collection.IteratorModule.EmptyIterator;
import static java.lang.Double.NEGATIVE_INFINITY;
import static java.lang.Double.POSITIVE_INFINITY;
import static java.math.RoundingMode.HALF_UP;

import io.vavr.*;
import io.vavr.collection.IteratorModule.ConcatIterator;
import io.vavr.collection.IteratorModule.DistinctIterator;
import io.vavr.collection.IteratorModule.GroupedIterator;
import io.vavr.control.Option;

import java.math.BigDecimal;
import java.util.*;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.*;

import static java.lang.Double.NEGATIVE_INFINITY;
import static java.lang.Double.POSITIVE_INFINITY;
import static java.math.RoundingMode.HALF_UP;
import static io.vavr.collection.IteratorModule.BigDecimalHelper.areEqual;
import static io.vavr.collection.IteratorModule.BigDecimalHelper.asDecimal;
import static io.vavr.collection.IteratorModule.CachedIterator;
import static io.vavr.collection.IteratorModule.EmptyIterator;

/**
* {@code io.vavr.collection.Iterator} is a compositional replacement for {@code java.util.Iterator}
* whose purpose is to iterate <em>once</em> over a sequence of elements.
Expand Down
3 changes: 1 addition & 2 deletions vavr/src/main/java/io/vavr/collection/LinearSeq.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,8 @@

import io.vavr.PartialFunction;
import io.vavr.Tuple;
import io.vavr.control.Option;
import io.vavr.Tuple2;

import io.vavr.control.Option;
import java.util.Comparator;
import java.util.Objects;
import java.util.function.*;
Expand Down
1 change: 0 additions & 1 deletion vavr/src/main/java/io/vavr/collection/LinkedHashMap.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import io.vavr.Tuple;
import io.vavr.Tuple2;
import io.vavr.control.Option;

import java.io.Serializable;
import java.util.ArrayList;
import java.util.Comparator;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
package io.vavr.collection;

import io.vavr.Tuple2;

import java.io.Serializable;
import java.util.ArrayList;
import java.util.Comparator;
Expand Down
Loading

0 comments on commit 22928dc

Please sign in to comment.