From 8c4608e47af8fa5da4f4f2f6bd7eda723b37d8e2 Mon Sep 17 00:00:00 2001
From: efiacor <fiachra.corcoran@est.tech>
Date: Tue, 10 Aug 2021 15:25:15 +0100
Subject: [PATCH] [DMAAP-MR] Sonar coverage fix

Signed-off-by: efiacor <fiachra.corcoran@est.tech>
Change-Id: Iaba44489b4bec15e0a8bb1ae6a2e18ff3917e60e
Issue-ID: DMAAP-1638
---
 pom.xml                                            | 107 ++-------------------
 .../onap/dmaap/mr/cambria/embed/KafkaLocal.java    |   2 +-
 .../org/onap/dmaap/service/UIRestServicesTest.java |   2 +-
 3 files changed, 12 insertions(+), 99 deletions(-)

diff --git a/pom.xml b/pom.xml
index 176bddd..6035e25 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,20 +31,6 @@
 			<name>Apache License Version 2.0</name>
 		</license>
 	</licenses>
-	<developers>
-		<developer>
-			<name>Rajashree</name>
-			<email></email>
-			<organization>ATT</organization>
-			<organizationUrl>www.att.com</organizationUrl>
-		</developer>
-		<developer>
-			<name>Ramkumar</name>
-			<email></email>
-			<organization>ATT</organization>
-			<organizationUrl>www.att.com</organizationUrl>
-		</developer>
-	</developers>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<dockerLocation>${basedir}/target/swm/package/nix/dist_files/</dockerLocation>
@@ -69,7 +55,6 @@
 		<maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
 		<camel.version>2.21.5</camel.version>
 		<camel.version.latest>3.5.0</camel.version.latest>
-		<sitePath>/content/sites/site/org/onap/dmaap/messagerouter/messageservice/${project.artifactId}/${project.version}</sitePath>
 		<skip.docker.build>false</skip.docker.build>
 		<skip.docker.tag>false</skip.docker.tag>
 		<skip.docker.push>false</skip.docker.push>
@@ -79,7 +64,6 @@
 		<sonar.language>java</sonar.language>
 		<sonar.skip>false</sonar.skip>
 		<sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
-		<sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
 		<sonar.projectVersion>${project.version}</sonar.projectVersion>
 		<log4j.version>2.13.3</log4j.version>
 		<maven.compiler.target>8</maven.compiler.target>
@@ -289,6 +273,12 @@
 			<groupId>org.apache.zookeeper</groupId>
 			<artifactId>zookeeper</artifactId>
 			<version>3.7.0</version>
+			<exclusions>
+				<exclusion>
+					<artifactId>slf4j-log4j12</artifactId>
+					<groupId>org.slf4j</groupId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>com.101tec</groupId>
@@ -338,11 +328,6 @@
 			<artifactId>jline</artifactId>
 			<version>2.12.1</version>
 		</dependency>
-		<dependency>
-			<groupId>commons-io</groupId>
-			<artifactId>commons-io</artifactId>
-			<version>2.7</version>
-		</dependency>
 		<dependency>
 			<groupId>org.quartz-scheduler</groupId>
 			<artifactId>quartz</artifactId>
@@ -434,7 +419,7 @@
 		<dependency>
 			<groupId>com.att.eelf</groupId>
 			<artifactId>eelf-core</artifactId>
-			<version>1.0.0</version>
+			<version>2.0.0-oss</version>
 			<exclusions>
 				<exclusion>
 					<groupId>org.mockito</groupId>
@@ -477,7 +462,7 @@
 		<dependency>
 			<groupId>com.att.nsa</groupId>
 			<artifactId>saToolkit</artifactId>
-			<version>0.0.1</version>
+			<version>1.2.0-oss</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.curator</groupId>
@@ -723,18 +708,6 @@
 			<version>3.0.11-oss</version>
 			<scope>provided</scope>
 		</dependency>
-<!--		<dependency>-->
-<!--			<groupId>org.apache.kafka</groupId>-->
-<!--			<artifactId>kafka_2.12</artifactId>-->
-<!--			<version>2.8.0</version>-->
-<!--			<scope>test</scope>-->
-<!--			<exclusions>-->
-<!--				<exclusion>-->
-<!--					<artifactId>metrics-core</artifactId>-->
-<!--					<groupId>com.yammer.metrics</groupId>-->
-<!--				</exclusion>-->
-<!--			</exclusions>-->
-<!--		</dependency>-->
 		<dependency>
 			<groupId>io.dropwizard.metrics</groupId>
 			<artifactId>metrics-core</artifactId>
@@ -1177,79 +1150,19 @@
 							</execution>
 						</executions>
 					</plugin>
-<!--					<plugin>-->
-<!--						<groupId>com.google.code.maven-replacer-plugin</groupId>-->
-<!--						<artifactId>replacer</artifactId>-->
-<!--						<version>1.5.2</version>-->
-<!--						<executions>-->
-<!--							<execution>-->
-<!--								<id>google-replacer-ajsc-arch-parent</id>-->
-<!--								<phase>prepare-package</phase>-->
-<!--								<goals>-->
-<!--									<goal>replace</goal>-->
-<!--								</goals>-->
-<!--								<configuration>-->
-<!--									<basedir>${project.build.directory}</basedir>-->
-<!--									<includes>-->
-<!--										<include>staticContent/**/*.html</include>-->
-<!--										<include>CDP/**</include>-->
-<!--										<include>bundleconfig/**</include>-->
-<!--										<include>versioned-runtime/**/*.context</include>-->
-<!--										<include>versioned-runtime/**/*.json</include>-->
-<!--										<include>versioned-ajsc/**/*.route</include>-->
-<!--										<include>versioned-ajsc/**/*.groovy</include>-->
-<!--										<include>versioned-ajsc/**/*.xml</include>-->
-<!--										<include>classes/*.properties</include>-->
-<!--										<include>swm/package/nix/dist_files${distFilesRoot}/etc/*.properties</include>-->
-<!--									</includes>-->
-<!--									<escape>true</escape>-->
-<!--									<replacements>-->
-<!--										<replacement>-->
-<!--											<token>__module_ajsc_namespace_name__</token>-->
-<!--											<value>${module.ajsc.namespace.name}</value>-->
-<!--										</replacement>-->
-<!--										<replacement>-->
-<!--											<token>__module_ajsc_namespace_version__</token>-->
-<!--											<value>${module.ajsc.namespace.version}</value>-->
-<!--										</replacement>-->
-<!--										<replacement>-->
-<!--											<token>__ajscHome__</token>-->
-<!--											<value>${replaceWinFilePath}</value>-->
-<!--										</replacement>-->
-<!--										<replacement>-->
-<!--											<token>__projectGroupId__</token>-->
-<!--											<value>${project.groupId}</value>-->
-<!--										</replacement>-->
-<!--										<replacement>-->
-<!--											<token>__projectArtifactId__</token>-->
-<!--											<value>${project.artifactId}</value>-->
-<!--										</replacement>-->
-<!--										<replacement>-->
-<!--											<token>__projectVersion__</token>-->
-<!--											<value>${project.version}</value>-->
-<!--										</replacement>-->
-<!--										<replacement>-->
-<!--											<token>__basedir__</token>-->
-<!--											<value>${replaceWinBasedirPath}</value>-->
-<!--										</replacement>-->
-<!--									</replacements>-->
-<!--								</configuration>-->
-<!--							</execution>-->
-<!--						</executions>-->
-<!--					</plugin>-->
 				</plugins>
 				<pluginManagement>
 					<plugins>
 						<plugin>
 							<groupId>org.apache.maven.plugins</groupId>
 							<artifactId>maven-surefire-plugin</artifactId>
-							<version>2.14.1</version>
+							<version>2.19.1</version>
 							<configuration>
 								<excludes>
 									<exclude>**/AbstractTest.java</exclude>
 								</excludes>
 									<argLine>
-										--illegal-access=permit
+										${surefireArgLine} --illegal-access=permit
 									</argLine>
 							</configuration>
 						</plugin>
diff --git a/src/test/java/org/onap/dmaap/mr/cambria/embed/KafkaLocal.java b/src/test/java/org/onap/dmaap/mr/cambria/embed/KafkaLocal.java
index 17c5bbb..43dcd6c 100644
--- a/src/test/java/org/onap/dmaap/mr/cambria/embed/KafkaLocal.java
+++ b/src/test/java/org/onap/dmaap/mr/cambria/embed/KafkaLocal.java
@@ -41,7 +41,7 @@ public class KafkaLocal {
 		zookeeper = new ZooKeeperLocal(zkProperties);
 		zookeeper.run();
 		System.out.println("done");
-		
+		Thread.sleep(5000);
 		//start local kafka broker
 		final scala.Option<String> prefix = scala.Option.apply("kafka");
 		kafka = new KafkaServer(kafkaConfig, Time.SYSTEM, prefix, false);
diff --git a/src/test/java/org/onap/dmaap/service/UIRestServicesTest.java b/src/test/java/org/onap/dmaap/service/UIRestServicesTest.java
index 3024484..77d8b01 100644
--- a/src/test/java/org/onap/dmaap/service/UIRestServicesTest.java
+++ b/src/test/java/org/onap/dmaap/service/UIRestServicesTest.java
@@ -107,7 +107,7 @@ public class UIRestServicesTest {
 		Class clazz = null;
 		Method method = null;
 		try {
-			clazz = Class.forName("UIRestServices");
+			clazz = Class.forName("org.onap.dmaap.service.UIRestServices");
 			Object obj = clazz.newInstance();
 			method = clazz.getDeclaredMethod("getDmaapContext", null);
 			method.setAccessible(true);
-- 
2.16.6