update sliapi-springboot

[ccsdk/sli/core.git] / sliapi / springboot / src / main / java / org / onap / ccsdk / sli / core / sliapi / springboot / controllers / swagger / RestconfApiController.java

diff --git a/sliapi/springboot/src/main/java/org/onap/ccsdk/sli/core/sliapi/springboot/RestconfApiController.java b/sliapi/springboot/src/main/java/org/onap/ccsdk/sli/core/sliapi/springboot/controllers/swagger/RestconfApiController.java
similarity index 79%
rename from sliapi/springboot/src/main/java/org/onap/ccsdk/sli/core/sliapi/springboot/RestconfApiController.java
rename to sliapi/springboot/src/main/java/org/onap/ccsdk/sli/core/sliapi/springboot/controllers/swagger/RestconfApiController.java
index 2da5490..10442d4 100644 (file)
--- a/sliapi/springboot/src/main/java/org/onap/ccsdk/sli/core/sliapi/springboot/RestconfApiController.java
+++ b/sliapi/springboot/src/main/java/org/onap/ccsdk/sli/core/sliapi/springboot/controllers/swagger/RestconfApiController.java
@@ -1,25 +1,26 @@
-package org.onap.ccsdk.sli.core.sliapi.springboot;
+package org.onap.ccsdk.sli.core.sliapi.springboot.controllers.swagger;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.gson.*;
-import org.onap.ccsdk.sli.core.sli.*;
-import org.onap.ccsdk.sli.core.sli.provider.base.*;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Properties;
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
+import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
+import org.onap.ccsdk.sli.core.sli.SvcLogicException;
+import org.onap.ccsdk.sli.core.sli.provider.base.SvcLogicServiceBase;
 import org.onap.ccsdk.sli.core.sliapi.model.ExecuteGraphInput;
 import org.onap.ccsdk.sli.core.sliapi.model.ResponseFields;
+import org.onap.ccsdk.sli.core.sliapi.springboot.controllers.swagger.RestconfApi;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Properties;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.gson.Gson;
+import com.google.gson.JsonObject;
 
 @javax.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2020-02-20T12:50:11.207-05:00")
 
@@ -29,54 +30,14 @@ public class RestconfApiController implements RestconfApi {
        private final ObjectMapper objectMapper;
        private final HttpServletRequest request;
 
-
-       private static SvcLogicServiceBase svc;
+  @Autowired
+  protected SvcLogicServiceBase svc;
        private static final Logger log = LoggerFactory.getLogger(RestconfApiController.class);
 
        @org.springframework.beans.factory.annotation.Autowired
        public RestconfApiController(ObjectMapper objectMapper, HttpServletRequest request) {
                this.objectMapper = objectMapper;
                this.request = request;
-
-               SvcLogicPropertiesProvider propProvider = new SvcLogicPropertiesProvider() {
-
-                       @Override
-                       public Properties getProperties() {
-                               Properties props = new Properties();
-                               String propPath = "src/main/resources/svclogic.properties";
-                               System.out.println(propPath);
-                               try (FileInputStream fileInputStream = new FileInputStream(propPath)) {
-                                       props = new Properties();
-                                       props.load(fileInputStream);
-                               } catch (final IOException e) {
-                                       log.error("Failed to load properties for file: {}", propPath,
-                                                       new ConfigurationException("Failed to load properties for file: " + propPath, e));
-                               }
-                               return props;
-                       }
-               };
-
-               SvcLogicStore store = null;
-               try {
-                       store = SvcLogicStoreFactory.getSvcLogicStore(propProvider.getProperties());
-               } catch (SvcLogicException e) {
-                       log.error("Cannot create SvcLogicStore", e);
-                       return;
-               }
-
-               String serviceLogicDirectory = System.getProperty("serviceLogicDirectory", "src/main/resources");
-               System.out.println("serviceLogicDirectory is " + serviceLogicDirectory);
-               SvcLogicLoader loader = new SvcLogicLoader(serviceLogicDirectory, store);
-
-               try {
-                       loader.loadAndActivate();
-               } catch (IOException e) {
-                       log.error("Cannot load directed graphs", e);
-               }
-               SvcLogicResolver resolver = new HashMapResolver();
-
-               svc = new SvcLogicServiceImplBase(store, resolver);
-
        }
 
        @Override