Fix some sonars in policy-models

Fixed the following sonar issues in some of the project directories:
- use assertNull, assertEquals, etc.
- swap assertEquals arguments
- extract a constant
- don't invoke toString() in logger calls
- TODOs
- generic types

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

1 files changed, 7 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 f25ab86aa..32827b04b 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
@@ -19,7 +19,7 @@
 package org.onap.policy.guard;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertTrue;
 
 import java.util.Date;
@@ -61,9 +61,12 @@ public class OperationsHistoryTest {
 
         int hc = dao.hashCode();
         dao.setId(101L);
-        assertTrue(hc != dao.hashCode());
+        assertNotEquals(hc, dao.hashCode());
 
-        assertTrue(dao.equals(dao));
-        assertFalse(dao.equals(new OperationsHistory()));
+        /*
+         * Disabling sonar to test equals().
+         */
+        assertEquals(dao, dao);             // NOSONAR
+        assertNotEquals(dao, new OperationsHistory());
     }
 }