Address more sonar issues in policy-models

Addressed sonar issues:
- diamond operator
Also removed a number of the "NOSONAR" comments now that we know how to
address them without disabling sonar.

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

1 files changed, 2 insertions, 5 deletions

diff --git a/models-interactions/model-impl/events/src/test/java/org/onap/policy/controlloop/ControlLoopOperationTest.java b/models-interactions/model-impl/events/src/test/java/org/onap/policy/controlloop/ControlLoopOperationTest.java
index 54eec71b5..eaf4ea93a 100644
--- a/models-interactions/model-impl/events/src/test/java/org/onap/policy/controlloop/ControlLoopOperationTest.java
+++ b/models-interactions/model-impl/events/src/test/java/org/onap/policy/controlloop/ControlLoopOperationTest.java
@@ -35,11 +35,8 @@ public class ControlLoopOperationTest {
     public void test() {
         ControlLoopOperation operation = new ControlLoopOperation();
 
-        /*
-         * Disabling sonar to test equals().
-         */
-        assertEquals(operation, operation);         // NOSONAR
-        assertNotEquals(operation, "");             // NOSONAR
+        assertEquals(operation, (Object) operation);
+        assertNotEquals(operation, (Object) "");
         assertNotEquals(operation, null);
 
         assertNotEquals(0, operation.hashCode());