Improve code coverage and sonar fixes

Increased code coverage to 90%
SONAR - Removed TODO comments
SONAR - Added NOSONAR where appropriate
SONAR - Replaced stream.Collect() with stream.toList() where applicable
SONAR - Made variables serializable or transient to comply with sonar rules

Issue-ID: POLICY-5069
Change-Id: Ife256eaf4e6f427fe40b138bacc6f112dc5bcea4
Signed-off-by: waynedunican <wayne.dunican@est.tech>

3 files changed, 8 insertions, 9 deletions

diff --git a/models-interactions/model-actors/actor.test/src/test/java/org/onap/policy/controlloop/actor/test/BasicBidirectionalTopicOperationTest.java b/models-interactions/model-actors/actor.test/src/test/java/org/onap/policy/controlloop/actor/test/BasicBidirectionalTopicOperationTest.java
index c795f9cc5..0d04e5894 100644
--- a/models-interactions/model-actors/actor.test/src/test/java/org/onap/policy/controlloop/actor/test/BasicBidirectionalTopicOperationTest.java
+++ b/models-interactions/model-actors/actor.test/src/test/java/org/onap/policy/controlloop/actor/test/BasicBidirectionalTopicOperationTest.java
@@ -37,7 +37,6 @@ import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
-import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.onap.policy.common.endpoints.event.comm.TopicSink;
@@ -71,7 +70,7 @@ class BasicBidirectionalTopicOperationTest {
      * Sets up.
      */
     @BeforeEach
-    void setUp() throws Exception {
+    void setUp() {
         oper.setUpBasic();
     }
 
diff --git a/models-interactions/model-actors/actor.test/src/test/java/org/onap/policy/controlloop/actor/test/BasicHttpOperationTest.java b/models-interactions/model-actors/actor.test/src/test/java/org/onap/policy/controlloop/actor/test/BasicHttpOperationTest.java
index 58392b96e..907802963 100644
--- a/models-interactions/model-actors/actor.test/src/test/java/org/onap/policy/controlloop/actor/test/BasicHttpOperationTest.java
+++ b/models-interactions/model-actors/actor.test/src/test/java/org/onap/policy/controlloop/actor/test/BasicHttpOperationTest.java
@@ -43,7 +43,7 @@ class BasicHttpOperationTest {
 
 
     @BeforeEach
-    void setUp() throws Exception {
+    void setUp() {
         oper = new BasicHttpOperation(ACTOR, OPERATION);
         oper.setUpBasic();
     }
@@ -62,7 +62,7 @@ class BasicHttpOperationTest {
     }
 
     @Test
-    void testSetUp() throws Exception {
+    void testSetUp() {
         assertNotNull(oper.client);
         assertSame(oper.client, oper.factory.get(BasicHttpOperation.MY_CLIENT));
         assertEquals(200, oper.rawResponse.getStatus());
@@ -73,7 +73,7 @@ class BasicHttpOperationTest {
     }
 
     @Test
-    void testInitOperator() throws Exception {
+    void testInitOperator() {
         oper.initConfig();
 
         assertSame(oper.client, oper.config.getClient());
diff --git a/models-interactions/model-actors/actor.test/src/test/java/org/onap/policy/controlloop/actor/test/BasicOperationTest.java b/models-interactions/model-actors/actor.test/src/test/java/org/onap/policy/controlloop/actor/test/BasicOperationTest.java
index b2afce2c3..cf61e191b 100644
--- a/models-interactions/model-actors/actor.test/src/test/java/org/onap/policy/controlloop/actor/test/BasicOperationTest.java
+++ b/models-interactions/model-actors/actor.test/src/test/java/org/onap/policy/controlloop/actor/test/BasicOperationTest.java
@@ -23,9 +23,9 @@ package org.onap.policy.controlloop.actor.test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertSame;
 
+import java.util.Collections;
 import java.util.Map;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -44,7 +44,7 @@ import org.onap.policy.controlloop.actorserviceprovider.Util;
 
 
     @BeforeEach
-     void setUp() throws Exception {
+     void setUp() {
         oper = new BasicHttpOperation(ACTOR, OPERATION);
         oper.setUpBasic();
     }
@@ -63,7 +63,7 @@ import org.onap.policy.controlloop.actorserviceprovider.Util;
     }
 
     @Test
-     void testSetUp() throws Exception {
+     void testSetUp() {
         assertNotNull(oper.future);
         assertNotNull(oper.outcome);
         assertNotNull(oper.executor);
@@ -82,7 +82,7 @@ import org.onap.policy.controlloop.actorserviceprovider.Util;
 
     @Test
      void testMakePayload() {
-        assertNull(oper.makePayload());
+        assertEquals(Collections.emptyMap(), oper.makePayload());
     }
 
     @Test