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;
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
* container.
*/
@Configuration
-@Profile("!mock")
+@Profile("!test")
public class AppManagerConfiguration {
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@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);
}