Code Review
/
portal
/
ric-dashboard.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add E2 manager client and controller
[portal/ric-dashboard.git]
/
webapp-backend
/
src
/
main
/
java
/
org
/
oranosc
/
ric
/
portal
/
dash
/
XappManagerConfiguration.java
diff --git
a/webapp-backend/src/main/java/org/oranosc/ric/portal/dash/XappManagerConfiguration.java
b/webapp-backend/src/main/java/org/oranosc/ric/portal/dash/XappManagerConfiguration.java
index
b0f04a7
..
bdee12c
100644
(file)
--- a/
webapp-backend/src/main/java/org/oranosc/ric/portal/dash/XappManagerConfiguration.java
+++ b/
webapp-backend/src/main/java/org/oranosc/ric/portal/dash/XappManagerConfiguration.java
@@
-19,16
+19,14
@@
*/
package org.oranosc.ric.portal.dash;
*/
package org.oranosc.ric.portal.dash;
-import org.oranosc.ric.
portal.dashboard.xmc
.api.DefaultApi;
-import org.oranosc.ric.
portal.dashboard.xmc
.invoker.ApiClient;
+import org.oranosc.ric.
xappmgr.client
.api.DefaultApi;
+import org.oranosc.ric.
xappmgr.client
.invoker.ApiClient;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.client.RestTemplate;
@Configuration
import org.springframework.context.annotation.Configuration;
import org.springframework.web.client.RestTemplate;
@Configuration
-@ComponentScan("org.oranosc.ric.portal")
public class XappManagerConfiguration {
@Value("${xapp.manager.base.url}")
public class XappManagerConfiguration {
@Value("${xapp.manager.base.url}")
@@
-40,20
+38,10
@@
public class XappManagerConfiguration {
* @return Instance of ApiClient configured from properties
*/
@Bean
* @return Instance of ApiClient configured from properties
*/
@Bean
- public ApiClient
a
piClient() {
- ApiClient apiClient = new ApiClient();
+ public ApiClient
xappA
piClient() {
+ ApiClient apiClient = new ApiClient(
new RestTemplate()
);
apiClient.setBasePath(xappManagerBaseUrl);
return apiClient;
}
apiClient.setBasePath(xappManagerBaseUrl);
return apiClient;
}
- /**
- * Required by autowired constructor {@link ApiClient#ApiClient(RestTemplate)}
- *
- * @return Instance of RestTemplate
- */
- @Bean
- public RestTemplate restTemplate() {
- return new RestTemplate();
- }
-
}
}