Merge pull request #1198 from JuditKnoll/cleanup

small cleanup

Author: hazendaz

src/main/groovy/org/codehaus/mojo/spotbugs/BaseViolationCheckMojo.groovy

@@ -197,19 +197,19 @@ abstract class BaseViolationCheckMojo extends AbstractMojo {
     }
 
     private boolean doSourceFilesExist() {
-        boolean foundClassFiles = false;
+        boolean foundClassFiles = false
         List<String> classFilesList = []
         if (this.classFilesDirectory.isDirectory()) {
             foundClassFiles = walkFiles(classFilesList, classFilesDirectory, foundClassFiles)
         }
 
-        boolean foundTestFiles = false;
+        boolean foundTestFiles = false
         List<String> testFilesList = []
         if (this.includeTests && this.testClassFilesDirectory.isDirectory()) {
             foundTestFiles = walkFiles(testFilesList, testClassFilesDirectory, foundTestFiles)
         }
 
-        return foundClassFiles || foundTestFiles;
+        return foundClassFiles || foundTestFiles
     }
 
     private boolean walkFiles(List filesList, File filesDirectory, boolean foundFiles) {

src/main/groovy/org/codehaus/mojo/spotbugs/ResourceHelper.groovy

@@ -93,14 +93,14 @@ final class ResourceHelper {
         if (new File(name).exists()) {
             // Avoid copying the file onto itself
             if (Path.of(name).toAbsolutePath().normalize().equals(outputResourcePath.toAbsolutePath().normalize())) {
-                return outputResourcePath;
+                return outputResourcePath
             }
 
             createParentDirectories(outputResourcePath)
 
             // Copy existing file (not a URL)
             return Files.copy(Path.of(name), outputResourcePath, StandardCopyOption.REPLACE_EXISTING,
-                StandardCopyOption.COPY_ATTRIBUTES);
+                StandardCopyOption.COPY_ATTRIBUTES)
         }
 
         // Copying resource from classpath to a file
@@ -124,7 +124,7 @@ final class ResourceHelper {
         return outputResourcePath
     }
 
-    private createParentDirectories(Path outputResourcePath) {
+    private static createParentDirectories(Path outputResourcePath) {
         Path parent = outputResourcePath.getParent()
         if (parent != null && Files.notExists(parent)) {
             Files.createDirectories(parent)

src/main/groovy/org/codehaus/mojo/spotbugs/SourceFileIndexer.groovy

@@ -135,7 +135,7 @@ class SourceFileIndexer {
      * @param path Path to clean up
      * @return Path safe to use for comparison
      */
-    private String normalizePath(String path) {
+    private static String normalizePath(String path) {
         return path.replace('\\', '/')
     }
 

src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsMojo.groovy

@@ -563,25 +563,25 @@ class SpotBugsMojo extends AbstractMavenReport implements SpotBugsPluginsTrait {
             log.debug("canGenerate is ${canGenerate}")
         }
 
-        boolean isSiteLifecycle = false;
+        boolean isSiteLifecycle = false
         if (session != null && session.getRequest() != null) {
-            List<String> goals = session.getRequest().getGoals();
+            List<String> goals = session.getRequest().getGoals()
             if (goals != null && goals.any { String goal -> goal == "site" || goal.startsWith("site:") }) {
-                isSiteLifecycle = true;
+                isSiteLifecycle = true
             }
         }
 
         if (canGenerate) {
             if (!isSiteLifecycle) {
                 // Only generate xdoc report, skip site pages
                 generateXDoc(getLocale())
-                return false;
+                return false
             }
         } else {
             log.info('No files found to run spotbugs, check compile phase has been run')
         }
 
-        return canGenerate;
+        return canGenerate
     }
 
     /**
@@ -1071,7 +1071,7 @@ class SpotBugsMojo extends AbstractMavenReport implements SpotBugsPluginsTrait {
      *
      * @param file Destination file to create.
      */
-    private void forceFileCreation(File file) {
+    private static void forceFileCreation(File file) {
         if (file.exists()) {
             file.delete()
         }
@@ -1381,7 +1381,7 @@ class SpotBugsMojo extends AbstractMavenReport implements SpotBugsPluginsTrait {
      * @see AbstractMavenReport#setReportOutputDirectory(File)
      */
     @Override
-    public void setReportOutputDirectory(File reportOutputDirectory) {
+    void setReportOutputDirectory(File reportOutputDirectory) {
         super.setReportOutputDirectory(reportOutputDirectory)
         this.outputDirectory = reportOutputDirectory
     }

src/main/groovy/org/codehaus/mojo/spotbugs/SpotbugsReportGenerator.groovy

@@ -595,7 +595,7 @@ class SpotbugsReportGenerator implements SpotBugsInfo {
         log.debug("Exiting printFilesSummary")
     }
 
-    public void generateReport() {
+    void generateReport() {
         if (log.isDebugEnabled()) {
             log.debug('Reporter Locale is ' + this.bundle.getLocale().getLanguage())
         }

src/main/groovy/org/codehaus/mojo/spotbugs/XDocsReporter.groovy

@@ -87,7 +87,7 @@ class XDocsReporter {
      *            The ThresholdValue integer to evaluate.
      * @return The string valueof the Threshold object.
      */
-    protected String evaluateThresholdParameter(String thresholdValue) {
+    protected static String evaluateThresholdParameter(String thresholdValue) {
         switch (thresholdValue) {
             case '1': return 'High'
             case '2': return 'Normal'
@@ -103,11 +103,11 @@ class XDocsReporter {
      *
      * @return The Spotbugs Version used on the report.
      */
-    protected String getSpotBugsVersion() {
+    protected static String getSpotBugsVersion() {
         return Version.VERSION_STRING
     }
 
-    public void generateReport() {
+    void generateReport() {
         StreamingMarkupBuilder xmlBuilder = new StreamingMarkupBuilder()
         xmlBuilder.encoding = outputEncoding.name()