Merge "Miscellaneous code clean up"

2 files changed, 4 insertions, 5 deletions

diff --git a/policy-management/src/test/java/org/onap/policy/drools/controller/internal/MavenDroolsController3Test.java b/policy-management/src/test/java/org/onap/policy/drools/controller/internal/MavenDroolsController3Test.java
index e237a455..e7f65296 100644
--- a/policy-management/src/test/java/org/onap/policy/drools/controller/internal/MavenDroolsController3Test.java
+++ b/policy-management/src/test/java/org/onap/policy/drools/controller/internal/MavenDroolsController3Test.java
@@ -32,7 +32,6 @@ import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.kie.api.builder.ReleaseId;
diff --git a/policy-management/src/test/java/org/onap/policy/drools/protocol/coders/ProtocolCoderToolsetTest.java b/policy-management/src/test/java/org/onap/policy/drools/protocol/coders/ProtocolCoderToolsetTest.java
index 2bbb08bf..8607fd6d 100644
--- a/policy-management/src/test/java/org/onap/policy/drools/protocol/coders/ProtocolCoderToolsetTest.java
+++ b/policy-management/src/test/java/org/onap/policy/drools/protocol/coders/ProtocolCoderToolsetTest.java
@@ -84,8 +84,8 @@ public class ProtocolCoderToolsetTest {
     public void testGsonToolset(JsonProtocolFilter protocolFilter) {
         GsonProtocolCoderToolset gsonToolset = new GsonProtocolCoderToolset(
                 EventProtocolParams.builder().topic(JUNIT_PROTOCOL_CODER_TOPIC)
-                        .groupId(this.releaseId.getGroupId())
-                        .artifactId(this.releaseId.getArtifactId())
+                        .groupId(releaseId.getGroupId())
+                        .artifactId(releaseId.getArtifactId())
                         .eventClass(Triple.class.getName())
                         .protocolFilter(protocolFilter)
                         .customGsonCoder(null)
@@ -193,8 +193,8 @@ public class ProtocolCoderToolsetTest {
 
     private void validateInitialization(JsonProtocolFilter protocolFilter, ProtocolCoderToolset coderToolset) {
         Assert.assertTrue(CONTROLLER_ID.equals(coderToolset.getControllerId()));
-        Assert.assertTrue(this.releaseId.getGroupId().equals(coderToolset.getGroupId()));
-        Assert.assertTrue(this.releaseId.getArtifactId().equals(coderToolset.getArtifactId()));
+        Assert.assertTrue(releaseId.getGroupId().equals(coderToolset.getGroupId()));
+        Assert.assertTrue(releaseId.getArtifactId().equals(coderToolset.getArtifactId()));
         Assert.assertNull(coderToolset.getCustomCoder());
 
         Assert.assertTrue(coderToolset.getCoders().size() == 1);