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=0101fc930d78a55be21d5e0eace5b50c15dd4fc2;hb=93a44cb851a49c923126f32016646860d104075c;hp=3cd81edef4975761770aebf9c845f4a44ac0bcec;hpb=ace0b71ff6e424193ff6d6519a529d279e7ade58;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 3cd81ede..0101fc93 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
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
@@ -30,11 +30,12 @@ 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;
+import org.springframework.web.util.DefaultUriBuilderFactory;
 
 /**
- * Creates an A1 mediator client as a bean to be managed by the Spring container.
+ * Creates an A1 mediator client as a bean to be managed by the Spring
+ * container.
  */
 @Configuration
 @Profile("!mock")
@@ -43,22 +44,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) {
+		logger.debug("ctor prefix '{}' suffix '{}'", urlPrefix, urlSuffix);
+		a1medUrl = new DefaultUriBuilderFactory(urlPrefix.trim()).builder().path(urlSuffix.trim()).build().normalize()
+				.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());
 	}