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-application/pom.xml | 152 +++++++++++++++++++++ .../src/main/java/org/onap/cps/Application.java | 32 +++++ cps-application/src/main/resources/application.yml | 51 +++++++ 3 files changed, 235 insertions(+) create mode 100644 cps-application/pom.xml create mode 100644 cps-application/src/main/java/org/onap/cps/Application.java create mode 100644 cps-application/src/main/resources/application.yml (limited to 'cps-application') diff --git a/cps-application/pom.xml b/cps-application/pom.xml new file mode 100644 index 000000000..a159ad883 --- /dev/null +++ b/cps-application/pom.xml @@ -0,0 +1,152 @@ + + + 4.0.0 + + + org.onap.cps + cps-parent + 0.0.1-SNAPSHOT + ../cps-parent/pom.xml + + + cps-application + + + 0.0 + + + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-tomcat + + + + + org.springframework.boot + spring-boot-starter-actuator + + + org.springframework.cloud + spring-cloud-starter-sleuth + + + + + + + + com.google.cloud.tools + jib-maven-plugin + + + package + build + + dockerBuild + + + + deploy + buildAndPush + + build + + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + + cps-docker + + false + + + + + ${project.groupId} + cps-rest + + + + + + com.google.cloud.tools + jib-maven-plugin + + + + + + xnf-docker + + false + + + + org.onap.cps.Application + nexus3.onap.org:10001/onap/cps-nf-proxy + + + + + ${project.groupId} + cps-nf-proxy-rest + + + + + + com.google.cloud.tools + jib-maven-plugin + + + + + + cps-xnf-docker + + false + + + + org.onap.cps.Application + nexus3.onap.org:10001/onap/cps-and-nf-proxy + + + + + ${project.groupId} + cps-rest + + + ${project.groupId} + cps-nf-proxy-rest + + + + + + com.google.cloud.tools + jib-maven-plugin + + + + + + \ No newline at end of file diff --git a/cps-application/src/main/java/org/onap/cps/Application.java b/cps-application/src/main/java/org/onap/cps/Application.java new file mode 100644 index 000000000..d8e849d53 --- /dev/null +++ b/cps-application/src/main/java/org/onap/cps/Application.java @@ -0,0 +1,32 @@ +/*- + * ============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-application/src/main/resources/application.yml b/cps-application/src/main/resources/application.yml new file mode 100644 index 000000000..c3ceecde0 --- /dev/null +++ b/cps-application/src/main/resources/application.yml @@ -0,0 +1,51 @@ +server: + port: 8080 + +rest: + api: + cps-base-path: /cps/api + xnf-base-path: /cps-nf-proxy/api + +spring: + main: + banner-mode: "off" + 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: info,health,loggers + endpoint: + health: + show-details: always + # kubernetes probes: liveness and readiness + probes: + enabled: true + loggers: + enabled: true + +logging: + level: + org: + springframework: INFO -- cgit 1.2.3-korg