added constants and some changes to predicate class (#49)

Author: AndreGCX

src/main/java/com/checkmarx/ast/predicate/Predicate.java

@@ -1,6 +1,5 @@
 package com.checkmarx.ast.predicate;
 
-import com.checkmarx.ast.project.Project;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
@@ -21,28 +20,31 @@
 @JsonDeserialize()
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class Predicate{
+public class Predicate {
 
     String ID;
     String SimilarityID;
     String ProjectID;
     String State;
     String Severity;
     String Comment;
+    String CreatedBy;
     String CreatedAt;
     String UpdatedAt;
 
     @JsonCreator
     public Predicate(@JsonProperty("ID") String id, @JsonProperty("SimilarityID") String similarityID,
                      @JsonProperty("ProjectID") String projectID, @JsonProperty("State") String state,
                      @JsonProperty("Severity") String severity, @JsonProperty("Comment") String comment,
-                     @JsonProperty("CreatedAt") String CreatedAt, @JsonProperty("UpdatedAt") String UpdatedAt) {
+                     @JsonProperty("CreatedBy") String createdBy, @JsonProperty("CreatedAt") String CreatedAt,
+                     @JsonProperty("UpdatedAt") String UpdatedAt) {
         this.ID = id;
         this.SimilarityID = similarityID;
         this.ProjectID = projectID;
         this.State = state;
         this.Severity = severity;
         this.Comment = comment;
+        this.CreatedBy = createdBy;
         this.CreatedAt = CreatedAt;
         this.UpdatedAt = UpdatedAt;
     }

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

@@ -4,30 +4,30 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import lombok.Value;
 
-@Value
+
+@lombok.Data
 @JsonDeserialize()
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class Result {
 
-    String type;
-    String id;
-    String similarityId;
-    String status;
-    String state;
-    String severity;
-    String created;
-    String firstFoundAt;
-    String foundAt;
-    String firstScan;
-    String firstScanId;
-    String publishedAt;
-    String recommendations;
-    Data data;
-    Comments comments;
-    VulnerabilityDetails vulnerabilityDetails;
+    private final String type;
+    private final String id;
+    private final String similarityId;
+    private final String status;
+    private String state;
+    private String severity;
+    private final String created;
+    private final String firstFoundAt;
+    private final String foundAt;
+    private final String firstScan;
+    private final String firstScanId;
+    private final String publishedAt;
+    private final String recommendations;
+    private final Data data;
+    private final Comments comments;
+    private final VulnerabilityDetails vulnerabilityDetails;
 
     public Result(@JsonProperty("type") String type,
                   @JsonProperty("id") String id,

src/main/java/com/checkmarx/ast/wrapper/CxConstants.java

@@ -9,9 +9,9 @@ public final class CxConstants {
     public static final String SAST_PRESET_NAME = "--sast-preset-name";
     public static final String FILE_FILTER = "--file-filter";
     public static final String BRANCH = "--branch";
-
+    public static final String AGENT = "--agent";
     public static final String SAST = "sast";
-
+    public static final String DEBUG = "--debug";
     static final String CLIENT_ID = "--client-id";
     static final String CLIENT_SECRET = "--client-secret";
     static final String API_KEY = "--apikey";

src/test/java/com/checkmarx/ast/PredicateTest.java

@@ -42,7 +42,7 @@ public void testTriageUpdate() throws Exception {
         Result result = results.getResults().stream().filter(res -> res.getType().equalsIgnoreCase(CxConstants.SAST)).findFirst().get();
 
         try {
-            wrapper.triageUpdate(UUID.fromString(scan.getProjectID()), result.getSimilarityId(), result.getType(), "confirmed", "Edited via Java Wrapper", "high");
+            wrapper.triageUpdate(UUID.fromString(scan.getProjectID()), result.getSimilarityId(), result.getType(), "to_verify", "Edited via Java Wrapper", "high");
         } catch (Exception e) {
             fail("Triage update failed. Should not throw exception");
         }