Show K8S pod statuses queried from CaaS-Ingress

[portal/ric-dashboard.git] / webapp-backend / src / main / java / org / oransc / ric / portal / dashboard / config / A1MediatorConfiguration.java

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 2ed6b9a..23fae06 100644 (file)
--- 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,8 +20,6 @@
 package org.oransc.ric.portal.dashboard.config;
 
 import java.lang.invoke.MethodHandles;
-import java.net.MalformedURLException;
-import java.net.URL;
 
 import org.oransc.ric.a1med.client.api.A1MediatorApi;
 import org.oransc.ric.a1med.client.invoker.ApiClient;
@@ -33,13 +31,14 @@ 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
  * container.
  */
 @Configuration
-@Profile("!mock")
+@Profile("!test")
 public class A1MediatorConfiguration {
 
        private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@@ -48,10 +47,12 @@ public class A1MediatorConfiguration {
        private final String a1medUrl;
 
        @Autowired
-       public A1MediatorConfiguration(@Value("${a1med.url}") final String url) throws MalformedURLException {
-               logger.info("Configuring A1 Mediator at URL {}", url);
-               new URL(url);
-               this.a1medUrl = url;
+       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() {
@@ -61,6 +62,7 @@ public class A1MediatorConfiguration {
        }
 
        @Bean
+       // The bean (method) name must be globally unique
        public A1MediatorApi a1MediatorApi() {
                return new A1MediatorApi(apiClient());
        }