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%2FA1MediatorConfiguration.java;h=0c8f4f21cffeabbc982a64a66a92ec939eb43645;hb=b8f4e986970eab6cfa5729c24680f2816f056edb;hp=5ea4b0572726a3cbcc5c10dfd7c153fe164b5595;hpb=9457e10be41282c973744cdced34cdeff65837f7;p=portal%2Fric-dashboard.git

diff --git a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/A1MediatorConfiguration.java b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/A1MediatorConfiguration.java
index 5ea4b057..0c8f4f21 100644
--- a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/A1MediatorConfiguration.java
+++ b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/A1MediatorConfiguration.java
@@ -20,6 +20,8 @@
 package org.oransc.ric.portal.dashboard.config;
 
 import java.lang.invoke.MethodHandles;
+import java.net.URI;
+import java.net.URISyntaxException;
 
 import org.oransc.ric.a1med.client.api.A1MediatorApi;
 import org.oransc.ric.a1med.client.invoker.ApiClient;
@@ -30,7 +32,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,22 +45,25 @@ public class A1MediatorConfiguration {
 	private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
 	// Populated by the autowired constructor
-	private final String a1medBasepath;
+	private final String a1medUrl;
 
 	@Autowired
-	public A1MediatorConfiguration(@Value("${a1med.basepath}") final String a1medBasepath) {
-		Assert.notNull(a1medBasepath, "base path must not be null");
-		logger.info("Configuring A1 Mediator at base path {}", a1medBasepath);
-		this.a1medBasepath = a1medBasepath;
+	public A1MediatorConfiguration(@Value("${a1med.url.prefix}") final String urlPrefix, //
+			@Value("${a1med.url.suffix}") final String urlSuffix) throws URISyntaxException {
+		logger.debug("ctor prefix '{}' suffix '{}'", urlPrefix, urlSuffix);
+		URI uri = new URI(urlPrefix.trim() + "/" + urlSuffix.trim()).normalize();
+		a1medUrl = uri.toString();
+		logger.info("Configuring A1 Mediator at URL {}", a1medUrl);
 	}
 
 	private ApiClient apiClient() {
 		ApiClient apiClient = new ApiClient(new RestTemplate());
-		apiClient.setBasePath(a1medBasepath);
+		apiClient.setBasePath(a1medUrl);
 		return apiClient;
 	}
 
 	@Bean
+	// The bean (method) name must be globally unique
 	public A1MediatorApi a1MediatorApi() {
 		return new A1MediatorApi(apiClient());
 	}