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%2FAppManagerConfiguration.java;h=93aadf69c31061eb3777ccd409e8d0849929f0a1;hb=93a44cb851a49c923126f32016646860d104075c;hp=889a07aa53c7dbd009cf1d05127906570abee889;hpb=6b1a3570356fd1a5624ea64db8d1f029ce0ab002;p=portal%2Fric-dashboard.git diff --git a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/AppManagerConfiguration.java b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/AppManagerConfiguration.java index 889a07aa..93aadf69 100644 --- a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/AppManagerConfiguration.java +++ b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/AppManagerConfiguration.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.plt.appmgr.client.api.HealthApi; import org.oransc.ric.plt.appmgr.client.api.XappApi; @@ -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 an xApp manager client as a bean to be managed by the Spring @@ -50,10 +49,10 @@ public class AppManagerConfiguration { @Autowired public AppManagerConfiguration(@Value("${appmgr.url.prefix}") final String urlPrefix, - @Value("${appmgr.url.suffix}") final String urlSuffix) throws URISyntaxException { + @Value("${appmgr.url.suffix}") final String urlSuffix) { logger.debug("ctor prefix '{}' suffix '{}'", urlPrefix, urlSuffix); - URI uri = new URI(urlPrefix.trim() + "/" + urlSuffix.trim()).normalize(); - xappMgrUrl = uri.toString(); + xappMgrUrl = new DefaultUriBuilderFactory(urlPrefix.trim()).builder().path(urlSuffix.trim()).build().normalize() + .toString(); logger.info("Configuring App Manager at URL {}", xappMgrUrl); }