From: wasala Date: Mon, 26 Mar 2018 13:48:46 +0000 (+0200) Subject: Divide into module dependecy X-Git-Tag: 2.0.0-ONAP~62 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F39%2F38539%2F1;p=dcaegen2%2Fservices%2Fprh.git Divide into module dependecy Add dependency build of dmaapClients and aaiClients. This modules are mandatory to prh application. Issue-ID: DCAEGEN2-407 Change-Id: I2150a15d76e81dd01503f44339ddb3c50f5b0348 Signed-off-by: wasala --- diff --git a/.gitignore b/.gitignore index f56704bd..691c9f04 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,15 @@ +# Compiled class file *.class # Mobile Tools for Java (J2ME) .mtj.tmp/ +# Log file +*.log + +# BlueJ files +*.ctxt + # Package Files # *.jar *.war @@ -15,4 +22,7 @@ hs_err_pid* .idea *.iml -target \ No newline at end of file +target + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* \ No newline at end of file diff --git a/pom.xml b/pom.xml index 089a1a0a..3b17ffa0 100644 --- a/pom.xml +++ b/pom.xml @@ -13,8 +13,20 @@ 1.0.0-SNAPSHOT pnf-registration-handler pnf-registration-handler + pom + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + + + + UTF-8 + UTF-8 + 8 3.7.0 @@ -33,6 +45,7 @@ content/sites/site/org/onap/dcaegen2/services/prh/${project.artifactId}/${project.version} + @@ -46,27 +59,24 @@ http://maven.restlet.com + external-repository https://oss.sonatype.org/content/repositories + - - - org.springframework.boot - spring-boot-starter-web - - org.springframework.boot - spring-boot-starter-webflux + org.immutables + value + 2.5.6 - - org.immutables - value - 2.5.6 - + + + + org.junit.jupiter @@ -100,9 +110,21 @@ test + + + + + org.apache.maven.wagon + wagon-webdav-jackrabbit + 3.0.0 + + + + + org.apache.maven.plugins maven-compiler-plugin @@ -114,34 +136,83 @@ true - + + + + org.apache.maven.plugins + maven-source-plugin + 3.0.1 + + true + + + + attach-sources + verify + + jar-no-fork + + + + + + org.apache.maven.plugins - maven-shade-plugin - 3.1.0 + maven-javadoc-plugin + 3.0.0 + + + true + false + false + + aggregate + site + + aggregate + + + + attach-javadoc + + jar + + + + + + + + org.apache.felix + maven-bundle-plugin + 3.5.0 + true + + + *;inline=false;scope=compile + true + lib + + + + + Bundling PRH Jar package - shade + bundle - - - - - org.onap.dcaegen2.services.prh.ServerPrhApp - - - + + org.apache.maven.plugins - maven-site-plugin - 3.6 + maven-antrun-plugin + 1.8 @@ -149,6 +220,35 @@ org.apache.maven.plugins maven-surefire-plugin 2.19.1 + + false + -Xmx2048m -Djava.awt.headless=true -XX:+UseConcMarkSweepGC + -XX:OnOutOfMemoryError="kill -9 %p" -XX:+HeapDumpOnOutOfMemoryError + + ${surefire.redirectTestOutputToFile} + + methods + 8 + 8 + true + xml + false + + ${project.build.directory} + + ${basedir}/src/test/resources/logback-test.xml + + ${project.build.directory} + + + **/*Test.java + + + **/*IT.java + + + ${surefireArgLine} + org.junit.platform @@ -157,6 +257,77 @@ + + + + org.codehaus.mojo + findbugs-maven-plugin + ${findbugs.plugin.version} + + Max + Low + true + + true + ${project.basedir}/findbugs-exclude.xml + ${project.reporting.outputDirectory}/findbugs + ${project.reporting.outputDirectory}/findbugs + + + + + analyze-compile + compile + + check + + + + + + + org.apache.maven.plugins + maven-jar-plugin + 3.0.2 + + + + true + + + ${project.version} + + + + + + + org.apache.maven.plugins + maven-site-plugin + 3.6 + + + + org.apache.maven.plugins + maven-jxr-plugin + 2.5 + + + + org.apache.maven.plugins + maven-project-info-reports-plugin + 2.9 + + false + false + + + + + org.apache.maven.plugins + maven-surefire-report-plugin + 2.21.0 + @@ -164,14 +335,58 @@ org.apache.maven.plugins maven-compiler-plugin + + + org.apache.maven.plugins + maven-jar-plugin + + - org.springframework.boot - spring-boot-maven-plugin + org.apache.maven.plugins + maven-surefire-plugin + + + org.apache.maven.plugins + maven-failsafe-plugin + + + + org.apache.maven.plugins + maven-source-plugin + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + + + + org.apache.maven.plugins + maven-site-plugin + + + + org.apache.maven.plugins + maven-jxr-plugin + + + + org.apache.maven.plugins + maven-project-info-reports-plugin + + + + org.apache.maven.plugins + maven-surefire-report-plugin + + org.apache.maven.plugins maven-javadoc-plugin @@ -191,17 +406,10 @@ - - - - - org.springframework.boot - spring-boot-dependencies - 2.0.0.RELEASE - pom - import - - - + + prh-app-server + prh-aai-client + prh-dmaap-client + diff --git a/prh-aai-client/pom.xml b/prh-aai-client/pom.xml new file mode 100644 index 00000000..5ac67ce8 --- /dev/null +++ b/prh-aai-client/pom.xml @@ -0,0 +1,14 @@ + + + + + prh + org.onap.dcaegen2.services + 1.0.0-SNAPSHOT + + 4.0.0 + + prh-aai-client + \ No newline at end of file diff --git a/src/main/java/org/onap/dcaegen2/services/prh/event/executor/publisher/config/aai/AAIDmaapProducerConfiguration.java b/prh-aai-client/src/main/java/services/config/AAIDmaapProducerConfiguration.java similarity index 84% rename from src/main/java/org/onap/dcaegen2/services/prh/event/executor/publisher/config/aai/AAIDmaapProducerConfiguration.java rename to prh-aai-client/src/main/java/services/config/AAIDmaapProducerConfiguration.java index 214ffa94..396a78be 100644 --- a/src/main/java/org/onap/dcaegen2/services/prh/event/executor/publisher/config/aai/AAIDmaapProducerConfiguration.java +++ b/prh-aai-client/src/main/java/services/config/AAIDmaapProducerConfiguration.java @@ -17,15 +17,13 @@ * limitations under the License. * ============LICENSE_END========================================================= */ -package org.onap.dcaegen2.services.prh.event.executor.publisher.config.aai; +package services.config; import java.net.URL; import org.immutables.value.Value; -import org.onap.dcaegen2.services.prh.event.executor.mutual.config.DmaapConfig; /** - * @author Przemysław Wąsala on 3/23/18 - * @project pnf-registration-handler + * @author Przemysław Wąsala on 3/23/18 */ @Value.Immutable(prehash = true) @Value.Style(stagedBuilder = true) diff --git a/src/main/java/org/onap/dcaegen2/services/prh/event/executor/mutual/config/Config.java b/prh-aai-client/src/main/java/services/config/Config.java similarity index 85% rename from src/main/java/org/onap/dcaegen2/services/prh/event/executor/mutual/config/Config.java rename to prh-aai-client/src/main/java/services/config/Config.java index d0784457..a2a012c5 100644 --- a/src/main/java/org/onap/dcaegen2/services/prh/event/executor/mutual/config/Config.java +++ b/prh-aai-client/src/main/java/services/config/Config.java @@ -17,13 +17,12 @@ * limitations under the License. * ============LICENSE_END========================================================= */ -package org.onap.dcaegen2.services.prh.event.executor.mutual.config; +package services.config; import java.io.Serializable; /** - * @author Przemysław Wąsala on 3/23/18 - * @project pnf-registration-handler + * @author Przemysław Wąsala on 3/23/18 */ interface Config extends Serializable { diff --git a/src/main/java/org/onap/dcaegen2/services/prh/event/executor/mutual/config/DmaapConfig.java b/prh-aai-client/src/main/java/services/config/DmaapConfig.java similarity index 87% rename from src/main/java/org/onap/dcaegen2/services/prh/event/executor/mutual/config/DmaapConfig.java rename to prh-aai-client/src/main/java/services/config/DmaapConfig.java index 0a2ee9d1..0ddaea28 100644 --- a/src/main/java/org/onap/dcaegen2/services/prh/event/executor/mutual/config/DmaapConfig.java +++ b/prh-aai-client/src/main/java/services/config/DmaapConfig.java @@ -17,11 +17,10 @@ * limitations under the License. * ============LICENSE_END========================================================= */ -package org.onap.dcaegen2.services.prh.event.executor.mutual.config; +package services.config; /** - * @author Przemysław Wąsala on 3/23/18 - * @project pnf-registration-handler + * @author Przemysław Wąsala on 3/23/18 */ public abstract class DmaapConfig implements Config { diff --git a/prh-app-server/pom.xml b/prh-app-server/pom.xml new file mode 100644 index 00000000..513b5118 --- /dev/null +++ b/prh-app-server/pom.xml @@ -0,0 +1,56 @@ + + + + prh + org.onap.dcaegen2.services + 1.0.0-SNAPSHOT + + 4.0.0 + + prh-app-server + jar + + + + + org.apache.maven.plugins + maven-compiler-plugin + + + org.springframework.boot + spring-boot-maven-plugin + + + + + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-webflux + + + org.junit.platform + junit-platform-commons + RELEASE + + + + + + + + org.springframework.boot + spring-boot-dependencies + 2.0.0.RELEASE + pom + import + + + + \ No newline at end of file diff --git a/src/main/java/org/onap/dcaegen2/services/prh/MainApp.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/MainApp.java similarity index 93% rename from src/main/java/org/onap/dcaegen2/services/prh/MainApp.java rename to prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/MainApp.java index ca7cc362..ebdf1bb4 100644 --- a/src/main/java/org/onap/dcaegen2/services/prh/MainApp.java +++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/MainApp.java @@ -26,8 +26,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.scheduling.annotation.EnableScheduling; /** - * @author Przemysław Wąsala on 3/23/18 - * @project pnf-registration-handler + * @author Przemysław Wąsala on 3/23/18 */ @SpringBootApplication @Configuration diff --git a/src/main/java/org/onap/dcaegen2/services/prh/exceptions/AAINotFoundException.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/exceptions/AAINotFoundException.java similarity index 91% rename from src/main/java/org/onap/dcaegen2/services/prh/exceptions/AAINotFoundException.java rename to prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/exceptions/AAINotFoundException.java index 61b0c69b..22dd24bd 100644 --- a/src/main/java/org/onap/dcaegen2/services/prh/exceptions/AAINotFoundException.java +++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/exceptions/AAINotFoundException.java @@ -20,8 +20,7 @@ package org.onap.dcaegen2.services.prh.exceptions; /** - * @author Przemysław Wąsala on 3/23/18 - * @project pnf-registration-handler + * @author Przemysław Wąsala on 3/23/18 */ public class AAINotFoundException extends Exception { diff --git a/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapConsumerTask.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapConsumerTask.java similarity index 94% rename from src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapConsumerTask.java rename to prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapConsumerTask.java index 5902587b..0d7ec225 100644 --- a/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapConsumerTask.java +++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapConsumerTask.java @@ -26,8 +26,7 @@ import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; /** - * @author Przemysław Wąsala on 3/23/18 - * @project pnf-registration-handler + * @author Przemysław Wąsala on 3/23/18 */ @Component public class DmaapConsumerTask implements DmaapTask { diff --git a/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapTask.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapTask.java similarity index 91% rename from src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapTask.java rename to prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapTask.java index bb3fdc6d..f5f8c284 100644 --- a/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapTask.java +++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapTask.java @@ -22,8 +22,7 @@ package org.onap.dcaegen2.services.prh.tasks; import org.onap.dcaegen2.services.prh.exceptions.AAINotFoundException; /** - * @author Przemysław Wąsala on 3/23/18 - * @project pnf-registration-handler + * @author Przemysław Wąsala on 3/23/18 */ public interface DmaapTask { diff --git a/src/main/java/org/onap/dcaegen2/services/prh/tasks/ScheduledTask.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/ScheduledTask.java similarity index 95% rename from src/main/java/org/onap/dcaegen2/services/prh/tasks/ScheduledTask.java rename to prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/ScheduledTask.java index c06eceb0..006d44ea 100644 --- a/src/main/java/org/onap/dcaegen2/services/prh/tasks/ScheduledTask.java +++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/ScheduledTask.java @@ -29,8 +29,7 @@ import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; /** - * @author Przemysław Wąsala on 3/23/18 - * @project pnf-registration-handler + * @author Przemysław Wąsala on 3/23/18 */ @Component public class ScheduledTask { diff --git a/prh-app-server/src/main/resources/application.yaml b/prh-app-server/src/main/resources/application.yaml new file mode 100644 index 00000000..4d372c26 --- /dev/null +++ b/prh-app-server/src/main/resources/application.yaml @@ -0,0 +1,2 @@ +server: + port: 8100 \ No newline at end of file diff --git a/src/test/java/org/onap/dcaegen2/services/prh/ServerPrhAppTest.java b/prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/ServerPrhAppTest.java similarity index 100% rename from src/test/java/org/onap/dcaegen2/services/prh/ServerPrhAppTest.java rename to prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/ServerPrhAppTest.java diff --git a/prh-app-server/src/test/resources/logback-test.xml b/prh-app-server/src/test/resources/logback-test.xml new file mode 100644 index 00000000..0a53315a --- /dev/null +++ b/prh-app-server/src/test/resources/logback-test.xml @@ -0,0 +1,33 @@ + + + + + + + + %d{ISO8601} - %-5p [%t:%C{1}@%L] - %m%n + + + + + + + + + diff --git a/prh-dmaap-client/pom.xml b/prh-dmaap-client/pom.xml new file mode 100644 index 00000000..68170645 --- /dev/null +++ b/prh-dmaap-client/pom.xml @@ -0,0 +1,14 @@ + + + + prh + org.onap.dcaegen2.services + 1.0.0-SNAPSHOT + + 4.0.0 + + prh-dmaap-client + + \ No newline at end of file diff --git a/src/main/java/org/onap/dcaegen2/services/prh/event/executor/mutual/config/AAIConfig.java b/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/config/Config.java similarity index 81% rename from src/main/java/org/onap/dcaegen2/services/prh/event/executor/mutual/config/AAIConfig.java rename to prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/config/Config.java index 58858b5c..422f3daf 100644 --- a/src/main/java/org/onap/dcaegen2/services/prh/event/executor/mutual/config/AAIConfig.java +++ b/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/config/Config.java @@ -17,12 +17,13 @@ * limitations under the License. * ============LICENSE_END========================================================= */ -package org.onap.dcaegen2.services.prh.event.executor.mutual.config; +package org.onap.dcaegen2.services.config; + +import java.io.Serializable; /** - * @author Przemysław Wąsala on 3/23/18 - * @project pnf-registration-handler + * @author Przemysław Wąsala on 3/23/18 */ -public abstract class AAIConfig implements Config { +interface Config extends Serializable { } diff --git a/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/config/DmaapConfig.java b/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/config/DmaapConfig.java new file mode 100644 index 00000000..3b485cdb --- /dev/null +++ b/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/config/DmaapConfig.java @@ -0,0 +1,34 @@ +/*- + * ============LICENSE_START======================================================= + * PROJECT + * ================================================================================ + * Copyright (C) 2018 NOKIA 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.dcaegen2.services.config; + +/** + * @author Przemysław Wąsala on 3/23/18 + */ +public abstract class DmaapConfig implements Config { + + private String dmmaphostName; + private Integer dmmapportNumber; + private String dmmaptopicName; + private String dmmapprotocol; + private String dmmapuserName; + private String dmmapuserPassword; + private String dmmapcontentType; +} diff --git a/src/main/java/org/onap/dcaegen2/services/prh/event/executor/consumer/config/dmaap/DmaapConsumerConfiguration.java b/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/config/DmaapConsumerConfiguration.java similarity index 83% rename from src/main/java/org/onap/dcaegen2/services/prh/event/executor/consumer/config/dmaap/DmaapConsumerConfiguration.java rename to prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/config/DmaapConsumerConfiguration.java index 3ea3d213..d36104bd 100644 --- a/src/main/java/org/onap/dcaegen2/services/prh/event/executor/consumer/config/dmaap/DmaapConsumerConfiguration.java +++ b/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/config/DmaapConsumerConfiguration.java @@ -17,14 +17,12 @@ * limitations under the License. * ============LICENSE_END========================================================= */ -package org.onap.dcaegen2.services.prh.event.executor.consumer.config.dmaap; +package org.onap.dcaegen2.services.config; import org.immutables.value.Value; -import org.onap.dcaegen2.services.prh.event.executor.mutual.config.DmaapConfig; /** - * @author Przemysław Wąsala on 3/23/18 - * @project pnf-registration-handler + * @author Przemysław Wąsala on 3/23/18 */ @Value.Immutable(prehash = true) @Value.Style(stagedBuilder = true) @@ -36,4 +34,4 @@ public abstract class DmaapConsumerConfiguration extends DmaapConfig { private String consumerGroup; private Integer timeoutMS; private Integer messageLimit; -} +} \ No newline at end of file diff --git a/src/main/java/org/onap/dcaegen2/services/prh/event/executor/publisher/config/dmaap/DmaapProducerConfiguration.java b/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/config/DmaapProducerConfiguration.java similarity index 80% rename from src/main/java/org/onap/dcaegen2/services/prh/event/executor/publisher/config/dmaap/DmaapProducerConfiguration.java rename to prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/config/DmaapProducerConfiguration.java index 494fad4c..f5749a3f 100644 --- a/src/main/java/org/onap/dcaegen2/services/prh/event/executor/publisher/config/dmaap/DmaapProducerConfiguration.java +++ b/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/config/DmaapProducerConfiguration.java @@ -17,15 +17,11 @@ * limitations under the License. * ============LICENSE_END========================================================= */ -package org.onap.dcaegen2.services.prh.event.executor.publisher.config.dmaap; - -import org.onap.dcaegen2.services.prh.event.executor.mutual.config.DmaapConfig; +package org.onap.dcaegen2.services.config; /** - * @author Przemysław Wąsala on 3/23/18 - * @project pnf-registration-handler + * @author Przemysław Wąsala on 3/23/18 */ - public class DmaapProducerConfiguration extends DmaapConfig { private static final long serialVersionUID = 1L; diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml deleted file mode 100644 index ef147c10..00000000 --- a/src/main/resources/application.yaml +++ /dev/null @@ -1,7 +0,0 @@ -server: - port: 8080 -logging: - level: - .: error - org.springframework: ERROR - org.onap.dcaegen2.services.prg: ERROR \ No newline at end of file