X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=webapp-backend%2Fsrc%2Fmain%2Fjava%2Forg%2Foranosc%2Fric%2Fportal%2Fdash%2FXappManagerConfiguration.java;fp=webapp-backend%2Fsrc%2Fmain%2Fjava%2Forg%2Foranosc%2Fric%2Fportal%2Fdash%2FXappManagerConfiguration.java;h=bdee12cc68014a170a75ab3da5271b90e9ae2984;hb=056a49df629daf4189a34c37ee30b1f5ad88a59d;hp=b0f04a77af47c701d3fa16511e301707bf50abbb;hpb=e2cbc4d0304646febf7e2cbe0dccdf9840189222;p=portal%2Fric-dashboard.git

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 b0f04a77..bdee12cc 100644
--- 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;
 
-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.context.annotation.ComponentScan;
 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}")
@@ -40,20 +38,10 @@ public class XappManagerConfiguration {
 	 * @return Instance of ApiClient configured from properties
 	 */
 	@Bean
-	public ApiClient apiClient() {
-		ApiClient apiClient = new ApiClient();
+	public ApiClient xappApiClient() {
+		ApiClient apiClient = new ApiClient(new RestTemplate());
 		apiClient.setBasePath(xappManagerBaseUrl);
 		return apiClient;
 	}
 
-	/**
-	 * Required by autowired constructor {@link ApiClient#ApiClient(RestTemplate)}
-	 * 
-	 * @return Instance of RestTemplate
-	 */
-	@Bean
-	public RestTemplate restTemplate() {
-		return new RestTemplate();
-	}
-
 }