From b77bf2529f15e60c852cf83d5150e75d30068bb0 Mon Sep 17 00:00:00 2001 From: "Claudio D. Gasparini" Date: Thu, 28 Jan 2021 15:36:37 +0100 Subject: Decouple configuration from application - Decouple configuration from application - Generate all 3 types of docker variations Issue-ID: CPS-175 Signed-off-by: Claudio D. Gasparini Change-Id: I1e2e0577c5911f7c79801e4c691d196515dc02a1 --- .../src/main/java/org/onap/cps/Application.java | 32 -------------- .../main/java/org/onap/cps/config/CpsConfig.java | 7 ++- .../cps/rest/controller/AdminRestController.java | 2 +- .../cps/rest/controller/DataRestController.java | 2 +- cps-rest/src/main/resources/application.yml | 51 ---------------------- .../rest/controller/AdminRestControllerSpec.groovy | 2 +- .../exceptions/CpsRestExceptionHandlerSpec.groovy | 2 +- 7 files changed, 9 insertions(+), 89 deletions(-) delete mode 100644 cps-rest/src/main/java/org/onap/cps/Application.java delete mode 100644 cps-rest/src/main/resources/application.yml (limited to 'cps-rest/src') 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 1b6f56a21..8f4bdb716 100644 --- 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 2ecbd4f54..61f9399e7 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.RestController; import org.springframework.web.multipart.MultipartFile; @RestController -@RequestMapping("${rest.api.base-path}") +@RequestMapping("${rest.api.cps-base-path}") public class DataRestController implements CpsDataApi { @Autowired diff --git a/cps-rest/src/main/resources/application.yml b/cps-rest/src/main/resources/application.yml deleted file mode 100644 index 22948c3c3..000000000 --- a/cps-rest/src/main/resources/application.yml +++ /dev/null @@ -1,51 +0,0 @@ -server: - port: 8080 - -rest: - api: - base-path: /cps/api - -spring: - main: - banner-mode: "off" -# for POC only, later this should move to cpi-ri module - jpa: - ddl-auto: create - open-in-view: false - properties: - hibernate: - enable_lazy_load_no_trans: true - dialect: org.hibernate.dialect.PostgreSQLDialect - - datasource: - url: jdbc:postgresql://${DB_HOST}:5432/cpsdb - username: ${DB_USERNAME} - password: ${DB_PASSWORD} - driverClassName: org.postgresql.Driver - initialization-mode: always - - cache: - type: caffeine - cache-names: yangSchema - caffeine: - spec: maximumSize=10000,expireAfterAccess=10m -# Actuator -management: - endpoints: - web: - base-path: /manage - exposure: - include: health,info,loggers - endpoint: - health: - show-details: always - # kubernetes probes: liveness and readiness - probes: - enabled: true - loggers: - enabled: true - -logging: - level: - org: - springframework: INFO diff --git a/cps-rest/src/test/groovy/org/onap/cps/rest/controller/AdminRestControllerSpec.groovy b/cps-rest/src/test/groovy/org/onap/cps/rest/controller/AdminRestControllerSpec.groovy index 540d6224a..88adf10ef 100644 --- a/cps-rest/src/test/groovy/org/onap/cps/rest/controller/AdminRestControllerSpec.groovy +++ b/cps-rest/src/test/groovy/org/onap/cps/rest/controller/AdminRestControllerSpec.groovy @@ -61,7 +61,7 @@ class AdminRestControllerSpec extends Specification { @Autowired MockMvc mvc - @Value('${rest.api.base-path}') + @Value('${rest.api.cps-base-path}') def basePath def anchorsEndpoint = '/v1/dataspaces/my_dataspace/anchors' diff --git a/cps-rest/src/test/groovy/org/onap/cps/rest/exceptions/CpsRestExceptionHandlerSpec.groovy b/cps-rest/src/test/groovy/org/onap/cps/rest/exceptions/CpsRestExceptionHandlerSpec.groovy index edc484b14..45f6102a2 100644 --- a/cps-rest/src/test/groovy/org/onap/cps/rest/exceptions/CpsRestExceptionHandlerSpec.groovy +++ b/cps-rest/src/test/groovy/org/onap/cps/rest/exceptions/CpsRestExceptionHandlerSpec.groovy @@ -61,7 +61,7 @@ class CpsRestExceptionHandlerSpec extends Specification { @Autowired MockMvc mvc - @Value('${rest.api.base-path}') + @Value('${rest.api.cps-base-path}') def basePath @Shared -- cgit 1.2.3-korg