Merge pull request #451 from checkmarx-ltd/pr-CXFLW-1642-sca-delete-project-null-check

Project Id check for delete project

Author: cx-kedar-bhujade

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.github.checkmarx-ltd</groupId>
 	<artifactId>cx-spring-boot-sdk</artifactId>
-	<version>0.6.26</version>
+	<version>0.6.27</version>
 
 
 	<name>cx-spring-boot-sdk</name>

src/main/java/com/checkmarx/sdk/service/scanner/ScaScanner.java

@@ -104,7 +104,7 @@ protected void applyFilterToResults(AstScaResults combinedResults, ScanParams sc
 
         Gson gson = new Gson();
         String jsonString = gson.toJson(findingsToRetain);
-        log.info(jsonString);
+        log.debug(jsonString);
         // Write JSON string to file
         try (FileWriter writer = new FileWriter("findingsToRetain.json")) {
             writer.write(jsonString);

src/main/java/com/checkmarx/sdk/utils/scanner/client/ScaClientHelper.java

@@ -1698,7 +1698,7 @@ public void deleteProject(ScanParams scanParams)  {
             log.info("Getting project by name for deleting project: '{}'", projectName);
             String resolvedProjectId = getRiskManagementProjectId(projectName);
             log.info("deleting CxSCA project according to project id {}",resolvedProjectId);
-            if(resolvedProjectId!=null || !resolvedProjectId.isEmpty()){
+            if(resolvedProjectId!=null && !resolvedProjectId.isEmpty()){
                 httpClient.deleteRequest(String.format(PROJECTS_BY_ID, resolvedProjectId), HttpStatus.SC_NO_CONTENT, "delete a project");
             }else{
                 log.info("deleting CxSCA project {} does not exist.",projectName);