From df3e9fb285aab069e7e23b22aa68c12605fc1757 Mon Sep 17 00:00:00 2001 From: Stefan Genov Date: Tue, 14 Jan 2025 12:00:04 +0200 Subject: [PATCH] style(lint): A bunch of lint changes. Disabled VisibilityModifier rule Signed-off-by: Stefan Genov --- .github/linters/sun_checks.xml | 3 - .../pscoe/iac/artifact/AbxPackageStore.java | 2 +- .../artifact/aria/models/Identifiable.java | 2 +- .../aria/models/VraNgApprovalPolicy.java | 2 +- .../artifact/aria/models/VraNgBlueprint.java | 2 +- .../aria/models/VraNgCatalogEntitlement.java | 2 +- .../models/VraNgCatalogEntitlementDto.java | 26 +++- .../models/VraNgCatalogEntitlementType.java | 2 +- .../aria/models/VraNgCatalogItem.java | 2 +- .../aria/models/VraNgCatalogItemType.java | 2 +- .../aria/models/VraNgCloudAccount.java | 42 +++++- .../iac/artifact/aria/models/VraNgConfig.java | 11 +- .../models/VraNgContentSharingPolicy.java | 2 +- .../aria/models/VraNgContentSource.java | 2 +- .../aria/models/VraNgContentSourceBase.java | 2 +- .../aria/models/VraNgContentSourceType.java | 2 +- .../artifact/aria/models/VraNgCustomForm.java | 2 +- .../aria/models/VraNgCustomFormAndData.java | 2 +- .../aria/models/VraNgCustomResource.java | 2 +- .../aria/models/VraNgDay2ActionsPolicy.java | 2 +- .../artifact/aria/models/VraNgDefinition.java | 2 +- .../models/VraNgDeploymentLimitPolicy.java | 2 +- .../aria/models/VraNgEntitledUser.java | 2 +- .../aria/models/VraNgIntegration.java | 30 ++++- .../iac/artifact/aria/models/VraNgItem.java | 2 +- .../aria/models/VraNgLeasePolicy.java | 2 +- .../aria/models/VraNgOrganization.java | 25 +++- .../aria/models/VraNgOrganizations.java | 2 +- .../aria/models/VraNgPackageAdapter.java | 2 +- .../aria/models/VraNgPackageContent.java | 2 +- .../aria/models/VraNgPackageDescriptor.java | 2 +- .../aria/models/VraNgPackageMemberType.java | 2 +- .../iac/artifact/aria/models/VraNgPolicy.java | 2 +- .../aria/models/VraNgPolicyFolderName.java | 2 +- .../artifact/aria/models/VraNgPrincipal.java | 2 +- .../artifact/aria/models/VraNgProject.java | 2 +- .../aria/models/VraNgPropertyGroup.java | 2 +- .../iac/artifact/aria/models/VraNgRegion.java | 28 +++- .../aria/models/VraNgResourceAction.java | 2 +- .../aria/models/VraNgResourceQuotaPolicy.java | 2 +- .../iac/artifact/aria/models/VraNgSecret.java | 20 ++- .../aria/models/VraNgSubscription.java | 2 +- .../artifact/aria/models/VraNgWorkflow.java | 2 +- .../models/VraNgWorkflowContentSource.java | 2 +- .../objectmapping/VraNgCloudAccountTag.java | 2 +- .../VraNgCloudRegionProfile.java | 2 +- .../models/objectmapping/package-info.java | 2 +- .../artifact/aria/models/package-info.java | 2 +- .../aria/package/VraNgPackageStore.java | 6 +- .../artifact/aria/rest/RestClientVraNg.java | 52 ++++---- .../aria/rest/RestClientVraNgPrimitive.java | 56 ++++---- .../aria/store/AbstractVraNgDeleteStore.java | 2 +- .../aria/store/AbstractVraNgStore.java | 4 +- .../aria/store/VraNgApprovalPolicyStore.java | 2 +- .../aria/store/VraNgBlueprintStore.java | 2 +- .../aria/store/VraNgCatalogItemStore.java | 10 +- .../aria/store/VraNgCatalogItemStore812.java | 10 +- .../store/VraNgContentSharingPolicyStore.java | 8 +- .../aria/store/VraNgContentSourceStore.java | 14 +- .../aria/store/VraNgCustomResourceStore.java | 4 +- .../store/VraNgDay2ActionsPolicyStore.java | 2 +- .../VraNgDeploymentLimitPolicyStore.java | 2 +- .../aria/store/VraNgEntitlementStore.java | 14 +- .../aria/store/VraNgLeasePolicyStore.java | 2 +- .../aria/store/VraNgPropertyGroupStore.java | 4 +- .../aria/store/VraNgResourceActionStore.java | 2 +- .../store/VraNgResourceQuotaPolicyStore.java | 2 +- .../aria/store/VraNgSubscriptionStore.java | 6 +- .../aria/store/VraNgTypeStoreFactory.java | 4 +- .../aria/store/VrangContentSourceUtils.java | 6 +- .../store/helpers/VraNgReleaseManager.java | 2 +- .../aria/utils/VraNgIntegrationUtils.java | 2 +- .../aria/utils/VraNgOrganizationUtil.java | 2 +- .../rest/RestClientVraNgPrimitiveTest.java | 16 +-- .../store/VraNgApprovalPolicyStoreTest.java | 8 +- .../aria/store/VraNgBlueprintStoreTest.java | 4 +- .../aria/store/VraNgCatalogItemStoreTest.java | 2 +- .../VraNgContentSharingPolicyStoreTest.java | 2 +- .../store/VraNgContentSourceStoreTest.java | 2 +- .../aria/store/VraNgCustomFormTest.java | 4 +- .../store/VraNgCustomResourceStoreTest.java | 8 +- .../VraNgDay2ActionsPolicyStoreTest.java | 2 +- .../VraNgDeploymentLimitPolicyStoreTest.java | 2 +- .../aria/store/VraNgEntitlementStoreTest.java | 2 +- .../aria/store/VraNgLeasePolicyStoreTest.java | 2 +- .../store/VraNgPropertyGroupStoreTest.java | 6 +- .../aria/store/VraNgReleaseManagerTest.java | 2 +- .../store/VraNgResourceActionStoreTest.java | 4 +- .../VraNgResourceQuotaPolicyStoreTest.java | 2 +- .../store/VraNgSubscriptionStoreTest.java | 8 +- .../aria/utils/VraNgProjectUtilTest.java | 2 +- .../filesystem/ApprovalPolicyFsMocks.java | 13 +- .../helpers/filesystem/BlueprintFsMocks.java | 37 +++--- .../filesystem/CatalogItemFsMocks.java | 121 +++++++++--------- .../ContentSharingPolicyFsMocks.java | 15 ++- .../filesystem/CustomResourceFsMocks.java | 12 +- .../filesystem/Day2ActionsPolicyFsMocks.java | 12 +- .../DeploymentLimitPolicyFsMocks.java | 13 +- .../filesystem/EntitlementFsMocks.java | 18 +-- .../filesystem/LeasePolicyFsMocks.java | 15 ++- .../filesystem/PropertyGroupFsMocks.java | 23 ++-- .../filesystem/ResourceActionFsMocks.java | 17 +-- .../ResourceQuotaPolicyFsMocks.java | 17 ++- .../filesystem/SubscriptionFsMocks.java | 10 +- .../helpers/filesystem/VraNgFsMock.java | 17 +-- .../helpers/stubs/BlueprintMockBuilder.java | 2 +- .../stubs/BlueprintVersionsMockBuilder.java | 2 +- .../stubs/CatalogEntitlementMockBuilder.java | 2 +- .../helpers/stubs/CatalogItemMockBuilder.java | 6 +- .../stubs/CloudAccountMockBuilder.java | 2 +- .../ContentSharingPolicyMockBuilder.java | 10 +- .../stubs/ContentSourceBaseMockBuilder.java | 2 +- .../helpers/stubs/CustomFormMockBuilder.java | 2 +- .../stubs/CustomResourceMockBuilder.java | 2 +- .../stubs/PropertyGroupMockBuilder.java | 2 +- .../stubs/ResourceActionMockBuilder.java | 2 +- .../stubs/SubscriptionMockBuilder.java | 2 +- .../RestClientVraNgPrimitiveTestDouble.java | 8 +- 118 files changed, 560 insertions(+), 387 deletions(-) diff --git a/.github/linters/sun_checks.xml b/.github/linters/sun_checks.xml index 1c1adffc7..a84304a74 100644 --- a/.github/linters/sun_checks.xml +++ b/.github/linters/sun_checks.xml @@ -192,9 +192,6 @@ https://www.oracle.com/java/technologies/javase/codeconventions-contents.html - - - diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/AbxPackageStore.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/AbxPackageStore.java index f3671630f..480c0ad7e 100644 --- a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/AbxPackageStore.java +++ b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/AbxPackageStore.java @@ -21,7 +21,7 @@ import com.vmware.pscoe.iac.artifact.model.abx.AbxConstant; import com.vmware.pscoe.iac.artifact.model.abx.AbxPackageContent; import com.vmware.pscoe.iac.artifact.model.abx.AbxPackageDescriptor; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgSecret; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgSecret; import com.vmware.pscoe.iac.artifact.aria.rest.RestClientVraNg; import org.apache.commons.lang3.NotImplementedException; import org.slf4j.Logger; diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/Identifiable.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/Identifiable.java index 1f98b85c5..eec9f2737 100644 --- a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/Identifiable.java +++ b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/Identifiable.java @@ -12,7 +12,7 @@ * This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file. * #L% */ -package com.vmware.pscoe.iac.artifact.aria.model; +package com.vmware.pscoe.iac.artifact.aria.models; /** * Interface that makes a Aria automation resource identifiable. diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgApprovalPolicy.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgApprovalPolicy.java index 910fc4ebb..bf14ee276 100644 --- a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgApprovalPolicy.java +++ b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgApprovalPolicy.java @@ -12,7 +12,7 @@ * This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file. * #L% */ -package com.vmware.pscoe.iac.artifact.aria.model; +package com.vmware.pscoe.iac.artifact.aria.models; import com.google.gson.JsonObject; diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgBlueprint.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgBlueprint.java index 3dd6c1b15..eef19224a 100644 --- a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgBlueprint.java +++ b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgBlueprint.java @@ -12,7 +12,7 @@ * This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file. * #L% */ -package com.vmware.pscoe.iac.artifact.aria.model; +package com.vmware.pscoe.iac.artifact.aria.models; import org.apache.commons.lang3.builder.HashCodeBuilder; diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgCatalogEntitlement.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgCatalogEntitlement.java index 8a304aa27..d4169979d 100644 --- a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgCatalogEntitlement.java +++ b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgCatalogEntitlement.java @@ -12,7 +12,7 @@ * This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file. * #L% */ -package com.vmware.pscoe.iac.artifact.aria.model; +package com.vmware.pscoe.iac.artifact.aria.models; import java.util.ArrayList; import java.util.List; diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgCatalogEntitlementDto.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgCatalogEntitlementDto.java index a510b3ff3..567995247 100644 --- a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgCatalogEntitlementDto.java +++ b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgCatalogEntitlementDto.java @@ -12,39 +12,59 @@ * This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file. * #L% */ -package com.vmware.pscoe.iac.artifact.aria.model; +package com.vmware.pscoe.iac.artifact.aria.models; import java.util.LinkedHashMap; import java.util.Map; +/** + * VraNgCatalogEntitlementDto is used to store the entitlement details of the + * VraNgCatalog. + */ public class VraNgCatalogEntitlementDto { - private String id; private String projectId; private Map definition = new LinkedHashMap(); + /** + * @return the id + */ public String getId() { return id; } + /** + * @param id the id to set + */ public void setId(String id) { this.id = id; } + /** + * @return the project id + */ public String getProjectId() { return projectId; } + /** + * @param projectId to set + */ public void setProjectId(String projectId) { this.projectId = projectId; } + /** + * @return the definition + */ public Map getDefinition() { return definition; } + /** + * @param definition to set + */ public void setDefinition(Map definition) { this.definition = definition; } - } diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgCatalogEntitlementType.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgCatalogEntitlementType.java index abda817dd..9ed3e1019 100644 --- a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgCatalogEntitlementType.java +++ b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgCatalogEntitlementType.java @@ -12,7 +12,7 @@ * This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file. * #L% */ -package com.vmware.pscoe.iac.artifact.aria.model; +package com.vmware.pscoe.iac.artifact.aria.models; import com.google.gson.annotations.SerializedName; diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgCatalogItem.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgCatalogItem.java index 1825f53b1..17ae677fd 100644 --- a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgCatalogItem.java +++ b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgCatalogItem.java @@ -12,7 +12,7 @@ * This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file. * #L% */ -package com.vmware.pscoe.iac.artifact.aria.model; +package com.vmware.pscoe.iac.artifact.aria.models; /** * Service Broker catalog item. diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgCatalogItemType.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgCatalogItemType.java index 9648cc210..487fa5bd2 100644 --- a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgCatalogItemType.java +++ b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgCatalogItemType.java @@ -12,7 +12,7 @@ * This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file. * #L% */ -package com.vmware.pscoe.iac.artifact.aria.model; +package com.vmware.pscoe.iac.artifact.aria.models; public class VraNgCatalogItemType { /** diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgCloudAccount.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgCloudAccount.java index 789a9eb28..fd67f7fb9 100644 --- a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgCloudAccount.java +++ b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgCloudAccount.java @@ -12,19 +12,28 @@ * This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file. * #L% */ -package com.vmware.pscoe.iac.artifact.aria.model; +package com.vmware.pscoe.iac.artifact.aria.models; import java.util.Collections; import java.util.List; +/** + * VraNgCloudAccount is the Aria Automation > Infrastructire > Cloud Account + * representation. + */ public class VraNgCloudAccount { - private final String id; private final String name; private final String type; private final List regionIds; private final List tags; + /** + * @param id - the id of the CA + * @param name - the name of the CA + * @param type - the type of the CA + * @param regionIds - all the region IDs for the cloud account + */ public VraNgCloudAccount(String id, String name, String type, List regionIds, List tags) { this.id = id; this.name = name; @@ -33,26 +42,44 @@ public VraNgCloudAccount(String id, String name, String type, List regio this.tags = tags; } + /** + * @return the id of the cloud account + */ public String getId() { return this.id; } + /** + * @return the name of the CA + */ public String getName() { return this.name; } + /** + * @return the type of the CA + */ public String getType() { return this.type; } + /** + * @return the region ids associated with the CA + */ public List getRegionIds() { return Collections.unmodifiableList(this.regionIds); } + /** + * @return the tags associated with the CA + */ public List getTags() { return Collections.unmodifiableList(this.tags); } + /** + * @param obj - object to check if it equals to this one + */ @Override public boolean equals(Object obj) { if (obj == null || !this.getClass().equals(obj.getClass())) { @@ -63,4 +90,15 @@ public boolean equals(Object obj) { return this.id.equals(other.getId()); } + /** + * @return the hash code of the object + */ + @Override + public int hashCode() { + int hash = 7; + hash = 31 * hash + (name == null ? 0 : name.hashCode()); + hash = 31 * hash + (type == null ? 0 : type.hashCode()); + return hash; + } + } diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgConfig.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgConfig.java index 61a0e74a6..51f91efa3 100644 --- a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgConfig.java +++ b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgConfig.java @@ -13,7 +13,7 @@ * This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file. * #L% */ -package com.vmware.pscoe.iac.artifact.aria.model; +package com.vmware.pscoe.iac.artifact.aria.models; import java.io.Serializable; import java.util.ArrayList; @@ -23,6 +23,9 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +/** + * Content Source Configuration. + */ @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ "workflows" }) public class VraNgConfig implements Serializable { @@ -31,11 +34,17 @@ public class VraNgConfig implements Serializable { @JsonProperty("workflows") private List workflows = new ArrayList<>(); + /** + * @return the workflows + */ @JsonProperty("workflows") public List getWorkflows() { return workflows; } + /** + * @param workflows - the workflows to set + */ @JsonProperty("workflows") public void setWorkflows(List workflows) { this.workflows = workflows; diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgContentSharingPolicy.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgContentSharingPolicy.java index 29d4baed4..623ce723a 100644 --- a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgContentSharingPolicy.java +++ b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgContentSharingPolicy.java @@ -12,7 +12,7 @@ * This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file. * #L% */ -package com.vmware.pscoe.iac.artifact.aria.model; +package com.vmware.pscoe.iac.artifact.aria.models; /** diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgContentSource.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgContentSource.java index 87e4e9922..100425a7f 100644 --- a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgContentSource.java +++ b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgContentSource.java @@ -12,7 +12,7 @@ * This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file. * #L% */ -package com.vmware.pscoe.iac.artifact.aria.model; +package com.vmware.pscoe.iac.artifact.aria.models; import java.util.List; import java.util.Map; diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgContentSourceBase.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgContentSourceBase.java index d6c4241f4..f6606fd37 100644 --- a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgContentSourceBase.java +++ b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgContentSourceBase.java @@ -12,7 +12,7 @@ * This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file. * #L% */ -package com.vmware.pscoe.iac.artifact.aria.model; +package com.vmware.pscoe.iac.artifact.aria.models; import java.util.ArrayList; import java.util.List; diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgContentSourceType.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgContentSourceType.java index 5189ed491..f398aa11a 100644 --- a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgContentSourceType.java +++ b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgContentSourceType.java @@ -12,7 +12,7 @@ * This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file. * #L% */ -package com.vmware.pscoe.iac.artifact.aria.model; +package com.vmware.pscoe.iac.artifact.aria.models; import com.google.gson.annotations.SerializedName; diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgCustomForm.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgCustomForm.java index 916d545a7..ff564f3f4 100644 --- a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgCustomForm.java +++ b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgCustomForm.java @@ -12,7 +12,7 @@ * This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file. * #L% */ -package com.vmware.pscoe.iac.artifact.aria.model; +package com.vmware.pscoe.iac.artifact.aria.models; import com.google.gson.Gson; import com.google.gson.GsonBuilder; diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgCustomFormAndData.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgCustomFormAndData.java index ecc5b4a52..80249c0de 100644 --- a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgCustomFormAndData.java +++ b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgCustomFormAndData.java @@ -12,7 +12,7 @@ * This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file. * #L% */ -package com.vmware.pscoe.iac.artifact.aria.model; +package com.vmware.pscoe.iac.artifact.aria.models; import com.google.gson.JsonParser; import com.google.gson.JsonElement; diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgCustomResource.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgCustomResource.java index 31f0a0c17..e942819a6 100644 --- a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgCustomResource.java +++ b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgCustomResource.java @@ -12,7 +12,7 @@ * This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file. * #L% */ -package com.vmware.pscoe.iac.artifact.aria.model; +package com.vmware.pscoe.iac.artifact.aria.models; import org.apache.commons.lang3.builder.HashCodeBuilder; diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgDay2ActionsPolicy.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgDay2ActionsPolicy.java index ea98c31d0..3ac07be94 100644 --- a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgDay2ActionsPolicy.java +++ b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgDay2ActionsPolicy.java @@ -12,7 +12,7 @@ * This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file. * #L% */ -package com.vmware.pscoe.iac.artifact.aria.model; +package com.vmware.pscoe.iac.artifact.aria.models; import com.google.gson.JsonObject; diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgDefinition.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgDefinition.java index 8e63ca9e8..97d3cbd00 100644 --- a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgDefinition.java +++ b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgDefinition.java @@ -12,7 +12,7 @@ * This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file. * #L% */ -package com.vmware.pscoe.iac.artifact.aria.model; +package com.vmware.pscoe.iac.artifact.aria.models; import java.util.List; diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgDeploymentLimitPolicy.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgDeploymentLimitPolicy.java index 6994fd2cc..812425b67 100644 --- a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgDeploymentLimitPolicy.java +++ b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgDeploymentLimitPolicy.java @@ -12,7 +12,7 @@ * This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file. * #L% */ -package com.vmware.pscoe.iac.artifact.aria.model; +package com.vmware.pscoe.iac.artifact.aria.models; import com.google.gson.JsonObject; diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgEntitledUser.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgEntitledUser.java index 854e3e169..a042a1dbd 100644 --- a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgEntitledUser.java +++ b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgEntitledUser.java @@ -12,7 +12,7 @@ * This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file. * #L% */ -package com.vmware.pscoe.iac.artifact.aria.model; +package com.vmware.pscoe.iac.artifact.aria.models; import java.util.List; diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgIntegration.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgIntegration.java index 49a3550bc..ea940aa12 100644 --- a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgIntegration.java +++ b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgIntegration.java @@ -13,7 +13,7 @@ * This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file. * #L% */ -package com.vmware.pscoe.iac.artifact.aria.model; +package com.vmware.pscoe.iac.artifact.aria.models; import java.io.Serializable; import java.util.HashMap; @@ -26,6 +26,9 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +/** + * Aria Automation > Infrastructure > Integration implementation. + */ @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ "name", "endpointUri", "endpointConfigurationLink" }) public class VraNgIntegration implements Serializable { @@ -43,41 +46,66 @@ public class VraNgIntegration implements Serializable { @JsonIgnore private transient Map additionalProperties = new HashMap<>(); + /** + * @param the name of the integration + */ @JsonProperty("name") public String getName() { return name; } + /** + * @param name - the integration name to set + */ @JsonProperty("name") public void setName(String name) { this.name = name; } + /** + * @return the endpoint of the integration + */ @JsonProperty("endpointUri") public String getEndpointUri() { return endpointUri; } + /** + * @param endpointUri - the endpoint uri to set + */ @JsonProperty("endpointUri") public void setEndpointUri(String endpointUri) { this.endpointUri = endpointUri; } + /** + * @return the endpoint configuration link + */ @JsonProperty("endpointConfigurationLink") public String getEndpointConfigurationLink() { return endpointConfigurationLink; } + /** + * @param endpointConfigurationLink - the endpoint config link + */ @JsonProperty("endpointConfigurationLink") public void setEndpointConfigurationLink(String endpointConfigurationLink) { this.endpointConfigurationLink = endpointConfigurationLink; } + /** + * @return a map of the additional properties + */ @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; } + /** + * @param name - name of an additional property to set + * @param value - the value of the additional prop to add + */ @JsonAnySetter public void setAdditionalProperty(String name, Object value) { this.additionalProperties.put(name, value); diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgItem.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgItem.java index 496655b50..c6f26a6db 100644 --- a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgItem.java +++ b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgItem.java @@ -12,7 +12,7 @@ * This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file. * #L% */ -package com.vmware.pscoe.iac.artifact.aria.model; +package com.vmware.pscoe.iac.artifact.aria.models; public class VraNgItem { /** diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgLeasePolicy.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgLeasePolicy.java index 842f4686f..5664f5147 100644 --- a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgLeasePolicy.java +++ b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgLeasePolicy.java @@ -12,7 +12,7 @@ * This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file. * #L% */ -package com.vmware.pscoe.iac.artifact.aria.model; +package com.vmware.pscoe.iac.artifact.aria.models; import com.google.gson.JsonObject; diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgOrganization.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgOrganization.java index 6cc25f25a..2f569c97a 100644 --- a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgOrganization.java +++ b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgOrganization.java @@ -13,14 +13,17 @@ * This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file. * #L% */ -package com.vmware.pscoe.iac.artifact.aria.model; +package com.vmware.pscoe.iac.artifact.aria.models; import com.fasterxml.jackson.annotation.*; import java.io.Serializable; +/** + * Model for Organizations in Aria. + */ @JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({"id", "name", "refLink"}) +@JsonPropertyOrder({ "id", "name", "refLink" }) public class VraNgOrganization implements Serializable { private static final long serialVersionUID = -3313748896114761975L; @@ -33,6 +36,9 @@ public class VraNgOrganization implements Serializable { @JsonProperty("refLink") private String refLink; + /** + * @return the project id + */ @JsonProperty("id") public String getId() { if (id == null) { @@ -41,25 +47,40 @@ public String getId() { return id; } + /** + * @param id - the project id to set + */ @JsonProperty("id") public void setId(String id) { this.id = id; } + /** + * @return the name of the project + */ @JsonProperty("name") public String getName() { return name; } + /** + * @param name - the project name to set + */ @JsonProperty("name") public void setName(String name) { this.name = name; } + /** + * @return the reference link of the project + */ public String getRefLink() { return refLink; } + /** + * @param refLink - the reference link of the project to set + */ public void setRefLink(String refLink) { this.refLink = refLink; } diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgOrganizations.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgOrganizations.java index 6ef8b6d0e..cbc8108c7 100644 --- a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgOrganizations.java +++ b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgOrganizations.java @@ -13,7 +13,7 @@ * This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file. * #L% */ -package com.vmware.pscoe.iac.artifact.aria.model; +package com.vmware.pscoe.iac.artifact.aria.models; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgPackageAdapter.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgPackageAdapter.java index d872203bd..4d904be9c 100644 --- a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgPackageAdapter.java +++ b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgPackageAdapter.java @@ -12,7 +12,7 @@ * This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file. * #L% */ -package com.vmware.pscoe.iac.artifact.aria.model; +package com.vmware.pscoe.iac.artifact.aria.models; import java.io.IOException; import java.nio.file.Files; diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgPackageContent.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgPackageContent.java index 957f84883..40d2425d8 100644 --- a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgPackageContent.java +++ b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgPackageContent.java @@ -12,7 +12,7 @@ * This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file. * #L% */ -package com.vmware.pscoe.iac.artifact.aria.model; +package com.vmware.pscoe.iac.artifact.aria.models; import java.util.List; diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgPackageDescriptor.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgPackageDescriptor.java index 1e472dc96..359b99415 100644 --- a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgPackageDescriptor.java +++ b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgPackageDescriptor.java @@ -12,7 +12,7 @@ * This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file. * #L% */ -package com.vmware.pscoe.iac.artifact.aria.model; +package com.vmware.pscoe.iac.artifact.aria.models; import java.io.File; import java.util.ArrayList; diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgPackageMemberType.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgPackageMemberType.java index 466aac84c..888ad6bf0 100644 --- a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgPackageMemberType.java +++ b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgPackageMemberType.java @@ -12,7 +12,7 @@ * This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file. * #L% */ -package com.vmware.pscoe.iac.artifact.aria.model; +package com.vmware.pscoe.iac.artifact.aria.models; public enum VraNgPackageMemberType { BLUEPRINT("blueprint"), diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgPolicy.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgPolicy.java index cf0359c93..2854ef150 100644 --- a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgPolicy.java +++ b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgPolicy.java @@ -12,7 +12,7 @@ * This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file. * #L% */ -package com.vmware.pscoe.iac.artifact.aria.model; +package com.vmware.pscoe.iac.artifact.aria.models; import java.util.List; import java.util.ArrayList; diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgPolicyFolderName.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgPolicyFolderName.java index bf47add06..7dca56fda 100644 --- a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgPolicyFolderName.java +++ b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgPolicyFolderName.java @@ -12,7 +12,7 @@ * This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file. * #L% */ -package com.vmware.pscoe.iac.artifact.aria.model; +package com.vmware.pscoe.iac.artifact.aria.models; public enum VraNgPolicyFolderName { /** diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgPrincipal.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgPrincipal.java index 905aa7a42..9a2835f08 100644 --- a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgPrincipal.java +++ b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgPrincipal.java @@ -12,7 +12,7 @@ * This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file. * #L% */ -package com.vmware.pscoe.iac.artifact.aria.model; +package com.vmware.pscoe.iac.artifact.aria.models; public class VraNgPrincipal { /** diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgProject.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgProject.java index 9dbc6d7fb..8aa8462e7 100644 --- a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgProject.java +++ b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgProject.java @@ -12,7 +12,7 @@ * This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file. * #L% */ -package com.vmware.pscoe.iac.artifact.aria.model; +package com.vmware.pscoe.iac.artifact.aria.models; /** * Represents a VraNgProject. diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgPropertyGroup.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgPropertyGroup.java index 7917d69e3..8558a7449 100644 --- a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgPropertyGroup.java +++ b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgPropertyGroup.java @@ -12,7 +12,7 @@ * This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file. * #L% */ -package com.vmware.pscoe.iac.artifact.aria.model; +package com.vmware.pscoe.iac.artifact.aria.models; import com.google.gson.JsonElement; import com.google.gson.JsonObject; diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgRegion.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgRegion.java index 26c7f1375..868538c6b 100644 --- a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgRegion.java +++ b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgRegion.java @@ -12,26 +12,42 @@ * This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file. * #L% */ -package com.vmware.pscoe.iac.artifact.aria.model; +package com.vmware.pscoe.iac.artifact.aria.models; +/** + * Aria automation > Infrastructure > Region. + */ public class VraNgRegion { private final String id; private final String cloudAccountId; + /** + * @param id - the id of the region + * @param cloudAccountId - the cloud account id for the region + */ public VraNgRegion(String id, String cloudAccountId) { this.id = id; this.cloudAccountId = cloudAccountId; } + /** + * @return the id of the region + */ public String getId() { return id; } + /** + * @return the cloud account id + */ public String getCloudAccountId() { return cloudAccountId; } + /** + * @param obj - obj to check if it equals + */ @Override public boolean equals(Object obj) { if (obj == null || !this.getClass().equals(obj.getClass())) { @@ -42,4 +58,14 @@ public boolean equals(Object obj) { return this.id.equals(other.getId()); } + /** + * @return the hash of the instance + */ + @Override + public int hashCode() { + int hash = 7; + hash = 31 * hash + (cloudAccountId == null ? 0 : cloudAccountId.hashCode()); + + return hash; + } } diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgResourceAction.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgResourceAction.java index 0cb14edc6..268ce7791 100644 --- a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgResourceAction.java +++ b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgResourceAction.java @@ -15,7 +15,7 @@ /** * Package. */ -package com.vmware.pscoe.iac.artifact.aria.model; +package com.vmware.pscoe.iac.artifact.aria.models; public class VraNgResourceAction implements Identifiable { diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgResourceQuotaPolicy.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgResourceQuotaPolicy.java index 2facceb3f..6b47b1d90 100644 --- a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgResourceQuotaPolicy.java +++ b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgResourceQuotaPolicy.java @@ -12,7 +12,7 @@ * This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file. * #L% */ -package com.vmware.pscoe.iac.artifact.aria.model; +package com.vmware.pscoe.iac.artifact.aria.models; import com.google.gson.JsonObject; diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgSecret.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgSecret.java index 658c10135..c93556f76 100644 --- a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgSecret.java +++ b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgSecret.java @@ -12,11 +12,29 @@ * This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file. * #L% */ -package com.vmware.pscoe.iac.artifact.aria.model; +package com.vmware.pscoe.iac.artifact.aria.models; +/** + * Represents an ABX secret + */ public class VraNgSecret { + /** + * The id of the secret. + */ public String id; + + /** + * The name of the secret. + */ public String name; + + /** + * The orgId associated with the secret. + */ public String orgId; + + /** + * the project ID associated with the secret. + */ public String projectId; } diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgSubscription.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgSubscription.java index 4f0dbad8d..2f4778e95 100644 --- a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgSubscription.java +++ b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgSubscription.java @@ -12,7 +12,7 @@ * This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file. * #L% */ -package com.vmware.pscoe.iac.artifact.aria.model; +package com.vmware.pscoe.iac.artifact.aria.models; import org.apache.commons.lang3.builder.HashCodeBuilder; diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgWorkflow.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgWorkflow.java index 993c82d0c..6fef2ec71 100644 --- a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgWorkflow.java +++ b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgWorkflow.java @@ -13,7 +13,7 @@ * This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file. * #L% */ -package com.vmware.pscoe.iac.artifact.aria.model; +package com.vmware.pscoe.iac.artifact.aria.models; import java.io.Serializable; import java.util.HashMap; diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgWorkflowContentSource.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgWorkflowContentSource.java index 1c403e4c2..9d2e269a9 100644 --- a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgWorkflowContentSource.java +++ b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/VraNgWorkflowContentSource.java @@ -13,7 +13,7 @@ * This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file. * #L% */ -package com.vmware.pscoe.iac.artifact.aria.model; +package com.vmware.pscoe.iac.artifact.aria.models; import java.io.Serializable; import java.util.HashMap; diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/objectmapping/VraNgCloudAccountTag.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/objectmapping/VraNgCloudAccountTag.java index ca3647814..bc1f84622 100644 --- a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/objectmapping/VraNgCloudAccountTag.java +++ b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/objectmapping/VraNgCloudAccountTag.java @@ -12,7 +12,7 @@ * This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file. * #L% */ -package com.vmware.pscoe.iac.artifact.aria.model.objectmapping; +package com.vmware.pscoe.iac.artifact.aria.models.objectmapping; import java.util.ArrayList; import java.util.List; diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/objectmapping/VraNgCloudRegionProfile.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/objectmapping/VraNgCloudRegionProfile.java index bddbdef07..778fd9531 100644 --- a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/objectmapping/VraNgCloudRegionProfile.java +++ b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/objectmapping/VraNgCloudRegionProfile.java @@ -12,7 +12,7 @@ * This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file. * #L% */ -package com.vmware.pscoe.iac.artifact.aria.model.objectmapping; +package com.vmware.pscoe.iac.artifact.aria.models.objectmapping; import java.util.List; diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/objectmapping/package-info.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/objectmapping/package-info.java index a4d3a61cd..205df162b 100644 --- a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/objectmapping/package-info.java +++ b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/objectmapping/package-info.java @@ -15,4 +15,4 @@ /** * Represents cloud account details. */ -package com.vmware.pscoe.iac.artifact.aria.model.objectmapping; +package com.vmware.pscoe.iac.artifact.aria.models.objectmapping; diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/package-info.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/package-info.java index 4f0c0704c..9ef58df5d 100644 --- a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/package-info.java +++ b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/models/package-info.java @@ -16,4 +16,4 @@ * Package that represents vRA 8 model. * */ -package com.vmware.pscoe.iac.artifact.aria.model; +package com.vmware.pscoe.iac.artifact.aria.models; diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/package/VraNgPackageStore.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/package/VraNgPackageStore.java index 2f1135763..feaaec880 100644 --- a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/package/VraNgPackageStore.java +++ b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/package/VraNgPackageStore.java @@ -28,9 +28,9 @@ import com.vmware.pscoe.iac.artifact.aria.configuration.ConfigurationVraNg; import com.vmware.pscoe.iac.artifact.model.Package; import com.vmware.pscoe.iac.artifact.model.PackageContent.Content; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgPackageAdapter; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgPackageContent; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgPackageDescriptor; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgPackageAdapter; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgPackageContent; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgPackageDescriptor; import com.vmware.pscoe.iac.artifact.aria.rest.RestClientVraNg; import com.vmware.pscoe.iac.artifact.aria.store.VraNgTypeStoreFactory; diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/rest/RestClientVraNg.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/rest/RestClientVraNg.java index ca87bb233..4188ed49a 100644 --- a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/rest/RestClientVraNg.java +++ b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/rest/RestClientVraNg.java @@ -27,28 +27,28 @@ import com.vmware.pscoe.iac.artifact.model.abx.AbxActionVersion; import com.vmware.pscoe.iac.artifact.model.abx.AbxConstant; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgApprovalPolicy; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgBlueprint; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgCatalogEntitlement; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgCatalogItem; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgCloudAccount; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgContentSharingPolicy; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgContentSource; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgContentSourceBase; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgCustomForm; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgCustomResource; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgDay2ActionsPolicy; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgDeploymentLimitPolicy; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgIntegration; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgLeasePolicy; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgProject; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgPropertyGroup; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgRegion; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgResourceAction; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgResourceQuotaPolicy; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgSecret; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgSubscription; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgWorkflowContentSource; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgApprovalPolicy; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgBlueprint; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgCatalogEntitlement; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgCatalogItem; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgCloudAccount; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgContentSharingPolicy; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgContentSource; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgContentSourceBase; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgCustomForm; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgCustomResource; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgDay2ActionsPolicy; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgDeploymentLimitPolicy; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgIntegration; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgLeasePolicy; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgProject; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgPropertyGroup; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgRegion; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgResourceAction; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgResourceQuotaPolicy; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgSecret; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgSubscription; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgWorkflowContentSource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -411,6 +411,10 @@ public Map getSubscriptionsByOrgIdAndName(final Strin /** * getCloudAccounts. + * + * @NOTE: This is not used anymore. It's a leftoever from the deprecation of + * regional content. + * Leaving it here for now in case it's needed. * * @return cloudAccounts */ @@ -425,6 +429,10 @@ public List getCloudAccounts() { /** * getCloudAccount. * + * @NOTE: This is not used anymore. It's a leftoever from the deprecation of + * regional content. + * Leaving it here for now in case it's needed. + * * @param id cloud account id * @return cloudAccount */ diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/rest/RestClientVraNgPrimitive.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/rest/RestClientVraNgPrimitive.java index 42329633c..9db430d29 100644 --- a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/rest/RestClientVraNgPrimitive.java +++ b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/rest/RestClientVraNgPrimitive.java @@ -39,34 +39,34 @@ import com.vmware.pscoe.iac.artifact.model.abx.AbxActionVersion; import com.vmware.pscoe.iac.artifact.model.abx.AbxConstant; import com.vmware.pscoe.iac.artifact.rest.RestClient; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgApprovalPolicy; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgBlueprint; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgCatalogEntitlement; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgCatalogEntitlementDto; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgCatalogEntitlementType; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgCatalogItem; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgCatalogItemType; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgCloudAccount; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgContentSharingPolicy; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgContentSource; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgContentSourceBase; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgContentSourceType; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgCustomForm; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgCustomResource; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgDay2ActionsPolicy; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgDeploymentLimitPolicy; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgIntegration; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgLeasePolicy; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgOrganization; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgOrganizations; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgProject; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgPropertyGroup; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgRegion; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgResourceAction; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgResourceQuotaPolicy; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgSecret; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgSubscription; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgWorkflowContentSource; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgApprovalPolicy; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgBlueprint; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgCatalogEntitlement; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgCatalogEntitlementDto; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgCatalogEntitlementType; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgCatalogItem; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgCatalogItemType; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgCloudAccount; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgContentSharingPolicy; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgContentSource; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgContentSourceBase; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgContentSourceType; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgCustomForm; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgCustomResource; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgDay2ActionsPolicy; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgDeploymentLimitPolicy; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgIntegration; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgLeasePolicy; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgOrganization; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgOrganizations; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgProject; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgPropertyGroup; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgRegion; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgResourceAction; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgResourceQuotaPolicy; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgSecret; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgSubscription; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgWorkflowContentSource; import com.vmware.pscoe.iac.artifact.aria.utils.VraNgOrganizationUtil; diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/AbstractVraNgDeleteStore.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/AbstractVraNgDeleteStore.java index a27af8484..9c611a0db 100644 --- a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/AbstractVraNgDeleteStore.java +++ b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/AbstractVraNgDeleteStore.java @@ -18,7 +18,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.vmware.pscoe.iac.artifact.aria.model.Identifiable; +import com.vmware.pscoe.iac.artifact.aria.models.Identifiable; /** * The purpose of this class is to provide a way to delete content from the diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/AbstractVraNgStore.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/AbstractVraNgStore.java index 670c8389d..ba4cdf0c0 100644 --- a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/AbstractVraNgStore.java +++ b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/AbstractVraNgStore.java @@ -17,8 +17,8 @@ import com.vmware.pscoe.iac.artifact.configuration.ConfigurationException; import com.vmware.pscoe.iac.artifact.aria.configuration.ConfigurationVraNg; import com.vmware.pscoe.iac.artifact.model.Package; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgIntegration; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgPackageDescriptor; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgIntegration; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgPackageDescriptor; import com.vmware.pscoe.iac.artifact.aria.rest.RestClientVraNg; import com.vmware.pscoe.iac.artifact.aria.utils.VraNgIntegrationUtils; diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgApprovalPolicyStore.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgApprovalPolicyStore.java index f2adc6edc..9785a3c4b 100644 --- a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgApprovalPolicyStore.java +++ b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgApprovalPolicyStore.java @@ -18,7 +18,7 @@ import com.google.gson.GsonBuilder; import com.google.gson.JsonObject; import com.google.gson.stream.JsonReader; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgApprovalPolicy; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgApprovalPolicy; import com.vmware.pscoe.iac.artifact.store.filters.CustomFolderFileFilter; import com.vmware.pscoe.iac.artifact.aria.utils.VraNgOrganizationUtil; import org.slf4j.Logger; diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgBlueprintStore.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgBlueprintStore.java index c0eeb14f4..310207320 100644 --- a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgBlueprintStore.java +++ b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgBlueprintStore.java @@ -23,7 +23,7 @@ import com.google.gson.stream.JsonReader; import com.vmware.pscoe.iac.artifact.aria.store.helpers.VraNgReleaseManager; import com.vmware.pscoe.iac.artifact.model.Package; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgBlueprint; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgBlueprint; import com.vmware.pscoe.iac.artifact.store.filters.CustomFolderFolderFilter; import static com.vmware.pscoe.iac.artifact.aria.store.VraNgDirs.DIR_BLUEPRINTS; import java.io.File; diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgCatalogItemStore.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgCatalogItemStore.java index c468d6ee2..346a344a5 100644 --- a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgCatalogItemStore.java +++ b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgCatalogItemStore.java @@ -20,11 +20,11 @@ import com.google.gson.JsonParser; import com.google.gson.stream.JsonReader; import com.vmware.pscoe.iac.artifact.model.Package; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgCatalogItem; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgContentSourceBase; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgContentSourceType; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgCustomForm; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgCustomFormAndData; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgCatalogItem; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgContentSourceBase; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgContentSourceType; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgCustomForm; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgCustomFormAndData; import com.vmware.pscoe.iac.artifact.store.filters.CustomFolderFileFilter; import org.apache.commons.io.FileUtils; import org.apache.commons.io.FilenameUtils; diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgCatalogItemStore812.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgCatalogItemStore812.java index b6dfe3ebc..3002fb81a 100644 --- a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgCatalogItemStore812.java +++ b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgCatalogItemStore812.java @@ -21,11 +21,11 @@ import com.google.gson.JsonObject; import com.google.gson.JsonParser; import com.vmware.pscoe.iac.artifact.model.Package; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgCatalogItem; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgContentSourceBase; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgContentSourceType; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgCustomForm; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgCustomFormAndData; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgCatalogItem; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgContentSourceBase; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgContentSourceType; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgCustomForm; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgCustomFormAndData; import org.apache.commons.lang3.StringUtils; diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgContentSharingPolicyStore.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgContentSharingPolicyStore.java index 00bd15660..461a52b9e 100644 --- a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgContentSharingPolicyStore.java +++ b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgContentSharingPolicyStore.java @@ -34,10 +34,10 @@ import com.google.gson.JsonIOException; import com.google.gson.JsonSyntaxException; import com.google.gson.stream.JsonReader; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgCatalogItem; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgContentSharingPolicy; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgContentSourceBase; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgItem; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgCatalogItem; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgContentSharingPolicy; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgContentSourceBase; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgItem; import com.vmware.pscoe.iac.artifact.store.filters.CustomFolderFileFilter; import com.vmware.pscoe.iac.artifact.aria.utils.VraNgOrganizationUtil; diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgContentSourceStore.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgContentSourceStore.java index 6ed200b12..0d9750c1f 100644 --- a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgContentSourceStore.java +++ b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgContentSourceStore.java @@ -27,13 +27,13 @@ import com.google.gson.stream.JsonReader; import com.vmware.pscoe.iac.artifact.aria.configuration.ConfigurationVraNg; import com.vmware.pscoe.iac.artifact.model.Package; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgContentSource; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgContentSourceBase; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgContentSourceType; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgIntegration; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgPackageDescriptor; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgWorkflow; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgWorkflowContentSource; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgContentSource; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgContentSourceBase; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgContentSourceType; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgIntegration; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgPackageDescriptor; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgWorkflow; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgWorkflowContentSource; import com.vmware.pscoe.iac.artifact.aria.rest.RestClientVraNg; import com.vmware.pscoe.iac.artifact.store.filters.CustomFolderFileFilter; import com.vmware.pscoe.iac.artifact.aria.utils.VraNgIntegrationUtils; diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgCustomResourceStore.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgCustomResourceStore.java index 02e491205..98bb45411 100644 --- a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgCustomResourceStore.java +++ b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgCustomResourceStore.java @@ -23,8 +23,8 @@ import com.vmware.pscoe.iac.artifact.configuration.ConfigurationException; import com.vmware.pscoe.iac.artifact.aria.configuration.ConfigurationVraNg; import com.vmware.pscoe.iac.artifact.model.Package; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgCustomResource; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgPackageDescriptor; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgCustomResource; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgPackageDescriptor; import com.vmware.pscoe.iac.artifact.aria.rest.RestClientVraNg; import com.vmware.pscoe.iac.artifact.store.filters.CustomFolderFileFilter; import com.vmware.pscoe.iac.artifact.aria.utils.VraNgOrganizationUtil; diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgDay2ActionsPolicyStore.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgDay2ActionsPolicyStore.java index a255070ee..e3ee2e492 100644 --- a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgDay2ActionsPolicyStore.java +++ b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgDay2ActionsPolicyStore.java @@ -18,7 +18,7 @@ import com.google.gson.GsonBuilder; import com.google.gson.JsonObject; import com.google.gson.stream.JsonReader; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgDay2ActionsPolicy; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgDay2ActionsPolicy; import com.vmware.pscoe.iac.artifact.store.filters.CustomFolderFileFilter; import com.vmware.pscoe.iac.artifact.aria.utils.VraNgOrganizationUtil; import org.slf4j.Logger; diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgDeploymentLimitPolicyStore.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgDeploymentLimitPolicyStore.java index 35a85395d..e8199540b 100644 --- a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgDeploymentLimitPolicyStore.java +++ b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgDeploymentLimitPolicyStore.java @@ -18,7 +18,7 @@ import com.google.gson.GsonBuilder; import com.google.gson.JsonObject; import com.google.gson.stream.JsonReader; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgDeploymentLimitPolicy; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgDeploymentLimitPolicy; import com.vmware.pscoe.iac.artifact.store.filters.CustomFolderFileFilter; import com.vmware.pscoe.iac.artifact.aria.utils.VraNgOrganizationUtil; diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgEntitlementStore.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgEntitlementStore.java index 289982e1b..d784e5c55 100644 --- a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgEntitlementStore.java +++ b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgEntitlementStore.java @@ -32,13 +32,13 @@ import java.util.stream.Collectors; import com.vmware.pscoe.iac.artifact.aria.configuration.ConfigurationVraNg; import com.vmware.pscoe.iac.artifact.model.Package; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgCatalogEntitlement; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgCatalogEntitlementType; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgCatalogItem; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgContentSourceBase; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgContentSourceType; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgPackageDescriptor; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgProject; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgCatalogEntitlement; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgCatalogEntitlementType; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgCatalogItem; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgContentSourceBase; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgContentSourceType; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgPackageDescriptor; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgProject; import com.vmware.pscoe.iac.artifact.aria.rest.RestClientVraNg; import com.vmware.pscoe.iac.artifact.store.filters.CustomFolderFileFilter; import org.apache.commons.lang3.StringUtils; diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgLeasePolicyStore.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgLeasePolicyStore.java index 3c5a01757..909700da8 100644 --- a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgLeasePolicyStore.java +++ b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgLeasePolicyStore.java @@ -33,7 +33,7 @@ import com.google.gson.GsonBuilder; import com.google.gson.JsonObject; import com.google.gson.stream.JsonReader; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgLeasePolicy; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgLeasePolicy; import com.vmware.pscoe.iac.artifact.store.filters.CustomFolderFileFilter; public final class VraNgLeasePolicyStore extends AbstractVraNgStore { diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgPropertyGroupStore.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgPropertyGroupStore.java index 39b77fcb6..4a92bd806 100644 --- a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgPropertyGroupStore.java +++ b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgPropertyGroupStore.java @@ -29,8 +29,8 @@ import com.google.gson.stream.JsonReader; import com.vmware.pscoe.iac.artifact.aria.configuration.ConfigurationVraNg; import com.vmware.pscoe.iac.artifact.model.Package; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgPackageDescriptor; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgPropertyGroup; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgPackageDescriptor; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgPropertyGroup; import com.vmware.pscoe.iac.artifact.aria.rest.RestClientVraNg; import com.vmware.pscoe.iac.artifact.store.filters.CustomFolderFileFilter; diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgResourceActionStore.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgResourceActionStore.java index 3f9deebe2..ca429d428 100644 --- a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgResourceActionStore.java +++ b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgResourceActionStore.java @@ -22,7 +22,7 @@ import com.google.gson.JsonObject; import com.vmware.pscoe.iac.artifact.configuration.ConfigurationException; import com.vmware.pscoe.iac.artifact.model.Package; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgResourceAction; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgResourceAction; import com.vmware.pscoe.iac.artifact.store.filters.CustomFolderFileFilter; import com.vmware.pscoe.iac.artifact.aria.utils.VraNgProjectUtil; import org.apache.commons.io.FileUtils; diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgResourceQuotaPolicyStore.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgResourceQuotaPolicyStore.java index 8fb00c4ec..124aa5533 100644 --- a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgResourceQuotaPolicyStore.java +++ b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgResourceQuotaPolicyStore.java @@ -29,7 +29,7 @@ import com.google.gson.GsonBuilder; import com.google.gson.JsonObject; import com.google.gson.stream.JsonReader; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgResourceQuotaPolicy; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgResourceQuotaPolicy; import com.vmware.pscoe.iac.artifact.store.filters.CustomFolderFileFilter; import com.vmware.pscoe.iac.artifact.aria.utils.VraNgOrganizationUtil; diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgSubscriptionStore.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgSubscriptionStore.java index d4888e586..723546506 100644 --- a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgSubscriptionStore.java +++ b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgSubscriptionStore.java @@ -23,9 +23,9 @@ import com.vmware.pscoe.iac.artifact.aria.configuration.ConfigurationVraNg; import com.vmware.pscoe.iac.artifact.model.Package; import com.vmware.pscoe.iac.artifact.model.abx.AbxAction; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgPackageDescriptor; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgProject; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgSubscription; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgPackageDescriptor; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgProject; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgSubscription; import com.vmware.pscoe.iac.artifact.aria.rest.RestClientVraNg; import com.vmware.pscoe.iac.artifact.store.filters.CustomFolderFileFilter; import com.vmware.pscoe.iac.artifact.aria.utils.VraNgOrganizationUtil; diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgTypeStoreFactory.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgTypeStoreFactory.java index f3fb3be1c..11e94f5ee 100644 --- a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgTypeStoreFactory.java +++ b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgTypeStoreFactory.java @@ -20,8 +20,8 @@ import com.vmware.pscoe.iac.artifact.aria.configuration.ConfigurationVraNg; import com.vmware.pscoe.iac.artifact.model.Package; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgPackageContent; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgPackageDescriptor; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgPackageContent; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgPackageDescriptor; import com.vmware.pscoe.iac.artifact.aria.rest.RestClientVraNg; import static com.vmware.pscoe.iac.artifact.aria.model.VraNgPackageContent.ContentType.APPROVAL_POLICY; diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VrangContentSourceUtils.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VrangContentSourceUtils.java index 327de9f22..189c6b468 100644 --- a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VrangContentSourceUtils.java +++ b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VrangContentSourceUtils.java @@ -22,9 +22,9 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.vmware.pscoe.iac.artifact.model.Package; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgContentSource; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgContentSourceBase; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgContentSourceType; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgContentSource; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgContentSourceBase; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgContentSourceType; import com.vmware.pscoe.iac.artifact.aria.rest.RestClientVraNg; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/helpers/VraNgReleaseManager.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/helpers/VraNgReleaseManager.java index 3cfbddfed..79aca8e15 100644 --- a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/helpers/VraNgReleaseManager.java +++ b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/helpers/VraNgReleaseManager.java @@ -27,7 +27,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgBlueprint; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgBlueprint; import com.vmware.pscoe.iac.artifact.aria.rest.RestClientVraNg; public class VraNgReleaseManager { diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/utils/VraNgIntegrationUtils.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/utils/VraNgIntegrationUtils.java index 7ae6a4696..9f4f05fcf 100644 --- a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/utils/VraNgIntegrationUtils.java +++ b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/utils/VraNgIntegrationUtils.java @@ -14,7 +14,7 @@ */ package com.vmware.pscoe.iac.artifact.aria.utils; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgIntegration; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgIntegration; import com.vmware.pscoe.iac.artifact.aria.rest.RestClientVraNg; import java.util.List; diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/utils/VraNgOrganizationUtil.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/utils/VraNgOrganizationUtil.java index c602cfc59..39f40cbfc 100644 --- a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/utils/VraNgOrganizationUtil.java +++ b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/utils/VraNgOrganizationUtil.java @@ -15,7 +15,7 @@ package com.vmware.pscoe.iac.artifact.aria.utils; import com.vmware.pscoe.iac.artifact.aria.configuration.ConfigurationVraNg; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgOrganization; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgOrganization; import com.vmware.pscoe.iac.artifact.aria.rest.RestClientVraNgPrimitive; import org.apache.commons.lang3.StringUtils; diff --git a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/aria/rest/RestClientVraNgPrimitiveTest.java b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/aria/rest/RestClientVraNgPrimitiveTest.java index 282b27c9e..6ad0ba056 100644 --- a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/aria/rest/RestClientVraNgPrimitiveTest.java +++ b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/aria/rest/RestClientVraNgPrimitiveTest.java @@ -60,14 +60,14 @@ import com.vmware.pscoe.iac.artifact.helpers.vrang.RestClientVraNgPrimitiveTestDouble; import com.vmware.pscoe.iac.artifact.helpers.vrang.RestClientVraNgPrimitiveTestResponseProvider; import com.vmware.pscoe.iac.artifact.model.abx.AbxAction; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgCatalogItem; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgCloudAccount; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgContentSharingPolicy; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgCustomForm; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgCustomResource; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgOrganization; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgProject; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgPropertyGroup; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgCatalogItem; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgCloudAccount; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgContentSharingPolicy; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgCustomForm; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgCustomResource; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgOrganization; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgProject; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgPropertyGroup; import com.vmware.pscoe.iac.artifact.aria.utils.VraNgOrganizationUtil; @SuppressWarnings("unchecked") diff --git a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgApprovalPolicyStoreTest.java b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgApprovalPolicyStoreTest.java index debb0c7e6..d8476c1ac 100644 --- a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgApprovalPolicyStoreTest.java +++ b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgApprovalPolicyStoreTest.java @@ -23,10 +23,10 @@ import com.vmware.pscoe.iac.artifact.model.Package; import com.vmware.pscoe.iac.artifact.model.PackageFactory; import com.vmware.pscoe.iac.artifact.model.PackageType; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgApprovalPolicy; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgOrganization; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgPackageDescriptor; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgPolicy; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgApprovalPolicy; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgOrganization; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgPackageDescriptor; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgPolicy; import com.vmware.pscoe.iac.artifact.aria.rest.RestClientVraNg; import org.junit.Rule; import org.junit.jupiter.api.AfterEach; diff --git a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgBlueprintStoreTest.java b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgBlueprintStoreTest.java index d5fa20115..bf3d9419e 100644 --- a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgBlueprintStoreTest.java +++ b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgBlueprintStoreTest.java @@ -21,8 +21,8 @@ import com.vmware.pscoe.iac.artifact.model.Package; import com.vmware.pscoe.iac.artifact.model.PackageFactory; import com.vmware.pscoe.iac.artifact.model.PackageType; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgBlueprint; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgPackageDescriptor; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgBlueprint; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgPackageDescriptor; import com.vmware.pscoe.iac.artifact.aria.rest.RestClientVraNg; import org.junit.Rule; diff --git a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgCatalogItemStoreTest.java b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgCatalogItemStoreTest.java index 16b556d5a..c288bd90d 100644 --- a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgCatalogItemStoreTest.java +++ b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgCatalogItemStoreTest.java @@ -26,7 +26,7 @@ import com.vmware.pscoe.iac.artifact.model.Package; import com.vmware.pscoe.iac.artifact.model.PackageFactory; import com.vmware.pscoe.iac.artifact.model.PackageType; -import com.vmware.pscoe.iac.artifact.aria.model.*; +import com.vmware.pscoe.iac.artifact.aria.models.*; import com.vmware.pscoe.iac.artifact.aria.rest.RestClientVraNg; import org.junit.Rule; import org.junit.jupiter.api.AfterEach; diff --git a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgContentSharingPolicyStoreTest.java b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgContentSharingPolicyStoreTest.java index 73550b456..7c849aa9a 100644 --- a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgContentSharingPolicyStoreTest.java +++ b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgContentSharingPolicyStoreTest.java @@ -32,7 +32,7 @@ import java.util.List; import java.util.Objects; -import com.vmware.pscoe.iac.artifact.aria.model.*; +import com.vmware.pscoe.iac.artifact.aria.models.*; import org.junit.Rule; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgContentSourceStoreTest.java b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgContentSourceStoreTest.java index a0a1c0875..bbad21d36 100644 --- a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgContentSourceStoreTest.java +++ b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgContentSourceStoreTest.java @@ -21,7 +21,7 @@ import com.vmware.pscoe.iac.artifact.model.Package; import com.vmware.pscoe.iac.artifact.model.PackageFactory; import com.vmware.pscoe.iac.artifact.model.PackageType; -import com.vmware.pscoe.iac.artifact.aria.model.*; +import com.vmware.pscoe.iac.artifact.aria.models.*; import com.vmware.pscoe.iac.artifact.rest.RestClient; import com.vmware.pscoe.iac.artifact.aria.rest.RestClientVraNg; diff --git a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgCustomFormTest.java b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgCustomFormTest.java index 520fb7635..0cd7a9ad2 100644 --- a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgCustomFormTest.java +++ b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgCustomFormTest.java @@ -24,8 +24,8 @@ import org.junit.jupiter.api.Test; import com.google.gson.JsonElement; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgCustomForm; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgCustomFormAndData; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgCustomForm; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgCustomFormAndData; import java.io.IOException; public class VraNgCustomFormTest { diff --git a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgCustomResourceStoreTest.java b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgCustomResourceStoreTest.java index 34c3dbb81..27bf1c35f 100644 --- a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgCustomResourceStoreTest.java +++ b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgCustomResourceStoreTest.java @@ -21,7 +21,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgOrganization; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgOrganization; import com.google.gson.*; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @@ -40,9 +40,9 @@ import com.vmware.pscoe.iac.artifact.model.Package; import com.vmware.pscoe.iac.artifact.model.PackageFactory; import com.vmware.pscoe.iac.artifact.model.PackageType; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgCustomResource; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgIntegration; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgPackageDescriptor; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgCustomResource; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgIntegration; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgPackageDescriptor; import com.vmware.pscoe.iac.artifact.aria.rest.RestClientVraNg; import org.apache.commons.io.FileUtils; diff --git a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgDay2ActionsPolicyStoreTest.java b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgDay2ActionsPolicyStoreTest.java index 75e98a3d9..13a6b32d7 100644 --- a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgDay2ActionsPolicyStoreTest.java +++ b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgDay2ActionsPolicyStoreTest.java @@ -21,7 +21,7 @@ import com.vmware.pscoe.iac.artifact.model.Package; import com.vmware.pscoe.iac.artifact.model.PackageFactory; import com.vmware.pscoe.iac.artifact.model.PackageType; -import com.vmware.pscoe.iac.artifact.aria.model.*; +import com.vmware.pscoe.iac.artifact.aria.models.*; import com.vmware.pscoe.iac.artifact.aria.rest.RestClientVraNg; import org.junit.Rule; import org.junit.jupiter.api.AfterEach; diff --git a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgDeploymentLimitPolicyStoreTest.java b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgDeploymentLimitPolicyStoreTest.java index 1be556bdc..bc03afe8d 100644 --- a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgDeploymentLimitPolicyStoreTest.java +++ b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgDeploymentLimitPolicyStoreTest.java @@ -21,7 +21,7 @@ import com.vmware.pscoe.iac.artifact.model.Package; import com.vmware.pscoe.iac.artifact.model.PackageFactory; import com.vmware.pscoe.iac.artifact.model.PackageType; -import com.vmware.pscoe.iac.artifact.aria.model.*; +import com.vmware.pscoe.iac.artifact.aria.models.*; import com.vmware.pscoe.iac.artifact.aria.rest.RestClientVraNg; import org.junit.Rule; import org.junit.jupiter.api.AfterEach; diff --git a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgEntitlementStoreTest.java b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgEntitlementStoreTest.java index 905adfc3a..0ada9ee91 100644 --- a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgEntitlementStoreTest.java +++ b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgEntitlementStoreTest.java @@ -21,7 +21,7 @@ import com.vmware.pscoe.iac.artifact.model.Package; import com.vmware.pscoe.iac.artifact.model.PackageFactory; import com.vmware.pscoe.iac.artifact.model.PackageType; -import com.vmware.pscoe.iac.artifact.aria.model.*; +import com.vmware.pscoe.iac.artifact.aria.models.*; import com.vmware.pscoe.iac.artifact.rest.RestClient; import com.vmware.pscoe.iac.artifact.aria.rest.RestClientVraNg; diff --git a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgLeasePolicyStoreTest.java b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgLeasePolicyStoreTest.java index 187fb35a7..b81b227a7 100644 --- a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgLeasePolicyStoreTest.java +++ b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgLeasePolicyStoreTest.java @@ -21,7 +21,7 @@ import com.vmware.pscoe.iac.artifact.model.Package; import com.vmware.pscoe.iac.artifact.model.PackageFactory; import com.vmware.pscoe.iac.artifact.model.PackageType; -import com.vmware.pscoe.iac.artifact.aria.model.*; +import com.vmware.pscoe.iac.artifact.aria.models.*; import com.vmware.pscoe.iac.artifact.aria.rest.RestClientVraNg; import org.junit.Rule; import org.junit.jupiter.api.AfterEach; diff --git a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgPropertyGroupStoreTest.java b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgPropertyGroupStoreTest.java index 45a88eecc..1975da70e 100644 --- a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgPropertyGroupStoreTest.java +++ b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgPropertyGroupStoreTest.java @@ -21,9 +21,9 @@ import com.vmware.pscoe.iac.artifact.model.Package; import com.vmware.pscoe.iac.artifact.model.PackageFactory; import com.vmware.pscoe.iac.artifact.model.PackageType; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgOrganization; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgPackageDescriptor; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgPropertyGroup; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgOrganization; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgPackageDescriptor; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgPropertyGroup; import com.vmware.pscoe.iac.artifact.aria.rest.RestClientVraNg; import org.junit.Rule; import org.junit.jupiter.api.AfterEach; diff --git a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgReleaseManagerTest.java b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgReleaseManagerTest.java index e6c892a84..c1d93d6ac 100644 --- a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgReleaseManagerTest.java +++ b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgReleaseManagerTest.java @@ -16,7 +16,7 @@ import com.vmware.pscoe.iac.artifact.aria.store.helpers.VraNgReleaseManager; import com.vmware.pscoe.iac.artifact.aria.rest.RestClientVraNg; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgBlueprint; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgBlueprint; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.Mockito; diff --git a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgResourceActionStoreTest.java b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgResourceActionStoreTest.java index 58e018595..59ea2d285 100644 --- a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgResourceActionStoreTest.java +++ b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgResourceActionStoreTest.java @@ -21,8 +21,8 @@ import com.vmware.pscoe.iac.artifact.model.Package; import com.vmware.pscoe.iac.artifact.model.PackageFactory; import com.vmware.pscoe.iac.artifact.model.PackageType; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgPackageDescriptor; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgResourceAction; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgPackageDescriptor; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgResourceAction; import com.vmware.pscoe.iac.artifact.aria.rest.RestClientVraNg; import org.junit.Rule; diff --git a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgResourceQuotaPolicyStoreTest.java b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgResourceQuotaPolicyStoreTest.java index c32e33dc6..4564b6dd7 100644 --- a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgResourceQuotaPolicyStoreTest.java +++ b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgResourceQuotaPolicyStoreTest.java @@ -21,7 +21,7 @@ import com.vmware.pscoe.iac.artifact.model.Package; import com.vmware.pscoe.iac.artifact.model.PackageFactory; import com.vmware.pscoe.iac.artifact.model.PackageType; -import com.vmware.pscoe.iac.artifact.aria.model.*; +import com.vmware.pscoe.iac.artifact.aria.models.*; import com.vmware.pscoe.iac.artifact.aria.rest.RestClientVraNg; import org.junit.Rule; import org.junit.jupiter.api.AfterEach; diff --git a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgSubscriptionStoreTest.java b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgSubscriptionStoreTest.java index 96ae3e9ff..4e9e2bed8 100644 --- a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgSubscriptionStoreTest.java +++ b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgSubscriptionStoreTest.java @@ -52,10 +52,10 @@ import com.vmware.pscoe.iac.artifact.model.PackageFactory; import com.vmware.pscoe.iac.artifact.model.PackageType; import com.vmware.pscoe.iac.artifact.model.abx.AbxAction; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgOrganization; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgPackageDescriptor; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgProject; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgSubscription; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgOrganization; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgPackageDescriptor; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgProject; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgSubscription; import com.vmware.pscoe.iac.artifact.aria.rest.RestClientVraNg; public class VraNgSubscriptionStoreTest { diff --git a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/aria/utils/VraNgProjectUtilTest.java b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/aria/utils/VraNgProjectUtilTest.java index 64e30fd4a..4e5a9811e 100644 --- a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/aria/utils/VraNgProjectUtilTest.java +++ b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/aria/utils/VraNgProjectUtilTest.java @@ -18,7 +18,7 @@ import com.google.gson.GsonBuilder; import com.google.gson.JsonObject; import com.vmware.pscoe.iac.artifact.helpers.stubs.ResourceActionMockBuilder; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgResourceAction; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgResourceAction; import com.vmware.pscoe.iac.artifact.aria.rest.RestClientVraNg; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/filesystem/ApprovalPolicyFsMocks.java b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/filesystem/ApprovalPolicyFsMocks.java index 39a63af6c..7c6d8cc09 100644 --- a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/filesystem/ApprovalPolicyFsMocks.java +++ b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/filesystem/ApprovalPolicyFsMocks.java @@ -16,7 +16,7 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgApprovalPolicy; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgApprovalPolicy; import java.io.File; import java.nio.file.Path; @@ -34,6 +34,7 @@ public class ApprovalPolicyFsMocks extends VraNgFsMock { /** * Constructor. + * * @param tempDir temporary folder for test data. */ @@ -43,6 +44,7 @@ public ApprovalPolicyFsMocks(File tempDir) { /** * Getter. + * * @return the full path where test policy json files are stored during tests. */ @Override @@ -52,17 +54,16 @@ public File getWorkdir() { /** * JSON encodes a policy and adds it to the resource actions directory. - * @param policy - The policy to store + * + * @param policy - The policy to store */ public void addPolicy(VraNgApprovalPolicy policy) { File file = Paths.get( - this.getWorkdir().getAbsolutePath(), - policy.getName() + ".json" - ).toFile(); + this.getWorkdir().getAbsolutePath(), + policy.getName() + ".json").toFile(); Gson gson = new GsonBuilder().setLenient().setPrettyPrinting().serializeNulls().create(); Path itemName = Paths.get(file.getPath()); writeFileToPath(itemName, gson.toJson(policy).getBytes()); } } - diff --git a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/filesystem/BlueprintFsMocks.java b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/filesystem/BlueprintFsMocks.java index c82b26694..5e8ed2481 100644 --- a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/filesystem/BlueprintFsMocks.java +++ b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/filesystem/BlueprintFsMocks.java @@ -18,7 +18,7 @@ import com.google.gson.GsonBuilder; import com.google.gson.JsonObject; import com.google.gson.JsonPrimitive; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgBlueprint; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgBlueprint; import java.io.File; import java.nio.file.Paths; @@ -40,8 +40,7 @@ public BlueprintFsMocks(File tempDir) { super(tempDir); } - - /** + /** * @return File */ @Override @@ -49,13 +48,13 @@ public File getWorkdir() { return Paths.get(this.tempDir.getPath(), WORKDIR).toFile(); } - /** * JSON encodes a blueprint and adds it to the blueprints directory. - * This will also create the content.yaml based on the blueprint and alternatively accepts a versions' data containing + * This will also create the content.yaml based on the blueprint and + * alternatively accepts a versions' data containing * information about the versions. * - * @param blueprint - The blueprint to store + * @param blueprint - The blueprint to store */ public void addBlueprint(final VraNgBlueprint blueprint) { addBlueprint(blueprint, blueprint.getName()); @@ -63,9 +62,11 @@ public void addBlueprint(final VraNgBlueprint blueprint) { /** * JSON encodes a blueprint and adds it to the blueprint directory. - * This will also create the content.yaml based on the blueprint and alternatively accepts a versions' data containing + * This will also create the content.yaml based on the blueprint and + * alternatively accepts a versions' data containing * information about the versions. - * @param blueprint - Blueprint to store + * + * @param blueprint - Blueprint to store * @param folderName - Blueprint folder name */ public void addBlueprint(final VraNgBlueprint blueprint, String folderName) { @@ -78,14 +79,12 @@ public void addBlueprint(final VraNgBlueprint blueprint, String folderName) { } File blueprintContent = Paths.get( - blueprintFolder.getAbsolutePath(), - "content.yaml" - ).toFile(); + blueprintFolder.getAbsolutePath(), + "content.yaml").toFile(); File blueprintDetails = Paths.get( - blueprintFolder.getAbsolutePath(), - "details.json" - ).toFile(); + blueprintFolder.getAbsolutePath(), + "details.json").toFile(); JsonObject bpDetails = new JsonObject(); bpDetails.add("id", new JsonPrimitive(blueprint.getId())); @@ -95,13 +94,11 @@ public void addBlueprint(final VraNgBlueprint blueprint, String folderName) { Gson gson = new GsonBuilder().setLenient().setPrettyPrinting().serializeNulls().create(); writeFileToPath( - Paths.get(blueprintContent.getPath()), - blueprint.getContent().getBytes() - ); + Paths.get(blueprintContent.getPath()), + blueprint.getContent().getBytes()); writeFileToPath( - Paths.get(blueprintDetails.getPath()), - gson.toJson(gson.fromJson(bpDetails.toString(), JsonObject.class)).getBytes() - ); + Paths.get(blueprintDetails.getPath()), + gson.toJson(gson.fromJson(bpDetails.toString(), JsonObject.class)).getBytes()); } } diff --git a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/filesystem/CatalogItemFsMocks.java b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/filesystem/CatalogItemFsMocks.java index 8a89219c4..e7471a5a3 100644 --- a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/filesystem/CatalogItemFsMocks.java +++ b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/filesystem/CatalogItemFsMocks.java @@ -16,7 +16,7 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgCatalogItem; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgCatalogItem; import java.io.File; import java.nio.file.Path; @@ -26,134 +26,131 @@ public class CatalogItemFsMocks extends VraNgFsMock { private final static String WORKDIR = "catalog-items"; + public CatalogItemFsMocks(File tempDir) { - super( tempDir ); + super(tempDir); } @Override public File getWorkdir() { - return Paths.get( this.tempDir.getPath(), WORKDIR ).toFile(); + return Paths.get(this.tempDir.getPath(), WORKDIR).toFile(); } @Override protected void ensureWorkdirExists() { super.ensureWorkdirExists(); - File iconsDir = getIconDir(); + File iconsDir = getIconDir(); - if ( iconsDir.exists() ) { - return ; + if (iconsDir.exists()) { + return; } - if ( ! iconsDir.mkdirs() ) { - throw new RuntimeException( "Error while creating " + iconsDir.getAbsolutePath() + " dir" ); + if (!iconsDir.mkdirs()) { + throw new RuntimeException("Error while creating " + iconsDir.getAbsolutePath() + " dir"); } - File formsDir = getFormDir(); - if ( formsDir.exists() ) { + File formsDir = getFormDir(); + if (formsDir.exists()) { return; } - if ( ! formsDir.mkdirs() ) { - throw new RuntimeException( "Error while creating " + formsDir.getAbsolutePath() + " dir" ); + if (!formsDir.mkdirs()) { + throw new RuntimeException("Error while creating " + formsDir.getAbsolutePath() + " dir"); } } /** - * @return File + * @return File */ public File getCatalogItemsDir() { - return Paths.get( tempDir.getPath(), DIR_CATALOG_ITEMS ).toFile(); + return Paths.get(tempDir.getPath(), DIR_CATALOG_ITEMS).toFile(); } /** * JSON encodes a catalog item and adds it to the DIR_CATALOG_ITEMS. * Adds the catalog items dir if it does not exist * - * @param catalogItem - The catalog item to add + * @param catalogItem - The catalog item to add */ - public void addCatalogItem( VraNgCatalogItem catalogItem ) { - File customCatalogItemFile = Paths.get( - getCatalogItemsDir().getAbsolutePath(), - getCatalogItemResourceName( catalogItem ) + ".json" - ).toFile(); - - Gson gson = new GsonBuilder().setLenient().setPrettyPrinting().serializeNulls().create(); - Path itemName = Paths.get( customCatalogItemFile.getPath() ); - writeFileToPath( itemName, gson.toJson( catalogItem ).getBytes() ); + public void addCatalogItem(VraNgCatalogItem catalogItem) { + File customCatalogItemFile = Paths.get( + getCatalogItemsDir().getAbsolutePath(), + getCatalogItemResourceName(catalogItem) + ".json").toFile(); + + Gson gson = new GsonBuilder().setLenient().setPrettyPrinting().serializeNulls().create(); + Path itemName = Paths.get(customCatalogItemFile.getPath()); + writeFileToPath(itemName, gson.toJson(catalogItem).getBytes()); } /** - * @return File + * @return File */ private File getIconDir() { - return Paths.get( getCatalogItemsDir().getAbsolutePath(), "icons" ).toFile(); + return Paths.get(getCatalogItemsDir().getAbsolutePath(), "icons").toFile(); } /** * Adds an icon with a body with the given information in the catalog item * - * @param catalogItem -> must contain an icon id and icon extension + * @param catalogItem -> must contain an icon id and icon extension */ - public void addCatalogItemIcon( VraNgCatalogItem catalogItem ) { - if ( ! catalogItem.hasIcon() ) { + public void addCatalogItemIcon(VraNgCatalogItem catalogItem) { + if (!catalogItem.hasIcon()) { throw new RuntimeException( - String.format( "Trying to store an icon for catalog item %s but no icon found", catalogItem.getName() ) - ); + String.format("Trying to store an icon for catalog item %s but no icon found", + catalogItem.getName())); } - File customIconFile = Paths.get( - getIconDir().getAbsolutePath(), - getCatalogItemResourceName( catalogItem ) + "." + catalogItem.getIconExtension() - ).toFile(); + File customIconFile = Paths.get( + getIconDir().getAbsolutePath(), + getCatalogItemResourceName(catalogItem) + "." + catalogItem.getIconExtension()).toFile(); - Path itemName = Paths.get( customIconFile.getPath() ); - writeFileToPath( itemName, "iconBody".getBytes() ); + Path itemName = Paths.get(customIconFile.getPath()); + writeFileToPath(itemName, "iconBody".getBytes()); } /** - * @return File + * @return File */ private File getFormDir() { - return Paths.get( getCatalogItemsDir().getAbsolutePath(), "forms" ).toFile(); + return Paths.get(getCatalogItemsDir().getAbsolutePath(), "forms").toFile(); } /** * Adds a form with a body with the given information in the catalog item * - * @param catalogItem -> must contain a formId + * @param catalogItem -> must contain a formId */ - public void addCatalogItemForm( VraNgCatalogItem catalogItem ) { - if ( ! catalogItem.hasForm() ) { + public void addCatalogItemForm(VraNgCatalogItem catalogItem) { + if (!catalogItem.hasForm()) { throw new RuntimeException( - String.format( "Trying to store a a form for catalog item %s but no form found", catalogItem.getName() ) - ); + String.format("Trying to store a a form for catalog item %s but no form found", + catalogItem.getName())); } - File customFormItem = Paths.get( - getFormDir().getAbsolutePath(), - getCatalogItemResourceName( catalogItem ) + ".json" - ).toFile(); - - Path itemName = Paths.get( customFormItem.getPath() ); - writeFileToPath( itemName, - ( - "{\"id\": \"342f2e18-ff1d-40cd-a1ba-8ec4ce8c3c87\",\"name\": \"Sum two numbers\",\"form\": \"{\\\"test\\\":" + - "\\\"test\\\"}\",\"styles\": null,\"sourceType\": \"com.vmw.vro.workflow\",\"type\": \"requestForm\"," + - "\"status\": \"ON\",\"formFormat\": \"JSON\"}" - ).getBytes() - ); + File customFormItem = Paths.get( + getFormDir().getAbsolutePath(), + getCatalogItemResourceName(catalogItem) + ".json").toFile(); + + Path itemName = Paths.get(customFormItem.getPath()); + writeFileToPath(itemName, + ("{\"id\": \"342f2e18-ff1d-40cd-a1ba-8ec4ce8c3c87\",\"name\": \"Sum two numbers\",\"form\": \"{\\\"test\\\":" + + + "\\\"test\\\"}\",\"styles\": null,\"sourceType\": \"com.vmw.vro.workflow\",\"type\": \"requestForm\"," + + + "\"status\": \"ON\",\"formFormat\": \"JSON\"}").getBytes()); } - /** - * Returns custom catalog item resource name that can be used for catalog items, forms and icons + * Returns custom catalog item resource name that can be used for catalog items, + * forms and icons * - * @param catalogItem + * @param catalogItem * - * @return String + * @return String */ - private String getCatalogItemResourceName( VraNgCatalogItem catalogItem ) { + private String getCatalogItemResourceName(VraNgCatalogItem catalogItem) { return catalogItem.getSourceName() + "__" + catalogItem.getName(); } } diff --git a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/filesystem/ContentSharingPolicyFsMocks.java b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/filesystem/ContentSharingPolicyFsMocks.java index 831e9b3da..1f5e0eb27 100644 --- a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/filesystem/ContentSharingPolicyFsMocks.java +++ b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/filesystem/ContentSharingPolicyFsMocks.java @@ -16,7 +16,7 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgContentSharingPolicy; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgContentSharingPolicy; import java.io.File; import java.nio.file.Paths; import java.nio.file.Path; @@ -33,6 +33,7 @@ public final class ContentSharingPolicyFsMocks extends VraNgFsMock { /** * Constructor. + * * @param tempDir a folder to store temporary test data */ public ContentSharingPolicyFsMocks(File tempDir) { @@ -41,6 +42,7 @@ public ContentSharingPolicyFsMocks(File tempDir) { /** * Calculates working directory path. + * * @return the working directory folder as a File object. */ @Override @@ -49,14 +51,15 @@ public File getWorkdir() { } /** - * JSON encodes a content sharing policy and adds it to the policies/content-sharing directory. - * @param csPolicy - The resource action to store + * JSON encodes a content sharing policy and adds it to the + * policies/content-sharing directory. + * + * @param csPolicy - The resource action to store */ public void addContentSharingPolicy(VraNgContentSharingPolicy csPolicy) { File file = Paths.get( - this.getWorkdir().getAbsolutePath(), - csPolicy.getName() + ".json" - ).toFile(); + this.getWorkdir().getAbsolutePath(), + csPolicy.getName() + ".json").toFile(); Gson gson = new GsonBuilder().setLenient().setPrettyPrinting().serializeNulls().create(); Path itemName = Paths.get(file.getPath()); diff --git a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/filesystem/CustomResourceFsMocks.java b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/filesystem/CustomResourceFsMocks.java index fd74d3bc2..20a353d1a 100644 --- a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/filesystem/CustomResourceFsMocks.java +++ b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/filesystem/CustomResourceFsMocks.java @@ -14,7 +14,7 @@ */ package com.vmware.pscoe.iac.artifact.helpers.filesystem; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgCustomResource; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgCustomResource; import java.io.File; import java.nio.file.Path; @@ -24,24 +24,24 @@ public class CustomResourceFsMocks extends VraNgFsMock { private final static String WORKDIR = "custom-resources"; public CustomResourceFsMocks(File tempDir) { - super( tempDir ); + super(tempDir); } @Override public File getWorkdir() { - return Paths.get( this.tempDir.getPath(), WORKDIR ).toFile(); + return Paths.get(this.tempDir.getPath(), WORKDIR).toFile(); } /** * JSON encodes a CR item and adds it to the DIR_CUSTOM_RESOURCES. * Adds the CR items dir if it does not exist * - * @param cr - The custom resource to add + * @param cr - The custom resource to add */ public void addCustomResource(VraNgCustomResource cr) { File crFile = Paths.get( - this.getWorkdir().getAbsolutePath(), - cr.getName() + ".json").toFile(); + this.getWorkdir().getAbsolutePath(), + cr.getName() + ".json").toFile(); Path crName = Paths.get(crFile.getPath()); writeFileToPath(crName, cr.getJson().getBytes()); diff --git a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/filesystem/Day2ActionsPolicyFsMocks.java b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/filesystem/Day2ActionsPolicyFsMocks.java index 2da9a70a7..f5be20564 100644 --- a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/filesystem/Day2ActionsPolicyFsMocks.java +++ b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/filesystem/Day2ActionsPolicyFsMocks.java @@ -16,7 +16,7 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgDay2ActionsPolicy; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgDay2ActionsPolicy; import java.io.File; import java.nio.file.Path; @@ -34,6 +34,7 @@ public class Day2ActionsPolicyFsMocks extends VraNgFsMock { /** * Constructor. + * * @param tempDir temporary folder for test data. */ @@ -43,6 +44,7 @@ public Day2ActionsPolicyFsMocks(File tempDir) { /** * Getter. + * * @return the full path where test policy json files are stored during tests. */ @Override @@ -52,13 +54,13 @@ public File getWorkdir() { /** * JSON encodes a policy and adds it to the resource actions directory. - * @param policy - The policy to store + * + * @param policy - The policy to store */ public void addPolicy(VraNgDay2ActionsPolicy policy) { File file = Paths.get( - this.getWorkdir().getAbsolutePath(), - policy.getName() + ".json" - ).toFile(); + this.getWorkdir().getAbsolutePath(), + policy.getName() + ".json").toFile(); Gson gson = new GsonBuilder().setLenient().setPrettyPrinting().serializeNulls().create(); Path itemName = Paths.get(file.getPath()); diff --git a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/filesystem/DeploymentLimitPolicyFsMocks.java b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/filesystem/DeploymentLimitPolicyFsMocks.java index dcc5dbeef..259819bea 100644 --- a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/filesystem/DeploymentLimitPolicyFsMocks.java +++ b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/filesystem/DeploymentLimitPolicyFsMocks.java @@ -16,7 +16,7 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgDeploymentLimitPolicy; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgDeploymentLimitPolicy; import java.io.File; import java.nio.file.Path; @@ -34,6 +34,7 @@ public class DeploymentLimitPolicyFsMocks extends VraNgFsMock { /** * Constructor. + * * @param tempDir temporary folder for test data. */ @@ -43,6 +44,7 @@ public DeploymentLimitPolicyFsMocks(File tempDir) { /** * Getter. + * * @return the full path where test policy json files are stored during tests. */ @Override @@ -52,17 +54,16 @@ public File getWorkdir() { /** * JSON encodes a policy and adds it to the resource actions directory. - * @param policy - The policy to store + * + * @param policy - The policy to store */ public void addPolicy(VraNgDeploymentLimitPolicy policy) { File file = Paths.get( - this.getWorkdir().getAbsolutePath(), - policy.getName() + ".json" - ).toFile(); + this.getWorkdir().getAbsolutePath(), + policy.getName() + ".json").toFile(); Gson gson = new GsonBuilder().setLenient().setPrettyPrinting().serializeNulls().create(); Path itemName = Paths.get(file.getPath()); writeFileToPath(itemName, gson.toJson(policy).getBytes()); } } - diff --git a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/filesystem/EntitlementFsMocks.java b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/filesystem/EntitlementFsMocks.java index 719e7319d..d1c3b3f8c 100644 --- a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/filesystem/EntitlementFsMocks.java +++ b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/filesystem/EntitlementFsMocks.java @@ -16,7 +16,7 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgCatalogEntitlement; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgCatalogEntitlement; import java.io.File; import java.nio.file.Paths; @@ -36,18 +36,18 @@ public File getWorkdir() { /** * JSON encodes a entitlement and adds it to the entitlements directory. - * This will also create the content.yaml based on the entitlement and alternatively accepts a versions' data containing + * This will also create the content.yaml based on the entitlement and + * alternatively accepts a versions' data containing * information about the versions. * - * @see com.vmware.pscoe.iac.artifact.helpers.stubs.entitlementVersionsMockBuilder - * @param entitlement - The entitlement to store - * @param versionsData - A string containing the versioning data + * @see com.vmware.pscoe.iac.artifact.helpers.stubs.entitlementVersionsMockBuilder + * @param entitlement - The entitlement to store + * @param versionsData - A string containing the versioning data */ public void addEntitlement(VraNgCatalogEntitlement entitlement) { - File file = Paths.get( - this.getWorkdir().getAbsolutePath(), - entitlement.getName() + ".json" - ).toFile(); + File file = Paths.get( + this.getWorkdir().getAbsolutePath(), + entitlement.getName() + ".json").toFile(); Gson gson = new GsonBuilder().setLenient().setPrettyPrinting().serializeNulls().create(); Path itemName = Paths.get(file.getPath()); diff --git a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/filesystem/LeasePolicyFsMocks.java b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/filesystem/LeasePolicyFsMocks.java index 3427f5e2f..c7366f5e7 100644 --- a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/filesystem/LeasePolicyFsMocks.java +++ b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/filesystem/LeasePolicyFsMocks.java @@ -16,7 +16,7 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgLeasePolicy; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgLeasePolicy; import java.io.File; import java.nio.file.Path; @@ -34,6 +34,7 @@ public class LeasePolicyFsMocks extends VraNgFsMock { /** * Constructor. + * * @param tempDir temporary folder for test data. */ @@ -43,6 +44,7 @@ public LeasePolicyFsMocks(File tempDir) { /** * Getter. + * * @return the full path where test policy json files are stored during tests. */ @Override @@ -52,20 +54,19 @@ public File getWorkdir() { /** * JSON encodes a resource action and adds it to the resource actions directory. - * This will also create the content.yaml based on the resource action and alternatively accepts a versions' data containing + * This will also create the content.yaml based on the resource action and + * alternatively accepts a versions' data containing * information about the versions. * - * @param policy - The policy to store + * @param policy - The policy to store */ public void addPolicy(VraNgLeasePolicy policy) { File file = Paths.get( - this.getWorkdir().getAbsolutePath(), - policy.getName() + ".json" - ).toFile(); + this.getWorkdir().getAbsolutePath(), + policy.getName() + ".json").toFile(); Gson gson = new GsonBuilder().setLenient().setPrettyPrinting().serializeNulls().create(); Path itemName = Paths.get(file.getPath()); writeFileToPath(itemName, gson.toJson(policy).getBytes()); } } - diff --git a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/filesystem/PropertyGroupFsMocks.java b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/filesystem/PropertyGroupFsMocks.java index fc5009f54..695e60b49 100644 --- a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/filesystem/PropertyGroupFsMocks.java +++ b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/filesystem/PropertyGroupFsMocks.java @@ -16,7 +16,7 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgPropertyGroup; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgPropertyGroup; import java.io.File; import java.nio.file.Path; @@ -26,27 +26,26 @@ public class PropertyGroupFsMocks extends VraNgFsMock { private final static String WORKDIR = "property-groups"; public PropertyGroupFsMocks(File tempDir) { - super( tempDir ); + super(tempDir); } @Override public File getWorkdir() { - return Paths.get( this.tempDir.getPath(), WORKDIR ).toFile(); + return Paths.get(this.tempDir.getPath(), WORKDIR).toFile(); } /** * Adds the property group dir if it does not exist * - * @param propertyGroup - The Property group to add + * @param propertyGroup - The Property group to add */ - public void addPropertyGroup( VraNgPropertyGroup propertyGroup ) { - File customPropertyGroupFile = Paths.get( - this.getWorkdir().getAbsolutePath(), - propertyGroup.getName() + ".json" - ).toFile(); + public void addPropertyGroup(VraNgPropertyGroup propertyGroup) { + File customPropertyGroupFile = Paths.get( + this.getWorkdir().getAbsolutePath(), + propertyGroup.getName() + ".json").toFile(); - Gson gson = new GsonBuilder().setLenient().setPrettyPrinting().serializeNulls().create(); - Path itemName = Paths.get( customPropertyGroupFile.getPath() ); - writeFileToPath( itemName, gson.toJson( propertyGroup ).getBytes() ); + Gson gson = new GsonBuilder().setLenient().setPrettyPrinting().serializeNulls().create(); + Path itemName = Paths.get(customPropertyGroupFile.getPath()); + writeFileToPath(itemName, gson.toJson(propertyGroup).getBytes()); } } diff --git a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/filesystem/ResourceActionFsMocks.java b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/filesystem/ResourceActionFsMocks.java index 7f691a1b8..542f36583 100644 --- a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/filesystem/ResourceActionFsMocks.java +++ b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/filesystem/ResourceActionFsMocks.java @@ -16,7 +16,7 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgResourceAction; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgResourceAction; import java.io.File; import java.nio.file.Paths; @@ -36,18 +36,19 @@ public File getWorkdir() { /** * JSON encodes a resource action and adds it to the resource actions directory. - * This will also create the content.yaml based on the resource action and alternatively accepts a versions' data containing + * This will also create the content.yaml based on the resource action and + * alternatively accepts a versions' data containing * information about the versions. * - * @see com.vmware.pscoe.iac.artifact.helpers.stubs.resource actionVersionsMockBuilder - * @param resourceAction - The resource action to store - * @param versionsData - A string containing the versioning data + * @see com.vmware.pscoe.iac.artifact.helpers.stubs.resource + * actionVersionsMockBuilder + * @param resourceAction - The resource action to store + * @param versionsData - A string containing the versioning data */ public void addResourceAction(VraNgResourceAction resourceAction) { File file = Paths.get( - this.getWorkdir().getAbsolutePath(), - resourceAction.getName() + ".json" - ).toFile(); + this.getWorkdir().getAbsolutePath(), + resourceAction.getName() + ".json").toFile(); Gson gson = new GsonBuilder().setLenient().setPrettyPrinting().serializeNulls().create(); Path itemName = Paths.get(file.getPath()); diff --git a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/filesystem/ResourceQuotaPolicyFsMocks.java b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/filesystem/ResourceQuotaPolicyFsMocks.java index 6ccd209c0..251ef0763 100644 --- a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/filesystem/ResourceQuotaPolicyFsMocks.java +++ b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/filesystem/ResourceQuotaPolicyFsMocks.java @@ -16,7 +16,7 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgResourceQuotaPolicy; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgResourceQuotaPolicy; import java.io.File; import java.nio.file.Path; @@ -34,33 +34,36 @@ public class ResourceQuotaPolicyFsMocks extends VraNgFsMock { /** * Constructor. + * * @param tempDir temporary folder for test data. */ public ResourceQuotaPolicyFsMocks(File tempDir) { super(tempDir); } + /** * Getter. + * * @return the full path where test policy json files are stored during tests. */ @Override public File getWorkdir() { return Paths.get(this.tempDir.getPath(), - DIR_POLICIES, RESOURCE_QUOTA_POLICY).toFile(); + DIR_POLICIES, RESOURCE_QUOTA_POLICY).toFile(); } /** * JSON encodes a resource action and adds it to the resource actions directory. - * This will also create the content.yaml based on the resource action and alternatively accepts a versions' data containing + * This will also create the content.yaml based on the resource action and + * alternatively accepts a versions' data containing * information about the versions. * - * @param rqPolicy - The resource quota policy to store + * @param rqPolicy - The resource quota policy to store */ public void addResourceQuotaPolicy(VraNgResourceQuotaPolicy rqPolicy) { File file = Paths.get( - this.getWorkdir().getAbsolutePath(), - rqPolicy.getName() + ".json" - ).toFile(); + this.getWorkdir().getAbsolutePath(), + rqPolicy.getName() + ".json").toFile(); Gson gson = new GsonBuilder().setLenient().setPrettyPrinting().serializeNulls().create(); Path itemName = Paths.get(file.getPath()); diff --git a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/filesystem/SubscriptionFsMocks.java b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/filesystem/SubscriptionFsMocks.java index 162eaad49..034a58b10 100644 --- a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/filesystem/SubscriptionFsMocks.java +++ b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/filesystem/SubscriptionFsMocks.java @@ -16,7 +16,7 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgSubscription; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgSubscription; import static com.vmware.pscoe.iac.artifact.aria.store.VraNgDirs.DIR_SUBSCRIPTIONS; @@ -27,11 +27,13 @@ public class SubscriptionFsMocks extends VraNgFsMock { /** * SubscriptionFsMocks constructor. + * * @param tempDir temporary directory. */ public SubscriptionFsMocks(File tempDir) { super(tempDir); } + /** * Returns working directory. */ @@ -42,13 +44,13 @@ public File getWorkdir() { /** * Save subscription file to temporary directory. + * * @param subscription subscription object */ public void addSubscription(VraNgSubscription subscription) { File file = Paths.get( - this.getWorkdir().getAbsolutePath(), - subscription.getName() + ".json" - ).toFile(); + this.getWorkdir().getAbsolutePath(), + subscription.getName() + ".json").toFile(); Gson gson = new GsonBuilder().setLenient().setPrettyPrinting().serializeNulls().create(); Path itemName = Paths.get(file.getPath()); diff --git a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/filesystem/VraNgFsMock.java b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/filesystem/VraNgFsMock.java index 0f989c0b3..67d5e02f5 100644 --- a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/filesystem/VraNgFsMock.java +++ b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/filesystem/VraNgFsMock.java @@ -33,7 +33,8 @@ public VraNgFsMock(File tempDir) { } /** - * Ensures the workdir exists. Will throw an error if the workdir cannot be created + * Ensures the workdir exists. Will throw an error if the workdir cannot be + * created */ protected void ensureWorkdirExists() { File workdir = this.getWorkdir(); @@ -50,18 +51,18 @@ protected void ensureWorkdirExists() { /** * Writes a given byte array body to path * - * @param path - the absolute path to the file ( with filename ) - * @param body - body to save + * @param path - the absolute path to the file ( with filename ) + * @param body - body to save */ protected void writeFileToPath(Path path, byte[] body) { try { Files.write( - path, - body, - StandardOpenOption.CREATE - ); + path, + body, + StandardOpenOption.CREATE); } catch (IOException e) { - throw new RuntimeException(String.format("Error while creating \"%s\". Message was: %s", path, e.getMessage())); + throw new RuntimeException( + String.format("Error while creating \"%s\". Message was: %s", path, e.getMessage())); } } diff --git a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/stubs/BlueprintMockBuilder.java b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/stubs/BlueprintMockBuilder.java index 599defb9c..ee5e6cf37 100644 --- a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/stubs/BlueprintMockBuilder.java +++ b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/stubs/BlueprintMockBuilder.java @@ -14,7 +14,7 @@ */ package com.vmware.pscoe.iac.artifact.helpers.stubs; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgBlueprint; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgBlueprint; public class BlueprintMockBuilder { private String id; diff --git a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/stubs/BlueprintVersionsMockBuilder.java b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/stubs/BlueprintVersionsMockBuilder.java index 558362502..4883e099a 100644 --- a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/stubs/BlueprintVersionsMockBuilder.java +++ b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/stubs/BlueprintVersionsMockBuilder.java @@ -15,7 +15,7 @@ package com.vmware.pscoe.iac.artifact.helpers.stubs; import com.google.gson.*; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgBlueprint; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgBlueprint; import org.apache.commons.io.IOUtils; import java.io.IOException; diff --git a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/stubs/CatalogEntitlementMockBuilder.java b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/stubs/CatalogEntitlementMockBuilder.java index bd2d71627..8e7d0c593 100644 --- a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/stubs/CatalogEntitlementMockBuilder.java +++ b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/stubs/CatalogEntitlementMockBuilder.java @@ -17,7 +17,7 @@ import java.util.ArrayList; import java.util.List; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgCatalogEntitlement; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgCatalogEntitlement; public class CatalogEntitlementMockBuilder { private String name = "mockedEntitlementName"; diff --git a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/stubs/CatalogItemMockBuilder.java b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/stubs/CatalogItemMockBuilder.java index 4e88a5a7f..76bc643d2 100644 --- a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/stubs/CatalogItemMockBuilder.java +++ b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/stubs/CatalogItemMockBuilder.java @@ -14,9 +14,9 @@ */ package com.vmware.pscoe.iac.artifact.helpers.stubs; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgCatalogItem; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgCatalogItemType; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgContentSourceType; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgCatalogItem; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgCatalogItemType; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgContentSourceType; public class CatalogItemMockBuilder { /** diff --git a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/stubs/CloudAccountMockBuilder.java b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/stubs/CloudAccountMockBuilder.java index 5b0bdaa93..33a26ea4a 100644 --- a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/stubs/CloudAccountMockBuilder.java +++ b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/stubs/CloudAccountMockBuilder.java @@ -17,7 +17,7 @@ import java.util.ArrayList; import java.util.List; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgCloudAccount; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgCloudAccount; public class CloudAccountMockBuilder { /*{ diff --git a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/stubs/ContentSharingPolicyMockBuilder.java b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/stubs/ContentSharingPolicyMockBuilder.java index aa09e66ec..4fbe2c203 100644 --- a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/stubs/ContentSharingPolicyMockBuilder.java +++ b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/stubs/ContentSharingPolicyMockBuilder.java @@ -15,11 +15,11 @@ package com.vmware.pscoe.iac.artifact.helpers.stubs; import java.util.ArrayList; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgContentSharingPolicy; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgDefinition; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgEntitledUser; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgItem; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgPrincipal; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgContentSharingPolicy; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgDefinition; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgEntitledUser; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgItem; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgPrincipal; public final class ContentSharingPolicyMockBuilder { diff --git a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/stubs/ContentSourceBaseMockBuilder.java b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/stubs/ContentSourceBaseMockBuilder.java index 34a1b0f1d..4d3326038 100644 --- a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/stubs/ContentSourceBaseMockBuilder.java +++ b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/stubs/ContentSourceBaseMockBuilder.java @@ -14,7 +14,7 @@ */ package com.vmware.pscoe.iac.artifact.helpers.stubs; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgContentSourceBase; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgContentSourceBase; public class ContentSourceBaseMockBuilder { private String id = "mockedSourceId"; diff --git a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/stubs/CustomFormMockBuilder.java b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/stubs/CustomFormMockBuilder.java index 6000ad81b..d23e89277 100644 --- a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/stubs/CustomFormMockBuilder.java +++ b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/stubs/CustomFormMockBuilder.java @@ -14,7 +14,7 @@ */ package com.vmware.pscoe.iac.artifact.helpers.stubs; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgCustomForm; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgCustomForm; public class CustomFormMockBuilder { /** diff --git a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/stubs/CustomResourceMockBuilder.java b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/stubs/CustomResourceMockBuilder.java index 9c9282757..9346200bc 100644 --- a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/stubs/CustomResourceMockBuilder.java +++ b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/stubs/CustomResourceMockBuilder.java @@ -18,7 +18,7 @@ import java.nio.charset.StandardCharsets; import com.google.gson.*; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgCustomResource; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgCustomResource; import org.apache.commons.io.IOUtils; diff --git a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/stubs/PropertyGroupMockBuilder.java b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/stubs/PropertyGroupMockBuilder.java index cdc052b55..d3a4c8fc3 100644 --- a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/stubs/PropertyGroupMockBuilder.java +++ b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/stubs/PropertyGroupMockBuilder.java @@ -20,7 +20,7 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParser; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgPropertyGroup; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgPropertyGroup; import org.apache.commons.io.IOUtils; diff --git a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/stubs/ResourceActionMockBuilder.java b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/stubs/ResourceActionMockBuilder.java index 68683c6fb..1a03cd3d5 100644 --- a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/stubs/ResourceActionMockBuilder.java +++ b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/stubs/ResourceActionMockBuilder.java @@ -23,7 +23,7 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParser; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgResourceAction; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgResourceAction; import org.apache.commons.io.IOUtils; diff --git a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/stubs/SubscriptionMockBuilder.java b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/stubs/SubscriptionMockBuilder.java index 704f9e7b1..7a7b8e360 100644 --- a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/stubs/SubscriptionMockBuilder.java +++ b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/stubs/SubscriptionMockBuilder.java @@ -20,7 +20,7 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParser; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgSubscription; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgSubscription; import org.apache.commons.io.IOUtils; diff --git a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/vrang/RestClientVraNgPrimitiveTestDouble.java b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/vrang/RestClientVraNgPrimitiveTestDouble.java index eb55d0186..469e723ea 100644 --- a/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/vrang/RestClientVraNgPrimitiveTestDouble.java +++ b/common/artifact-manager/src/test/java/com/vmware/pscoe/iac/artifact/helpers/vrang/RestClientVraNgPrimitiveTestDouble.java @@ -29,10 +29,10 @@ import com.vmware.pscoe.iac.artifact.model.Version; import com.vmware.pscoe.iac.artifact.model.abx.AbxAction; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgContentSharingPolicy; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgProject; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgCatalogItem; -import com.vmware.pscoe.iac.artifact.aria.model.VraNgCloudAccount; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgContentSharingPolicy; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgProject; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgCatalogItem; +import com.vmware.pscoe.iac.artifact.aria.models.VraNgCloudAccount; public class RestClientVraNgPrimitiveTestDouble extends RestClientVraNgPrimitive {