Merge branch 'develop' into pr-CXFLW-967-custom-fields

Author: satyamchaurasiapersistent

pom.xml

@@ -10,7 +10,8 @@
 	</parent>
 	<groupId>com.github.checkmarx-ltd</groupId>
 	<artifactId>cx-spring-boot-sdk</artifactId>
-	<version>0.5.69</version>
+
+	<version>0.5.70</version>
 	<name>cx-spring-boot-sdk</name>
 	<description>Checkmarx Java Spring Boot SDK</description>
 	<properties>

src/main/java/com/checkmarx/sdk/dto/ScanResults.java

@@ -68,6 +68,8 @@ public class ScanResults{
     @Setter
     private Integer pdfScanID;
 
+    @Getter @Setter
+    private String latestCommitterEmail;
     public ScanResults(Boolean osa, String projectId,String deepLink, String reportCreationTime, String scanTime, String team, String project, String link, String files, String loc, String scanType,String version,
                        List<XIssue> xIssues,List<XIssue> unFilteredIssues, Map<String, Object> additionalDetails, CxScanSummary scanSummary, SCAResults scaResults, ASTResults astResults) {
         this.osa = osa;
@@ -654,6 +656,8 @@ public IssueDetails comment(final String comment) {
     @Builder
     public static class ScaDetails {
         private String vulnerabilityLink;
+
+        private Map scanTags;
         private Finding finding;
         private Package vulnerabilityPackage;
     }

src/main/java/com/checkmarx/sdk/dto/sca/SCAResults.java

@@ -7,6 +7,7 @@
 
 import java.io.Serializable;
 import java.util.List;
+import java.util.Map;
 
 @Builder
 @Getter
@@ -25,6 +26,8 @@ public class SCAResults extends ResultsBase implements Serializable {
     private boolean isPolicyViolated;
     private List<String> violatedPolicies;
     private String output;
+
+    private Map scanTags;
 
     public void calculateVulnerableAndOutdatedPackages() {
         int sum;

src/main/java/com/checkmarx/sdk/remotesettings/custom/Customremotemain.java

@@ -0,0 +1,68 @@
+
+package com.checkmarx.sdk.remotesettings.custom;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+import javax.annotation.Generated;
+
+@Generated("jsonschema2pojo")
+public class Customremotemain {
+
+    private String path;
+    private Integer pullingCommandId;
+    private Link link;
+    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
+
+    public String getPath() {
+        return path;
+    }
+
+    public void setPath(String path) {
+        this.path = path;
+    }
+
+    public Customremotemain withPath(String path) {
+        this.path = path;
+        return this;
+    }
+
+    public Integer getPullingCommandId() {
+        return pullingCommandId;
+    }
+
+    public void setPullingCommandId(Integer pullingCommandId) {
+        this.pullingCommandId = pullingCommandId;
+    }
+
+    public Customremotemain withPullingCommandId(Integer pullingCommandId) {
+        this.pullingCommandId = pullingCommandId;
+        return this;
+    }
+
+    public Link getLink() {
+        return link;
+    }
+
+    public void setLink(Link link) {
+        this.link = link;
+    }
+
+    public Customremotemain withLink(Link link) {
+        this.link = link;
+        return this;
+    }
+
+    public Map<String, Object> getAdditionalProperties() {
+        return this.additionalProperties;
+    }
+
+    public void setAdditionalProperty(String name, Object value) {
+        this.additionalProperties.put(name, value);
+    }
+
+    public Customremotemain withAdditionalProperty(String name, Object value) {
+        this.additionalProperties.put(name, value);
+        return this;
+    }
+
+}

src/main/java/com/checkmarx/sdk/remotesettings/custom/Link.java

@@ -0,0 +1,54 @@
+
+package com.checkmarx.sdk.remotesettings.custom;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+import javax.annotation.Generated;
+
+@Generated("jsonschema2pojo")
+public class Link {
+
+    private String rel;
+    private String uri;
+    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
+
+    public String getRel() {
+        return rel;
+    }
+
+    public void setRel(String rel) {
+        this.rel = rel;
+    }
+
+    public Link withRel(String rel) {
+        this.rel = rel;
+        return this;
+    }
+
+    public String getUri() {
+        return uri;
+    }
+
+    public void setUri(String uri) {
+        this.uri = uri;
+    }
+
+    public Link withUri(String uri) {
+        this.uri = uri;
+        return this;
+    }
+
+    public Map<String, Object> getAdditionalProperties() {
+        return this.additionalProperties;
+    }
+
+    public void setAdditionalProperty(String name, Object value) {
+        this.additionalProperties.put(name, value);
+    }
+
+    public Link withAdditionalProperty(String name, Object value) {
+        this.additionalProperties.put(name, value);
+        return this;
+    }
+
+}

src/main/java/com/checkmarx/sdk/remotesettings/exclude/ExcludeSettingsmain.java

@@ -0,0 +1,82 @@
+
+package com.checkmarx.sdk.remotesettings.exclude;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+import javax.annotation.Generated;
+
+@Generated("jsonschema2pojo")
+public class ExcludeSettingsmain {
+
+    private Integer projectId;
+    private String excludeFoldersPattern;
+    private String excludeFilesPattern;
+    private Link link;
+    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
+
+    public Integer getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(Integer projectId) {
+        this.projectId = projectId;
+    }
+
+    public ExcludeSettingsmain withProjectId(Integer projectId) {
+        this.projectId = projectId;
+        return this;
+    }
+
+    public String getExcludeFoldersPattern() {
+        return excludeFoldersPattern;
+    }
+
+    public void setExcludeFoldersPattern(String excludeFoldersPattern) {
+        this.excludeFoldersPattern = excludeFoldersPattern;
+    }
+
+    public ExcludeSettingsmain withExcludeFoldersPattern(String excludeFoldersPattern) {
+        this.excludeFoldersPattern = excludeFoldersPattern;
+        return this;
+    }
+
+    public String getExcludeFilesPattern() {
+        return excludeFilesPattern;
+    }
+
+    public void setExcludeFilesPattern(String excludeFilesPattern) {
+        this.excludeFilesPattern = excludeFilesPattern;
+    }
+
+    public ExcludeSettingsmain withExcludeFilesPattern(String excludeFilesPattern) {
+        this.excludeFilesPattern = excludeFilesPattern;
+        return this;
+    }
+
+    public Link getLink() {
+        return link;
+    }
+
+    public void setLink(Link link) {
+        this.link = link;
+    }
+
+    public ExcludeSettingsmain withLink(Link link) {
+        this.link = link;
+        return this;
+    }
+
+    public Map<String, Object> getAdditionalProperties() {
+        return this.additionalProperties;
+    }
+
+    public void setAdditionalProperty(String name, Object value) {
+        this.additionalProperties.put(name, value);
+    }
+
+    public ExcludeSettingsmain withAdditionalProperty(String name, Object value) {
+        this.additionalProperties.put(name, value);
+        return this;
+    }
+
+}

src/main/java/com/checkmarx/sdk/remotesettings/exclude/Link.java

@@ -0,0 +1,54 @@
+
+package com.checkmarx.sdk.remotesettings.exclude;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+import javax.annotation.Generated;
+
+@Generated("jsonschema2pojo")
+public class Link {
+
+    private String rel;
+    private String uri;
+    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
+
+    public String getRel() {
+        return rel;
+    }
+
+    public void setRel(String rel) {
+        this.rel = rel;
+    }
+
+    public Link withRel(String rel) {
+        this.rel = rel;
+        return this;
+    }
+
+    public String getUri() {
+        return uri;
+    }
+
+    public void setUri(String uri) {
+        this.uri = uri;
+    }
+
+    public Link withUri(String uri) {
+        this.uri = uri;
+        return this;
+    }
+
+    public Map<String, Object> getAdditionalProperties() {
+        return this.additionalProperties;
+    }
+
+    public void setAdditionalProperty(String name, Object value) {
+        this.additionalProperties.put(name, value);
+    }
+
+    public Link withAdditionalProperty(String name, Object value) {
+        this.additionalProperties.put(name, value);
+        return this;
+    }
+
+}

src/main/java/com/checkmarx/sdk/remotesettings/git/Gitremotemain.java

@@ -0,0 +1,82 @@
+
+package com.checkmarx.sdk.remotesettings.git;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+import javax.annotation.Generated;
+
+@Generated("jsonschema2pojo")
+public class Gitremotemain {
+
+    private String url;
+    private String branch;
+    private Boolean useSsh;
+    private Link link;
+    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public Gitremotemain withUrl(String url) {
+        this.url = url;
+        return this;
+    }
+
+    public String getBranch() {
+        return branch;
+    }
+
+    public void setBranch(String branch) {
+        this.branch = branch;
+    }
+
+    public Gitremotemain withBranch(String branch) {
+        this.branch = branch;
+        return this;
+    }
+
+    public Boolean getUseSsh() {
+        return useSsh;
+    }
+
+    public void setUseSsh(Boolean useSsh) {
+        this.useSsh = useSsh;
+    }
+
+    public Gitremotemain withUseSsh(Boolean useSsh) {
+        this.useSsh = useSsh;
+        return this;
+    }
+
+    public Link getLink() {
+        return link;
+    }
+
+    public void setLink(Link link) {
+        this.link = link;
+    }
+
+    public Gitremotemain withLink(Link link) {
+        this.link = link;
+        return this;
+    }
+
+    public Map<String, Object> getAdditionalProperties() {
+        return this.additionalProperties;
+    }
+
+    public void setAdditionalProperty(String name, Object value) {
+        this.additionalProperties.put(name, value);
+    }
+
+    public Gitremotemain withAdditionalProperty(String name, Object value) {
+        this.additionalProperties.put(name, value);
+        return this;
+    }
+
+}