[commons-collections] 03/03: PMD: No need to nest

[gg...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-collections.git

commit e84ff4dff079d843f0aa710afe298091ab9adfa9
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Nov 6 11:32:13 2022 -0500

    PMD: No need to nest
    
    - PMD: No need to just call super
    - PMD: Simplify ternary expression to expression
    - PMD: Ignore empty loop warning
    - Fix import
---
 .../org/apache/commons/collections4/IteratorUtils.java     |  1 -
 .../commons/collections4/bloomfilter/IndexFilter.java      |  2 +-
 .../commons/collections4/bloomfilter/IndexProducer.java    |  6 ++----
 .../commons/collections4/map/AbstractReferenceMap.java     |  5 ++---
 .../commons/collections4/properties/PropertiesFactory.java | 14 --------------
 5 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/src/main/java/org/apache/commons/collections4/IteratorUtils.java b/src/main/java/org/apache/commons/collections4/IteratorUtils.java
index 625054b4f..42c9a49f2 100644
--- a/src/main/java/org/apache/commons/collections4/IteratorUtils.java
+++ b/src/main/java/org/apache/commons/collections4/IteratorUtils.java
@@ -17,7 +17,6 @@
 package org.apache.commons.collections4;
 
 import java.lang.reflect.Array;
-import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/src/main/java/org/apache/commons/collections4/bloomfilter/IndexFilter.java b/src/main/java/org/apache/commons/collections4/bloomfilter/IndexFilter.java
index f589a0cc7..c7e6ca186 100644
--- a/src/main/java/org/apache/commons/collections4/bloomfilter/IndexFilter.java
+++ b/src/main/java/org/apache/commons/collections4/bloomfilter/IndexFilter.java
@@ -72,7 +72,7 @@ public final class IndexFilter {
         if (number >= size) {
             throw new IndexOutOfBoundsException(String.format("number too large %d >= %d", number, size));
         }
-        return tracker.test(number) ? consumer.test(number) : true;
+        return !tracker.test(number) || consumer.test(number);
     }
 
     /**
diff --git a/src/main/java/org/apache/commons/collections4/bloomfilter/IndexProducer.java b/src/main/java/org/apache/commons/collections4/bloomfilter/IndexProducer.java
index 8668b81fe..dbaf0908c 100644
--- a/src/main/java/org/apache/commons/collections4/bloomfilter/IndexProducer.java
+++ b/src/main/java/org/apache/commons/collections4/bloomfilter/IndexProducer.java
@@ -87,10 +87,8 @@ public interface IndexProducer {
                 public boolean test(long word) {
                     int i = wordIdx;
                     while (word != 0) {
-                        if ((word & 1) == 1) {
-                            if (!consumer.test(i)) {
-                                return false;
-                            }
+                        if ((word & 1) == 1 && !consumer.test(i)) {
+                            return false;
                         }
                         word >>>= 1;
                         i++;
diff --git a/src/main/java/org/apache/commons/collections4/map/AbstractReferenceMap.java b/src/main/java/org/apache/commons/collections4/map/AbstractReferenceMap.java
index ac59468f7..295ef67c9 100644
--- a/src/main/java/org/apache/commons/collections4/map/AbstractReferenceMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/AbstractReferenceMap.java
@@ -294,9 +294,8 @@ public abstract class AbstractReferenceMap<K, V> extends AbstractHashedMap<K, V>
     @Override
     public void clear() {
         super.clear();
-        // drain the queue
-        while (queue.poll() != null) {
-            // empty
+        // Drain the queue
+        while (queue.poll() != null) { // NOPMD
         }
     }
 
diff --git a/src/main/java/org/apache/commons/collections4/properties/PropertiesFactory.java b/src/main/java/org/apache/commons/collections4/properties/PropertiesFactory.java
index 965989a3b..fa7d1a71f 100644
--- a/src/main/java/org/apache/commons/collections4/properties/PropertiesFactory.java
+++ b/src/main/java/org/apache/commons/collections4/properties/PropertiesFactory.java
@@ -20,8 +20,6 @@ package org.apache.commons.collections4.properties;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.io.PrintStream;
-import java.io.PrintWriter;
 import java.io.Reader;
 import java.io.Writer;
 import java.util.Collection;
@@ -150,18 +148,6 @@ public class PropertiesFactory extends AbstractPropertiesFactory<Properties> {
             return Collections.emptySet();
         }
 
-        @Override
-        public void list(final PrintStream out) {
-            // Implement as super
-            super.list(out);
-        }
-
-        @Override
-        public void list(final PrintWriter out) {
-            // Implement as super
-            super.list(out);
-        }
-
         /**
          * Throws {@link UnsupportedOperationException}.
          * Caller should use try-with-resources statement.