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%2FAnrXappConfiguration.java;h=4573ff0f2f0fc1599386df473db46ed1a29ec7c7;hb=5c6a886668da88b66383d590486297ed82827090;hp=3a2e810b6d84bdc3a1119ec65fda367c0abbd9f2;hpb=0d109ab39573a2d912bc1d963ab93f3006730721;p=portal%2Fric-dashboard.git

diff --git a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/AnrXappConfiguration.java b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/AnrXappConfiguration.java
index 3a2e810b..4573ff0f 100644
--- a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/AnrXappConfiguration.java
+++ b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/AnrXappConfiguration.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.anrxapp.client.api.HealthApi;
 import org.oransc.ric.anrxapp.client.api.NcrtApi;
@@ -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;
 
 /**
@@ -44,27 +45,29 @@ public class AnrXappConfiguration {
 	private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
 	// Populated by the autowired constructor
-	private final String anrXappBasepath;
+	private final String anrXappUrl;
 
 	@Autowired
-	public AnrXappConfiguration(@Value("${anrxapp.basepath}") final String anrXappBasepath) {
-		Assert.notNull(anrXappBasepath, "base path must not be null");
-		logger.info("Configuring ANR client at base path {}", anrXappBasepath);
-		this.anrXappBasepath = anrXappBasepath;
+	public AnrXappConfiguration(@Value("${anrxapp.url}") final String url) throws MalformedURLException {
+		logger.info("Configuring ANR client at base URL {}", url);
+		new URL(url);
+		this.anrXappUrl = url;
 	}
 
 	private ApiClient apiClient() {
 		ApiClient apiClient = new ApiClient(new RestTemplate());
-		apiClient.setBasePath(anrXappBasepath);
+		apiClient.setBasePath(anrXappUrl);
 		return apiClient;
 	}
 
 	@Bean
+	// The bean (method) name must be globally unique
 	public HealthApi anrHealthApi() {
 		return new HealthApi(apiClient());
 	}
 
 	@Bean
+	// The bean (method) name must be globally unique
 	public NcrtApi anrNcrtApi() {
 		return new NcrtApi(apiClient());
 	}