Apply simple sonar fixes

Note: A number of these were identified, by SonarLint, in the Test
classes, which are not typically scanned by Sonar.

Removed unnecessary imports.
Removed unneeded "throws Xxx".
Replaced lambda with method references.
Replaced duplicate strings with constants.
Replaced try-fail-catch with assert-j methods to eliminate sonar
complaints about duplicate failure messages.
Added missing @Override annotations.
Use map.computeIfAbsent() where appropriate.
Also fixed some minor checkstyle issues.
Removed unneeded "volatile" declarations.
Replaced some if-else constructs with "?:" construct, per sonar.
Replaced Object.wait() with CountDownLatch.await(); according to sonar
(and javadocs), Object.wait() can return due to "spurious wakeups".
Fixed issue whereby CryptoUtilsTest wouldn't run in my Eclipse.

Change-Id: Ib6b71ed65662cfd6209400dac57ed69279bf29ec
Issue-ID: POLICY-1791
Signed-off-by: Jim Hahn <jrh3@att.com>

7 files changed, 19 insertions, 8 deletions

diff --git a/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/bus/internal/BusConsumerTest.java b/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/bus/internal/BusConsumerTest.java
index c9064d45..ae07798d 100644
--- a/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/bus/internal/BusConsumerTest.java
+++ b/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/bus/internal/BusConsumerTest.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * policy-endpoints
  * ================================================================================
- * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2018-2019 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.
@@ -47,6 +47,7 @@ import org.powermock.reflect.Whitebox;
 public class BusConsumerTest extends TopicTestBase {
 
     @Before
+    @Override
     public void setUp() {
         super.setUp();
     }
@@ -88,13 +89,17 @@ public class BusConsumerTest extends TopicTestBase {
             cons.fetch();
             fail("missing exception");
 
-        } catch (IOException | InterruptedException e) {
+        } catch (IOException e) {
+            assertEquals(ex, e);
+
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
             assertEquals(ex, e);
         }
     }
 
     @Test
-    public void testCambriaConsumerWrapperClose() throws Exception {
+    public void testCambriaConsumerWrapperClose() {
         CambriaConsumerWrapper cons = new CambriaConsumerWrapper(builder.build());
 
         // set filter several times to cause different branches of close() to be executed
diff --git a/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/bus/internal/BusPublisherTest.java b/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/bus/internal/BusPublisherTest.java
index 9c1e4af4..283d44da 100644
--- a/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/bus/internal/BusPublisherTest.java
+++ b/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/bus/internal/BusPublisherTest.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * policy-endpoints
  * ================================================================================
- * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2018-2019 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.
@@ -48,6 +48,7 @@ import org.onap.policy.common.endpoints.event.comm.bus.internal.BusPublisher.Dma
 public class BusPublisherTest extends TopicTestBase {
 
     @Before
+    @Override
     public void setUp() {
         super.setUp();
     }
@@ -90,7 +91,7 @@ public class BusPublisherTest extends TopicTestBase {
     }
 
     @Test
-    public void testCambriaPublisherWrapperClose() throws Exception {
+    public void testCambriaPublisherWrapperClose() {
         CambriaBatchingPublisher pub = mock(CambriaBatchingPublisher.class);
         CambriaPublisherWrapper cambria = new CambriaPublisherWrapper(makeBuilder().build());
         cambria.publisher = pub;
@@ -146,7 +147,7 @@ public class BusPublisherTest extends TopicTestBase {
     }
 
     @Test
-    public void testDmaapPublisherWrapperSend() throws Exception {
+    public void testDmaapPublisherWrapperSend() {
         MRSimplerBatchPublisher pub = mock(MRSimplerBatchPublisher.class);
         DmaapPublisherWrapper dmaap = new DmaapAafPublisherWrapper(servers, MY_TOPIC, MY_USERNAME, MY_PASSWD, true);
         dmaap.publisher = pub;
@@ -168,7 +169,7 @@ public class BusPublisherTest extends TopicTestBase {
     }
 
     @Test(expected = IllegalArgumentException.class)
-    public void testDmaapPublisherWrapperSend_NullMessage() throws Exception {
+    public void testDmaapPublisherWrapperSend_NullMessage() {
         MRSimplerBatchPublisher pub = mock(MRSimplerBatchPublisher.class);
         DmaapPublisherWrapper dmaap = new DmaapAafPublisherWrapper(servers, MY_TOPIC, MY_USERNAME, MY_PASSWD, true);
         dmaap.publisher = pub;
diff --git a/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/bus/internal/BusTopicBaseTest.java b/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/bus/internal/BusTopicBaseTest.java
index 5628a239..01028045 100644
--- a/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/bus/internal/BusTopicBaseTest.java
+++ b/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/bus/internal/BusTopicBaseTest.java
@@ -39,6 +39,7 @@ public class BusTopicBaseTest extends TopicTestBase {
      * Initializes the object to be tested.
      */
     @Before
+    @Override
     public void setUp() {
         super.setUp();
 
diff --git a/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/bus/internal/BusTopicParamsTest.java b/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/bus/internal/BusTopicParamsTest.java
index 8d1c6343..54531c56 100644
--- a/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/bus/internal/BusTopicParamsTest.java
+++ b/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/bus/internal/BusTopicParamsTest.java
@@ -35,6 +35,7 @@ import org.onap.policy.common.endpoints.event.comm.bus.internal.BusTopicParams.T
 public class BusTopicParamsTest extends TopicTestBase {
 
     @Before
+    @Override
     public void setUp() {
         super.setUp();
     }
@@ -123,7 +124,7 @@ public class BusTopicParamsTest extends TopicTestBase {
      * Tests the boolean methods by applying a function, once with {@code false} and once
      * with {@code true}. Verifies that all of the boolean methods return the correct
      * value by concatenating them.
-     * 
+     *
      * @param expectedTrue the string that is expected when {@code true} is passed to the
      *        method
      * @param function function to be applied to the builder
diff --git a/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/bus/internal/InlineBusTopicSinkTest.java b/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/bus/internal/InlineBusTopicSinkTest.java
index cb6eb107..2356746e 100644
--- a/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/bus/internal/InlineBusTopicSinkTest.java
+++ b/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/bus/internal/InlineBusTopicSinkTest.java
@@ -47,6 +47,7 @@ public class InlineBusTopicSinkTest extends TopicTestBase {
      * Creates the object to be tested.
      */
     @Before
+    @Override
     public void setUp() {
         super.setUp();
 
diff --git a/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/bus/internal/InlineDmaapTopicSinkTest.java b/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/bus/internal/InlineDmaapTopicSinkTest.java
index aaab402c..d9bc990b 100644
--- a/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/bus/internal/InlineDmaapTopicSinkTest.java
+++ b/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/bus/internal/InlineDmaapTopicSinkTest.java
@@ -37,6 +37,7 @@ public class InlineDmaapTopicSinkTest extends TopicTestBase {
      * Creates the object to be tested.
      */
     @Before
+    @Override
     public void setUp() {
         super.setUp();
 
diff --git a/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/bus/internal/InlineUebTopicSinkTest.java b/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/bus/internal/InlineUebTopicSinkTest.java
index 2516406f..a45504f2 100644
--- a/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/bus/internal/InlineUebTopicSinkTest.java
+++ b/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/bus/internal/InlineUebTopicSinkTest.java
@@ -37,6 +37,7 @@ public class InlineUebTopicSinkTest extends TopicTestBase {
      * Creates the object to be tested.
      */
     @Before
+    @Override
     public void setUp() {
         super.setUp();