X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=webapp-backend%2Fsrc%2Fmain%2Fjava%2Forg%2Foransc%2Fric%2Fportal%2Fdashboard%2Fconfig%2FAnrXappConfiguration.java;h=33a5384a6c4358c78f4a5c7fe8014915662eb31d;hb=93a44cb851a49c923126f32016646860d104075c;hp=9cffa4b2a1b47d59f648bb13cc5527fa4b6ba42a;hpb=6b1a3570356fd1a5624ea64db8d1f029ce0ab002;p=portal%2Fric-dashboard.git 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 9cffa4b2..33a5384a 100644 --- 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,6 @@ package org.oransc.ric.portal.dashboard.config; import java.lang.invoke.MethodHandles; -import java.net.URI; -import java.net.URISyntaxException; import org.oransc.ric.anrxapp.client.api.HealthApi; import org.oransc.ric.anrxapp.client.api.NcrtApi; @@ -34,6 +32,7 @@ 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 instances of the ANR xApp client APIs. @@ -49,10 +48,10 @@ public class AnrXappConfiguration { @Autowired public AnrXappConfiguration(@Value("${anrxapp.url.prefix}") final String urlPrefix, - @Value("${anrxapp.url.suffix}") final String urlSuffix) throws URISyntaxException { + @Value("${anrxapp.url.suffix}") final String urlSuffix) { logger.debug("ctor prefix '{}' suffix '{}'", urlPrefix, urlSuffix); - URI uri = new URI(urlPrefix.trim() + "/" + urlSuffix.trim()).normalize(); - anrXappUrl = uri.toString(); + anrXappUrl = new DefaultUriBuilderFactory(urlPrefix.trim()).builder().path(urlSuffix.trim()).build().normalize() + .toString(); logger.info("Configuring ANR client at URL {}", anrXappUrl); }