chore: Cleanup

fortify · Sep 20, 2023 · 7510977 · 7510977
1 parent 072c13c
commit 7510977
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 117 deletions.
diff --git a/...core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/rest/helper/FoDErrorResponse.java b/...core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/rest/helper/FoDErrorResponse.java
diff --git a/...ore/fcli-fod/src/main/java/com/fortify/cli/fod/_common/rest/helper/FoDUploadResponse.java b/...ore/fcli-fod/src/main/java/com/fortify/cli/fod/_common/rest/helper/FoDUploadResponse.java
diff --git a/...fod/src/main/java/com/fortify/cli/fod/assessment_type/helper/FoDAssessmentTypeHelper.java b/...fod/src/main/java/com/fortify/cli/fod/assessment_type/helper/FoDAssessmentTypeHelper.java
@@ -12,23 +12,22 @@
  */
 package com.fortify.cli.fod.assessment_type.helper;
 
+import java.time.Instant;
+import java.util.Date;
+
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.fortify.cli.common.json.JsonHelper;
 import com.fortify.cli.common.progress.helper.IProgressWriterI18n;
 import com.fortify.cli.fod._common.rest.FoDUrls;
 import com.fortify.cli.fod._common.util.FoDEnums;
 import com.fortify.cli.fod.scan.helper.FoDScanType;
+
 import kong.unirest.GetRequest;
 import kong.unirest.UnirestInstance;
 import lombok.Getter;
 
-import java.time.Instant;
-import java.util.Date;
-import java.util.Optional;
-
 public final class FoDAssessmentTypeHelper {
     @Getter
     private static final ObjectMapper objectMapper = new ObjectMapper();

diff --git a/...core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/FoDScanStartDastCommand.java b/...core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/FoDScanStartDastCommand.java
@@ -13,6 +13,13 @@
 
 package com.fortify.cli.fod.scan.cli.cmd;
 
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Arrays;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Properties;
+
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fortify.cli.common.output.transform.IActionCommandResultSupplier;
 import com.fortify.cli.common.output.transform.IRecordTransformer;
@@ -34,19 +41,13 @@
 import com.fortify.cli.fod.scan.helper.dast.FoDScanDastStartRequest;
 import com.fortify.cli.fod.scan_config.helper.FoDScanConfigDastDescriptor;
 import com.fortify.cli.fod.scan_config.helper.FoDScanConfigDastHelper;
+
 import kong.unirest.UnirestInstance;
 import lombok.Getter;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.Mixin;
 import picocli.CommandLine.Option;
 
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.Arrays;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Properties;
-
 @Command(name = FoDOutputHelperMixins.StartDast.CMD_NAME)
 public class FoDScanStartDastCommand extends AbstractFoDJsonNodeOutputCommand implements IRecordTransformer, IActionCommandResultSupplier {
     DateTimeFormatter dtf = DateTimeFormatter.ofPattern("MM/dd/yyyy HH:mm");

diff --git a/...re/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/FoDScanStartMobileCommand.java b/...re/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/FoDScanStartMobileCommand.java
@@ -13,6 +13,14 @@
 
 package com.fortify.cli.fod.scan.cli.cmd;
 
+import java.io.File;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Arrays;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Properties;
+
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fortify.cli.common.output.transform.IActionCommandResultSupplier;
 import com.fortify.cli.common.output.transform.IRecordTransformer;
@@ -31,29 +39,20 @@
 import com.fortify.cli.fod.scan.helper.FoDScanType;
 import com.fortify.cli.fod.scan.helper.mobile.FoDScanMobileHelper;
 import com.fortify.cli.fod.scan.helper.mobile.FoDScanMobileStartRequest;
+
 import kong.unirest.UnirestInstance;
 import lombok.Getter;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.Mixin;
 import picocli.CommandLine.Option;
 
-import java.io.File;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.Arrays;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Properties;
-
 @Command(name = FoDOutputHelperMixins.StartMobile.CMD_NAME)
 public class FoDScanStartMobileCommand extends AbstractFoDJsonNodeOutputCommand implements IRecordTransformer, IActionCommandResultSupplier {
     DateTimeFormatter dtf = DateTimeFormatter.ofPattern("MM/dd/yyyy HH:mm");
     @Getter @Mixin private FoDOutputHelperMixins.StartMobile outputHelper;
     @Mixin private FoDDelimiterMixin delimiterMixin; // Is automatically injected in resolver mixins
     @Mixin private FoDReleaseByQualifiedNameOrIdResolverMixin.PositionalParameter releaseResolver;
-    private enum MobileAssessmentTypes { Mobile, MobilePlus, Remediation }
     @Option(names = {"--assessment-type"}, required = true)
-    //private MobileAssessmentTypes mobileAssessmentType;
     private String mobileAssessmentType;
     @Option(names = {"--entitlement-id"})
     private Integer entitlementId;

diff --git a/...core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/FoDScanStartSastCommand.java b/...core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/FoDScanStartSastCommand.java
@@ -13,6 +13,9 @@
 
 package com.fortify.cli.fod.scan.cli.cmd;
 
+import java.io.File;
+import java.util.Properties;
+
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fortify.cli.common.output.transform.IActionCommandResultSupplier;
 import com.fortify.cli.common.output.transform.IRecordTransformer;
@@ -28,15 +31,13 @@
 import com.fortify.cli.fod.scan.helper.sast.FoDScanSastHelper;
 import com.fortify.cli.fod.scan.helper.sast.FoDScanSastStartRequest;
 import com.fortify.cli.fod.scan_config.helper.FoDScanConfigSastDescriptor;
+
 import kong.unirest.UnirestInstance;
 import lombok.Getter;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.Mixin;
 import picocli.CommandLine.Option;
 
-import java.io.File;
-import java.util.Properties;
-
 @Command(name = FoDOutputHelperMixins.StartSast.CMD_NAME)
 public class FoDScanStartSastCommand extends AbstractFoDJsonNodeOutputCommand implements IRecordTransformer, IActionCommandResultSupplier {
     @Getter @Mixin private FoDOutputHelperMixins.StartSast outputHelper;

diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/FoDScanHelper.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/FoDScanHelper.java
@@ -13,28 +13,25 @@
 
 package com.fortify.cli.fod.scan.helper;
 
+import static java.util.function.Predicate.not;
+
+import java.util.Optional;
+
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.fortify.cli.common.json.JsonHelper;
 import com.fortify.cli.common.output.transform.fields.RenameFieldsTransformer;
-import com.fortify.cli.common.progress.helper.IProgressWriterI18n;
 import com.fortify.cli.fod._common.rest.FoDUrls;
-import com.fortify.cli.fod._common.util.FoDEnums;
-import com.fortify.cli.fod.assessment_type.helper.FoDAssessmentTypeDescriptor;
-import com.fortify.cli.fod.assessment_type.helper.FoDAssessmentTypeHelper;
 import com.fortify.cli.fod.rest.lookup.helper.FoDLookupDescriptor;
 import com.fortify.cli.fod.rest.lookup.helper.FoDLookupHelper;
 import com.fortify.cli.fod.rest.lookup.helper.FoDLookupType;
+
 import kong.unirest.UnirestInstance;
 import lombok.Getter;
 
-import java.util.Optional;
-
-import static java.util.function.Predicate.not;
-
 // TODO Class contains some fairly long methods; consider splitting methods
 public class FoDScanHelper {
     @Getter

diff --git a/...re/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/mobile/FoDScanMobileHelper.java b/...re/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/mobile/FoDScanMobileHelper.java
@@ -21,11 +21,11 @@
 import com.fortify.cli.common.progress.helper.IProgressWriterI18n;
 import com.fortify.cli.fod._common.rest.FoDUrls;
 import com.fortify.cli.fod._common.rest.helper.FoDFileTransferHelper;
-import com.fortify.cli.fod._common.rest.helper.FoDUploadResponse;
 import com.fortify.cli.fod.release.helper.FoDReleaseDescriptor;
 import com.fortify.cli.fod.scan.helper.FoDScanDescriptor;
 import com.fortify.cli.fod.scan.helper.FoDScanHelper;
 import com.fortify.cli.fod.scan.helper.FoDScanType;
+import com.fortify.cli.fod.scan.helper.FoDStartScanResponse;
 
 import kong.unirest.HttpRequest;
 import kong.unirest.UnirestInstance;
@@ -50,8 +50,8 @@ public static final FoDScanDescriptor startScan(UnirestInstance unirest, IProgre
             request = request.queryString("entitlementId", req.getEntitlementId());
         }
 
-        JsonNode uploadResponse = FoDFileTransferHelper.uploadChunked(unirest, request, scanFile);
-        FoDUploadResponse startScanResponse = JsonHelper.treeToValue(uploadResponse, FoDUploadResponse.class);
+        JsonNode response = FoDFileTransferHelper.uploadChunked(unirest, request, scanFile);
+        FoDStartScanResponse startScanResponse = JsonHelper.treeToValue(response, FoDStartScanResponse.class);
         if (startScanResponse == null || startScanResponse.getScanId() <= 0) {
             throw new RuntimeException("Unable to retrieve scan id from response when starting Static scan.");
         }

diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/sast/FoDScanSastHelper.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/sast/FoDScanSastHelper.java
@@ -13,28 +13,29 @@
 
 package com.fortify.cli.fod.scan.helper.sast;
 
+import java.io.File;
+
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.fortify.cli.common.json.JsonHelper;
 import com.fortify.cli.common.util.StringUtils;
 import com.fortify.cli.fod._common.rest.FoDUrls;
 import com.fortify.cli.fod._common.rest.helper.FoDFileTransferHelper;
-import com.fortify.cli.fod._common.rest.helper.FoDUploadResponse;
 import com.fortify.cli.fod._common.util.FoDConstants;
 import com.fortify.cli.fod._common.util.FoDEnums;
 import com.fortify.cli.fod.release.helper.FoDReleaseDescriptor;
 import com.fortify.cli.fod.scan.helper.FoDScanDescriptor;
 import com.fortify.cli.fod.scan.helper.FoDScanHelper;
 import com.fortify.cli.fod.scan.helper.FoDScanType;
+import com.fortify.cli.fod.scan.helper.FoDStartScanResponse;
 import com.fortify.cli.fod.scan_config.helper.FoDScanConfigSastDescriptor;
+
 import kong.unirest.GetRequest;
 import kong.unirest.HttpRequest;
 import kong.unirest.UnirestInstance;
 import lombok.Getter;
 
-import java.io.File;
-
 public class FoDScanSastHelper extends FoDScanHelper {
     @Getter
     private static final ObjectMapper objectMapper = new ObjectMapper();
@@ -79,8 +80,8 @@ public static final FoDScanDescriptor startScanAdvanced(UnirestInstance unirest,
     }
 
     private static FoDScanDescriptor startScan(UnirestInstance unirest, FoDReleaseDescriptor releaseDescriptor, HttpRequest<?> request, File scanFile) {
-        JsonNode uploadResponse = FoDFileTransferHelper.uploadChunked(unirest, request, scanFile);
-        FoDUploadResponse startScanResponse = JsonHelper.treeToValue(uploadResponse, FoDUploadResponse.class);
+        JsonNode response = FoDFileTransferHelper.uploadChunked(unirest, request, scanFile);
+        FoDStartScanResponse startScanResponse = JsonHelper.treeToValue(response, FoDStartScanResponse.class);
         if (startScanResponse == null || startScanResponse.getScanId() <= 0) {
             throw new RuntimeException("Unable to retrieve scan id from response when starting Static scan.");
         }