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, 1 insertions, 4 deletions

diff --git a/models-interactions/model-impl/guard/src/test/java/org/onap/policy/guard/OperationsHistoryTest.java b/models-interactions/model-impl/guard/src/test/java/org/onap/policy/guard/OperationsHistoryTest.java
index 32827b04b..47bdb4c36 100644
--- a/models-interactions/model-impl/guard/src/test/java/org/onap/policy/guard/OperationsHistoryTest.java
+++ b/models-interactions/model-impl/guard/src/test/java/org/onap/policy/guard/OperationsHistoryTest.java
@@ -63,10 +63,7 @@ public class OperationsHistoryTest {
         dao.setId(101L);
         assertNotEquals(hc, dao.hashCode());
 
-        /*
-         * Disabling sonar to test equals().
-         */
-        assertEquals(dao, dao);             // NOSONAR
+        assertEquals(dao, (Object) dao);
         assertNotEquals(dao, new OperationsHistory());
     }
 }