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=2e8efb2b3916fbc8e179af026f929861af0f06c4;hb=a0180adc6a1e1ec09472549596428b70d48db3fc;hp=0101fc930d78a55be21d5e0eace5b50c15dd4fc2;hpb=93a44cb851a49c923126f32016646860d104075c;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 0101fc93..2e8efb2b 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
@@ -2,7 +2,7 @@
  * ========================LICENSE_START=================================
  * O-RAN-SC
  * %%
- * Copyright (C) 2019 AT&T Intellectual Property and Nokia
+ * Copyright (C) 2019 AT&T Intellectual Property
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,8 +21,7 @@ package org.oransc.ric.portal.dashboard.config;
 
 import java.lang.invoke.MethodHandles;
 
-import org.oransc.ric.a1med.client.api.A1MediatorApi;
-import org.oransc.ric.a1med.client.invoker.ApiClient;
+import org.oransc.ric.portal.dashboard.model.RicRegionList;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,41 +29,33 @@ 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.web.client.RestTemplate;
-import org.springframework.web.util.DefaultUriBuilderFactory;
 
 /**
- * Creates an A1 mediator client as a bean to be managed by the Spring
+ * Creates an A1 mediator client builder as a bean to be managed by the Spring
  * container.
  */
 @Configuration
-@Profile("!mock")
+@Profile("!test")
 public class A1MediatorConfiguration {
 
 	private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
 	// Populated by the autowired constructor
-	private final String a1medUrl;
+	private final String urlSuffix;
+	private final RicRegionList instanceConfig;
 
 	@Autowired
-	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(a1medUrl);
-		return apiClient;
+	public A1MediatorConfiguration(@Value("${a1med.url.suffix}") final String urlSuffix,
+			final RicRegionList instanceConfig) {
+		logger.info("ctor: URL suffix {}", urlSuffix);
+		this.urlSuffix = urlSuffix;
+		this.instanceConfig = instanceConfig;
 	}
 
 	@Bean
 	// The bean (method) name must be globally unique
-	public A1MediatorApi a1MediatorApi() {
-		return new A1MediatorApi(apiClient());
+	public A1MediatorApiBuilder a1MediatorApiBuilder() {
+		return new A1MediatorApiBuilder(instanceConfig, urlSuffix);
 	}
 
 }