From c747114b805c85f4a111f35f289b2e58acf92ef9 Mon Sep 17 00:00:00 2001 From: efiacor Date: Thu, 15 Jul 2021 14:13:18 +0100 Subject: [DMAAP-MR] Fix vulnerabilities for rel I Signed-off-by: efiacor Change-Id: Ie900556f2542c154cbef8c5a11db86bcc46402f7 Issue-ID: DMAAP-1608 --- src/test/java/org/onap/dmaap/JUnitTestSuite.java | 6 ++++-- src/test/java/org/onap/dmaap/TestRunner.java | 6 ++++-- src/test/java/org/onap/dmaap/mmagent/TestRunner.java | 5 +++-- src/test/java/org/onap/dmaap/mr/cambria/embed/ZooKeeperLocal.java | 3 ++- .../resources/streamReaders/CambriaJsonStreamReaderTest.java | 3 --- .../cambria/resources/streamReaders/CambriaRawStreamReaderTest.java | 3 --- src/test/java/org/onap/dmaap/util/JUnitTestSuite.java | 5 +++-- 7 files changed, 16 insertions(+), 15 deletions(-) (limited to 'src/test/java/org/onap') diff --git a/src/test/java/org/onap/dmaap/JUnitTestSuite.java b/src/test/java/org/onap/dmaap/JUnitTestSuite.java index d20d0d6..b555b57 100644 --- a/src/test/java/org/onap/dmaap/JUnitTestSuite.java +++ b/src/test/java/org/onap/dmaap/JUnitTestSuite.java @@ -25,13 +25,15 @@ import junit.framework.TestSuite; import org.junit.runner.RunWith; import org.junit.runners.Suite; import org.junit.runners.Suite.SuiteClasses; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + @RunWith(Suite.class) @SuiteClasses({ DMaaPCambriaExceptionMapperTest.class, DMaaPWebExceptionMapper.class, JaxrsEchoServiceTest.class, HelloWorldTest.class, JaxrsUserServiceTest.class }) public class JUnitTestSuite { - private static final Logger LOGGER = Logger.getLogger(JUnitTestSuite.class); + private static final Logger LOGGER = LogManager.getLogger(JUnitTestSuite.class); public static void main(String[] args) { LOGGER.info("Running the test suite"); diff --git a/src/test/java/org/onap/dmaap/TestRunner.java b/src/test/java/org/onap/dmaap/TestRunner.java index 4542566..a8d1ddc 100644 --- a/src/test/java/org/onap/dmaap/TestRunner.java +++ b/src/test/java/org/onap/dmaap/TestRunner.java @@ -23,10 +23,12 @@ import org.junit.runner.JUnitCore; import org.junit.runner.Result; import org.junit.runner.notification.Failure; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + public class TestRunner { - private static final Logger LOGGER = Logger.getLogger(TestRunner.class); + private static final Logger LOGGER = LogManager.getLogger(TestRunner.class); public static void main(String[] args) { // TODO Auto-generated method stub diff --git a/src/test/java/org/onap/dmaap/mmagent/TestRunner.java b/src/test/java/org/onap/dmaap/mmagent/TestRunner.java index 3e4ece3..9bf4839 100644 --- a/src/test/java/org/onap/dmaap/mmagent/TestRunner.java +++ b/src/test/java/org/onap/dmaap/mmagent/TestRunner.java @@ -23,10 +23,11 @@ import org.junit.runner.JUnitCore; import org.junit.runner.Result; import org.junit.runner.notification.Failure; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; public class TestRunner { - private static final Logger LOGGER = Logger.getLogger(TestRunner.class); + private static final Logger LOGGER = LogManager.getLogger(TestRunner.class); public static void main(String[] args) { // TODO Auto-generated method stub diff --git a/src/test/java/org/onap/dmaap/mr/cambria/embed/ZooKeeperLocal.java b/src/test/java/org/onap/dmaap/mr/cambria/embed/ZooKeeperLocal.java index 3209845..97447a8 100644 --- a/src/test/java/org/onap/dmaap/mr/cambria/embed/ZooKeeperLocal.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/embed/ZooKeeperLocal.java @@ -22,6 +22,7 @@ import org.apache.zookeeper.server.ServerConfig; import org.apache.zookeeper.server.ZooKeeperServerMain; +import org.apache.zookeeper.server.admin.AdminServer.AdminServerException; import org.apache.zookeeper.server.quorum.QuorumPeerConfig; import java.io.FileNotFoundException; @@ -49,7 +50,7 @@ public class ZooKeeperLocal { public void run() { try { zooKeeperServer.runFromConfig(configuration); - } catch (IOException e) { + } catch (IOException | AdminServerException e) { System.out.println("ZooKeeper Failed"); e.printStackTrace(System.err); } diff --git a/src/test/java/org/onap/dmaap/mr/cambria/resources/streamReaders/CambriaJsonStreamReaderTest.java b/src/test/java/org/onap/dmaap/mr/cambria/resources/streamReaders/CambriaJsonStreamReaderTest.java index ddfc435..1be8920 100644 --- a/src/test/java/org/onap/dmaap/mr/cambria/resources/streamReaders/CambriaJsonStreamReaderTest.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/resources/streamReaders/CambriaJsonStreamReaderTest.java @@ -54,9 +54,6 @@ public class CambriaJsonStreamReaderTest { stream = IOUtils.toInputStream(source, "UTF-8"); test = new CambriaJsonStreamReader(stream,"hello"); test.next(); - } catch (IOException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); } catch (CambriaApiException e1) { e1.printStackTrace(); } diff --git a/src/test/java/org/onap/dmaap/mr/cambria/resources/streamReaders/CambriaRawStreamReaderTest.java b/src/test/java/org/onap/dmaap/mr/cambria/resources/streamReaders/CambriaRawStreamReaderTest.java index ab58082..887e7c9 100644 --- a/src/test/java/org/onap/dmaap/mr/cambria/resources/streamReaders/CambriaRawStreamReaderTest.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/resources/streamReaders/CambriaRawStreamReaderTest.java @@ -55,9 +55,6 @@ public class CambriaRawStreamReaderTest { stream = IOUtils.toInputStream(source, "UTF-8"); test = new CambriaRawStreamReader(stream,"hello"); msg = test.next(); - } catch (IOException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); } catch (CambriaApiException e1) { e1.printStackTrace(); } diff --git a/src/test/java/org/onap/dmaap/util/JUnitTestSuite.java b/src/test/java/org/onap/dmaap/util/JUnitTestSuite.java index 9de79ab..7a05d9d 100644 --- a/src/test/java/org/onap/dmaap/util/JUnitTestSuite.java +++ b/src/test/java/org/onap/dmaap/util/JUnitTestSuite.java @@ -25,12 +25,13 @@ import junit.framework.TestSuite; import org.junit.runner.RunWith; import org.junit.runners.Suite; import org.junit.runners.Suite.SuiteClasses; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; @RunWith(Suite.class) @SuiteClasses({ ContentLengthInterceptorTest.class, DMaaPAuthFilterTest.class, ServicePropertiesMapBeanTest.class}) public class JUnitTestSuite { - private static final Logger LOGGER = Logger.getLogger(JUnitTestSuite.class); + private static final Logger LOGGER = LogManager.getLogger(JUnitTestSuite.class); public static void main(String[] args) { LOGGER.info("Running the test suite"); -- cgit 1.2.3-korg