Apply recipes of org.openrewrite.staticanalysis.

jenkinsci · Nov 18, 2024 · 1a306f2 · 1a306f2
1 parent d3fa8d7
commit 1a306f2
Show file tree

Hide file tree

Showing 250 changed files with 423 additions and 182 deletions.
diff --git a/etc/Jenkinsfile.declarative b/etc/Jenkinsfile.declarative
@@ -25,4 +25,4 @@ pipeline {
             recordIssues enabledForFailure: true, tool: taskScanner(includePattern:'**/*.java', highTags:'FIXME', normalTags:'TODO')
         }
     }
-}
+}
diff --git a/etc/Jenkinsfile.fullBuild b/etc/Jenkinsfile.fullBuild
@@ -35,4 +35,4 @@ node {
     stage ('Collect Maven Warnings') {
         recordIssues tool: mavenConsole()
     }
-}
+}
diff --git a/etc/Jenkinsfile.local b/etc/Jenkinsfile.local
@@ -35,4 +35,4 @@ node {
     stage ('Collect Maven Warnings') {
         recordIssues tool: mavenConsole()
     }
-}
+}
diff --git a/etc/Jenkinsfile.parallel.declarative b/etc/Jenkinsfile.parallel.declarative
@@ -29,4 +29,4 @@ pipeline {
                 [tool: taskScanner(includePattern:'**/*.java', highTags:'FIXME', normalTags:'TODO')]]
         }
     }
-}
+}
diff --git a/src/main/java/edu/hm/hafner/analysis/CSharpNamespaceDetector.java b/src/main/java/edu/hm/hafner/analysis/CSharpNamespaceDetector.java
@@ -32,4 +32,3 @@ Pattern getPattern() {
         return NAMESPACE_PATTERN;
     }
 }
-
diff --git a/src/main/java/edu/hm/hafner/analysis/Categories.java b/src/main/java/edu/hm/hafner/analysis/Categories.java
@@ -60,4 +60,3 @@ private Categories() {
         // prevents instantiation
     }
 }
-
diff --git a/src/main/java/edu/hm/hafner/analysis/DuplicationGroup.java b/src/main/java/edu/hm/hafner/analysis/DuplicationGroup.java
@@ -1,5 +1,6 @@
 package edu.hm.hafner.analysis;
 
+import java.io.Serial;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
@@ -15,6 +16,7 @@
  * detector like CPD, DupFinder, or Simian.
  */
 public final class DuplicationGroup implements Serializable {
+    @Serial
     private static final long serialVersionUID = -5005784523279541971L;
 
     private final List<Issue> occurrences = new ArrayList<>();

diff --git a/src/main/java/edu/hm/hafner/analysis/FullTextFingerprint.java b/src/main/java/edu/hm/hafner/analysis/FullTextFingerprint.java
@@ -141,4 +141,3 @@ Stream<String> readLinesFromFile(final String fileName, final Charset charset)
         }
     }
 }
-
diff --git a/src/main/java/edu/hm/hafner/analysis/Issue.java b/src/main/java/edu/hm/hafner/analysis/Issue.java
@@ -1,5 +1,6 @@
 package edu.hm.hafner.analysis;
 
+import java.io.Serial;
 import java.io.Serializable;
 import java.lang.reflect.InvocationTargetException;
 import java.util.Locale;
@@ -26,6 +27,7 @@
  */
 @SuppressWarnings({"PMD.TooManyFields", "PMD.GodClass", "PMD.CyclomaticComplexity", "NoFunctionalReturnType"})
 public class Issue implements Serializable {
+    @Serial
     private static final long serialVersionUID = 1L; // release 1.0.0
 
     private static final PathUtil PATH_UTIL = new PathUtil();
@@ -935,8 +937,8 @@ public boolean equals(@CheckForNull final Object o) {
         if (!description.equals(issue.description)) {
             return false;
         }
-        if (additionalProperties != null ? !additionalProperties.equals(issue.additionalProperties) :
-                issue.additionalProperties != null) {
+        if (additionalProperties != null ? !additionalProperties.equals(issue.additionalProperties)
+                : issue.additionalProperties != null) {
             return false;
         }
         if (!origin.equals(issue.origin)) {

diff --git a/src/main/java/edu/hm/hafner/analysis/IssueBuilder.java b/src/main/java/edu/hm/hafner/analysis/IssueBuilder.java
@@ -47,10 +47,10 @@ public class IssueBuilder implements AutoCloseable {
     private final TreeStringBuilder packageNameBuilder = new TreeStringBuilder();
     private final TreeStringBuilder messageBuilder = new TreeStringBuilder();
 
-    private int lineStart = 0;
-    private int lineEnd = 0;
-    private int columnStart = 0;
-    private int columnEnd = 0;
+    private int lineStart;
+    private int lineEnd;
+    private int columnStart;
+    private int columnEnd;
 
     @CheckForNull
     private LineRangeList lineRanges;

diff --git a/src/main/java/edu/hm/hafner/analysis/IssueParser.java b/src/main/java/edu/hm/hafner/analysis/IssueParser.java
@@ -1,5 +1,6 @@
 package edu.hm.hafner.analysis;
 
+import java.io.Serial;
 import java.io.Serializable;
 import java.util.Locale;
 import java.util.stream.Stream;
@@ -16,6 +17,7 @@
  */
 @SuppressWarnings("checkstyle:JavadocVariable")
 public abstract class IssueParser implements Serializable {
+    @Serial
     private static final long serialVersionUID = 200992696185460268L;
 
     protected static final String ADDITIONAL_PROPERTIES = "additionalProperties";
@@ -133,4 +135,3 @@ private static String normalize(@CheckForNull final String input) {
         return StringUtils.defaultString(input).toUpperCase(Locale.ENGLISH);
     }
 }
-
diff --git a/src/main/java/edu/hm/hafner/analysis/LookaheadParser.java b/src/main/java/edu/hm/hafner/analysis/LookaheadParser.java
@@ -1,5 +1,6 @@
 package edu.hm.hafner.analysis;
 
+import java.io.Serial;
 import java.util.ArrayDeque;
 import java.util.Deque;
 import java.util.Optional;
@@ -21,6 +22,7 @@
  * @author Ullrich Hafner
  */
 public abstract class LookaheadParser extends IssueParser {
+    @Serial
     private static final long serialVersionUID = 3240719494150024894L;
 
     /** Pattern identifying an ant task debug output prefix. */

diff --git a/src/main/java/edu/hm/hafner/analysis/ModuleDetector.java b/src/main/java/edu/hm/hafner/analysis/ModuleDetector.java
@@ -163,4 +163,3 @@ public interface FileSystem {
         InputStream open(String fileName) throws IOException, InvalidPathException;
     }
 }
-
diff --git a/src/main/java/edu/hm/hafner/analysis/ParsingCanceledException.java b/src/main/java/edu/hm/hafner/analysis/ParsingCanceledException.java
@@ -1,11 +1,14 @@
 package edu.hm.hafner.analysis;
 
+import java.io.Serial;
+
 /**
  * Indicates that parsing has been canceled due to a user initiated interrupt.
  *
  * @author Ullrich Hafner
  */
 public class ParsingCanceledException extends RuntimeException {
+    @Serial
     private static final long serialVersionUID = 3341274949787014225L;
 
     /**
@@ -25,4 +28,3 @@ public ParsingCanceledException(final Throwable cause) {
         super("Canceling parsing since build has been aborted.", cause);
     }
 }
-
diff --git a/src/main/java/edu/hm/hafner/analysis/ParsingException.java b/src/main/java/edu/hm/hafner/analysis/ParsingException.java
@@ -1,5 +1,7 @@
 package edu.hm.hafner.analysis;
 
+import java.io.Serial;
+
 import org.apache.commons.lang3.exception.ExceptionUtils;
 
 import com.google.errorprone.annotations.FormatMethod;
@@ -10,6 +12,7 @@
  * @author Ullrich Hafner
  */
 public class ParsingException extends RuntimeException {
+    @Serial
     private static final long serialVersionUID = -9016364685084958944L;
 
     /**

diff --git a/src/main/java/edu/hm/hafner/analysis/ReaderFactory.java b/src/main/java/edu/hm/hafner/analysis/ReaderFactory.java
@@ -177,4 +177,3 @@ public void parse(final DefaultHandler handler) {
         }
     }
 }
-
diff --git a/src/main/java/edu/hm/hafner/analysis/Report.java b/src/main/java/edu/hm/hafner/analysis/Report.java
@@ -4,6 +4,7 @@
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.PrintStream;
+import java.io.Serial;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -60,6 +61,7 @@
 @SuppressWarnings({"PMD.ExcessivePublicCount", "PMD.ExcessiveClassLength", "PMD.GodClass", "PMD.CognitiveComplexity", "PMD.CyclomaticComplexity", "checkstyle:ClassFanOutComplexity"})
 // TODO: provide a readResolve method to check the instance and improve the performance (TreeString, etc.)
 public class Report implements Iterable<Issue>, Serializable {
+    @Serial
     private static final long serialVersionUID = 4L; // release 10.0.0
 
     @VisibleForTesting
@@ -81,7 +83,7 @@ public class Report implements Iterable<Issue>, Serializable {
     @CheckForNull @SuppressWarnings({"all", "UnusedVariable"})
     private transient Map<String, String> namesByOrigin; // Not needed anymore since  10.0.0
 
-    private int duplicatesSize = 0;
+    private int duplicatesSize;
 
     /**
      * Creates an empty {@link Report}.

diff --git a/src/main/java/edu/hm/hafner/analysis/RevApiInfoExtension.java b/src/main/java/edu/hm/hafner/analysis/RevApiInfoExtension.java
@@ -1,5 +1,6 @@
 package edu.hm.hafner.analysis;
 
+import java.io.Serial;
 import java.io.Serializable;
 import java.util.Collections;
 import java.util.HashMap;
@@ -13,6 +14,7 @@
  */
 @SuppressWarnings("PMD.DataClass")
 public final class RevApiInfoExtension implements Serializable {
+    @Serial
     private static final long serialVersionUID = 6058160289391492934L;
     private final Map<String, String> severities = new HashMap<>();
     private final String issueName;

diff --git a/src/main/java/edu/hm/hafner/analysis/Severity.java b/src/main/java/edu/hm/hafner/analysis/Severity.java
@@ -1,5 +1,6 @@
 package edu.hm.hafner.analysis;
 
+import java.io.Serial;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -28,6 +29,7 @@
  */
 @Immutable
 public class Severity implements Serializable {
+    @Serial
     private static final long serialVersionUID = 8921726169259131484L;
 
     /** An error, e.g. a compile error. */

diff --git a/src/main/java/edu/hm/hafner/analysis/package-info.java b/src/main/java/edu/hm/hafner/analysis/package-info.java
@@ -5,4 +5,4 @@
 package edu.hm.hafner.analysis;
 
 import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
-import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.NonNull;
diff --git a/src/main/java/edu/hm/hafner/analysis/parser/AbstractMavenLogParser.java b/src/main/java/edu/hm/hafner/analysis/parser/AbstractMavenLogParser.java
@@ -1,5 +1,6 @@
 package edu.hm.hafner.analysis.parser;
 
+import java.io.Serial;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -14,6 +15,7 @@
  * @author Jagruti Tiwari
  */
 public abstract class AbstractMavenLogParser extends LookaheadParser {
+    @Serial
     private static final long serialVersionUID = -3768790896172545192L;
 
     /** Regular expression to parse the start of maven plugin in console. */

diff --git a/src/main/java/edu/hm/hafner/analysis/parser/AcuCobolParser.java b/src/main/java/edu/hm/hafner/analysis/parser/AcuCobolParser.java
@@ -1,5 +1,6 @@
 package edu.hm.hafner.analysis.parser;
 
+import java.io.Serial;
 import java.util.Optional;
 import java.util.regex.Matcher;
 
@@ -16,6 +17,7 @@
  * @author jerryshea
  */
 public class AcuCobolParser extends LookaheadParser {
+    @Serial
     private static final long serialVersionUID = -894639209290549425L;
 
     private static final String ACU_COBOL_WARNING_PATTERN = "^\\s*(\\[.*\\])?\\s*?(.*), line ([0-9]*): Warning: (.*)$";
@@ -42,4 +44,3 @@ protected Optional<Issue> createIssue(final Matcher matcher, final LookaheadStre
                 .buildOptional();
     }
 }
-
diff --git a/src/main/java/edu/hm/hafner/analysis/parser/AjcParser.java b/src/main/java/edu/hm/hafner/analysis/parser/AjcParser.java
@@ -1,5 +1,6 @@
 package edu.hm.hafner.analysis.parser;
 
+import java.io.Serial;
 import java.io.UncheckedIOException;
 import java.util.Iterator;
 import java.util.regex.Pattern;
@@ -18,6 +19,7 @@
  * @author Tom Diamond
  */
 public class AjcParser extends IssueParser {
+    @Serial
     private static final long serialVersionUID = -9123765511497052454L;
 
     private static final Pattern ESCAPE_CHARACTERS = Pattern.compile((char) 27 + "\\[.*" + (char) 27 + "\\[0m");

diff --git a/src/main/java/edu/hm/hafner/analysis/parser/AnsibleLintParser.java b/src/main/java/edu/hm/hafner/analysis/parser/AnsibleLintParser.java
@@ -1,5 +1,6 @@
 package edu.hm.hafner.analysis.parser;
 
+import java.io.Serial;
 import java.util.Optional;
 import java.util.regex.Matcher;
 
@@ -19,6 +20,7 @@
  * @author Ce Qi
  */
 public class AnsibleLintParser extends LookaheadParser {
+    @Serial
     private static final long serialVersionUID = 8481090596321427484L;
 
     private static final String ANSIBLE_LINT_WARNING_PATTERN = "(?<file>.*)\\:(?<lineno>[0-9]*)\\:\\s*(\\[(?<cat>[a-zA-Z0-9\\-\\[\\]]+)\\]|(?<newcat>[^\\[][a-zA-Z0-9\\[\\]\\-]+)):?\\s(?<msg>.*)";
@@ -57,4 +59,3 @@ protected Optional<Issue> createIssue(final Matcher matcher, final LookaheadStre
                 .buildOptional();
     }
 }
-
diff --git a/src/main/java/edu/hm/hafner/analysis/parser/AntJavacParser.java b/src/main/java/edu/hm/hafner/analysis/parser/AntJavacParser.java
@@ -1,5 +1,6 @@
 package edu.hm.hafner.analysis.parser;
 
+import java.io.Serial;
 import java.util.Optional;
 import java.util.regex.Matcher;
 
@@ -18,6 +19,7 @@
  * @author Ullrich Hafner
  */
 public class AntJavacParser extends AbstractMavenLogParser {
+    @Serial
     private static final long serialVersionUID = 1737791073711198075L;
 
     private static final String ANT_JAVAC_WARNING_PATTERN = ANT_TASK + "\\s*(.*java):(\\d*):\\s*"
@@ -73,4 +75,3 @@ private Severity mapSeverity(final String type) {
         return equalsIgnoreCase(type, "error") ? Severity.ERROR : Severity.WARNING_NORMAL;
     }
 }
-
diff --git a/src/main/java/edu/hm/hafner/analysis/parser/AquaScannerParser.java b/src/main/java/edu/hm/hafner/analysis/parser/AquaScannerParser.java
@@ -1,5 +1,7 @@
 package edu.hm.hafner.analysis.parser;
 
+import java.io.Serial;
+
 import org.apache.commons.lang3.StringUtils;
 import org.json.JSONArray;
 import org.json.JSONObject;
@@ -22,6 +24,7 @@ public class AquaScannerParser extends JsonIssueParser {
     private static final String AQUA_VULNERABILITY_LEVEL_TAG_MEDIUM = "medium";
     private static final String AQUA_VULNERABILITY_LEVEL_TAG_LOW = "low";
     private static final String AQUA_VULNERABILITY_LEVEL_TAG_NEGLIGIBLE = "negligible";
+    @Serial
     private static final long serialVersionUID = 1L;
 
     @Override

diff --git a/src/main/java/edu/hm/hafner/analysis/parser/Armcc5CompilerParser.java b/src/main/java/edu/hm/hafner/analysis/parser/Armcc5CompilerParser.java
@@ -1,5 +1,6 @@
 package edu.hm.hafner.analysis.parser;
 
+import java.io.Serial;
 import java.util.Optional;
 import java.util.regex.Matcher;
 
@@ -15,6 +16,7 @@
  * @author Dmytro Kutianskyi
  */
 public class Armcc5CompilerParser extends LookaheadParser {
+    @Serial
     private static final long serialVersionUID = -2677728927938443701L;
 
     private static final String ARMCC5_WARNING_PATTERN = "^(.+)\\((\\d+)\\): (warning|error):  #(.+): (.+)$";
@@ -52,4 +54,3 @@ protected Optional<Issue> createIssue(final Matcher matcher, final LookaheadStre
                 .setSeverity(priority).buildOptional();
     }
 }
-
diff --git a/src/main/java/edu/hm/hafner/analysis/parser/ArmccCompilerParser.java b/src/main/java/edu/hm/hafner/analysis/parser/ArmccCompilerParser.java
@@ -1,5 +1,6 @@
 package edu.hm.hafner.analysis.parser;
 
+import java.io.Serial;
 import java.util.Optional;
 import java.util.regex.Matcher;
 
@@ -17,6 +18,7 @@
  * @author Emanuele Zattin
  */
 public class ArmccCompilerParser extends LookaheadParser {
+    @Serial
     private static final long serialVersionUID = -2677728927938443703L;
 
     private static final String ARMCC_WARNING_PATTERN = "^\"(.+)\", line (\\d+): ([A-Z][a-z]+):\\D*(\\d+)\\D*?:\\s+(.+)$";
@@ -47,4 +49,3 @@ protected Optional<Issue> createIssue(final Matcher matcher, final LookaheadStre
                       .setSeverity(priority).buildOptional();
     }
 }
-