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 --- cps-nf-proxy-rest/pom.xml | 52 +++++----------------- .../java/org/onap/cps/nfproxy/Application.java | 30 ------------- .../org/onap/cps/nfproxy/config/NfProxyConfig.java | 6 ++- .../nfproxy/rest/controller/NfProxyController.java | 2 +- .../src/main/resources/application.yml | 46 ------------------- .../cps/nfproxy/config/NfProxyConfigSpec.groovy | 32 ------------- .../rest/controller/NfProxyControllerSpec.groovy | 2 +- 7 files changed, 17 insertions(+), 153 deletions(-) delete mode 100644 cps-nf-proxy-rest/src/main/java/org/onap/cps/nfproxy/Application.java mode change 100755 => 100644 cps-nf-proxy-rest/src/main/java/org/onap/cps/nfproxy/config/NfProxyConfig.java delete mode 100644 cps-nf-proxy-rest/src/main/resources/application.yml delete mode 100644 cps-nf-proxy-rest/src/test/groovy/org/onap/cps/nfproxy/config/NfProxyConfigSpec.groovy (limited to 'cps-nf-proxy-rest') diff --git a/cps-nf-proxy-rest/pom.xml b/cps-nf-proxy-rest/pom.xml index 7b56014353..ca2cf83452 100755 --- a/cps-nf-proxy-rest/pom.xml +++ b/cps-nf-proxy-rest/pom.xml @@ -12,9 +12,7 @@ cps-nf-proxy-rest - org.onap.cps.nfproxy.Application - nexus3.onap.org:10001/onap/cps-nf-proxy - 0.44 + 0.0 @@ -52,6 +50,10 @@ io.springfox springfox-boot-starter + + io.swagger + swagger-annotations + org.apache.commons commons-lang3 @@ -92,10 +94,6 @@ - - org.springframework.boot - spring-boot-maven-plugin - io.swagger.codegen.v3 @@ -112,44 +110,16 @@ org.onap.cps.nfproxy.rest.api spring false + + src/gen/java + java11 + true + true + - - - - docker - - false - - - - - com.google.cloud.tools - jib-maven-plugin - - - package - build - - dockerBuild - - - - deploy - buildAndPush - - build - - - - - - - - - diff --git a/cps-nf-proxy-rest/src/main/java/org/onap/cps/nfproxy/Application.java b/cps-nf-proxy-rest/src/main/java/org/onap/cps/nfproxy/Application.java deleted file mode 100644 index abad806e0b..0000000000 --- a/cps-nf-proxy-rest/src/main/java/org/onap/cps/nfproxy/Application.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * ============LICENSE_START======================================================= - * Copyright (C) 2021 Pantheon.tech - * ================================================================================ - * 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.nfproxy; - -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); - } -} diff --git a/cps-nf-proxy-rest/src/main/java/org/onap/cps/nfproxy/config/NfProxyConfig.java b/cps-nf-proxy-rest/src/main/java/org/onap/cps/nfproxy/config/NfProxyConfig.java old mode 100755 new mode 100644 index 3bdedc3631..defe0f19c8 --- a/cps-nf-proxy-rest/src/main/java/org/onap/cps/nfproxy/config/NfProxyConfig.java +++ b/cps-nf-proxy-rest/src/main/java/org/onap/cps/nfproxy/config/NfProxyConfig.java @@ -33,9 +33,11 @@ public class NfProxyConfig { /** * Swagger-ui configuration. */ - @Bean + @Bean("nf-proxy-docket") public Docket api() { - return new Docket(DocumentationType.OAS_30).select() + return new Docket(DocumentationType.OAS_30) + .groupName("nf-proxy-docket") + .select() .apis(RequestHandlerSelectors.any()) .paths(PathSelectors.any()) .build(); diff --git a/cps-nf-proxy-rest/src/main/java/org/onap/cps/nfproxy/rest/controller/NfProxyController.java b/cps-nf-proxy-rest/src/main/java/org/onap/cps/nfproxy/rest/controller/NfProxyController.java index 8125c5aed7..99451e69a2 100644 --- a/cps-nf-proxy-rest/src/main/java/org/onap/cps/nfproxy/rest/controller/NfProxyController.java +++ b/cps-nf-proxy-rest/src/main/java/org/onap/cps/nfproxy/rest/controller/NfProxyController.java @@ -27,7 +27,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @RestController -@RequestMapping("${rest.api.base-path}") +@RequestMapping("${rest.api.xnf-base-path}") public class NfProxyController implements NfProxyApi { @Override diff --git a/cps-nf-proxy-rest/src/main/resources/application.yml b/cps-nf-proxy-rest/src/main/resources/application.yml deleted file mode 100644 index 06c0fd1ea3..0000000000 --- a/cps-nf-proxy-rest/src/main/resources/application.yml +++ /dev/null @@ -1,46 +0,0 @@ -server: - port: 8080 - -rest: - api: - base-path: /cps-nf-proxy/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 - -# Actuator -management: - endpoints: - web: - base-path: /manage - exposure: - include: info,health,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-nf-proxy-rest/src/test/groovy/org/onap/cps/nfproxy/config/NfProxyConfigSpec.groovy b/cps-nf-proxy-rest/src/test/groovy/org/onap/cps/nfproxy/config/NfProxyConfigSpec.groovy deleted file mode 100644 index 3eb42d7779..0000000000 --- a/cps-nf-proxy-rest/src/test/groovy/org/onap/cps/nfproxy/config/NfProxyConfigSpec.groovy +++ /dev/null @@ -1,32 +0,0 @@ -/* - * ============LICENSE_START======================================================= - * Copyright (C) 2021 Pantheon.tech - * ================================================================================ - * 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.nfproxy.config - - -import spock.lang.Specification -import springfox.documentation.spring.web.plugins.Docket - -class NfProxyConfigSpec extends Specification { - def objectUnderTest = new NfProxyConfig() - - def 'xNF Proxy configuration has a Docket API'() { - expect: 'the CPS configuration has a Docket API' - objectUnderTest.api() instanceof Docket - } -} diff --git a/cps-nf-proxy-rest/src/test/groovy/org/onap/cps/nfproxy/rest/controller/NfProxyControllerSpec.groovy b/cps-nf-proxy-rest/src/test/groovy/org/onap/cps/nfproxy/rest/controller/NfProxyControllerSpec.groovy index d1c3b1648f..874a1b004e 100644 --- a/cps-nf-proxy-rest/src/test/groovy/org/onap/cps/nfproxy/rest/controller/NfProxyControllerSpec.groovy +++ b/cps-nf-proxy-rest/src/test/groovy/org/onap/cps/nfproxy/rest/controller/NfProxyControllerSpec.groovy @@ -33,7 +33,7 @@ class NfProxyControllerSpec extends Specification { @Autowired MockMvc mvc - @Value('${rest.api.base-path}') + @Value('${rest.api.xnf-base-path}') def basePath def 'Hello world method invocation.'(){ -- cgit 1.2.3-korg