Merge pull request #378 from checkmarx-ltd/develop

Removal of code : Pr cxflw 916 scan with settings
checkmarx-ltd · Jan 29, 2024 · 5ec6d71 · 5ec6d71
2 parents 294c9fc + c9c7255
commit 5ec6d71
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 29 deletions.
diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,8 @@
 	</parent>
 	<groupId>com.github.checkmarx-ltd</groupId>
 	<artifactId>cx-spring-boot-sdk</artifactId>
-	<version>0.5.71</version>
+
+	<version>0.5.73</version>
 
 	<name>cx-spring-boot-sdk</name>
 	<description>Checkmarx Java Spring Boot SDK</description>

diff --git a/src/main/java/com/checkmarx/sdk/service/CxService.java b/src/main/java/com/checkmarx/sdk/service/CxService.java
@@ -2373,37 +2373,48 @@ public Integer createScan(CxScanParams params, String comment) throws CheckmarxE
 
 
 //preserving settings
-        Gitremotemain gitremotemainObj = getGitRepoDetails(projectId);
-        Customremotemain customremotemainObj = getCustomRepoDetails(projectId);
-        Perforceremotemain perforceremotemainObj = getPerforceRepoDetails(projectId);
-        Sharedremotemain sharedremotemainObj = getSharedRepoDetails(projectId);
-        Svnremotemain svnremotemainObj = getSvnRepoDetails(projectId);
-        Tfsremotemain tfsremotemainObj = getTfsRepoDetails(projectId);
-        ExcludeSettingsmain excludeSettingsmainObj = getExcludeSettingsDetails(projectId);
+//        Gitremotemain gitremotemainObj = getGitRepoDetails(projectId);
+//        Customremotemain customremotemainObj = getCustomRepoDetails(projectId);
+//        Perforceremotemain perforceremotemainObj = getPerforceRepoDetails(projectId);
+//        Sharedremotemain sharedremotemainObj = getSharedRepoDetails(projectId);
+//        Svnremotemain svnremotemainObj = getSvnRepoDetails(projectId);
+//        Tfsremotemain tfsremotemainObj = getTfsRepoDetails(projectId);
+//        ExcludeSettingsmain excludeSettingsmainObj = getExcludeSettingsDetails(projectId);
+
         prepareSources(params, projectId);
         //Setting Remembered Git Settings
-        if (gitremotemainObj != null) {
-            setGitRepoDetails(gitremotemainObj, projectId);
-        }
-        if (customremotemainObj != null) {
-            setCustomRepoDetails(customremotemainObj, projectId);
-        }
-        if (perforceremotemainObj != null) {
-            setPerforceRepoDetails(perforceremotemainObj, projectId);
-        }
-        if (sharedremotemainObj != null) {
-            setSharedRepoDetails(sharedremotemainObj, projectId);
-        }
-        if (svnremotemainObj != null) {
-            setSvnRepoDetails(svnremotemainObj, projectId);
-        }
-        if (tfsremotemainObj != null) {
-            setTfsRepoDetails(tfsremotemainObj, projectId);
-        }
+//        try {
+//            if(params.isFileSource() || (params.isGitSource()
+//                    && cxProperties.getEnabledZipScan())){
+//                if (gitremotemainObj != null) {
+//                    setGitRepoDetails(gitremotemainObj, projectId);
+//                }
+//                if (customremotemainObj != null) {
+//                    setCustomRepoDetails(customremotemainObj, projectId);
+//                }
+//                if (perforceremotemainObj != null) {
+//                    setPerforceRepoDetails(perforceremotemainObj, projectId);
+//                }
+//                if (sharedremotemainObj != null) {
+//                    setSharedRepoDetails(sharedremotemainObj, projectId);
+//                }
+//                if (svnremotemainObj != null) {
+//                    setSvnRepoDetails(svnremotemainObj, projectId);
+//                }
+//                if (tfsremotemainObj != null) {
+//                    setTfsRepoDetails(tfsremotemainObj, projectId);
+//                }
+//
+//                if (excludeSettingsmainObj != null) {
+//                    setExcludeSettingsDetails(excludeSettingsmainObj, projectId);
+//                }
+//            }
+//        }catch (Exception e) {
+//            log.error("Error Occurred While Setting Settings.");
+//            log.error(ExceptionUtils.getStackTrace(e));
+//        }
+
 
-        if (excludeSettingsmainObj != null) {
-            setExcludeSettingsDetails(excludeSettingsmainObj, projectId);
-        }
 
 
         if(params.isIncremental() && projectExistedBeforeScan) {