Enhancements to reuse sliboot controller

Update sliboot implementation so that controller can be imported into
other apps to implement SLI-API API (notably healthcheck)

Change-Id: I1f1e37eb3af583c609c0b074946abdfe58b25a33
Issue-ID: CCSDK-2948
Signed-off-by: Dan Timoney <dtimoney@att.com>

2 files changed, 11 insertions, 43 deletions

diff --git a/ms/sliboot/src/main/java/org/onap/ccsdk/apps/ms/sliboot/App.java b/ms/sliboot/src/main/java/org/onap/ccsdk/apps/ms/sliboot/SlibootApp.java
index b93c2f9f..9805d004 100644
--- a/ms/sliboot/src/main/java/org/onap/ccsdk/apps/ms/sliboot/App.java
+++ b/ms/sliboot/src/main/java/org/onap/ccsdk/apps/ms/sliboot/SlibootApp.java
@@ -24,7 +24,11 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

 import org.springframework.boot.SpringApplication;

 import org.springframework.boot.autoconfigure.SpringBootApplication;

+import org.springframework.boot.autoconfigure.domain.EntityScan;

 import org.springframework.context.annotation.ComponentScan;

+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;

+import org.springframework.transaction.annotation.EnableTransactionManagement;

+

 import springfox.documentation.swagger2.annotations.EnableSwagger2;

 import org.apache.shiro.realm.Realm;

 import org.apache.shiro.realm.text.PropertiesRealm;

@@ -33,15 +37,17 @@ import org.apache.shiro.spring.web.config.ShiroFilterChainDefinition;
 import org.springframework.context.annotation.Bean;

 import org.onap.aaf.cadi.shiro.AAFRealm;

 

-@SpringBootApplication

+@SpringBootApplication(scanBasePackages={ "org.onap.ccsdk.apps.ms.sliboot.*", "org.onap.ccsdk.apps.services" })

+@EnableJpaRepositories("org.onap.ccsdk.apps.ms.sliboot.*")

+@EntityScan("org.onap.ccsdk.apps.ms.sliboot.*")

+@EnableTransactionManagement

 @EnableSwagger2

-@ComponentScan(basePackages = { "org.onap.ccsdk.apps.ms.sliboot.*", "org.onap.ccsdk.apps.services" })

-public class App {

+public class SlibootApp {

 

-  private static final Logger log = LoggerFactory.getLogger(App.class);

+  private static final Logger log = LoggerFactory.getLogger(SlibootApp.class);

 

   public static void main(String[] args) throws Exception {

-    SpringApplication.run(App.class, args);

+    SpringApplication.run(SlibootApp.class, args);

   }

 

   @Bean

diff --git a/ms/sliboot/src/main/java/org/onap/ccsdk/apps/ms/sliboot/WebConfig.java b/ms/sliboot/src/main/java/org/onap/ccsdk/apps/ms/sliboot/WebConfig.java
deleted file mode 100644
index 1cef3161..00000000
--- a/ms/sliboot/src/main/java/org/onap/ccsdk/apps/ms/sliboot/WebConfig.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP - CCSDK

- * ================================================================================

- * Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.

- * ================================================================================

- * Licensed under the Apache License, Version 2.0 (the "License");

- * you may not use this file except in compliance with the License.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package org.onap.ccsdk.apps.ms.sliboot;

-

-import org.springframework.boot.autoconfigure.domain.EntityScan;

-import org.springframework.context.annotation.ComponentScan;

-import org.springframework.context.annotation.Configuration;

-import org.springframework.data.jpa.repository.config.EnableJpaRepositories;

-import org.springframework.transaction.annotation.EnableTransactionManagement;

-import org.springframework.web.servlet.config.annotation.EnableWebMvc;

-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;

-

-@Configuration

-@EnableJpaRepositories("org.onap.ccsdk.apps.ms.sliboot.*")

-@ComponentScan(basePackages = {"org.onap.ccsdk.apps.ms.sliboot.*", "org.onap.ccsdk.apps.services"})

-@EntityScan("org.onap.ccsdk.apps.ms.sliboot.*")

-@EnableTransactionManagement

-public class WebConfig implements WebMvcConfigurer {

-

-}
\ No newline at end of file