Tidying. Replace findbugs with spotbugs.

pholser · Nov 21, 2020 · 440a2c8 · 440a2c8
1 parent 4b56e0f
commit 440a2c8
Show file tree

Hide file tree

Showing 25 changed files with 121 additions and 68 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -93,8 +93,8 @@
                 <artifactId>maven-pmd-plugin</artifactId>
             </plugin>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>findbugs-maven-plugin</artifactId>
+                <groupId>com.github.spotbugs</groupId>
+                <artifactId>spotbugs-maven-plugin</artifactId>
             </plugin>
         </plugins>
     </build>

diff --git a/examples/pom.xml b/examples/pom.xml
@@ -79,8 +79,8 @@
                 <artifactId>maven-pmd-plugin</artifactId>
             </plugin>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>findbugs-maven-plugin</artifactId>
+                <groupId>com.github.spotbugs</groupId>
+                <artifactId>spotbugs-maven-plugin</artifactId>
             </plugin>
         </plugins>
     </build>

diff --git a/generators/pom.xml b/generators/pom.xml
@@ -88,8 +88,8 @@
                 <artifactId>maven-pmd-plugin</artifactId>
             </plugin>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>findbugs-maven-plugin</artifactId>
+                <groupId>com.github.spotbugs</groupId>
+                <artifactId>spotbugs-maven-plugin</artifactId>
             </plugin>
             <plugin>
                 <groupId>eu.somatik.serviceloader-maven-plugin</groupId>

diff --git a/...c/main/java/com/pholser/junit/quickcheck/generator/java/util/OptionalDoubleGenerator.java b/...c/main/java/com/pholser/junit/quickcheck/generator/java/util/OptionalDoubleGenerator.java
@@ -42,7 +42,7 @@ a copy of this software and associated documentation files (the
  * Produces values of type {@link OptionalDouble}.
  */
 public class OptionalDoubleGenerator extends Generator<OptionalDouble> {
-    private final DoubleGenerator doubleGenerator = new DoubleGenerator();
+    private final DoubleGenerator doubles = new DoubleGenerator();
 
     public OptionalDoubleGenerator() {
         super(OptionalDouble.class);
@@ -60,14 +60,17 @@ public OptionalDoubleGenerator() {
      * @param range annotation that gives the range's constraints
      */
     public void configure(InRange range) {
-        doubleGenerator.configure(range);
+        doubles.configure(range);
     }
 
-    @Override public OptionalDouble generate(SourceOfRandomness random, GenerationStatus status) {
+    @Override public OptionalDouble generate(
+        SourceOfRandomness random,
+        GenerationStatus status) {
+
         double trial = random.nextDouble();
         return trial < 0.25
             ? OptionalDouble.empty()
-            : OptionalDouble.of(doubleGenerator.generate(random, status));
+            : OptionalDouble.of(doubles.generate(random, status));
     }
 
     @Override public List<OptionalDouble> doShrink(
@@ -80,7 +83,7 @@ public void configure(InRange range) {
         List<OptionalDouble> shrinks = new ArrayList<>();
         shrinks.add(OptionalDouble.empty());
         shrinks.addAll(
-            doubleGenerator.shrink(random, larger.getAsDouble())
+            doubles.shrink(random, larger.getAsDouble())
                 .stream()
                 .map(OptionalDouble::of)
                 .collect(toList()));
@@ -91,7 +94,7 @@ public void configure(InRange range) {
         OptionalDouble narrowed = narrow(value);
 
         return narrowed.isPresent()
-            ? doubleGenerator.magnitude(narrowed.getAsDouble())
+            ? doubles.magnitude(narrowed.getAsDouble())
             : ZERO;
     }
 }
diff --git a/.../src/main/java/com/pholser/junit/quickcheck/generator/java/util/OptionalIntGenerator.java b/.../src/main/java/com/pholser/junit/quickcheck/generator/java/util/OptionalIntGenerator.java
@@ -42,7 +42,7 @@ a copy of this software and associated documentation files (the
  * Produces values of type {@link OptionalInt}.
  */
 public class OptionalIntGenerator extends Generator<OptionalInt> {
-    private final IntegerGenerator integerGenerator = new IntegerGenerator();
+    private final IntegerGenerator integers = new IntegerGenerator();
 
     public OptionalIntGenerator() {
         super(OptionalInt.class);
@@ -59,7 +59,7 @@ public OptionalIntGenerator() {
      * @param range annotation that gives the range's constraints
      */
     public void configure(InRange range) {
-        integerGenerator.configure(range);
+        integers.configure(range);
     }
 
     @Override public OptionalInt generate(
@@ -69,7 +69,7 @@ public void configure(InRange range) {
         double trial = random.nextDouble();
         return trial < 0.25
             ? OptionalInt.empty()
-            : OptionalInt.of(integerGenerator.generate(random, status));
+            : OptionalInt.of(integers.generate(random, status));
     }
 
     @Override public List<OptionalInt> doShrink(
@@ -82,7 +82,7 @@ public void configure(InRange range) {
         List<OptionalInt> shrinks = new ArrayList<>();
         shrinks.add(OptionalInt.empty());
         shrinks.addAll(
-            integerGenerator.shrink(random, larger.getAsInt())
+            integers.shrink(random, larger.getAsInt())
                 .stream()
                 .map(OptionalInt::of)
                 .collect(toList()));

diff --git a/...src/main/java/com/pholser/junit/quickcheck/generator/java/util/OptionalLongGenerator.java b/...src/main/java/com/pholser/junit/quickcheck/generator/java/util/OptionalLongGenerator.java
@@ -42,7 +42,7 @@ a copy of this software and associated documentation files (the
  * Produces values of type {@link OptionalLong}.
  */
 public class OptionalLongGenerator extends Generator<OptionalLong> {
-    private final LongGenerator longGenerator = new LongGenerator();
+    private final LongGenerator longs = new LongGenerator();
 
     public OptionalLongGenerator() {
         super(OptionalLong.class);
@@ -59,7 +59,7 @@ public OptionalLongGenerator() {
      * @param range annotation that gives the range's constraints
      */
     public void configure(InRange range) {
-        longGenerator.configure(range);
+        longs.configure(range);
     }
 
     @Override public OptionalLong generate(
@@ -69,7 +69,7 @@ public void configure(InRange range) {
         double trial = random.nextDouble();
         return trial < 0.25
             ? OptionalLong.empty()
-            : OptionalLong.of(longGenerator.generate(random, status));
+            : OptionalLong.of(longs.generate(random, status));
     }
 
     @Override public List<OptionalLong> doShrink(
@@ -82,7 +82,7 @@ public void configure(InRange range) {
         List<OptionalLong> shrinks = new ArrayList<>();
         shrinks.add(OptionalLong.empty());
         shrinks.addAll(
-            longGenerator.shrink(random, larger.getAsLong())
+            longs.shrink(random, larger.getAsLong())
                 .stream()
                 .map(OptionalLong::of)
                 .collect(toList()));

diff --git a/generators/src/main/java/com/pholser/junit/quickcheck/generator/java/util/RFC4122.java b/generators/src/main/java/com/pholser/junit/quickcheck/generator/java/util/RFC4122.java
@@ -80,7 +80,7 @@ protected final UUID newUUID(byte[] bytes) {
     private abstract static class NameBasedUUIDGenerator
         extends AbstractUUIDGenerator {
 
-        private final StringGenerator stringGenerator = new StringGenerator();
+        private final StringGenerator strings = new StringGenerator();
         private final int versionMask;
         private final MessageDigest digest;
         private Namespace namespace;
@@ -99,10 +99,11 @@ protected NameBasedUUIDGenerator(
 
             digest.reset();
 
-            Namespaces namespaces = namespace == null ? URL : namespace.value();
+            Namespaces namespaces =
+                namespace == null ? URL : namespace.value();
             digest.update(namespaces.bytes);
             digest.update(
-                stringGenerator.generate(random, status)
+                strings.generate(random, status)
                     .getBytes(StandardCharsets.UTF_8));
 
             byte[] hash = digest.digest();

diff --git a/generators/src/main/java/com/pholser/junit/quickcheck/generator/java/util/SetGenerator.java b/generators/src/main/java/com/pholser/junit/quickcheck/generator/java/util/SetGenerator.java
@@ -33,7 +33,9 @@ a copy of this software and associated documentation files (the
  *
  * @param <T> the type of set generated
  */
-public abstract class SetGenerator<T extends Set> extends CollectionGenerator<T> {
+public abstract class SetGenerator<T extends Set>
+    extends CollectionGenerator<T> {
+
     protected SetGenerator(Class<T> type) {
         super(type);
     }

diff --git a/...n/java/com/pholser/junit/quickcheck/generator/java/util/concurrent/CallableGenerator.java b/...n/java/com/pholser/junit/quickcheck/generator/java/util/concurrent/CallableGenerator.java
@@ -43,8 +43,14 @@ public CallableGenerator() {
     }
 
     @SuppressWarnings("unchecked")
-    @Override public Callable<V> generate(SourceOfRandomness random, GenerationStatus status) {
-        return makeLambda(Callable.class, componentGenerators().get(0), status);
+    @Override public Callable<V> generate(
+        SourceOfRandomness random,
+        GenerationStatus status) {
+
+        return makeLambda(
+            Callable.class,
+            componentGenerators().get(0),
+            status);
     }
 
     @Override public int numberOfNeededComponents() {

diff --git a/.../java/com/pholser/junit/quickcheck/generator/java/util/function/BiPredicateGenerator.java b/.../java/com/pholser/junit/quickcheck/generator/java/util/function/BiPredicateGenerator.java
@@ -49,8 +49,7 @@ public BiPredicateGenerator() {
         super(BiPredicate.class);
     }
 
-    @Override
-    public void provide(Generators provided) {
+    @Override public void provide(Generators provided) {
         super.provide(provided);
 
         generator = gen().type(boolean.class);

diff --git a/...va/com/pholser/junit/quickcheck/generator/java/util/function/BinaryOperatorGenerator.java b/...va/com/pholser/junit/quickcheck/generator/java/util/function/BinaryOperatorGenerator.java
@@ -37,14 +37,22 @@ a copy of this software and associated documentation files (the
  *
  * @param <T> parameters type and return type of produced operator
  */
-public class BinaryOperatorGenerator<T> extends ComponentizedGenerator<BinaryOperator> {
+public class BinaryOperatorGenerator<T>
+    extends ComponentizedGenerator<BinaryOperator> {
+
     public BinaryOperatorGenerator() {
         super(BinaryOperator.class);
     }
 
     @SuppressWarnings("unchecked")
-    @Override public BinaryOperator<T> generate(SourceOfRandomness random, GenerationStatus status) {
-        return makeLambda(BinaryOperator.class, componentGenerators().get(0), status);
+    @Override public BinaryOperator<T> generate(
+        SourceOfRandomness random,
+        GenerationStatus status) {
+
+        return makeLambda(
+            BinaryOperator.class,
+            componentGenerators().get(0),
+            status);
     }
 
     @Override public int numberOfNeededComponents() {

diff --git a/...va/com/pholser/junit/quickcheck/generator/java/util/function/DoubleFunctionGenerator.java b/...va/com/pholser/junit/quickcheck/generator/java/util/function/DoubleFunctionGenerator.java
@@ -37,14 +37,22 @@ a copy of this software and associated documentation files (the
  *
  * @param <R> return type of produced function
  */
-public class DoubleFunctionGenerator<R> extends ComponentizedGenerator<DoubleFunction> {
+public class DoubleFunctionGenerator<R>
+    extends ComponentizedGenerator<DoubleFunction> {
+
     public DoubleFunctionGenerator() {
         super(DoubleFunction.class);
     }
 
     @SuppressWarnings("unchecked")
-    @Override public DoubleFunction<R> generate(SourceOfRandomness random, GenerationStatus status) {
-        return makeLambda(DoubleFunction.class, componentGenerators().get(0), status);
+    @Override public DoubleFunction<R> generate(
+        SourceOfRandomness random,
+        GenerationStatus status) {
+
+        return makeLambda(
+            DoubleFunction.class,
+            componentGenerators().get(0),
+            status);
     }
 
     @Override public int numberOfNeededComponents() {

diff --git a/...ain/java/com/pholser/junit/quickcheck/generator/java/util/function/FunctionGenerator.java b/...ain/java/com/pholser/junit/quickcheck/generator/java/util/function/FunctionGenerator.java
@@ -44,8 +44,14 @@ public FunctionGenerator() {
     }
 
     @SuppressWarnings("unchecked")
-    @Override public Function<T, R> generate(SourceOfRandomness random, GenerationStatus status) {
-        return makeLambda(Function.class, componentGenerators().get(1), status);
+    @Override public Function<T, R> generate(
+        SourceOfRandomness random,
+        GenerationStatus status) {
+
+        return makeLambda(
+            Function.class,
+            componentGenerators().get(1),
+            status);
     }
 
     @Override public int numberOfNeededComponents() {

diff --git a/.../java/com/pholser/junit/quickcheck/generator/java/util/function/IntFunctionGenerator.java b/.../java/com/pholser/junit/quickcheck/generator/java/util/function/IntFunctionGenerator.java
@@ -37,14 +37,22 @@ a copy of this software and associated documentation files (the
  *
  * @param <R> return type of produced function
  */
-public class IntFunctionGenerator<R> extends ComponentizedGenerator<IntFunction> {
+public class IntFunctionGenerator<R>
+    extends ComponentizedGenerator<IntFunction> {
+
     public IntFunctionGenerator() {
         super(IntFunction.class);
     }
 
     @SuppressWarnings("unchecked")
-    @Override public IntFunction<R> generate(SourceOfRandomness random, GenerationStatus status) {
-        return makeLambda(IntFunction.class, componentGenerators().get(0), status);
+    @Override public IntFunction<R> generate(
+        SourceOfRandomness random,
+        GenerationStatus status) {
+
+        return makeLambda(
+            IntFunction.class,
+            componentGenerators().get(0),
+            status);
     }
 
     @Override public int numberOfNeededComponents() {

diff --git a/...java/com/pholser/junit/quickcheck/generator/java/util/function/LongFunctionGenerator.java b/...java/com/pholser/junit/quickcheck/generator/java/util/function/LongFunctionGenerator.java
@@ -37,14 +37,22 @@ a copy of this software and associated documentation files (the
  *
  * @param <R> return type of produced function
  */
-public class LongFunctionGenerator<R> extends ComponentizedGenerator<LongFunction> {
+public class LongFunctionGenerator<R>
+    extends ComponentizedGenerator<LongFunction> {
+
     public LongFunctionGenerator() {
         super(LongFunction.class);
     }
 
     @SuppressWarnings("unchecked")
-    @Override public LongFunction<R> generate(SourceOfRandomness random, GenerationStatus status) {
-        return makeLambda(LongFunction.class, componentGenerators().get(0), status);
+    @Override public LongFunction<R> generate(
+        SourceOfRandomness random,
+        GenerationStatus status) {
+
+        return makeLambda(
+            LongFunction.class,
+            componentGenerators().get(0),
+            status);
     }
 
     @Override public int numberOfNeededComponents() {

diff --git a/...in/java/com/pholser/junit/quickcheck/generator/java/util/function/PredicateGenerator.java b/...in/java/com/pholser/junit/quickcheck/generator/java/util/function/PredicateGenerator.java
@@ -46,8 +46,7 @@ public PredicateGenerator() {
         super(Predicate.class);
     }
 
-    @Override
-    public void provide(Generators provided) {
+    @Override public void provide(Generators provided) {
         super.provide(provided);
 
         generator = gen().type(boolean.class);

diff --git a/...ain/java/com/pholser/junit/quickcheck/generator/java/util/function/SupplierGenerator.java b/...ain/java/com/pholser/junit/quickcheck/generator/java/util/function/SupplierGenerator.java
@@ -43,8 +43,14 @@ public SupplierGenerator() {
     }
 
     @SuppressWarnings("unchecked")
-    @Override public Supplier<T> generate(SourceOfRandomness random, GenerationStatus status) {
-        return makeLambda(Supplier.class, componentGenerators().get(0), status);
+    @Override public Supplier<T> generate(
+        SourceOfRandomness random,
+        GenerationStatus status) {
+
+        return makeLambda(
+            Supplier.class,
+            componentGenerators().get(0),
+            status);
     }
 
     @Override public int numberOfNeededComponents() {

diff --git a/...om/pholser/junit/quickcheck/generator/java/util/function/ToDoubleBiFunctionGenerator.java b/...om/pholser/junit/quickcheck/generator/java/util/function/ToDoubleBiFunctionGenerator.java
@@ -49,8 +49,7 @@ public ToDoubleBiFunctionGenerator() {
         super(ToDoubleBiFunction.class);
     }
 
-    @Override
-    public void provide(Generators provided) {
+    @Override public void provide(Generators provided) {
         super.provide(provided);
 
         generator = gen().type(double.class);

diff --git a/.../com/pholser/junit/quickcheck/generator/java/util/function/ToDoubleFunctionGenerator.java b/.../com/pholser/junit/quickcheck/generator/java/util/function/ToDoubleFunctionGenerator.java
@@ -48,8 +48,7 @@ public ToDoubleFunctionGenerator() {
         super(ToDoubleFunction.class);
     }
 
-    @Override
-    public void provide(Generators provided) {
+    @Override public void provide(Generators provided) {
         super.provide(provided);
 
         generator = gen().type(double.class);

diff --git a/...a/com/pholser/junit/quickcheck/generator/java/util/function/ToIntBiFunctionGenerator.java b/...a/com/pholser/junit/quickcheck/generator/java/util/function/ToIntBiFunctionGenerator.java
@@ -49,8 +49,7 @@ public ToIntBiFunctionGenerator() {
         super(ToIntBiFunction.class);
     }
 
-    @Override
-    public void provide(Generators provided) {
+    @Override public void provide(Generators provided) {
         super.provide(provided);
 
         generator = gen().type(int.class);