From 5e61f6b7f6ecf90ddbfb1f6d70a185d2a12010d6 Mon Sep 17 00:00:00 2001 From: tiagobcx Date: Mon, 28 Nov 2022 09:54:27 +0000 Subject: [PATCH 1/3] adding isDirectDependency field --- .../com/checkmarx/ast/results/result/ScaPackageData.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/checkmarx/ast/results/result/ScaPackageData.java b/src/main/java/com/checkmarx/ast/results/result/ScaPackageData.java index 8542ae02..e97305ed 100644 --- a/src/main/java/com/checkmarx/ast/results/result/ScaPackageData.java +++ b/src/main/java/com/checkmarx/ast/results/result/ScaPackageData.java @@ -19,18 +19,21 @@ public class ScaPackageData { List> dependencyPaths; boolean outdated; boolean supportsQuickFix; + boolean isDirectDependency; public ScaPackageData(@JsonProperty("Id") String id, @JsonProperty("fixLink") String fixLink, @JsonProperty("dependencyPaths") List> dependencyPaths, @JsonProperty("outdated") boolean outdated, - @JsonProperty("supportsQuickFix") boolean supportsQuickFix) { + @JsonProperty("supportsQuickFix") boolean supportsQuickFix, + @JsonProperty("isDirectDependency") boolean isDirectDependency) { Id = id; this.fixLink = fixLink; this.dependencyPaths = dependencyPaths; this.outdated = outdated; this.supportsQuickFix = supportsQuickFix; + this.isDirectDependency = isDirectDependency; } } From 9e0a90f4cdebf04bb2e52447edcb6eb0c5830f0c Mon Sep 17 00:00:00 2001 From: tiagobcx Date: Mon, 28 Nov 2022 12:30:04 +0000 Subject: [PATCH 2/3] using new cli field --- .../com/checkmarx/ast/results/result/ScaPackageData.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/checkmarx/ast/results/result/ScaPackageData.java b/src/main/java/com/checkmarx/ast/results/result/ScaPackageData.java index e97305ed..2583097f 100644 --- a/src/main/java/com/checkmarx/ast/results/result/ScaPackageData.java +++ b/src/main/java/com/checkmarx/ast/results/result/ScaPackageData.java @@ -19,7 +19,7 @@ public class ScaPackageData { List> dependencyPaths; boolean outdated; boolean supportsQuickFix; - boolean isDirectDependency; + String typeOfDependency; public ScaPackageData(@JsonProperty("Id") String id, @@ -27,13 +27,13 @@ public ScaPackageData(@JsonProperty("Id") String id, @JsonProperty("dependencyPaths") List> dependencyPaths, @JsonProperty("outdated") boolean outdated, @JsonProperty("supportsQuickFix") boolean supportsQuickFix, - @JsonProperty("isDirectDependency") boolean isDirectDependency) { + @JsonProperty("typeOfDependency") String typeOfDependency) { Id = id; this.fixLink = fixLink; this.dependencyPaths = dependencyPaths; this.outdated = outdated; this.supportsQuickFix = supportsQuickFix; - this.isDirectDependency = isDirectDependency; + this.typeOfDependency = typeOfDependency; } } From 7b7c7283df45b77bf2fe8b38f1d331f44f59551f Mon Sep 17 00:00:00 2001 From: tiagobcx Date: Tue, 29 Nov 2022 10:22:10 +0000 Subject: [PATCH 3/3] adding new scaType field to the results --- src/main/java/com/checkmarx/ast/results/result/Result.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/checkmarx/ast/results/result/Result.java b/src/main/java/com/checkmarx/ast/results/result/Result.java index 53dce276..07d84514 100644 --- a/src/main/java/com/checkmarx/ast/results/result/Result.java +++ b/src/main/java/com/checkmarx/ast/results/result/Result.java @@ -13,6 +13,7 @@ public class Result { private final String type; + private final String scaType; private final String id; private final String similarityId; private final String status; @@ -48,8 +49,10 @@ public Result(@JsonProperty("type") String type, @JsonProperty("descriptionHTML") String descriptionHTML, @JsonProperty("data") Data data, @JsonProperty("comments") Comments comments, - @JsonProperty("vulnerabilityDetails") VulnerabilityDetails vulnerabilityDetails) { + @JsonProperty("vulnerabilityDetails") VulnerabilityDetails vulnerabilityDetails, + @JsonProperty("scaType") String scaType) { this.type = type; + this.scaType=scaType; this.id = id; this.similarityId = similarityId; this.status = status;