From a69e3a9565186ae06c96215f9c73198d0651b529 Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Thu, 5 Apr 2018 13:27:38 -0400 Subject: Sonar fixes to pooling Made various changes to the pooling feature to address some of the sonar issues. Remove duplicate classes, Pair & Triple. Fix sonar issue about duplicate process(xxx) methods. Remove extra items from pom.xml and add assembly builder. Fix license text in pom.xml, inadvertently reformatted. Fix a few typos in comments and change LinkedList to Queue. Move assembly.xml to correct source directory. Replace ScheduledFuture with CancellableScheduledTask, to satisfy sonar. Eliminate "TODO" items: add logging, delay after sending Offline message. Add more logging in process(Message) methods. Begin creating end-to-end junit test, fixed bugs found as a result. Restore logback-test.xml to WARN. Fix merge conflict - restored test properties file. Change-Id: Ic70a8cee49678ea0fc3da309699aec1f6088fe70 Issue-ID: POLICY-728 Signed-off-by: Jim Hahn --- feature-pooling-dmaap/pom.xml | 238 +++++++++++++++--------------------------- 1 file changed, 86 insertions(+), 152 deletions(-) (limited to 'feature-pooling-dmaap/pom.xml') diff --git a/feature-pooling-dmaap/pom.xml b/feature-pooling-dmaap/pom.xml index 4ae26b92..6afbd1f1 100644 --- a/feature-pooling-dmaap/pom.xml +++ b/feature-pooling-dmaap/pom.xml @@ -2,7 +2,7 @@ ============LICENSE_START======================================================= ONAP Policy Engine - Drools PDP ================================================================================ - Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + Copyright (C) 2018 AT&T 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. @@ -17,30 +17,82 @@ limitations under the License. ============LICENSE_END========================================================= --> + + - - 4.0.0 - + org.onap.policy.drools-pdp drools-pdp 1.2.0-SNAPSHOT - + feature-pooling-dmaap - - feature-pooling + + feature-pooling-dmaap Endpoints 1.8 1.8 9.3.20.v20170531 - 1.6.6 + 1.6.6 + + + + maven-assembly-plugin + 2.6 + + + zipfile + + single + + package + + true + ${project.artifactId}-${project.version} + + src/assembly/assemble_zip.xml + + false + + + + + + org.apache.maven.plugins + maven-dependency-plugin + 2.8 + + + copy-dependencies + + copy-dependencies + + prepare-package + + false + ${project.build.directory}/assembly/lib + false + true + true + false + false + false + runtime + true + + + + + + + @@ -51,126 +103,42 @@ org.slf4j slf4j-log4j12 - + com.att.nsa saClientLibrary - - - - - - org.onap.dmaap.messagerouter.dmaapclient - dmaapClient - ${dmaap.version} - - - org.slf4j - slf4j-log4j12 - - - log4j - log4j - - - - - - org.eclipse.jetty - jetty-server - ${jetty.version} - - - - org.eclipse.jetty - jetty-servlet - ${jetty.version} - - - - org.glassfish.jersey.core - jersey-server - ${jersey.version} - - - - org.glassfish.jersey.containers - jersey-container-servlet-core - - - - org.glassfish.jersey.media - jersey-media-json-jackson - ${jersey.version} - - - - org.glassfish.jersey.containers - jersey-container-jetty-http - ${jersey.version} - - - org.eclipse.jetty - jetty-util - - - org.glassfish.jersey.core - jersey-client - ${jersey.version} - - - - com.fasterxml.jackson.core - jackson-core - ${jackson.version} - - + com.fasterxml.jackson.core - jackson-databind + jackson-core ${jackson.version} - + - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 + com.fasterxml.jackson.core + jackson-databind ${jackson.version} - - - com.fasterxml.jackson.core - jackson-annotations - ${jackson.version} - - io.swagger - swagger-jersey2-jaxrs + com.fasterxml.jackson.core + jackson-annotations + ${jackson.version} - org.apache.httpcomponents - httpcore - - - - org.apache.httpcomponents - httpclient + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + ${jackson.version} - - org.apache.commons - commons-collections4 - 4.1 - - ch.qos.logback logback-classic - + org.onap.policy.drools-pdp @@ -178,11 +146,11 @@ ${project.version} - - org.onap.policy.drools-pdp - policy-management - ${project.version} - + + org.onap.policy.drools-pdp + policy-management + ${project.version} + junit @@ -196,47 +164,13 @@ ${project.version} test - - org.powermock - powermock-api-mockito - ${powermock.version} - test - - - org.powermock - powermock-module-junit4 - ${powermock.version} - test - - - junit - junit - - - org.powermock - powermock-core - - - org.powermock - powermock-reflect - - - org.javassist - javassist - - - - - org.javassist - javassist - 3.21.0-GA - test - - - org.onap.policy.common - utils - ${project.version} - + + + org.mockito + mockito-core + 2.13.0 + test + -- cgit 1.2.3-korg