Upgrade to E2 spec of 2 May 2019

[portal/ric-dashboard.git] / webapp-backend / src / main / java / org / oransc / ric / portal / dashboard / config / E2ManagerConfiguration.java

diff --git a/webapp-backend/src/main/java/org/oranosc/ric/portal/dash/config/E2ManagerConfiguration.java b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/E2ManagerConfiguration.java
similarity index 76%
rename from webapp-backend/src/main/java/org/oranosc/ric/portal/dash/config/E2ManagerConfiguration.java
rename to webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/E2ManagerConfiguration.java
index 6498ee1..3b610b5 100644 (file)
--- a/webapp-backend/src/main/java/org/oranosc/ric/portal/dash/config/E2ManagerConfiguration.java
+++ b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/E2ManagerConfiguration.java
@@ -17,12 +17,14 @@
  * limitations under the License.
  * ========================LICENSE_END===================================
  */
-package org.oranosc.ric.portal.dash.config;
+package org.oransc.ric.portal.dashboard.config;
 
 import java.lang.invoke.MethodHandles;
 
-import org.oranosc.ric.e2mgr.client.api.DefaultApi;
-import org.oranosc.ric.e2mgr.client.invoker.ApiClient;
+import org.oransc.ric.e2mgr.client.api.EndcSetupRequestApi;
+import org.oransc.ric.e2mgr.client.api.HealthCheckApi;
+import org.oransc.ric.e2mgr.client.api.X2SetupRequestApi;
+import org.oransc.ric.e2mgr.client.invoker.ApiClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -52,14 +54,25 @@ public class E2ManagerConfiguration {
                this.e2mgrBasepath = e2mgrBasepath;
        }
 
-       /**
-        * @return A DefaultApi with an ApiClient configured from properties
-        */
-       @Bean
-       public DefaultApi e2ManagerClient() {
+       private ApiClient apiClient() {
                ApiClient apiClient = new ApiClient(new RestTemplate());
                apiClient.setBasePath(e2mgrBasepath);
-               return new DefaultApi(apiClient);
+               return apiClient;
+       }
+
+       @Bean
+       public EndcSetupRequestApi endcSetupRequestApi() {
+               return new EndcSetupRequestApi(apiClient());
+       }
+
+       @Bean
+       public HealthCheckApi healthCheckApi() {
+               return new HealthCheckApi(apiClient());
+       }
+
+       @Bean
+       public X2SetupRequestApi x2SetupRequestApi() {
+               return new X2SetupRequestApi(apiClient());
        }
 
 }