Added new data structure for SCA results

Author: AndreGCX

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

@@ -25,9 +25,12 @@ public class Data {
     String expectedValue;
     String value;
     String fileName;
+    String packageIdentifier;
+    String recommendedVersion;
     int line;
     List<Node> nodes;
     List<PackageData> packageData;
+    ScaPackageCollection scanPackageCollection;
 
     public Data(@JsonProperty("queryId") String queryId,
                 @JsonProperty("queryName") String queryName,
@@ -39,9 +42,12 @@ public Data(@JsonProperty("queryId") String queryId,
                 @JsonProperty("expectedValue") String expectedValue,
                 @JsonProperty("value") String value,
                 @JsonProperty("filename") String fileName,
+                @JsonProperty("packageIdentifier") String packageIdentifier,
+                @JsonProperty("recommendedVersion") String recommendedVersion,
                 @JsonProperty("line") int line,
                 @JsonProperty("nodes") List<Node> nodes,
-                @JsonProperty("packageData") List<PackageData> packageData) {
+                @JsonProperty("packageData") List<PackageData> packageData,
+                @JsonProperty("scanPackageCollection") ScaPackageCollection scanPackageCollection) {
         this.queryId = queryId;
         this.queryName = queryName;
         this.group = group;
@@ -52,8 +58,11 @@ public Data(@JsonProperty("queryId") String queryId,
         this.expectedValue = expectedValue;
         this.value = value;
         this.fileName = fileName;
+        this.packageIdentifier = packageIdentifier;
+        this.recommendedVersion = recommendedVersion;
         this.line = line;
         this.nodes = nodes;
         this.packageData = packageData;
+        this.scanPackageCollection = scanPackageCollection;
     }
 }

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

@@ -0,0 +1,34 @@
+package com.checkmarx.ast.results.result;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import lombok.Value;
+
+@Value
+@JsonDeserialize()
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class DependencyPath {
+
+    String Id;
+    String name;
+    String version;
+    boolean isResolved;
+    boolean isDevelopment;
+
+
+    public DependencyPath(@JsonProperty("Id") String id,
+                          @JsonProperty("name") String name,
+                          @JsonProperty("version") String version,
+                          @JsonProperty("isResolved") boolean isResolved,
+                          @JsonProperty("isDevelopment") boolean isDevelopment) {
+
+        Id = id;
+        this.name = name;
+        this.version = version;
+        this.isResolved = isResolved;
+        this.isDevelopment = isDevelopment;
+    }
+}

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

@@ -0,0 +1,33 @@
+package com.checkmarx.ast.results.result;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import lombok.Value;
+
+import java.util.List;
+
+@Value
+@JsonDeserialize()
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class ScaPackageCollection {
+
+    String Id;
+    List<String> locations;
+    List<DependencyPath> dependencyPathArray;
+    boolean outdated;
+
+
+    public ScaPackageCollection(@JsonProperty("Id") String id,
+                                @JsonProperty("locations") List<String> locations,
+                                @JsonProperty("dependencyPathArray") List<DependencyPath> dependencyPathArray,
+                                @JsonProperty("outdated") boolean outdated) {
+
+        Id = id;
+        this.locations = locations;
+        this.dependencyPathArray = dependencyPathArray;
+        this.outdated = outdated;
+    }
+}

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

@@ -17,16 +17,29 @@ public class VulnerabilityCVSS {
     String availability;
     String confidentiality;
     String attackComplexity;
+    String integrityImpact;
+    String scope;
+    String privilegesRequired;
+    String userInteraction;
+
 
     public VulnerabilityCVSS(@JsonProperty("version") int version,
                              @JsonProperty("attackVector") String attackVector,
                              @JsonProperty("availability") String availability,
                              @JsonProperty("confidentiality") String confidentiality,
-                             @JsonProperty("attackComplexity") String attackComplexity) {
+                             @JsonProperty("attackComplexity") String attackComplexity,
+                             @JsonProperty("integrityImpact") String integrityImpact,
+                             @JsonProperty("scope") String scope,
+                             @JsonProperty("privilegesRequired") String privilegesRequired,
+                             @JsonProperty("userInteraction") String userInteraction) {
         this.version = version;
         this.attackVector = attackVector;
         this.availability = availability;
         this.confidentiality = confidentiality;
         this.attackComplexity = attackComplexity;
+        this.integrityImpact = integrityImpact;
+        this.scope = scope;
+        this.privilegesRequired = privilegesRequired;
+        this.userInteraction = userInteraction;
     }
 }