fix(SP-2588): Intellij inspect cleanup

Author: isasmendiagus

src/main/java/com/scanoss/Scanner.java

@@ -34,6 +34,7 @@
 import com.scanoss.utils.JsonUtils;
 import lombok.*;
 import lombok.extern.slf4j.Slf4j;
+import org.jetbrains.annotations.NotNull;
 
 import java.io.File;
 import java.io.IOException;
@@ -221,17 +222,19 @@ public List<String> processFolder(@NonNull String folder, FileProcessor processo
         List<Future<String>> futures = new ArrayList<>();
         try {
             Files.walkFileTree(Paths.get(folder), new SimpleFileVisitor<>() {
+                @NotNull
                 @Override
-                public FileVisitResult preVisitDirectory(Path file, BasicFileAttributes attrs) {
+                public FileVisitResult preVisitDirectory(Path file, @NotNull BasicFileAttributes attrs) {
                     if(folderFilter.test(file)) {
                         log.debug("Processing file: {}", file.getFileName().toString());
                         return FileVisitResult.SKIP_SUBTREE; // Skip the rest of this directory tree
                     }
                     return FileVisitResult.CONTINUE;
                 }
 
+                @NotNull
                 @Override
-                public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) {
+                public FileVisitResult visitFile(Path file, @NotNull BasicFileAttributes attrs) {
                     if (attrs.isRegularFile() && !fileFilter.test(file) && attrs.size() > 0) {
                         String filename = file.toString();
                         Future<String> future = executorService.submit(() -> processor.process(filename, stripDirectory(folder, filename)));
@@ -290,7 +293,7 @@ public List<String> processFileList(@NonNull String root, @NonNull List<String>
                 if (skipDir) {
                     continue; // skip this file as the folder is not allowed
                 }
-                String nameLower = path.getFileName().toString().toLowerCase();
+
                 if (!this.fileFilter.test(path)) {
                     Path fullPath = Path.of(root, file);
                     File f = fullPath.toFile();

src/main/java/com/scanoss/ScannerPostProcessor.java

@@ -146,7 +146,6 @@ private void buildPurl2ComponentDetailsMap(@NonNull List<ScanFileResult> scanFil
      *
      * @param results The list of scan results to process and modify
      * @param rules   The list of replacement rules to apply
-     * @return The modified input list of scan results with updated PURLs
      */
     private void applyReplaceRules(@NonNull List<ScanFileResult> results, @NonNull List<ReplaceRule> rules) {
         log.debug("Starting replace rules application for {} results with {} rules", results.size(), rules.size());
@@ -268,7 +267,7 @@ private ScanFileDetails createUpdatedResultDetails(ScanFileDetails existingCompo
 
     /**
      * Marks all components in the list as non-matching by replacing each component
-     * with a new instance that has MatchType.NONE while preserving the serverDetails
+     * with a new instance that has MatchType. NONE while preserving the serverDetails
      * Modifies the input list in place using List.replaceAll().
      *
      * @param components List of scan file details to be marked as non-matching
@@ -451,7 +450,7 @@ private boolean isPurlMatch(String rulePurl, String[] resultPurls) {
      * 1. The result has a valid file path identifier
      * 2. The result contains a non-empty list of scan details
      * 3. The primary scan detail entry (first in the list) exists
-     *
+     * <p>
      * This structural validation is a prerequisite for any further processing of scan results,
      * such as match analysis or rule processing. Without these basic elements, the scan result
      * cannot be meaningfully processed.

src/main/java/com/scanoss/cli/ScanCommandLine.java

@@ -118,10 +118,6 @@ public void run() {
             throw new RuntimeException("Error: No file or folder specified to scan");
         }
 
-        //TODO: Deprecate options
-        String sbomType = null;
-        String sbom = null;
-
         String caCertPem = null;
         if (caCert != null && !caCert.isEmpty()) {
             caCertPem = loadFileToString(caCert);
@@ -164,7 +160,7 @@ public void run() {
         scanner = Scanner.builder().skipSnippets(skipSnippets).allFolders(allFolders).allExtensions(allExtensions)
                 .hiddenFilesFolders(allHidden).numThreads(numThreads).url(apiUrl).apiKey(apiKey)
                 .retryLimit(retryLimit).timeout(Duration.ofSeconds(timeoutLimit)).scanFlags(scanFlags)
-                .sbomType(sbomType).sbom(sbom).snippetLimit(snippetLimit).customCert(caCertPem).proxy(proxy).hpsm(enableHpsm)
+                .snippetLimit(snippetLimit).customCert(caCertPem).proxy(proxy).hpsm(enableHpsm)
                 .settings(settings)
                 .build();
 
@@ -241,7 +237,7 @@ private void scanFolder(String folder) {
                 JsonUtils.writeJsonPretty(JsonUtils.joinJsonObjects(JsonUtils.toJsonObjects(results)), out);
                 return;
             }
-            printMsg(err, String.format("Found 0 results."));
+            printMsg(err, "Found 0 results.");
         } catch (ScannerException | WinnowingException e) {
             if (CommandLine.debug) {
                 e.printStackTrace(err);

src/main/java/com/scanoss/rest/HttpStatusCode.java

@@ -22,6 +22,8 @@
  */
 package com.scanoss.rest;
 
+import lombok.Getter;
+
 /**
  * Enum list of standard HTTP Status Codes
  */
@@ -281,6 +283,10 @@ public enum HttpStatusCode {
      */
     NETWORK_AUTHENTICATION_REQUIRED(511, "Network Authentication Required");
 
+    /**
+     *  Get the Integer value of the HTTP Status Code
+     */
+    @Getter
     private final int value;
     private final String description;
 
@@ -310,15 +316,6 @@ public static String getByValueToString(int value) {
         return value + " Unknown Status Code";
     }
 
-    /**
-     * Get the Integer value of the HTTP Status Code
-     *
-     * @return HTTP status integer value
-     */
-    public int getValue() {
-        return value;
-    }
-
     /**
      * String friendly version of the HTTP Status Code
      *

src/main/java/com/scanoss/utils/Hpsm.java

@@ -39,7 +39,7 @@ public class Hpsm {
     private static final int CRC8_MAXIM_DOW_POLYNOMIAL = 0x8C; // 0x31 reflected
     private static final int CRC8_MAXIM_DOW_INITIAL = 0x00; // 0x00 reflected
     private static final int CRC8_MAXIM_DOW_FINAL = 0x00; // 0x00 reflected
-    private static int[] crc8MaximDowTable = new int[CRC8_MAXIM_DOW_TABLE_SIZE];
+    private static final int[] crc8MaximDowTable = new int[CRC8_MAXIM_DOW_TABLE_SIZE];
 
     private static final byte[] HEX_ARRAY = "0123456789ABCDEF".getBytes(StandardCharsets.US_ASCII);
 

src/test/java/com/scanoss/TestBom.java

@@ -110,8 +110,7 @@ public void testReplaceRulesSortingWithDuplicatePaths() {
 
         // Verify the rules with same path length maintain original order
         assertEquals("Size should be 2", 2, sortedRules.size());
-        assertTrue("Both rules should have same priority",
-                new RuleComparator().compare(sortedRules.get(0), sortedRules.get(1)) == 0);
+        assertEquals("Both rules should have same priority", 0, new RuleComparator().compare(sortedRules.get(0), sortedRules.get(1)));
 
         log.info("Finished testReplaceRulesSortingWithDuplicatePaths -->");
     }

src/test/java/com/scanoss/TestScanner.java

@@ -283,7 +283,7 @@ public void TestScannerFiltering() {
         f = "testing/data/folder-ends-with-nbproject";
         Scanner scanner = Scanner.builder().build();
         List<String> wfps = scanner.wfpFolder(f);
-        assertTrue("WFP should NOT be empty", !wfps.isEmpty());
+        assertFalse("WFP should NOT be empty", wfps.isEmpty());
 
         log.info("Testing filtering: file nbproject should not be filtered... ");
         f = "testing/data";

src/test/java/com/scanoss/TestSettings.java

@@ -32,7 +32,6 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.ArrayList;
 import java.util.List;
 
 import static org.junit.Assert.*;