Split URL properties into prefix/suffix

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

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 4573ff0..9cffa4b 100644 (file)
--- 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,8 +20,8 @@
 package org.oransc.ric.portal.dashboard.config;
 
 import java.lang.invoke.MethodHandles;
-import java.net.MalformedURLException;
-import java.net.URL;
+import java.net.URI;
+import java.net.URISyntaxException;
 
 import org.oransc.ric.anrxapp.client.api.HealthApi;
 import org.oransc.ric.anrxapp.client.api.NcrtApi;
@@ -48,10 +48,12 @@ public class AnrXappConfiguration {
        private final String anrXappUrl;
 
        @Autowired
-       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;
+       public AnrXappConfiguration(@Value("${anrxapp.url.prefix}") final String urlPrefix,
+                       @Value("${anrxapp.url.suffix}") final String urlSuffix) throws URISyntaxException {
+               logger.debug("ctor prefix '{}' suffix '{}'", urlPrefix, urlSuffix);
+               URI uri = new URI(urlPrefix.trim() + "/" + urlSuffix.trim()).normalize();
+               anrXappUrl = uri.toString();
+               logger.info("Configuring ANR client at URL {}", anrXappUrl);
        }
 
        private ApiClient apiClient() {