Merge "Decouple configuration from application"

4 files changed, 7 insertions, 36 deletions

diff --git a/cps-rest/src/main/java/org/onap/cps/Application.java b/cps-rest/src/main/java/org/onap/cps/Application.java
deleted file mode 100644
index d8e849d53..000000000
--- a/cps-rest/src/main/java/org/onap/cps/Application.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*-

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

- *  Copyright (C) 2020 Nordix Foundation. 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.

- *

- * SPDX-License-Identifier: Apache-2.0

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

- */

-

-package org.onap.cps;

-

-import org.springframework.boot.SpringApplication;

-import org.springframework.boot.autoconfigure.SpringBootApplication;

-

-@SpringBootApplication

-public class Application {

-

-    public static void main(final String[] args) {

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

-    }

-}
\ No newline at end of file
diff --git a/cps-rest/src/main/java/org/onap/cps/config/CpsConfig.java b/cps-rest/src/main/java/org/onap/cps/config/CpsConfig.java
index cca5fe7d8..419a21893 100755
--- a/cps-rest/src/main/java/org/onap/cps/config/CpsConfig.java
+++ b/cps-rest/src/main/java/org/onap/cps/config/CpsConfig.java
@@ -34,9 +34,12 @@ public class CpsConfig {
     /**

      * Swagger configuration.

      */

-    @Bean

+    @Bean("cps-docket")

     public Docket api() {

-        return new Docket(DocumentationType.OAS_30).select().apis(RequestHandlerSelectors.any())

+        return new Docket(DocumentationType.OAS_30)

+            .groupName("cps-docket")

+            .select()

+            .apis(RequestHandlerSelectors.any())

             .paths(PathSelectors.any()).build();

     }

 

diff --git a/cps-rest/src/main/java/org/onap/cps/rest/controller/AdminRestController.java b/cps-rest/src/main/java/org/onap/cps/rest/controller/AdminRestController.java
index 0f8e041d0..d74e9b1cf 100755
--- a/cps-rest/src/main/java/org/onap/cps/rest/controller/AdminRestController.java
+++ b/cps-rest/src/main/java/org/onap/cps/rest/controller/AdminRestController.java
@@ -38,7 +38,7 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 @RestController
-@RequestMapping("${rest.api.base-path}")
+@RequestMapping("${rest.api.cps-base-path}")
 public class AdminRestController implements CpsAdminApi {
 
     @Autowired
diff --git a/cps-rest/src/main/java/org/onap/cps/rest/controller/DataRestController.java b/cps-rest/src/main/java/org/onap/cps/rest/controller/DataRestController.java
index 07f555383..9b31df563 100644
--- a/cps-rest/src/main/java/org/onap/cps/rest/controller/DataRestController.java
+++ b/cps-rest/src/main/java/org/onap/cps/rest/controller/DataRestController.java
@@ -30,7 +30,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
-@RequestMapping("${rest.api.base-path}")
+@RequestMapping("${rest.api.cps-base-path}")
 public class DataRestController implements CpsDataApi {
 
     @Autowired