feat/isasmendi/add scanoss.json support

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.scanoss</groupId>
     <artifactId>scanoss</artifactId>
-    <version>0.7.3</version>
+    <version>0.8.0</version>
     <packaging>jar</packaging>
     <name>scanoss.java</name>
     <url>https://github.com/scanoss/scanoss.java</url>
@@ -38,7 +38,7 @@
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <slf4jVersion>2.0.7</slf4jVersion>
+        <slf4jVersion>2.0.16</slf4jVersion>
         <native.maven.plugin.version>0.9.13</native.maven.plugin.version>
         <exec.mainClass>com.scanoss.cli.CommandLine</exec.mainClass>
     </properties>
@@ -77,7 +77,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.28</version>
+            <version>1.18.36</version>
             <optional>true</optional>
         </dependency>
         <dependency>
@@ -93,7 +93,7 @@
         <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.1</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -108,19 +108,24 @@
         <dependency>
             <groupId>org.apache.tika</groupId>
             <artifactId>tika-core</artifactId>
-            <version>2.8.0</version>
+            <version>2.9.2</version>
         </dependency>
         <dependency>
             <groupId>info.picocli</groupId>
             <artifactId>picocli</artifactId>
-            <version>4.7.4</version>
+            <version>4.7.6</version>
         </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.10.1</version>
+            <version>2.11.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.github.package-url</groupId>
+            <artifactId>packageurl-java</artifactId>
+            <version>1.5.0</version>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
@@ -148,9 +153,10 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>3.6.0</version>
+                <version>3.7.1</version>
                 <executions>
                     <execution>
+                        <id>with-all-dependencies</id>
                         <phase>package</phase>
                         <goals>
                             <goal>single</goal>
@@ -166,6 +172,40 @@
                             </descriptorRefs>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>without-slf4j</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <archive>
+                                <manifest>
+                                    <mainClass>${exec.mainClass}</mainClass>
+                                </manifest>
+                            </archive>
+                            <inlineDescriptors>
+                                <inlineDescriptor>
+                                    <id>with-dependencies-excluded-slf4j</id>
+                                    <formats>
+                                        <format>jar</format>
+                                    </formats>
+                                    <includeBaseDirectory>false</includeBaseDirectory>
+                                    <dependencySets>
+                                        <dependencySet>
+                                            <outputDirectory>/</outputDirectory>
+                                            <useProjectArtifact>true</useProjectArtifact>
+                                            <unpack>true</unpack>
+                                            <excludes>
+                                                <exclude>org.slf4j:slf4j-api</exclude>
+                                                <exclude>org.slf4j:slf4j-simple</exclude>
+                                            </excludes>
+                                        </dependencySet>
+                                    </dependencySets>
+                                </inlineDescriptor>
+                            </inlineDescriptors>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
             <plugin>

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

@@ -22,12 +22,15 @@
  */
 package com.scanoss;
 
+import com.scanoss.dto.ScanFileResult;
 import com.scanoss.exceptions.ScannerException;
 import com.scanoss.exceptions.WinnowingException;
 import com.scanoss.processor.FileProcessor;
 import com.scanoss.processor.ScanFileProcessor;
 import com.scanoss.processor.WfpFileProcessor;
 import com.scanoss.rest.ScanApi;
+import com.scanoss.settings.Settings;
+import com.scanoss.utils.JsonUtils;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NonNull;
@@ -89,14 +92,17 @@ public class Scanner {
     private ScanApi scanApi;
     private ScanFileProcessor scanFileProcessor;
     private WfpFileProcessor wfpFileProcessor;
+    private Settings settings;
+    private ScannerPostProcessor postProcessor;
 
     @SuppressWarnings("unused")
     private Scanner(Boolean skipSnippets, Boolean allExtensions, Boolean obfuscate, Boolean hpsm,
                     Boolean hiddenFilesFolders, Boolean allFolders, Integer numThreads, Duration timeout,
                     Integer retryLimit, String url, String apiKey, String scanFlags, String sbomType, String sbom,
                     Integer snippetLimit, String customCert, Proxy proxy,
                     Winnowing winnowing, ScanApi scanApi,
-                    ScanFileProcessor scanFileProcessor, WfpFileProcessor wfpFileProcessor
+                    ScanFileProcessor scanFileProcessor, WfpFileProcessor wfpFileProcessor,
+                    Settings settings, ScannerPostProcessor postProcessor
     ) {
         this.skipSnippets = skipSnippets;
         this.allExtensions = allExtensions;
@@ -128,7 +134,9 @@ private Scanner(Boolean skipSnippets, Boolean allExtensions, Boolean obfuscate,
         this.wfpFileProcessor = Objects.requireNonNullElseGet(wfpFileProcessor, () -> WfpFileProcessor.builder()
                 .winnowing(this.winnowing)
                 .build());
-    }
+        this.settings = Objects.requireNonNullElseGet(settings, () -> Settings.builder().build());
+        this.postProcessor = Objects.requireNonNullElseGet(postProcessor, () ->
+                ScannerPostProcessor.builder().build());    }
 
     /**
      * Generate a WFP/Fingerprint for the given file
@@ -400,7 +408,8 @@ public String scanFile(@NonNull String filename) throws ScannerException, Winnow
      * @return List of scan result strings (in JSON format)
      */
     public List<String> scanFolder(@NonNull String folder) {
-        return processFolder(folder, scanFileProcessor);
+        List<String> results = processFolder(folder, scanFileProcessor);
+        return postProcessResults(results);
     }
 
     /**
@@ -411,7 +420,22 @@ public List<String> scanFolder(@NonNull String folder) {
      * @return List of scan result strings (in JSON format)
      */
     public List<String> scanFileList(@NonNull String folder, @NonNull List<String> files) {
-        return processFileList(folder, files, scanFileProcessor);
+        List<String> results = processFileList(folder, files, scanFileProcessor);
+        return postProcessResults(results);
+    }
+
+    /**
+     * Post-processes scan results based on BOM (Bill of Materials) settings if available.
+     * @param results List of raw scan results in JSON string format
+     * @return Processed results, either modified based on BOM or original results if no BOM exists
+     */
+    private List<String> postProcessResults(List<String> results) {
+        if (settings.getBom() != null) {
+            List<ScanFileResult> scanFileResults = JsonUtils.toScanFileResults(results);
+            List <ScanFileResult>  newScanFileResults = this.postProcessor.process(scanFileResults, this.settings.getBom());
+            return JsonUtils.toRawJsonString(newScanFileResults);
+        }
+        return results;
     }
 
 }