changes on data structure for SCA package data collection

Author: AndreGCX

src/main/java/com/checkmarx/ast/results/result/Data.java

@@ -30,7 +30,7 @@ public class Data {
     int line;
     List<Node> nodes;
     List<PackageData> packageData;
-    ScaPackageCollection scanPackageCollection;
+    ScaPackageData scaPackageData;
 
     public Data(@JsonProperty("queryId") String queryId,
                 @JsonProperty("queryName") String queryName,
@@ -47,7 +47,7 @@ public Data(@JsonProperty("queryId") String queryId,
                 @JsonProperty("line") int line,
                 @JsonProperty("nodes") List<Node> nodes,
                 @JsonProperty("packageData") List<PackageData> packageData,
-                @JsonProperty("scanPackageCollection") ScaPackageCollection scanPackageCollection) {
+                @JsonProperty("scaPackageData") ScaPackageData scaPackageData) {
         this.queryId = queryId;
         this.queryName = queryName;
         this.group = group;
@@ -63,6 +63,6 @@ public Data(@JsonProperty("queryId") String queryId,
         this.line = line;
         this.nodes = nodes;
         this.packageData = packageData;
-        this.scanPackageCollection = scanPackageCollection;
+        this.scaPackageData = scaPackageData;
     }
 }

src/main/java/com/checkmarx/ast/results/result/DependencyPath.java

@@ -6,6 +6,8 @@
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import lombok.Value;
 
+import java.util.List;
+
 @Value
 @JsonDeserialize()
 @JsonInclude(JsonInclude.Include.NON_NULL)
@@ -15,19 +17,22 @@ public class DependencyPath {
     String Id;
     String name;
     String version;
+    List<String> locations;
     boolean isResolved;
     boolean isDevelopment;
 
 
     public DependencyPath(@JsonProperty("Id") String id,
                           @JsonProperty("name") String name,
                           @JsonProperty("version") String version,
+                          @JsonProperty("locations") List<String> locations,
                           @JsonProperty("isResolved") boolean isResolved,
                           @JsonProperty("isDevelopment") boolean isDevelopment) {
 
         Id = id;
         this.name = name;
         this.version = version;
+        this.locations = locations;
         this.isResolved = isResolved;
         this.isDevelopment = isDevelopment;
     }

…results/result/ScaPackageCollection.java …x/ast/results/result/ScaPackageData.javasrc/main/java/com/checkmarx/ast/results/result/ScaPackageCollection.java renamed to src/main/java/com/checkmarx/ast/results/result/ScaPackageData.java src/main/java/com/checkmarx/ast/results/result/ScaPackageCollection.java renamed to src/main/java/com/checkmarx/ast/results/result/ScaPackageData.java

@@ -12,22 +12,22 @@
 @JsonDeserialize()
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class ScaPackageCollection {
+public class ScaPackageData {
 
     String Id;
-    List<String> locations;
-    List<DependencyPath> dependencyPathArray;
+    String fixLink;
+    List<List<DependencyPath>> dependencyPaths;
     boolean outdated;
 
 
-    public ScaPackageCollection(@JsonProperty("Id") String id,
-                                @JsonProperty("locations") List<String> locations,
-                                @JsonProperty("dependencyPathArray") List<DependencyPath> dependencyPathArray,
-                                @JsonProperty("outdated") boolean outdated) {
+    public ScaPackageData(@JsonProperty("Id") String id,
+                          @JsonProperty("fixLink") String fixLink,
+                          @JsonProperty("dependencyPaths") List<List<DependencyPath>> dependencyPaths,
+                          @JsonProperty("outdated") boolean outdated) {
 
         Id = id;
-        this.locations = locations;
-        this.dependencyPathArray = dependencyPathArray;
+        this.fixLink = fixLink;
+        this.dependencyPaths = dependencyPaths;
         this.outdated = outdated;
     }
 }