X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-backend%2Fsrc%2Fmain%2Fjava%2Forg%2Foransc%2Fric%2Fportal%2Fdashboard%2Fconfig%2FAppManagerConfiguration.java;h=ffb5db64547f6f6e2d7422e6b1127fbe850a9f81;hb=53f1fcf033e3a166d7203e0a1c5e0971f9c6bc16;hp=94ba3575f9f835a812fe50854a65b74bfb5a6db8;hpb=6dd828008e1c553b5b4ac6e45af0ccf73c2ed92e;p=portal%2Fric-dashboard.git

diff --git a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/AppManagerConfiguration.java b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/AppManagerConfiguration.java
index 94ba3575..ffb5db64 100644
--- a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/AppManagerConfiguration.java
+++ b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/AppManagerConfiguration.java
@@ -21,9 +21,7 @@ package org.oransc.ric.portal.dashboard.config;
 
 import java.lang.invoke.MethodHandles;
 
-import org.oransc.ric.plt.appmgr.client.api.HealthApi;
-import org.oransc.ric.plt.appmgr.client.api.XappApi;
-import org.oransc.ric.plt.appmgr.client.invoker.ApiClient;
+import org.oransc.ric.portal.dashboard.model.RicInstanceList;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,11 +29,9 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
-import org.springframework.web.client.RestTemplate;
-import org.springframework.web.util.DefaultUriBuilderFactory;
 
 /**
- * Creates an xApp manager client as a bean to be managed by the Spring
+ * Creates an App manager client builder as a bean to be managed by the Spring
  * container.
  */
 @Configuration
@@ -45,38 +41,21 @@ public class AppManagerConfiguration {
 	private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
 	// Populated by the autowired constructor
-	private final String xappMgrUrl;
+	private final String urlSuffix;
+	private final RicInstanceList instanceConfig;
 
 	@Autowired
-	public AppManagerConfiguration(@Value("${appmgr.url.prefix}") final String urlPrefix,
-			@Value("${appmgr.url.suffix}") final String urlSuffix) {
-		logger.debug("ctor prefix '{}' suffix '{}'", urlPrefix, urlSuffix);
-		xappMgrUrl = new DefaultUriBuilderFactory(urlPrefix.trim()).builder().path(urlSuffix.trim()).build().normalize()
-				.toString();
-		logger.info("Configuring App Manager at URL {}", xappMgrUrl);
+	public AppManagerConfiguration(@Value("${appmgr.url.suffix}") final String urlSuffix,
+			final RicInstanceList instanceConfig) {
+		logger.info("ctor: URL suffix {}", urlSuffix);
+		this.urlSuffix = urlSuffix;
+		this.instanceConfig = instanceConfig;
 	}
 
-	private ApiClient apiClient() {
-		ApiClient apiClient = new ApiClient(new RestTemplate());
-		apiClient.setBasePath(xappMgrUrl);
-		return apiClient;
-	}
-
-	/**
-	 * @return A HealthApi with an ApiClient configured from properties
-	 */
 	@Bean
 	// The bean (method) name must be globally unique
-	public HealthApi xappMgrHealthApi() {
-		return new HealthApi(apiClient());
+	public AppManagerApiBuilder appManagerApiBuilder() {
+		return new AppManagerApiBuilder(instanceConfig, urlSuffix);
 	}
 
-	/**
-	 * @return An XappApi with an ApiClient configured from properties
-	 */
-	@Bean
-	// The bean (method) name must be globally unique
-	public XappApi xappMgrXappApi() {
-		return new XappApi(apiClient());
-	}
 }