More sonar fixes in models

Addressed the following sonar issues:
- missing assert in junit
- duplicate code blocks
  - fixed those in the simulators
  - leaving the others in the concept classes for Liam/"G"

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

2 files changed, 9 insertions, 2 deletions

diff --git a/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/DemoTest.java b/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/DemoTest.java
index d496455eb..e45ee0aea 100644
--- a/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/DemoTest.java
+++ b/models-interactions/model-impl/so/src/test/java/org/onap/policy/so/DemoTest.java
@@ -21,9 +21,10 @@
 
 package org.onap.policy.so;
 
+import static org.junit.Assert.assertNotNull;
+
 import java.util.HashMap;
 import java.util.Map;
-
 import org.junit.Test;
 import org.onap.policy.so.util.Serialization;
 import org.slf4j.Logger;
@@ -103,6 +104,7 @@ public class DemoTest {
 
         logger.debug(Serialization.gsonPretty.toJson(request));
 
+        assertNotNull(request);
     }
 
     @Test
@@ -166,6 +168,8 @@ public class DemoTest {
         request.getRequestDetails().getRelatedInstanceList().add(relatedInstanceListElement2);
 
         logger.debug(Serialization.gsonPretty.toJson(request));
+
+        assertNotNull(request);
     }
 
 }
diff --git a/models-interactions/model-impl/vfc/src/test/java/org/onap/policy/vfc/DemoTest.java b/models-interactions/model-impl/vfc/src/test/java/org/onap/policy/vfc/DemoTest.java
index 1c530c797..f66e9ecd6 100644
--- a/models-interactions/model-impl/vfc/src/test/java/org/onap/policy/vfc/DemoTest.java
+++ b/models-interactions/model-impl/vfc/src/test/java/org/onap/policy/vfc/DemoTest.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * Copyright (C) 2017-2019 Intel Corp. All rights reserved.
  * Modifications Copyright (C) 2019 Nordix Foundation.
- * Modifications Copyright (C) 2018-2019 AT&T Corporation. All rights reserved.
+ * Modifications Copyright (C) 2018-2020 AT&T Corporation. 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.
@@ -20,6 +20,8 @@
 
 package org.onap.policy.vfc;
 
+import static org.junit.Assert.assertNotNull;
+
 import java.util.LinkedList;
 import org.junit.Test;
 import org.onap.policy.vfc.util.Serialization;
@@ -80,5 +82,6 @@ public class DemoTest {
         body = Serialization.gsonPretty.toJson(response);
         logger.info("{}", body);
 
+        assertNotNull(body);
     }
 }