[accumulo-access] branch main updated: Bump spotbugs checks to rank 20 (#24)

[ctubbsii]

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

ctubbsii pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo-access.git


The following commit(s) were added to refs/heads/main by this push:
     new 6812598  Bump spotbugs checks to rank 20 (#24)
6812598 is described below

commit 681259800111e2656834d70e42b80757ab513677
Author: Christopher Tubbs <ctubb...@apache.org>
AuthorDate: Thu Oct 5 17:21:13 2023 -0400

    Bump spotbugs checks to rank 20 (#24)
    
    Bump spotbugs aggressiveness to rank 20 and fix 3 new issues:
    * Add missing serialVersionUID field for anonymous subclass of
      serializable class
    * Make use of description field from test data to avoid spotbugs error
      about unused field (the alternative was to suppress it; I thought
      printing it was better, since the description is there for our
      convenience)
    * Internal mutable type leaking through benchmark class's API
    
    Also include trivial fixes from code review in #22:
    * Simplified .equals to one line
    * Use character class for matching on literal dot to avoid escape
      confusion with backslash
    
    * Avoid copy of internal mutable list by making benchmark class method 
non-public
    * Update 
src/test/java/org/apache/accumulo/access/AccessExpressionBenchmark.java
    
    Co-authored-by: Keith Turner <ktur...@apache.org>
---
 pom.xml                                                             | 2 +-
 src/build/ci/spotbugs-exclude.xml                                   | 2 +-
 src/main/java/org/apache/accumulo/access/AeNode.java                | 6 +-----
 .../java/org/apache/accumulo/access/CachingAccessEvaluator.java     | 2 ++
 src/test/java/org/apache/accumulo/access/AccessEvaluatorTest.java   | 1 +
 .../java/org/apache/accumulo/access/AccessExpressionBenchmark.java  | 2 +-
 6 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index be24afe..e971c8e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -200,7 +200,7 @@
           <effort>Max</effort>
           <failOnError>true</failOnError>
           <includeTests>true</includeTests>
-          <maxRank>17</maxRank>
+          <maxRank>20</maxRank>
           
<jvmArgs>-Dcom.overstock.findbugs.ignore=com.google.common.util.concurrent.RateLimiter,com.google.common.hash.Hasher,com.google.common.hash.HashCode,com.google.common.hash.HashFunction,com.google.common.hash.Hashing,com.google.common.cache.Cache,com.google.common.io.CountingOutputStream,com.google.common.io.ByteStreams,com.google.common.cache.LoadingCache,com.google.common.base.Stopwatch,com.google.common.cache.RemovalNotification,com.google.common.util.concurrent.Uninterruptib
 [...]
           <plugins combine.children="append">
             <plugin>
diff --git a/src/build/ci/spotbugs-exclude.xml 
b/src/build/ci/spotbugs-exclude.xml
index e363407..c7e7650 100644
--- a/src/build/ci/spotbugs-exclude.xml
+++ b/src/build/ci/spotbugs-exclude.xml
@@ -21,6 +21,6 @@
 -->
 <FindBugsFilter>
 <Match>
-  <Class name="~.*\.jmh_generated\..*" />
+  <Class name="~.*[.]jmh_generated[.].*" />
 </Match>
 </FindBugsFilter>
diff --git a/src/main/java/org/apache/accumulo/access/AeNode.java 
b/src/main/java/org/apache/accumulo/access/AeNode.java
index f1e28d1..65023b4 100644
--- a/src/main/java/org/apache/accumulo/access/AeNode.java
+++ b/src/main/java/org/apache/accumulo/access/AeNode.java
@@ -41,11 +41,7 @@ abstract class AeNode implements Comparable<AeNode> {
 
   @Override
   public boolean equals(Object o) {
-    if (o instanceof AeNode) {
-      return compareTo((AeNode) o) == 0;
-    }
-
-    return false;
+    return o instanceof AeNode && compareTo((AeNode) o) == 0;
   }
 
   @Override
diff --git 
a/src/main/java/org/apache/accumulo/access/CachingAccessEvaluator.java 
b/src/main/java/org/apache/accumulo/access/CachingAccessEvaluator.java
index 99f8764..414b051 100644
--- a/src/main/java/org/apache/accumulo/access/CachingAccessEvaluator.java
+++ b/src/main/java/org/apache/accumulo/access/CachingAccessEvaluator.java
@@ -34,6 +34,8 @@ class CachingAccessEvaluator implements AccessEvaluator {
     }
     this.accessEvaluator = accessEvaluator;
     this.cache = new LinkedHashMap<>(cacheSize, 0.75f, true) {
+      private static final long serialVersionUID = 1L;
+
       @Override
       public boolean removeEldestEntry(Map.Entry<String,Boolean> entry) {
         return size() > cacheSize;
diff --git a/src/test/java/org/apache/accumulo/access/AccessEvaluatorTest.java 
b/src/test/java/org/apache/accumulo/access/AccessEvaluatorTest.java
index 5b3f62b..6a9e19e 100644
--- a/src/test/java/org/apache/accumulo/access/AccessEvaluatorTest.java
+++ b/src/test/java/org/apache/accumulo/access/AccessEvaluatorTest.java
@@ -82,6 +82,7 @@ public class AccessEvaluatorTest {
     assertFalse(testData.isEmpty());
 
     for (var testSet : testData) {
+      System.out.println("runTestCases for " + testSet.description);
       AccessEvaluator evaluator;
       assertTrue(testSet.auths.length >= 1);
       if (testSet.auths.length == 1) {
diff --git 
a/src/test/java/org/apache/accumulo/access/AccessExpressionBenchmark.java 
b/src/test/java/org/apache/accumulo/access/AccessExpressionBenchmark.java
index 56927f6..330256f 100644
--- a/src/test/java/org/apache/accumulo/access/AccessExpressionBenchmark.java
+++ b/src/test/java/org/apache/accumulo/access/AccessExpressionBenchmark.java
@@ -117,7 +117,7 @@ public class AccessExpressionBenchmark {
       return allTestExpressionsStr;
     }
 
-    public ArrayList<EvaluatorTests> getEvaluatorTests() {
+    List<EvaluatorTests> getEvaluatorTests() {
       return evaluatorTests;
     }