* ========================LICENSE_START=================================
* O-RAN-SC
* %%
- * Copyright (C) 2019 AT&T Intellectual Property and Nokia
+ * Copyright (C) 2019 AT&T Intellectual Property
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
package org.oransc.ric.portal.dashboard.config;
import java.lang.invoke.MethodHandles;
-import java.net.MalformedURLException;
-import java.net.URL;
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());
private final String xappMgrUrl;
@Autowired
- public AppManagerConfiguration(@Value("${xappmgr.url}") final String url) throws MalformedURLException {
- logger.info("Configuring xApp Manager at base URL {}", url);
- new URL(url);
- this.xappMgrUrl = url;
+ public AppManagerConfiguration(@Value("${appmgr.url.prefix}") final String urlPrefix,
+ @Value("${appmgr.url.suffix}") final String urlSuffix) {
+ logger.debug("ctor prefix '{}' suffix '{}'", urlPrefix, urlSuffix);
+ xappMgrUrl = new DefaultUriBuilderFactory(urlPrefix.trim()).builder().path(urlSuffix.trim()).build().normalize()
+ .toString();
+ logger.info("Configuring App Manager at URL {}", xappMgrUrl);
}
private ApiClient apiClient() {