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=7ecd95cf14b0298cc46209e68c05c1205d364673;hb=a91a1032725b91b493c060937b3f27ac9e62807e;hp=00cd9390a32c97ee4810534e5a9a67aeac391155;hpb=dd3e10c0442cb16c08e9a8ecee429576396accac;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 00cd9390..7ecd95cf 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
@@ -20,6 +20,8 @@
 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.HealthApi;
 import org.oransc.ric.xappmgr.client.api.XappApi;
@@ -31,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;
 
 /**
@@ -45,18 +46,18 @@ 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 path {}", url);
+		new URL(url);
+		this.xappMgrUrl = url;
 	}
 
 	private ApiClient apiClient() {
 		ApiClient apiClient = new ApiClient(new RestTemplate());
-		apiClient.setBasePath(xappMgrBasepath);
+		apiClient.setBasePath(xappMgrUrl);
 		return apiClient;
 	}