refactor!: Moved the rest clients and helpers

Signed-off-by: Stefan Genov <stefan.genov@broadcom.com>
vmware · Dec 17, 2024 · 0a6074a · 0a6074a
1 parent 4b0e807
commit 0a6074a
Show file tree

Hide file tree

Showing 49 changed files with 120 additions and 97 deletions.
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
@@ -22,7 +22,7 @@
 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.rest.RestClientVraNg;
+import com.vmware.pscoe.iac.artifact.aria.rest.RestClientVraNg;
 import org.apache.commons.lang3.NotImplementedException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/AbxReleaseManager.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/AbxReleaseManager.java
@@ -31,7 +31,7 @@
 import com.vmware.pscoe.iac.artifact.model.abx.AbxAction;
 import com.vmware.pscoe.iac.artifact.model.abx.AbxActionVersion;
 import com.vmware.pscoe.iac.artifact.model.abx.AbxPackageDescriptor;
-import com.vmware.pscoe.iac.artifact.rest.RestClientVraNg;
+import com.vmware.pscoe.iac.artifact.aria.rest.RestClientVraNg;
 
 public class AbxReleaseManager {
 	private final Logger logger = LoggerFactory.getLogger(AbxReleaseManager.class);

diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/PackageStoreFactory.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/PackageStoreFactory.java
@@ -25,6 +25,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.vmware.pscoe.iac.artifact.aria.rest.RestClientVraNg;
 import com.vmware.pscoe.iac.artifact.aria.configuration.ConfigurationVraNg;
 import com.vmware.pscoe.iac.artifact.cli.CliManagerFactory;
 import com.vmware.pscoe.iac.artifact.cli.CliManagerVrops;

diff --git a/...pscoe/iac/artifact/VraNgPackageStore.java → ...ifact/aria/package/VraNgPackageStore.java b/...pscoe/iac/artifact/VraNgPackageStore.java → ...ifact/aria/package/VraNgPackageStore.java
@@ -31,7 +31,7 @@
 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.rest.RestClientVraNg;
+import com.vmware.pscoe.iac.artifact.aria.rest.RestClientVraNg;
 import com.vmware.pscoe.iac.artifact.aria.store.VraNgTypeStoreFactory;
 
 import org.slf4j.Logger;

diff --git a/...oe/iac/artifact/rest/RestClientVraNg.java → ...c/artifact/aria/rest/RestClientVraNg.java b/...oe/iac/artifact/rest/RestClientVraNg.java → ...c/artifact/aria/rest/RestClientVraNg.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.rest;
+package com.vmware.pscoe.iac.artifact.aria.rest;
 
 import java.io.File;
 import java.net.URISyntaxException;
@@ -73,7 +73,7 @@ public class RestClientVraNg extends RestClientVraNgPrimitive {
 	 * @param configuration configuration vra
 	 * @param restTemplate  rest template
 	 */
-	protected RestClientVraNg(final ConfigurationVraNg configuration, final RestTemplate restTemplate) {
+	public RestClientVraNg(final ConfigurationVraNg configuration, final RestTemplate restTemplate) {
 		super(configuration, restTemplate);
 	}
 

diff --git a/...rest/RestClientVraNgAuthNInterceptor.java → ...rest/RestClientVraNgAuthNInterceptor.java b/...rest/RestClientVraNgAuthNInterceptor.java → ...rest/RestClientVraNgAuthNInterceptor.java
@@ -12,13 +12,14 @@
  * 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.rest;
+package com.vmware.pscoe.iac.artifact.aria.rest;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.jayway.jsonpath.DocumentContext;
 import com.jayway.jsonpath.JsonPath;
 import com.vmware.pscoe.iac.artifact.aria.configuration.ConfigurationVraNg;
+import com.vmware.pscoe.iac.artifact.rest.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.*;
@@ -47,7 +48,7 @@ public class RestClientVraNgAuthNInterceptor extends RestClientRequestIntercepto
 	private String tokenType;
 	private LocalDateTime tokenExpirationDate;
 
-	protected RestClientVraNgAuthNInterceptor(ConfigurationVraNg configuration, RestTemplate restTemplate) {
+	public RestClientVraNgAuthNInterceptor(ConfigurationVraNg configuration, RestTemplate restTemplate) {
 		super(configuration, restTemplate);
 		this.tokenType = DEFAULT_TOKEN_TYPE;
 	}
@@ -60,9 +61,9 @@ public ClientHttpResponse intercept(HttpRequest request, byte[] body, ClientHttp
 				acquireToken(request);
 			}
 			if (this.token != null) {
-			   request.getHeaders().add("Authorization", this.tokenType + " " + this.token);
+				request.getHeaders().add("Authorization", this.tokenType + " " + this.token);
 			}
- 
+
 			return execution.execute(request, body);
 		} catch (Exception e) {
 			throw new RuntimeException(e);
@@ -77,7 +78,8 @@ private void acquireToken(HttpRequest request) throws JsonProcessingException {
 		} else {
 			logger.info("Acquiring refresh token with credentials");
 			ResponseEntity<String> requestWithCredentialsResponse = this.requestWithCredentials(request);
-			DocumentContext requestWithCredentialsResponseBody = JsonPath.parse(requestWithCredentialsResponse.getBody());
+			DocumentContext requestWithCredentialsResponseBody = JsonPath
+					.parse(requestWithCredentialsResponse.getBody());
 			refreshToken = requestWithCredentialsResponseBody.read("$.refresh_token");
 		}
 
@@ -87,16 +89,18 @@ private void acquireToken(HttpRequest request) throws JsonProcessingException {
 		final int expiresIn = responseBody.jsonString().contains("expires_in") ? responseBody.read("$.expires_in") : 0;
 		this.tokenExpirationDate = now.plus(expiresIn, ChronoField.SECOND_OF_MINUTE.getBaseUnit());
 		this.token = responseBody.jsonString().contains("access_token") ? responseBody.read("$.access_token") : null;
-		String tokenTypeFromResponse = responseBody.jsonString().contains("token_type") ? responseBody.read("$.token_type") : null;
+		String tokenTypeFromResponse = responseBody.jsonString().contains("token_type")
+				? responseBody.read("$.token_type")
+				: null;
 		this.setTokenType(tokenTypeFromResponse);
 	}
 
 	private ResponseEntity<String> requestWithRefreshToken(HttpRequest request, String refreshToken) {
 		final URI tokenUri = UriComponentsBuilder.newInstance()
-			.scheme(request.getURI().getScheme())
-			.host(this.getConfiguration().getAuthHost())
-			.port(this.getConfiguration().getPort())
-			.path(SERVICE_REFRESH_TOKEN).build().toUri();
+				.scheme(request.getURI().getScheme())
+				.host(this.getConfiguration().getAuthHost())
+				.port(this.getConfiguration().getPort())
+				.path(SERVICE_REFRESH_TOKEN).build().toUri();
 
 		logger.info("Token URI: {}", tokenUri);
 		// Prepare Headers
@@ -114,12 +118,12 @@ private ResponseEntity<String> requestWithRefreshToken(HttpRequest request, Stri
 
 	private ResponseEntity<String> requestWithCredentials(HttpRequest request) throws JsonProcessingException {
 		final URI tokenUri = UriComponentsBuilder.newInstance()
-			.scheme(request.getURI().getScheme())
-			.host(this.getConfiguration().getAuthHost())
-			.port(this.getConfiguration().getPort())
-			.path(SERVICE_CREDENTIALS)
-			.queryParam("access_token")
-			.build().toUri();
+				.scheme(request.getURI().getScheme())
+				.host(this.getConfiguration().getAuthHost())
+				.port(this.getConfiguration().getPort())
+				.path(SERVICE_CREDENTIALS)
+				.queryParam("access_token")
+				.build().toUri();
 
 		logger.info("Auth URL: {}", tokenUri);
 
@@ -147,7 +151,8 @@ private ResponseEntity<String> requestWithCredentials(HttpRequest request) throw
 	}
 
 	private boolean isRequestInBlackList(HttpRequest request) {
-		return request.getURI().getPath().contains(SERVICE_REFRESH_TOKEN) || request.getURI().getPath().contains(SERVICE_CREDENTIALS);
+		return request.getURI().getPath().contains(SERVICE_REFRESH_TOKEN)
+				|| request.getURI().getPath().contains(SERVICE_CREDENTIALS);
 	}
 
 	private boolean hasValidToken() {
@@ -161,7 +166,7 @@ private boolean isValidTokenType(String tokenType) {
 	private void setTokenType(String newTokenType) {
 		if (this.isValidTokenType(newTokenType)) {
 			// Capitalized for case sensitive Auth schemes
-			this.tokenType = newTokenType.substring(0,1).toUpperCase() + newTokenType.substring(1).toLowerCase();
+			this.tokenType = newTokenType.substring(0, 1).toUpperCase() + newTokenType.substring(1).toLowerCase();
 		} else if (this.tokenType == null) {
 			this.tokenType = DEFAULT_TOKEN_TYPE;
 		}

diff --git a/...tifact/rest/RestClientVraNgPrimitive.java → ...t/aria/rest/RestClientVraNgPrimitive.java b/...tifact/rest/RestClientVraNgPrimitive.java → ...t/aria/rest/RestClientVraNgPrimitive.java
@@ -15,7 +15,7 @@
 /**
  * Package.
  */
-package com.vmware.pscoe.iac.artifact.rest;
+package com.vmware.pscoe.iac.artifact.aria.rest;
 
 import java.io.File;
 import java.io.IOException;
@@ -38,7 +38,7 @@
 import com.vmware.pscoe.iac.artifact.model.abx.AbxAction;
 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;
@@ -68,7 +68,7 @@
 import com.vmware.pscoe.iac.artifact.aria.model.VraNgSubscription;
 import com.vmware.pscoe.iac.artifact.aria.model.VraNgWorkflowContentSource;
 
-import com.vmware.pscoe.iac.artifact.utils.VraNgOrganizationUtil;
+import com.vmware.pscoe.iac.artifact.aria.utils.VraNgOrganizationUtil;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.hc.core5.net.URIBuilder;

diff --git a/...ct-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/AbstractVraNgStore.java b/...ct-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/AbstractVraNgStore.java
@@ -19,8 +19,8 @@
 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.rest.RestClientVraNg;
-import com.vmware.pscoe.iac.artifact.utils.VraNgIntegrationUtils;
+import com.vmware.pscoe.iac.artifact.aria.rest.RestClientVraNg;
+import com.vmware.pscoe.iac.artifact.aria.utils.VraNgIntegrationUtils;
 
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;

diff --git a/...ager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgApprovalPolicyStore.java b/...ager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgApprovalPolicyStore.java
@@ -20,7 +20,7 @@
 import com.google.gson.stream.JsonReader;
 import com.vmware.pscoe.iac.artifact.aria.model.VraNgApprovalPolicy;
 import com.vmware.pscoe.iac.artifact.store.filters.CustomFolderFileFilter;
-import com.vmware.pscoe.iac.artifact.utils.VraNgOrganizationUtil;
+import com.vmware.pscoe.iac.artifact.aria.utils.VraNgOrganizationUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/...t-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgBlueprintStore.java b/...t-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgBlueprintStore.java
@@ -21,7 +21,7 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonPrimitive;
 import com.google.gson.stream.JsonReader;
-import com.vmware.pscoe.iac.artifact.VraNgReleaseManager;
+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.store.filters.CustomFolderFolderFilter;

diff --git a/...rc/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgContentSharingPolicyStore.java b/...rc/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgContentSharingPolicyStore.java
@@ -39,7 +39,7 @@
 import com.vmware.pscoe.iac.artifact.aria.model.VraNgContentSourceBase;
 import com.vmware.pscoe.iac.artifact.aria.model.VraNgItem;
 import com.vmware.pscoe.iac.artifact.store.filters.CustomFolderFileFilter;
-import com.vmware.pscoe.iac.artifact.utils.VraNgOrganizationUtil;
+import com.vmware.pscoe.iac.artifact.aria.utils.VraNgOrganizationUtil;
 
 public class VraNgContentSharingPolicyStore extends AbstractVraNgStore {
 	/**

diff --git a/...nager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgContentSourceStore.java b/...nager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgContentSourceStore.java
@@ -34,9 +34,9 @@
 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.rest.RestClientVraNg;
+import com.vmware.pscoe.iac.artifact.aria.rest.RestClientVraNg;
 import com.vmware.pscoe.iac.artifact.store.filters.CustomFolderFileFilter;
-import com.vmware.pscoe.iac.artifact.utils.VraNgIntegrationUtils;
+import com.vmware.pscoe.iac.artifact.aria.utils.VraNgIntegrationUtils;
 import org.apache.commons.lang3.StringUtils;
 
 /**

diff --git a/...ager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgCustomResourceStore.java b/...ager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgCustomResourceStore.java
@@ -25,10 +25,10 @@
 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.rest.RestClientVraNg;
+import com.vmware.pscoe.iac.artifact.aria.rest.RestClientVraNg;
 import com.vmware.pscoe.iac.artifact.store.filters.CustomFolderFileFilter;
-import com.vmware.pscoe.iac.artifact.utils.VraNgOrganizationUtil;
-import com.vmware.pscoe.iac.artifact.utils.VraNgProjectUtil;
+import com.vmware.pscoe.iac.artifact.aria.utils.VraNgOrganizationUtil;
+import com.vmware.pscoe.iac.artifact.aria.utils.VraNgProjectUtil;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.FilenameUtils;
 

diff --git a/...r/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgDay2ActionsPolicyStore.java b/...r/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgDay2ActionsPolicyStore.java
@@ -20,7 +20,7 @@
 import com.google.gson.stream.JsonReader;
 import com.vmware.pscoe.iac.artifact.aria.model.VraNgDay2ActionsPolicy;
 import com.vmware.pscoe.iac.artifact.store.filters.CustomFolderFileFilter;
-import com.vmware.pscoe.iac.artifact.utils.VraNgOrganizationUtil;
+import com.vmware.pscoe.iac.artifact.aria.utils.VraNgOrganizationUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/...c/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgDeploymentLimitPolicyStore.java b/...c/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgDeploymentLimitPolicyStore.java
@@ -20,7 +20,7 @@
 import com.google.gson.stream.JsonReader;
 import com.vmware.pscoe.iac.artifact.aria.model.VraNgDeploymentLimitPolicy;
 import com.vmware.pscoe.iac.artifact.store.filters.CustomFolderFileFilter;
-import com.vmware.pscoe.iac.artifact.utils.VraNgOrganizationUtil;
+import com.vmware.pscoe.iac.artifact.aria.utils.VraNgOrganizationUtil;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/...manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgEntitlementStore.java b/...manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgEntitlementStore.java
@@ -39,7 +39,7 @@
 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.rest.RestClientVraNg;
+import com.vmware.pscoe.iac.artifact.aria.rest.RestClientVraNg;
 import com.vmware.pscoe.iac.artifact.store.filters.CustomFolderFileFilter;
 import org.apache.commons.lang3.StringUtils;
 import org.yaml.snakeyaml.DumperOptions;

diff --git a/...manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgLeasePolicyStore.java b/...manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgLeasePolicyStore.java
@@ -25,7 +25,7 @@
 import java.util.List;
 import java.util.Map;
 
-import com.vmware.pscoe.iac.artifact.utils.VraNgOrganizationUtil;
+import com.vmware.pscoe.iac.artifact.aria.utils.VraNgOrganizationUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/...nager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgPropertyGroupStore.java b/...nager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgPropertyGroupStore.java
@@ -31,10 +31,10 @@
 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.rest.RestClientVraNg;
+import com.vmware.pscoe.iac.artifact.aria.rest.RestClientVraNg;
 
 import com.vmware.pscoe.iac.artifact.store.filters.CustomFolderFileFilter;
-import com.vmware.pscoe.iac.artifact.utils.VraNgOrganizationUtil;
+import com.vmware.pscoe.iac.artifact.aria.utils.VraNgOrganizationUtil;
 
 import static com.vmware.pscoe.iac.artifact.aria.store.VraNgDirs.DIR_PROPERTY_GROUPS;
 

diff --git a/...ager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgResourceActionStore.java b/...ager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgResourceActionStore.java
@@ -24,7 +24,7 @@
 import com.vmware.pscoe.iac.artifact.model.Package;
 import com.vmware.pscoe.iac.artifact.aria.model.VraNgResourceAction;
 import com.vmware.pscoe.iac.artifact.store.filters.CustomFolderFileFilter;
-import com.vmware.pscoe.iac.artifact.utils.VraNgProjectUtil;
+import com.vmware.pscoe.iac.artifact.aria.utils.VraNgProjectUtil;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.FilenameUtils;
 

diff --git a/...src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgResourceQuotaPolicyStore.java b/...src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgResourceQuotaPolicyStore.java
@@ -32,7 +32,7 @@
 import com.vmware.pscoe.iac.artifact.aria.model.VraNgResourceQuotaPolicy;
 import com.vmware.pscoe.iac.artifact.store.filters.CustomFolderFileFilter;
 
-import com.vmware.pscoe.iac.artifact.utils.VraNgOrganizationUtil;
+import com.vmware.pscoe.iac.artifact.aria.utils.VraNgOrganizationUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/...anager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgSubscriptionStore.java b/...anager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgSubscriptionStore.java
@@ -26,9 +26,9 @@
 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.rest.RestClientVraNg;
+import com.vmware.pscoe.iac.artifact.aria.rest.RestClientVraNg;
 import com.vmware.pscoe.iac.artifact.store.filters.CustomFolderFileFilter;
-import com.vmware.pscoe.iac.artifact.utils.VraNgOrganizationUtil;
+import com.vmware.pscoe.iac.artifact.aria.utils.VraNgOrganizationUtil;
 
 import org.apache.commons.io.FileUtils;
 

diff --git a/...manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgTypeStoreFactory.java b/...manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VraNgTypeStoreFactory.java
@@ -22,7 +22,7 @@
 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.rest.RestClientVraNg;
+import com.vmware.pscoe.iac.artifact.aria.rest.RestClientVraNg;
 
 import static com.vmware.pscoe.iac.artifact.aria.model.VraNgPackageContent.ContentType.APPROVAL_POLICY;
 import static com.vmware.pscoe.iac.artifact.aria.model.VraNgPackageContent.ContentType.BLUEPRINT;

diff --git a/...nager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VrangContentSourceUtils.java b/...nager/src/main/java/com/vmware/pscoe/iac/artifact/aria/store/VrangContentSourceUtils.java
@@ -25,7 +25,7 @@
 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.rest.RestClientVraNg;
+import com.vmware.pscoe.iac.artifact.aria.rest.RestClientVraNg;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;