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%2FXappManagerConfiguration.java;h=1b699de6e056b2cc99f8349e59ae214a7909339c;hb=1fde0c3b93c9cf75b9e48382f298f644b03fa249;hp=3714b824341bb7bc2e5b679e39dabe6f247ad09c;hpb=f660cae7a447b60d84ef75f7c2bcbf62412d4579;p=portal%2Fric-dashboard.git

diff --git a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/XappManagerConfiguration.java b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/XappManagerConfiguration.java
index 3714b824..1b699de6 100644
--- a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/XappManagerConfiguration.java
+++ b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/XappManagerConfiguration.java
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
@@ -20,8 +20,11 @@
 package org.oransc.ric.portal.dashboard.config;
 
 import java.lang.invoke.MethodHandles;
+import java.net.MalformedURLException;
+import java.net.URL;
 
-import org.oransc.ric.xappmgr.client.api.DefaultApi;
+import org.oransc.ric.xappmgr.client.api.HealthApi;
+import org.oransc.ric.xappmgr.client.api.XappApi;
 import org.oransc.ric.xappmgr.client.invoker.ApiClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -30,7 +33,6 @@ 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.util.Assert;
 import org.springframework.web.client.RestTemplate;
 
 /**
@@ -44,23 +46,36 @@ public class XappManagerConfiguration {
 	private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
 	// Populated by the autowired constructor
-	private final String xappMgrBasepath;
+	private final String xappMgrUrl;
 
 	@Autowired
-	public XappManagerConfiguration(@Value("${xappmgr.basepath}") final String xappMgrBasepath) {
-		Assert.notNull(xappMgrBasepath, "base path must not be null");
-		logger.info("Configuring xApp Manager at base path {}", xappMgrBasepath);
-		this.xappMgrBasepath = xappMgrBasepath;
+	public XappManagerConfiguration(@Value("${xappmgr.url}") final String url) throws MalformedURLException {
+		logger.info("Configuring xApp Manager at base URL {}", url);
+		new URL(url);
+		this.xappMgrUrl = url;
+	}
+
+	private ApiClient apiClient() {
+		ApiClient apiClient = new ApiClient(new RestTemplate());
+		apiClient.setBasePath(xappMgrUrl);
+		return apiClient;
 	}
 
 	/**
-	 * @return A DefaultApi with an ApiClient configured from properties
+	 * @return A HealthApi with an ApiClient configured from properties
 	 */
 	@Bean
-	public DefaultApi xappClient() {
-		ApiClient apiClient = new ApiClient(new RestTemplate());
-		apiClient.setBasePath(xappMgrBasepath);
-		return new DefaultApi(apiClient);
+	// The bean (method) name must be globally unique
+	public HealthApi xappMgrHealthApi() {
+		return new HealthApi(apiClient());
 	}
 
+	/**
+	 * @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());
+	}
 }