From c2ea9cc40319675766808d3136cb452c2b7f32d8 Mon Sep 17 00:00:00 2001 From: Madhur Jain <87946372+jmadhur87@users.noreply.github.com> Date: Mon, 24 Aug 2026 18:19:35 +0530 Subject: [PATCH 1/2] chore: Update int to Long_Int (#1081) --- .../cli/cmd/AbstractSSCIssueTemplateUpdateCommand.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/issue_template/cli/cmd/AbstractSSCIssueTemplateUpdateCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/issue_template/cli/cmd/AbstractSSCIssueTemplateUpdateCommand.java index 1ec99fa9144..ac8a70ae2bb 100644 --- a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/issue_template/cli/cmd/AbstractSSCIssueTemplateUpdateCommand.java +++ b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/issue_template/cli/cmd/AbstractSSCIssueTemplateUpdateCommand.java @@ -16,7 +16,7 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ArrayNode; -import com.fasterxml.jackson.databind.node.IntNode; +import com.fasterxml.jackson.databind.node.LongNode; import com.fasterxml.jackson.databind.node.ObjectNode; import com.fortify.cli.common.json.JsonHelper; import com.fortify.cli.common.output.transform.IActionCommandResultSupplier; @@ -63,7 +63,7 @@ protected ArrayNode getCustomTagIds(UnirestInstance unirest, SSCIssueTemplateDes currentTags, addTagsMixin.getTagSpecs(), rmTagsMixin.getTagSpecs() - ).map(tag -> new IntNode(Integer.valueOf(tag.getId()))).collect(JsonHelper.arrayNodeCollector()); + ).map(tag -> new LongNode(Long.valueOf(tag.getId()))).collect(JsonHelper.arrayNodeCollector()); } @Override From facac5840c1bfdce905276d9d11d8172a9c5c01f Mon Sep 17 00:00:00 2001 From: mjain6 Date: Mon, 7 Sep 2026 01:52:23 +0530 Subject: [PATCH 2/2] Update int to long --- .../scan/cli/cmd/AbstractFoDScanSetupCommand.java | 2 +- .../scan/helper/FoDScanAssessmentTypeDescriptor.java | 2 +- .../fod/_common/scan/helper/FoDScanDescriptor.java | 4 ++-- .../cli/fod/_common/scan/helper/FoDScanHelper.java | 4 ++-- .../dast/FoDScanDastAutomatedSetupBaseRequest.java | 2 +- .../scan/helper/dast/FoDScanDastDescriptor.java | 2 +- .../helper/dast/FoDScanDastLegacyStartRequest.java | 2 +- .../helper/mobile/FoDScanMobileStartRequest.java | 2 +- .../scan/helper/oss/FoDScanOssDescriptor.java | 2 +- .../scan/helper/sast/FoDScanSastDescriptor.java | 2 +- .../fod/access_control/helper/FoDUserDescriptor.java | 2 +- .../helper/FoDUserGroupDescriptor.java | 2 +- .../access_control/helper/FoDUserGroupHelper.java | 4 ++-- .../helper/FoDUserGroupMembersRequest.java | 4 ++-- .../cli/fod/access_control/helper/FoDUserHelper.java | 2 +- .../cli/fod/app/helper/FoDAppCreateRequest.java | 6 +++--- .../fortify/cli/fod/app/helper/FoDAppDescriptor.java | 4 ++-- .../cli/mixin/FoDAttributeResolverMixin.java | 4 ++-- .../helper/FoDAttributeDefinitionDescriptor.java | 2 +- .../helper/FoDAttributeDefinitionHelper.java | 12 ++++++------ .../helper/FoDAttributeValueDescriptor.java | 2 +- .../fod/attribute/helper/FoDPickListDescriptor.java | 2 +- .../AbstractFoDDastAutomatedScanSetupCommand.java | 2 +- .../cli/cmd/FoDDastLegacyScanStartCommand.java | 4 ++-- .../helper/FoDScanConfigDastAutomatedDescriptor.java | 2 +- .../helper/FoDScanConfigDastLegacyDescriptor.java | 2 +- .../fod/issue/helper/FoDBulkIssueUpdateRequest.java | 6 +++--- .../fod/issue/helper/FoDIssueAttributeHelper.java | 2 +- .../fortify/cli/fod/issue/helper/FoDIssueHelper.java | 2 +- .../mast_scan/cli/cmd/FoDMastScanSetupCommand.java | 4 ++-- .../mast_scan/cli/cmd/FoDMastScanStartCommand.java | 4 ++-- .../helper/FoDScanConfigMobileDescriptor.java | 4 ++-- .../helper/FoDMicroserviceDescriptor.java | 4 ++-- .../oss_scan/helper/FoDScanConfigOssDescriptor.java | 2 +- .../fod/release/cli/cmd/FoDReleaseUpdateCommand.java | 2 +- .../helper/FoDReleaseAssessmentTypeDescriptor.java | 2 +- .../cli/fod/release/helper/FoDReleaseDescriptor.java | 12 ++++++------ .../cli/fod/release/helper/FoDReleaseHelper.java | 6 +++--- .../fod/release/helper/FoDReleaseUpdateRequest.java | 2 +- .../fod/report/cli/mixin/FoDReportResolverMixin.java | 4 ++-- .../cli/fod/report/helper/FoDReportDescriptor.java | 8 ++++---- .../sast_scan/cli/cmd/FoDSastScanSetupCommand.java | 2 +- .../helper/FoDScanConfigSastDescriptor.java | 4 ++-- .../helper/FoDScanConfigSastSetupRequest.java | 2 +- 44 files changed, 76 insertions(+), 76 deletions(-) diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/scan/cli/cmd/AbstractFoDScanSetupCommand.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/scan/cli/cmd/AbstractFoDScanSetupCommand.java index bc6676c0a3d..fd26aa6df5c 100644 --- a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/scan/cli/cmd/AbstractFoDScanSetupCommand.java +++ b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/scan/cli/cmd/AbstractFoDScanSetupCommand.java @@ -39,7 +39,7 @@ public abstract class AbstractFoDScanSetupCommand extends AbstractFoDJsonNode protected String assessmentType; // Plain text name as custom assessment types can be created @Mixin protected FoDEntitlementFrequencyTypeMixins.RequiredOption entitlementFrequencyTypeMixin; @Option(names = {"--entitlement-id"}) - protected Integer entitlementId; + protected Long entitlementId; protected String assessmentTypeName; diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/scan/helper/FoDScanAssessmentTypeDescriptor.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/scan/helper/FoDScanAssessmentTypeDescriptor.java index e6c2c3bdf28..9d062fd849d 100644 --- a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/scan/helper/FoDScanAssessmentTypeDescriptor.java +++ b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/scan/helper/FoDScanAssessmentTypeDescriptor.java @@ -30,7 +30,7 @@ public class FoDScanAssessmentTypeDescriptor { private String name; private String scanType; private Integer scanTypeId; - private Integer entitlementId; + private Long entitlementId; private String entitlementDescription; private Integer frequencyTypeId; private String frequencyType; diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/scan/helper/FoDScanDescriptor.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/scan/helper/FoDScanDescriptor.java index c4b96737522..5441f2fbc16 100644 --- a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/scan/helper/FoDScanDescriptor.java +++ b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/scan/helper/FoDScanDescriptor.java @@ -52,11 +52,11 @@ public String getReleaseAndScanId() { @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyy-MM-dd'T'hh:mm:ss") private Date completedDateTime; - public Map attributesAsMap() { + public Map attributesAsMap() { if (attributes == null || attributes.isEmpty()) { return Collections.emptyMap(); } - Map attrMap = new HashMap<>(); + Map attrMap = new HashMap<>(); for (FoDAttributeValueDescriptor attr : attributes) { attrMap.put(attr.getId(), attr.getValue()); } diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/scan/helper/FoDScanHelper.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/scan/helper/FoDScanHelper.java index 56320cd7ac4..2a680052541 100644 --- a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/scan/helper/FoDScanHelper.java +++ b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/scan/helper/FoDScanHelper.java @@ -133,9 +133,9 @@ public static void validateScanDate(FoDScanDescriptor scanDescriptor, int retent public static FoDScanAssessmentTypeDescriptor getEntitlementToUse(UnirestInstance unirest, String relId, FoDScanType scanType, String assessmentType, FoDEnums.EntitlementFrequencyType entitlementFrequencyType, - int entitlementId) { + long entitlementId) { FoDScanConfigDastAutomatedDescriptor currentSetup = FoDScanDastAutomatedHelper.getSetupDescriptor(unirest, relId); - Integer entitlementIdToUse = 0; + Long entitlementIdToUse = 0L; Integer assessmentTypeId = 0; LOG.info("Finding/Validating entitlement to use."); diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/scan/helper/dast/FoDScanDastAutomatedSetupBaseRequest.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/scan/helper/dast/FoDScanDastAutomatedSetupBaseRequest.java index 6c3f2d8f409..92cf92cc3bf 100644 --- a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/scan/helper/dast/FoDScanDastAutomatedSetupBaseRequest.java +++ b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/scan/helper/dast/FoDScanDastAutomatedSetupBaseRequest.java @@ -38,7 +38,7 @@ public static class NetworkAuthenticationType { } public Integer assessmentTypeId; - public Integer entitlementId; + public Long entitlementId; public FoDEnums.EntitlementFrequencyType entitlementFrequencyType; // ['SingleScan', 'Subscription'] @Builder.Default public FoDEnums.DynamicScanEnvironmentFacingType dynamicScanEnvironmentFacingType = FoDEnums.DynamicScanEnvironmentFacingType.External; // ['Internal', 'External'] diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/scan/helper/dast/FoDScanDastDescriptor.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/scan/helper/dast/FoDScanDastDescriptor.java index 9c7fcf5bbe1..4c2d7441e0a 100644 --- a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/scan/helper/dast/FoDScanDastDescriptor.java +++ b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/scan/helper/dast/FoDScanDastDescriptor.java @@ -24,7 +24,7 @@ @Data @ToString @EqualsAndHashCode(callSuper = true) public class FoDScanDastDescriptor extends JsonNodeHolder { - private Integer scanId; + private Long scanId; private String scanType; } diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/scan/helper/dast/FoDScanDastLegacyStartRequest.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/scan/helper/dast/FoDScanDastLegacyStartRequest.java index 4930fd7c649..3bfd13f2a60 100644 --- a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/scan/helper/dast/FoDScanDastLegacyStartRequest.java +++ b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/scan/helper/dast/FoDScanDastLegacyStartRequest.java @@ -28,7 +28,7 @@ public class FoDScanDastLegacyStartRequest { private String startDate; private Integer assessmentTypeId; - private Integer entitlementId; + private Long entitlementId; private String entitlementFrequencyType; private Boolean isRemediationScan; //private Boolean isBundledAssessment; diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/scan/helper/mobile/FoDScanMobileStartRequest.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/scan/helper/mobile/FoDScanMobileStartRequest.java index b960c685fff..f89e0e87043 100644 --- a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/scan/helper/mobile/FoDScanMobileStartRequest.java +++ b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/scan/helper/mobile/FoDScanMobileStartRequest.java @@ -27,7 +27,7 @@ public class FoDScanMobileStartRequest { @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "MM/dd/yyyy HH:mm") private String startDate; private Integer assessmentTypeId; - private Integer entitlementId; + private Long entitlementId; private String entitlementFrequencyType; private String timeZone; private String frameworkType; diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/scan/helper/oss/FoDScanOssDescriptor.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/scan/helper/oss/FoDScanOssDescriptor.java index e46fc0b74f4..b0ed866e844 100644 --- a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/scan/helper/oss/FoDScanOssDescriptor.java +++ b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/scan/helper/oss/FoDScanOssDescriptor.java @@ -22,7 +22,7 @@ @Reflectable @NoArgsConstructor @Data @EqualsAndHashCode(callSuper = true) public class FoDScanOssDescriptor extends JsonNodeHolder { - private Integer scanId; + private Long scanId; private String scanType; } diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/scan/helper/sast/FoDScanSastDescriptor.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/scan/helper/sast/FoDScanSastDescriptor.java index aea80adadbf..71fab51c58f 100644 --- a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/scan/helper/sast/FoDScanSastDescriptor.java +++ b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/scan/helper/sast/FoDScanSastDescriptor.java @@ -22,7 +22,7 @@ @Reflectable @NoArgsConstructor @Data @EqualsAndHashCode(callSuper = true) public class FoDScanSastDescriptor extends JsonNodeHolder { - private Integer scanId; + private Long scanId; private String scanType; } diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/access_control/helper/FoDUserDescriptor.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/access_control/helper/FoDUserDescriptor.java index 2dd0e2acacc..f1845ad474d 100644 --- a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/access_control/helper/FoDUserDescriptor.java +++ b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/access_control/helper/FoDUserDescriptor.java @@ -22,7 +22,7 @@ @Reflectable @NoArgsConstructor @Data @EqualsAndHashCode(callSuper = true) public class FoDUserDescriptor extends JsonNodeHolder { - private Integer userId; + private Long userId; private String userName; private String firstName; private String lastName; diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/access_control/helper/FoDUserGroupDescriptor.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/access_control/helper/FoDUserGroupDescriptor.java index c591047e718..b7e767e3e02 100644 --- a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/access_control/helper/FoDUserGroupDescriptor.java +++ b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/access_control/helper/FoDUserGroupDescriptor.java @@ -22,7 +22,7 @@ @Reflectable @NoArgsConstructor @Data @EqualsAndHashCode(callSuper = true) public class FoDUserGroupDescriptor extends JsonNodeHolder { - private Integer id; + private Long id; private String name; private Integer assignedUsersCount; private Integer assignedApplicationsCount; diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/access_control/helper/FoDUserGroupHelper.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/access_control/helper/FoDUserGroupHelper.java index d99ff490890..e60197ea2f6 100644 --- a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/access_control/helper/FoDUserGroupHelper.java +++ b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/access_control/helper/FoDUserGroupHelper.java @@ -88,7 +88,7 @@ public static final FoDUserGroupDescriptor createUserGroup(UnirestInstance unire return FoDUserGroupHelper.getUserGroupDescriptor(unirest, groupId, true); } - public static final FoDUserGroupDescriptor updateUserGroup(UnirestInstance unirest, Integer groupId, FoDUserGroupUpdateRequest userGroupUpdateRequest) { + public static final FoDUserGroupDescriptor updateUserGroup(UnirestInstance unirest, Long groupId, FoDUserGroupUpdateRequest userGroupUpdateRequest) { ObjectNode body = objectMapper.valueToTree(userGroupUpdateRequest); unirest.put(FoDUrls.USER_GROUP) .routeParam("groupId", String.valueOf(groupId)) @@ -128,7 +128,7 @@ public static final FoDUserGroupDescriptor updateUserGroupMembership(UnirestInst FoDEnums.UserGroupMembershipAction action) { FoDUserDescriptor userDescriptor = FoDUserHelper.getUserDescriptor(unirest, userNameOrId, true); FoDUserGroupDescriptor userGroupDescriptor = FoDUserGroupHelper.getUserGroupDescriptor(unirest, userGroupNameOrId, true); - ArrayList userIds = new ArrayList<>(); + ArrayList userIds = new ArrayList<>(); userIds.add(userDescriptor.getUserId()); FoDUserGroupMembersRequest userGroupMembersRequest = FoDUserGroupMembersRequest.builder().build(); if (action.equals(FoDEnums.UserGroupMembershipAction.Add)) { diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/access_control/helper/FoDUserGroupMembersRequest.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/access_control/helper/FoDUserGroupMembersRequest.java index 8d57513452a..8fdeb2befb9 100644 --- a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/access_control/helper/FoDUserGroupMembersRequest.java +++ b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/access_control/helper/FoDUserGroupMembersRequest.java @@ -24,6 +24,6 @@ @Reflectable @NoArgsConstructor @AllArgsConstructor @Data @Builder public class FoDUserGroupMembersRequest { - private ArrayList removeUsers; - private ArrayList addUsers; + private ArrayList removeUsers; + private ArrayList addUsers; } diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/access_control/helper/FoDUserHelper.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/access_control/helper/FoDUserHelper.java index 3fa17f3921a..c0043476d4e 100644 --- a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/access_control/helper/FoDUserHelper.java +++ b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/access_control/helper/FoDUserHelper.java @@ -97,7 +97,7 @@ public static final FoDUserDescriptor createUser(UnirestInstance unirest, FoDUse return descriptor; } - public static final FoDUserDescriptor updateUser(UnirestInstance unirest, Integer userId, + public static final FoDUserDescriptor updateUser(UnirestInstance unirest, Long userId, FoDUserUpdateRequest userUpdateRequest) { ObjectNode body = objectMapper.valueToTree(userUpdateRequest); FoDUserDescriptor userDescriptor = getUserDescriptor(unirest, String.valueOf(userId), true); diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/helper/FoDAppCreateRequest.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/helper/FoDAppCreateRequest.java index 96c0432bb9d..d19dda7f6f0 100644 --- a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/helper/FoDAppCreateRequest.java +++ b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/helper/FoDAppCreateRequest.java @@ -57,7 +57,7 @@ public class FoDAppCreateRequest { private String releaseName; private String releaseDescription; private String sdlcStatusType; - private Integer ownerId; + private Long ownerId; private String applicationType; @Builder.Default private boolean hasMicroservices = false; private JsonNode microservices; @@ -141,10 +141,10 @@ public FoDAppCreateRequestBuilder releaseNameDescriptor(FoDQualifiedReleaseNameD } public FoDAppCreateRequestBuilder owner(UnirestInstance unirest, String owner) { - int userId = 0; + long userId = 0; if (owner == null) return ownerId(null); try { - userId = Integer.parseInt(owner); + userId = Long.parseLong(owner); } catch (NumberFormatException nfe) { userId = FoDUserHelper.getUserDescriptor(unirest, owner, true).getUserId(); } diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/helper/FoDAppDescriptor.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/helper/FoDAppDescriptor.java index 3c5ea585143..c25994d7b21 100644 --- a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/helper/FoDAppDescriptor.java +++ b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/helper/FoDAppDescriptor.java @@ -35,8 +35,8 @@ public class FoDAppDescriptor extends JsonNodeHolder { private String emailList; private boolean hasMicroservices; - public Map attributesAsMap() { - Map attrMap = new HashMap<>(); + public Map attributesAsMap() { + Map attrMap = new HashMap<>(); for (FoDAttributeValueDescriptor attr : attributes) { attrMap.put(attr.getId(), attr.getValue()); } diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/attribute/cli/mixin/FoDAttributeResolverMixin.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/attribute/cli/mixin/FoDAttributeResolverMixin.java index 7aa9fc8da74..604d7949ea9 100644 --- a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/attribute/cli/mixin/FoDAttributeResolverMixin.java +++ b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/attribute/cli/mixin/FoDAttributeResolverMixin.java @@ -51,10 +51,10 @@ public Collection getAttributeDescriptorJsonNodes(UnirestInstance unir .collect(Collectors.toList()); } - public Integer[] getAttributeIds(UnirestInstance unirest) { + public Long[] getAttributeIds(UnirestInstance unirest) { return Stream.of(getAttributeDescriptors(unirest)) .map(FoDAttributeDefinitionDescriptor::getId) - .toArray(Integer[]::new); + .toArray(Long[]::new); } } diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/attribute/helper/FoDAttributeDefinitionDescriptor.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/attribute/helper/FoDAttributeDefinitionDescriptor.java index 8c234d20622..eb577ec1bc7 100644 --- a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/attribute/helper/FoDAttributeDefinitionDescriptor.java +++ b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/attribute/helper/FoDAttributeDefinitionDescriptor.java @@ -26,7 +26,7 @@ @Reflectable @NoArgsConstructor @JsonIgnoreProperties(ignoreUnknown = true) public class FoDAttributeDefinitionDescriptor extends JsonNodeHolder { - private Integer id; + private Long id; private String name; private Integer attributeTypeId; private String attributeType; diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/attribute/helper/FoDAttributeDefinitionHelper.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/attribute/helper/FoDAttributeDefinitionHelper.java index fcc86265013..2479682a9a9 100644 --- a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/attribute/helper/FoDAttributeDefinitionHelper.java +++ b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/attribute/helper/FoDAttributeDefinitionHelper.java @@ -67,7 +67,7 @@ public FoDAttributeDefinitionDescriptor getDefinition(String nameOrId, boolean f } FoDAttributeDefinitionDescriptor result = null; try { - int id = Integer.parseInt(nameOrId); + long id = Long.parseLong(nameOrId); result = getAllDefinitions().stream() .filter(d -> d.getId() != null && d.getId() == id) .findFirst().orElse(null); @@ -127,16 +127,16 @@ public JsonNode mergeAttributesNode(ArrayList curre ArrayNode attrArray = JsonHelper.getObjectMapper().createArrayNode(); if (updates == null || updates.isEmpty()) return attrArray; - Map updatesWithId = new HashMap<>(); + Map updatesWithId = new HashMap<>(); for (Map.Entry attr : updates.entrySet()) { var def = getDefinition(attr.getKey(), true); updatesWithId.put(def.getId(), attr.getValue()); } - Set processedIds = new HashSet<>(); + Set processedIds = new HashSet<>(); if (current != null) { for (FoDAttributeValueDescriptor attr : current) { - int id = attr.getId(); + long id = attr.getId(); ObjectNode attrObj = JsonHelper.getObjectMapper().createObjectNode(); attrObj.put("id", id); attrObj.put("value", updatesWithId.getOrDefault(id, attr.getValue())); @@ -145,7 +145,7 @@ public JsonNode mergeAttributesNode(ArrayList curre } } - for (Map.Entry entry : updatesWithId.entrySet()) { + for (Map.Entry entry : updatesWithId.entrySet()) { if (!processedIds.contains(entry.getKey())) { ObjectNode attrObj = JsonHelper.getObjectMapper().createObjectNode(); attrObj.put("id", entry.getKey()); @@ -201,7 +201,7 @@ private FoDAttributeDefinitionDescriptor fetchFromApi(String nameOrId, boolean f var request = unirest.get(FoDUrls.ATTRIBUTES); JsonNode result; try { - int id = Integer.parseInt(nameOrId); + long id = Long.parseLong(nameOrId); result = FoDDataHelper.findUnique(request, String.format("id:%d", id)); } catch (NumberFormatException nfe) { result = FoDDataHelper.findUnique(request, String.format("name:%s", nameOrId)); diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/attribute/helper/FoDAttributeValueDescriptor.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/attribute/helper/FoDAttributeValueDescriptor.java index b842889b651..b5f96761815 100644 --- a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/attribute/helper/FoDAttributeValueDescriptor.java +++ b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/attribute/helper/FoDAttributeValueDescriptor.java @@ -24,7 +24,7 @@ @Reflectable @NoArgsConstructor @JsonIgnoreProperties(ignoreUnknown = true) public class FoDAttributeValueDescriptor extends JsonNodeHolder { - private Integer id; + private Long id; private String name; private String value; } diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/attribute/helper/FoDPickListDescriptor.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/attribute/helper/FoDPickListDescriptor.java index ac91dece412..9a5494a8587 100644 --- a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/attribute/helper/FoDPickListDescriptor.java +++ b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/attribute/helper/FoDPickListDescriptor.java @@ -22,6 +22,6 @@ @Data @EqualsAndHashCode(callSuper = true) @Reflectable @NoArgsConstructor public class FoDPickListDescriptor extends JsonNodeHolder { - private Integer id; + private Long id; private String name; } diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/dast_scan/cli/cmd/AbstractFoDDastAutomatedScanSetupCommand.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/dast_scan/cli/cmd/AbstractFoDDastAutomatedScanSetupCommand.java index b130cebcb64..9d266f950ea 100644 --- a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/dast_scan/cli/cmd/AbstractFoDDastAutomatedScanSetupCommand.java +++ b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/dast_scan/cli/cmd/AbstractFoDDastAutomatedScanSetupCommand.java @@ -106,7 +106,7 @@ protected FoDScanConfigDastAutomatedDescriptor getSetupDescriptor(UnirestInstanc return FoDScanDastAutomatedHelper.getSetupDescriptor(unirest, releaseId); } - protected void validateEntitlement(FoDScanConfigDastAutomatedDescriptor currentSetup, Integer entitlementIdToUse, + protected void validateEntitlement(FoDScanConfigDastAutomatedDescriptor currentSetup, Long entitlementIdToUse, String relId, FoDReleaseAssessmentTypeDescriptor atd) { // validate entitlement specified or currently in use against assessment type found if (entitlementId != null && entitlementId > 0) { diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/dast_scan/cli/cmd/FoDDastLegacyScanStartCommand.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/dast_scan/cli/cmd/FoDDastLegacyScanStartCommand.java index e869f59b813..5f0faca7abd 100644 --- a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/dast_scan/cli/cmd/FoDDastLegacyScanStartCommand.java +++ b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/dast_scan/cli/cmd/FoDDastLegacyScanStartCommand.java @@ -58,7 +58,7 @@ public class FoDDastLegacyScanStartCommand extends AbstractFoDScanStartCommand { //private DynamicAssessmentTypes dynamicAssessmentType; private String dynamicAssessmentType; @Option(names = {"--entitlement-id"}) - private Integer entitlementId; + private Long entitlementId; @Option(names = {"--start-date"}) private String startDate; @Option(names = {"--notes"}) @@ -77,7 +77,7 @@ public class FoDDastLegacyScanStartCommand extends AbstractFoDScanStartCommand { protected FoDScanDescriptor startScan(UnirestInstance unirest, FoDReleaseDescriptor releaseDescriptor) { try ( var progressWriter = progressWriterFactory.create() ) { String relId = releaseDescriptor.getReleaseId(); - Integer entitlementIdToUse = 0; + Long entitlementIdToUse = 0L; Integer assessmentTypeId = 0; Boolean isRemediation = false; diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/dast_scan/helper/FoDScanConfigDastAutomatedDescriptor.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/dast_scan/helper/FoDScanConfigDastAutomatedDescriptor.java index e6db9039d8f..273f4f73a9f 100644 --- a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/dast_scan/helper/FoDScanConfigDastAutomatedDescriptor.java +++ b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/dast_scan/helper/FoDScanConfigDastAutomatedDescriptor.java @@ -25,7 +25,7 @@ @EqualsAndHashCode(callSuper=false) public class FoDScanConfigDastAutomatedDescriptor extends JsonNodeHolder { private Integer assessmentTypeId; - private Integer entitlementId; + private Long entitlementId; private String entitlementFrequencyType; private String scanType; } diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/dast_scan/helper/FoDScanConfigDastLegacyDescriptor.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/dast_scan/helper/FoDScanConfigDastLegacyDescriptor.java index 4858298f164..fafacd7b508 100644 --- a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/dast_scan/helper/FoDScanConfigDastLegacyDescriptor.java +++ b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/dast_scan/helper/FoDScanConfigDastLegacyDescriptor.java @@ -25,7 +25,7 @@ @EqualsAndHashCode(callSuper=false) public class FoDScanConfigDastLegacyDescriptor extends JsonNodeHolder { private Integer assessmentTypeId; - private Integer entitlementId; + private Long entitlementId; private String entitlementDescription; private String entitlementFrequencyType; private Integer entitlementFrequencyTypeId; diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/issue/helper/FoDBulkIssueUpdateRequest.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/issue/helper/FoDBulkIssueUpdateRequest.java index 45df3e6fd18..75b30a4661b 100644 --- a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/issue/helper/FoDBulkIssueUpdateRequest.java +++ b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/issue/helper/FoDBulkIssueUpdateRequest.java @@ -38,7 +38,7 @@ @Builder @JsonInclude(JsonInclude.Include.NON_NULL) public class FoDBulkIssueUpdateRequest { - private Integer userId; + private Long userId; private String developerStatus; private String auditorStatus; private String severity; @@ -73,10 +73,10 @@ private void validateRequired(List messages, Object obj, String message) public static class FoDBulkIssueUpdateRequestBuilder { public FoDBulkIssueUpdateRequestBuilder user(UnirestInstance unirest, String user) { - int userId = 0; + long userId = 0; if (user == null) return userId(null); try { - userId = Integer.parseInt(user); + userId = Long.parseLong(user); } catch (NumberFormatException nfe) { userId = FoDUserHelper.getUserDescriptor(unirest, user, true).getUserId(); } diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/issue/helper/FoDIssueAttributeHelper.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/issue/helper/FoDIssueAttributeHelper.java index 6f5f76defaa..ab03b275ac7 100644 --- a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/issue/helper/FoDIssueAttributeHelper.java +++ b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/issue/helper/FoDIssueAttributeHelper.java @@ -102,7 +102,7 @@ private String tryResolveAgainstAttributes(String[] attributeNames, String candi } } try { - int providedId = Integer.parseInt(candidate); + long providedId = Long.parseLong(candidate); for (var pv : picklist) { if (Objects.equals(pv.getId(), providedId)) { return pv.getName(); diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/issue/helper/FoDIssueHelper.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/issue/helper/FoDIssueHelper.java index a44b2941c71..4073873e5e1 100644 --- a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/issue/helper/FoDIssueHelper.java +++ b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/issue/helper/FoDIssueHelper.java @@ -162,7 +162,7 @@ public static final ArrayNode mergeReleaseIssues(ArrayNode issues) { sortedRecords.sort( Comparator.comparingInt((ObjectNode n) -> n.get("severity").asInt()).reversed() .thenComparing(n -> n.get("category").asText()) - .thenComparing(n -> n.get("releaseId").asInt()) + .thenComparing(n -> n.get("releaseId").asLong()) ); ArrayNode result = JsonHelper.getObjectMapper().createArrayNode(); diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/mast_scan/cli/cmd/FoDMastScanSetupCommand.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/mast_scan/cli/cmd/FoDMastScanSetupCommand.java index b5f1d1f0aec..493ecff87a0 100644 --- a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/mast_scan/cli/cmd/FoDMastScanSetupCommand.java +++ b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/mast_scan/cli/cmd/FoDMastScanSetupCommand.java @@ -100,7 +100,7 @@ protected JsonNode setup(UnirestInstance unirest, FoDReleaseDescriptor releaseDe var atd = FoDReleaseAssessmentTypeHelper.getAssessmentTypeDescriptor(unirest, releaseId, FoDScanType.Mobile, entitlementFrequencyTypeMixin.getEntitlementFrequencyType(), assessmentType); Integer assessmentTypeId = atd.getAssessmentTypeId(); - Integer entitlementIdToUse = atd.getEntitlementId(); + Long entitlementIdToUse = atd.getEntitlementId(); assessmentTypeName = atd.getName(); validateEntitlement(currentSetup, entitlementIdToUse, releaseId, atd); @@ -124,7 +124,7 @@ protected JsonNode setup(UnirestInstance unirest, FoDReleaseDescriptor releaseDe return FoDScanConfigMobileHelper.setupScan(unirest, releaseDescriptor, setupMastScanRequest).asJsonNode(); } - private void validateEntitlement(FoDScanConfigMobileDescriptor currentSetup, Integer entitlementIdToUse, String releaseId, FoDReleaseAssessmentTypeDescriptor atd) { + private void validateEntitlement(FoDScanConfigMobileDescriptor currentSetup, Long entitlementIdToUse, String releaseId, FoDReleaseAssessmentTypeDescriptor atd) { // validate entitlement specified or currently in use against assessment type found if (entitlementId != null && entitlementId > 0) { // check if "entitlement id" explicitly matches what has been found diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/mast_scan/cli/cmd/FoDMastScanStartCommand.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/mast_scan/cli/cmd/FoDMastScanStartCommand.java index 6abd49f0864..44fa2d9b680 100644 --- a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/mast_scan/cli/cmd/FoDMastScanStartCommand.java +++ b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/mast_scan/cli/cmd/FoDMastScanStartCommand.java @@ -57,7 +57,7 @@ public class FoDMastScanStartCommand extends AbstractFoDScanStartCommand { @Option(names = {"--assessment-type"}, required = true) private String mobileAssessmentType; @Option(names = {"--entitlement-id"}) - private Integer entitlementId; + private Long entitlementId; private enum MobileFrameworks { iOS, Android } @Option(names = {"--framework"}) private MobileFrameworks mobileFramework; @@ -138,7 +138,7 @@ protected FoDScanDescriptor startScan(UnirestInstance unirest, FoDReleaseDescrip } } - private void validateEntitlement(FoDScanConfigMobileDescriptor currentSetup, Integer entitlementIdToUse, String relId, FoDReleaseAssessmentTypeDescriptor atd) { + private void validateEntitlement(FoDScanConfigMobileDescriptor currentSetup, Long entitlementIdToUse, String relId, FoDReleaseAssessmentTypeDescriptor atd) { // validate entitlement specified or currently in use against assessment type found if (entitlementId != null && entitlementId > 0) { // check if "entitlement id" explicitly matches what has been found diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/mast_scan/helper/FoDScanConfigMobileDescriptor.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/mast_scan/helper/FoDScanConfigMobileDescriptor.java index 0e2eb8734c4..5e1f5a043e4 100644 --- a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/mast_scan/helper/FoDScanConfigMobileDescriptor.java +++ b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/mast_scan/helper/FoDScanConfigMobileDescriptor.java @@ -22,9 +22,9 @@ @Reflectable @NoArgsConstructor @Data @EqualsAndHashCode(callSuper=false) public class FoDScanConfigMobileDescriptor extends JsonNodeHolder { - private Integer releaseId; + private Long releaseId; private Integer assessmentTypeId; - private Integer entitlementId; + private Long entitlementId; private String entitlementFrequencyType; private String frameworkType; private String auditPreferenceType; diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/microservice/helper/FoDMicroserviceDescriptor.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/microservice/helper/FoDMicroserviceDescriptor.java index 8e4c3cc1487..c462013388d 100644 --- a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/microservice/helper/FoDMicroserviceDescriptor.java +++ b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/microservice/helper/FoDMicroserviceDescriptor.java @@ -33,8 +33,8 @@ public class FoDMicroserviceDescriptor extends JsonNodeHolder { private String microserviceName; private ArrayList attributes; - public Map attributesAsMap() { - Map attrMap = new HashMap<>(); + public Map attributesAsMap() { + Map attrMap = new HashMap<>(); for (FoDAttributeValueDescriptor attr : attributes) { attrMap.put(attr.getId(), attr.getValue()); } diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/oss_scan/helper/FoDScanConfigOssDescriptor.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/oss_scan/helper/FoDScanConfigOssDescriptor.java index e7d01500a96..f875327dcd1 100644 --- a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/oss_scan/helper/FoDScanConfigOssDescriptor.java +++ b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/oss_scan/helper/FoDScanConfigOssDescriptor.java @@ -22,5 +22,5 @@ @Reflectable @NoArgsConstructor @Data @EqualsAndHashCode(callSuper=false) public class FoDScanConfigOssDescriptor extends JsonNodeHolder { - private Integer releaseId; + private Long releaseId; } diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/release/cli/cmd/FoDReleaseUpdateCommand.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/release/cli/cmd/FoDReleaseUpdateCommand.java index 41d0c73f61f..3c358c217ce 100644 --- a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/release/cli/cmd/FoDReleaseUpdateCommand.java +++ b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/release/cli/cmd/FoDReleaseUpdateCommand.java @@ -69,7 +69,7 @@ public JsonNode getJsonNode(UnirestInstance unirest) { FoDReleaseUpdateRequest appRelUpdateRequest = FoDReleaseUpdateRequest.builder() .releaseName(StringUtils.isNotBlank(releaseName) ? getUnqualifiedReleaseName(releaseName, releaseDescriptor) : releaseDescriptor.getReleaseName()) .releaseDescription(StringUtils.isNotBlank(description) ? description : releaseDescriptor.getReleaseDescription()) - .ownerId(StringUtils.isNotBlank(releaseOwner) ? Integer.valueOf(releaseOwner) : releaseDescriptor.getOwnerId()) + .ownerId(StringUtils.isNotBlank(releaseOwner) ? Long.valueOf(releaseOwner) : releaseDescriptor.getOwnerId()) .microserviceId(releaseDescriptor.getMicroserviceId()) .sdlcStatusType(sdlcStatusTypeNew != null ? String.valueOf(sdlcStatusTypeNew) : releaseDescriptor.getSdlcStatusType()) .attributes(jsonAttrs).build(); diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/release/helper/FoDReleaseAssessmentTypeDescriptor.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/release/helper/FoDReleaseAssessmentTypeDescriptor.java index 3c7fc5f42cb..90ab213e8ea 100644 --- a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/release/helper/FoDReleaseAssessmentTypeDescriptor.java +++ b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/release/helper/FoDReleaseAssessmentTypeDescriptor.java @@ -29,7 +29,7 @@ public class FoDReleaseAssessmentTypeDescriptor extends JsonNodeHolder { private String name; private String scanType; private Integer scanTypeId; - private Integer entitlementId; + private Long entitlementId; private String frequencyType; private Integer frequencyTypeId; private Integer units; diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/release/helper/FoDReleaseDescriptor.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/release/helper/FoDReleaseDescriptor.java index cdb54a3e9d2..d2e03d03339 100644 --- a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/release/helper/FoDReleaseDescriptor.java +++ b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/release/helper/FoDReleaseDescriptor.java @@ -48,10 +48,10 @@ public class FoDReleaseDescriptor extends JsonNodeHolder { private Boolean isPassed; private String passFailReasonType; private String sdlcStatusType; - private Integer ownerId; - private Integer currentStaticScanId; - private Integer currentDynamicScanId; - private Integer currentMobileScanId; + private Long ownerId; + private Long currentStaticScanId; + private Long currentDynamicScanId; + private Long currentMobileScanId; private String staticAnalysisStatusType; private String dynamicAnalysisStatusType; private String mobileAnalysisStatusType; @@ -72,8 +72,8 @@ public String getQualifierPrefix(String delimiter) { return applicationName+delimiter+msQualifierPrefix; } - public Map attributesAsMap() { - Map attrMap = new HashMap<>(); + public Map attributesAsMap() { + Map attrMap = new HashMap<>(); for (FoDAttributeValueDescriptor attr : attributes) { attrMap.put(attr.getId(), attr.getValue()); } diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/release/helper/FoDReleaseHelper.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/release/helper/FoDReleaseHelper.java index 43a45e44fea..292d93262c7 100644 --- a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/release/helper/FoDReleaseHelper.java +++ b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/release/helper/FoDReleaseHelper.java @@ -52,14 +52,14 @@ public static final JsonNode renameFields(JsonNode record) { public static final FoDReleaseDescriptor getReleaseDescriptor(UnirestInstance unirest, String qualifiedReleaseNameOrId, String delimiter, boolean failIfNotFound, String... fields) { try { - int relId = Integer.parseInt(qualifiedReleaseNameOrId); + long relId = Long.parseLong(qualifiedReleaseNameOrId); return getReleaseDescriptorFromId(unirest, relId, failIfNotFound, fields); } catch (NumberFormatException nfe) { return getReleaseDescriptorFromQualifiedName(unirest, FoDQualifiedReleaseNameDescriptor.fromQualifiedReleaseName(qualifiedReleaseNameOrId, delimiter), failIfNotFound, fields); } } - public static final FoDReleaseDescriptor getReleaseDescriptorFromId(UnirestInstance unirest, int relId, boolean failIfNotFound, String... fields) { + public static final FoDReleaseDescriptor getReleaseDescriptorFromId(UnirestInstance unirest, long relId, boolean failIfNotFound, String... fields) { GetRequest request = addFieldsParam(unirest.get(FoDUrls.RELEASES), fields); return getDescriptor(request, String.valueOf(relId), failIfNotFound, String.format("releaseId:%d", relId)); } @@ -78,7 +78,7 @@ public static final FoDReleaseDescriptor getReleaseDescriptorFromQualifiedName(U public static final FoDReleaseDescriptor createRelease(UnirestInstance unirest, FoDReleaseCreateRequest relCreateRequest) { ObjectNode body = objectMapper.valueToTree(relCreateRequest); var releaseId = unirest.post(FoDUrls.RELEASES) - .body(body).asObject(JsonNode.class).getBody().get("releaseId").asInt(); + .body(body).asObject(JsonNode.class).getBody().get("releaseId").asLong(); return getReleaseDescriptorFromId(unirest, releaseId, true); } diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/release/helper/FoDReleaseUpdateRequest.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/release/helper/FoDReleaseUpdateRequest.java index 9aad0c02b22..9795c8e6d7d 100644 --- a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/release/helper/FoDReleaseUpdateRequest.java +++ b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/release/helper/FoDReleaseUpdateRequest.java @@ -27,7 +27,7 @@ public class FoDReleaseUpdateRequest { private String releaseName; private String releaseDescription; private String sdlcStatusType; - private Integer ownerId; + private Long ownerId; private String microserviceId; private JsonNode attributes; } diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/report/cli/mixin/FoDReportResolverMixin.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/report/cli/mixin/FoDReportResolverMixin.java index ba520bbce84..50817182525 100644 --- a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/report/cli/mixin/FoDReportResolverMixin.java +++ b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/report/cli/mixin/FoDReportResolverMixin.java @@ -47,8 +47,8 @@ public Collection getReportDescriptorJsonNodes(UnirestInstance unirest return Stream.of(getReportDescriptors(unirest)).map(FoDReportDescriptor::asJsonNode).collect(Collectors.toList()); } - public Integer[] getReportIds(UnirestInstance unirest) { - return Stream.of(getReportDescriptors(unirest)).map(FoDReportDescriptor::getReportId).toArray(Integer[]::new); + public Long[] getReportIds(UnirestInstance unirest) { + return Stream.of(getReportDescriptors(unirest)).map(FoDReportDescriptor::getReportId).toArray(Long[]::new); } } diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/report/helper/FoDReportDescriptor.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/report/helper/FoDReportDescriptor.java index 963502b9b74..e2c7103f99c 100644 --- a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/report/helper/FoDReportDescriptor.java +++ b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/report/helper/FoDReportDescriptor.java @@ -22,7 +22,7 @@ @Reflectable @NoArgsConstructor @Data @EqualsAndHashCode(callSuper = true) public class FoDReportDescriptor extends JsonNodeHolder { - private Integer reportId; + private Long reportId; private String reportName; private String reportNotes; private Integer reportStatusTypeId; @@ -32,7 +32,7 @@ public class FoDReportDescriptor extends JsonNodeHolder { private String customReportTypeName; private Boolean isReceived; private String language; - private Integer applicationId; - private Integer releaseId; - private Integer userId; + private Long applicationId; + private Long releaseId; + private Long userId; } diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/sast_scan/cli/cmd/FoDSastScanSetupCommand.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/sast_scan/cli/cmd/FoDSastScanSetupCommand.java index 550b58894a8..1861e6c6539 100644 --- a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/sast_scan/cli/cmd/FoDSastScanSetupCommand.java +++ b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/sast_scan/cli/cmd/FoDSastScanSetupCommand.java @@ -204,7 +204,7 @@ private Integer getTechnologyStackId(UnirestInstance unirest) { } } - private void validateEntitlement(FoDScanConfigSastDescriptor currentSetup, Integer entitlementIdToUse, String relId, FoDReleaseAssessmentTypeDescriptor atd) { + private void validateEntitlement(FoDScanConfigSastDescriptor currentSetup, Long entitlementIdToUse, String relId, FoDReleaseAssessmentTypeDescriptor atd) { // validate entitlement specified or currently in use against assessment type found if (entitlementId != null && entitlementId > 0) { // check if "entitlement id" explicitly matches what has been found diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/sast_scan/helper/FoDScanConfigSastDescriptor.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/sast_scan/helper/FoDScanConfigSastDescriptor.java index e9829d9b3fd..a3c0155b09b 100644 --- a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/sast_scan/helper/FoDScanConfigSastDescriptor.java +++ b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/sast_scan/helper/FoDScanConfigSastDescriptor.java @@ -22,9 +22,9 @@ @Reflectable @NoArgsConstructor @Data @EqualsAndHashCode(callSuper=false) public class FoDScanConfigSastDescriptor extends JsonNodeHolder { - private Integer releaseId; + private Long releaseId; private Integer assessmentTypeId; - private Integer entitlementId; + private Long entitlementId; private String entitlementDescription; private String entitlementFrequencyType; private Integer entitlementFrequencyTypeId; diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/sast_scan/helper/FoDScanConfigSastSetupRequest.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/sast_scan/helper/FoDScanConfigSastSetupRequest.java index 6aa02ff1adb..d67d9211b4b 100644 --- a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/sast_scan/helper/FoDScanConfigSastSetupRequest.java +++ b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/sast_scan/helper/FoDScanConfigSastSetupRequest.java @@ -26,7 +26,7 @@ public class FoDScanConfigSastSetupRequest { private Integer assessmentTypeId; private String entitlementFrequencyType; - private Integer entitlementId; + private Long entitlementId; private Integer technologyStackId; private Integer languageLevelId; private Boolean performOpenSourceAnalysis;