package org.onap.ccsdk.sli.core.sliapi.springboot.controllers.swagger;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Properties;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.gson.Gson;
+import com.google.gson.JsonObject;
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.onap.ccsdk.sli.core.sliapi.model.TestResult;
+import org.onap.ccsdk.sli.core.sliapi.model.TestResults;
+import org.onap.ccsdk.sli.core.sliapi.springboot.controllers.data.TestResultConfig;
+import org.onap.ccsdk.sli.core.sliapi.springboot.controllers.data.TestResultsConfigRepository;
+import org.onap.ccsdk.sli.core.sliapi.springboot.controllers.data.TestResultsOperationalRepository;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.context.annotation.ComponentScan;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.gson.Gson;
-import com.google.gson.JsonObject;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
+import java.util.*;
@javax.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2020-02-20T12:50:11.207-05:00")
@Controller
+@ComponentScan(basePackages = {"org.onap.ccsdk.sli.core.sliapi.springboot.*"})
+@EntityScan("org.onap.ccsdk.sli.core.sliapi.springboot.*")
public class RestconfApiController implements RestconfApi {
private final ObjectMapper objectMapper;
private final HttpServletRequest request;
- @Autowired
- protected SvcLogicServiceBase svc;
+ @Autowired
+ protected SvcLogicServiceBase svc;
+
+ @Autowired
+ private TestResultsConfigRepository testResultsConfigRepository;
+
+ @Autowired
+ private TestResultsOperationalRepository testResultsOperationalRepository;
+
private static final Logger log = LoggerFactory.getLogger(RestconfApiController.class);
@org.springframework.beans.factory.annotation.Autowired
}
}
+ @Override
+ public ResponseEntity<Void> deleteTestResult(String testIdentifier) {
+
+ List<TestResultConfig> testResultConfigs = testResultsConfigRepository.findByTestIdentifier(testIdentifier);
+
+ if (testResultConfigs != null) {
+ Iterator<TestResultConfig> testResultConfigIterator = testResultConfigs.iterator();
+ while (testResultConfigIterator.hasNext()) {
+ testResultsConfigRepository.delete(testResultConfigIterator.next());
+ }
+ }
+
+ return (new ResponseEntity<>(HttpStatus.OK));
+ }
+
+ @Override
+ public ResponseEntity<Void> deleteTestResults() {
+
+ testResultsConfigRepository.deleteAll();
+
+ return (new ResponseEntity<>(HttpStatus.OK));
+ }
+
+ @Override
+ public ResponseEntity<TestResults> gETTestResults() {
+
+ TestResults results = new TestResults();
+
+ testResultsOperationalRepository.findAll().forEach(testResult -> {
+ TestResult item = null;
+ try {
+ item = objectMapper.readValue(testResult.getResults(), TestResult.class);
+ results.addTestResultsItem(item);
+ } catch (JsonProcessingException e) {
+ log.error("Could not convert testResult", e);
+ }
+ });
+
+
+ return new ResponseEntity<>(results, HttpStatus.OK);
+ }
+
+ @Override
+ public ResponseEntity<TestResult> getTestResult(String testIdentifier) {
+ List<TestResultConfig> testResultConfigs = testResultsConfigRepository.findByTestIdentifier(testIdentifier);
+
+ if ((testResultConfigs == null) || (testResultConfigs.size() == 0)) {
+ return new ResponseEntity<>(HttpStatus.NOT_FOUND);
+ } else {
+ TestResultConfig testResultConfig = testResultConfigs.get(0);
+ TestResult testResult = null;
+ try {
+ testResult = objectMapper.readValue(testResultConfig.getResults(), TestResult.class);
+ } catch (JsonProcessingException e) {
+ log.error("Cannot convert test result", e);
+ return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
+ }
+
+
+ return new ResponseEntity<>(testResult, HttpStatus.OK);
+ }
+ }
+
+ @Override
+ public ResponseEntity<TestResults> getTestResults() {
+ if(getObjectMapper().isPresent() && getAcceptHeader().isPresent()) {
+ } else {
+ log.warn("ObjectMapper or HttpServletRequest not configured in default RestconfApi interface so no example is generated");
+ }
+
+ TestResults results = new TestResults();
+
+ testResultsConfigRepository.findAll().forEach(testResult -> {
+ TestResult item = null;
+ try {
+ item = objectMapper.readValue(testResult.getResults(), TestResult.class);
+ results.addTestResultsItem(item);
+ } catch (JsonProcessingException e) {
+ log.error("Could not convert testResult", e);
+ }
+ });
+
+
+ return new ResponseEntity<>(results, HttpStatus.OK);
+ }
+
+ @Override
+ public ResponseEntity<TestResult> pUTTestResult(String testIdentifier, @Valid TestResult testResult) {
+ if(getObjectMapper().isPresent() && getAcceptHeader().isPresent()) {
+ } else {
+ log.warn("ObjectMapper or HttpServletRequest not configured in default RestconfApi interface so no example is generated");
+ }
+
+ List<TestResultConfig> testResultConfigs = testResultsConfigRepository.findByTestIdentifier(testIdentifier);
+ Iterator<TestResultConfig> testResultIter = testResultConfigs.iterator();
+ while (testResultIter.hasNext()) {
+ testResultsConfigRepository.delete(testResultIter.next());
+ }
+
+ TestResultConfig testResultConfig = null;
+ try {
+ testResultConfig = new TestResultConfig(testResult.getTestIdentifier(), objectMapper.writeValueAsString(testResult));
+ testResultsConfigRepository.save(testResultConfig);
+ } catch (JsonProcessingException e) {
+ log.error("Could not save test result", e);
+ return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
+ }
+
+ return new ResponseEntity<>(testResult, HttpStatus.OK);
+ }
+
+ @Override
+ public ResponseEntity<TestResults> postTestResults(@Valid TestResults testResults) {
+ List<TestResult> resultList = testResults.getTestResults();
+
+ Iterator<TestResult> resultIterator = resultList.iterator();
+
+ while (resultIterator.hasNext()) {
+ TestResult curResult = resultIterator.next();
+ try {
+ testResultsConfigRepository.save(new TestResultConfig(curResult.getTestIdentifier(), objectMapper.writeValueAsString(curResult)));
+ } catch (JsonProcessingException e) {
+ log.error("Could not save test result", e);
+ return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
+ }
+ }
+
+ return new ResponseEntity<>(testResults, HttpStatus.OK);
+ }
+
+ @Override
+ public ResponseEntity<TestResults> putTestResults(@Valid TestResults testResults) {
+ testResultsConfigRepository.deleteAll();
+
+ List<TestResult> resultList = testResults.getTestResults();
+
+ Iterator<TestResult> resultIterator = resultList.iterator();
+
+
+ while (resultIterator.hasNext()) {
+ TestResult curResult = resultIterator.next();
+ try {
+ testResultsConfigRepository.save(new TestResultConfig(curResult.getTestIdentifier(), objectMapper.writeValueAsString(curResult)));
+ } catch (JsonProcessingException e) {
+ log.error("Could not save test result", e);
+ return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
+ }
+ }
+
+ return new ResponseEntity<>(testResults, HttpStatus.OK);
+ }
+
public static String propsToJson(Properties props, String root)
{
StringBuffer sbuff = new StringBuffer();
package org.onap.ccsdk.sli.core.sliapi.springboot.core;\r
\r
import org.onap.logging.filter.spring.LoggingInterceptor;\r
+import org.springframework.boot.autoconfigure.domain.EntityScan;\r
import org.springframework.context.annotation.Bean;\r
+import org.springframework.context.annotation.ComponentScan;\r
import org.springframework.context.annotation.Configuration;\r
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;\r
+import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;\r
+import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;\r
+import org.springframework.orm.jpa.JpaTransactionManager;\r
+import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;\r
+import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;\r
+import org.springframework.transaction.PlatformTransactionManager;\r
+import org.springframework.transaction.annotation.EnableTransactionManagement;\r
import org.springframework.web.servlet.config.annotation.EnableWebMvc;\r
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;\r
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;\r
\r
+import javax.persistence.EntityManagerFactory;\r
+import javax.sql.DataSource;\r
+\r
@EnableWebMvc\r
@Configuration\r
+@EnableJpaRepositories("org.onap.ccsdk.sli.core.sliapi.springboot.*")\r
+@ComponentScan(basePackages = {"org.onap.ccsdk.sli.core.sliapi.springboot.*"})\r
+@EntityScan("org.onap.ccsdk.sli.core.sliapi.springboot.*")\r
+@EnableTransactionManagement\r
public class WebConfig implements WebMvcConfigurer {\r
\r
- @Bean\r
+/* @Bean\r
LoggingInterceptor loggingInterceptor() {\r
return new LoggingInterceptor();\r
}\r
\r
public void addInterceptors(InterceptorRegistry registry) { \r
registry.addInterceptor(loggingInterceptor()); // handles audit log entries\r
+ }*/\r
+\r
+ @Bean\r
+ public DataSource dataSource() {\r
+\r
+ EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder();\r
+ builder.setName("sdnctl");\r
+ return builder.setType(EmbeddedDatabaseType.DERBY).build();\r
+ }\r
+\r
+ @Bean\r
+ public EntityManagerFactory entityManagerFactory() {\r
+\r
+ HibernateJpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();\r
+ vendorAdapter.setGenerateDdl(true);\r
+\r
+ LocalContainerEntityManagerFactoryBean factory = new LocalContainerEntityManagerFactoryBean();\r
+ factory.setJpaVendorAdapter(vendorAdapter);\r
+ factory.setPackagesToScan("org.onap.ccsdk.sli.core.sliapi.springboot.*");\r
+ factory.setDataSource(dataSource());\r
+ factory.afterPropertiesSet();\r
+\r
+ return factory.getObject();\r
}\r
\r
+ @Bean\r
+ public PlatformTransactionManager transactionManager() {\r
+\r
+ JpaTransactionManager txManager = new JpaTransactionManager();\r
+ txManager.setEntityManagerFactory(entityManagerFactory());\r
+ return txManager;\r
+ }\r
}
\ No newline at end of file
Code Review / ccsdk / sli / core.git / commitdiff