From 86808a985b9c948862c3272e50116be512802699 Mon Sep 17 00:00:00 2001 From: Jay Nanduri Date: Tue, 17 May 2022 10:21:30 -0400 Subject: [PATCH 1/2] update wrapper with new fields --- .../java/com/checkmarx/ast/results/Results.java | 4 +++- .../checkmarx/ast/results/ResultsSummary.java | 16 +++++++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/checkmarx/ast/results/Results.java b/src/main/java/com/checkmarx/ast/results/Results.java index 8ea7e522..d19cd707 100644 --- a/src/main/java/com/checkmarx/ast/results/Results.java +++ b/src/main/java/com/checkmarx/ast/results/Results.java @@ -18,10 +18,12 @@ public class Results { int totalCount; List results; + String scanId; @JsonCreator - public Results(@JsonProperty("totalCount") int totalCount, @JsonProperty("results") List results) { + public Results(@JsonProperty("totalCount") int totalCount, @JsonProperty("results") List results, @JsonProperty("scanId") String scanId) { this.totalCount = totalCount; this.results = results; + this.scanId = scanId; } } diff --git a/src/main/java/com/checkmarx/ast/results/ResultsSummary.java b/src/main/java/com/checkmarx/ast/results/ResultsSummary.java index 73478e67..f1bb5f50 100644 --- a/src/main/java/com/checkmarx/ast/results/ResultsSummary.java +++ b/src/main/java/com/checkmarx/ast/results/ResultsSummary.java @@ -1,5 +1,7 @@ package com.checkmarx.ast.results; +import java.util.Map; + import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; @@ -28,6 +30,10 @@ public class ResultsSummary { private String createdAt; private String projectId; private String baseURI; + private Map tags; + private String projectName; + private String branchName; + private String asyncMessage; public ResultsSummary(@JsonProperty("TotalIssues") int totalIssues, @@ -45,7 +51,11 @@ public ResultsSummary(@JsonProperty("TotalIssues") int totalIssues, @JsonProperty("ScanTime") String scanTime, @JsonProperty("CreatedAt") String createdAt, @JsonProperty("ProjectID") String projectId, - @JsonProperty("BaseURI") String baseURI) { + @JsonProperty("BaseURI") String baseURI, + @JsonProperty("Tags") Map tags, + @JsonProperty("ProjectName") String projectName, + @JsonProperty("BranchName") String branchName, + @JsonProperty("AsyncMessage") String asyncMessage) { this.totalIssues = totalIssues; this.highIssues = highIssues; this.mediumIssues = mediumIssues; @@ -62,5 +72,9 @@ public ResultsSummary(@JsonProperty("TotalIssues") int totalIssues, this.createdAt = createdAt; this.projectId = projectId; this.baseURI = baseURI; + this.tags = tags; + this.projectName = projectName; + this.branchName = branchName; + this.asyncMessage = asyncMessage; } } From 033a8070a3ca986f273efc609f2c20a6eea09105 Mon Sep 17 00:00:00 2001 From: Jay Nanduri Date: Thu, 19 May 2022 14:37:32 -0400 Subject: [PATCH 2/2] changed the parameter --- src/main/java/com/checkmarx/ast/results/ResultsSummary.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/checkmarx/ast/results/ResultsSummary.java b/src/main/java/com/checkmarx/ast/results/ResultsSummary.java index f1bb5f50..55fda3d9 100644 --- a/src/main/java/com/checkmarx/ast/results/ResultsSummary.java +++ b/src/main/java/com/checkmarx/ast/results/ResultsSummary.java @@ -33,7 +33,7 @@ public class ResultsSummary { private Map tags; private String projectName; private String branchName; - private String asyncMessage; + private String scanInfoMessage; public ResultsSummary(@JsonProperty("TotalIssues") int totalIssues, @@ -55,7 +55,7 @@ public ResultsSummary(@JsonProperty("TotalIssues") int totalIssues, @JsonProperty("Tags") Map tags, @JsonProperty("ProjectName") String projectName, @JsonProperty("BranchName") String branchName, - @JsonProperty("AsyncMessage") String asyncMessage) { + @JsonProperty("ScanInfoMessage") String scanInfoMessage) { this.totalIssues = totalIssues; this.highIssues = highIssues; this.mediumIssues = mediumIssues; @@ -75,6 +75,6 @@ public ResultsSummary(@JsonProperty("TotalIssues") int totalIssues, this.tags = tags; this.projectName = projectName; this.branchName = branchName; - this.asyncMessage = asyncMessage; + this.scanInfoMessage = scanInfoMessage; } }