Merge "Miscellaneous code clean up"

1 files changed, 3 insertions, 6 deletions

diff --git a/feature-mdc-filters/src/test/java/org/onap/policy/drools/mdc/filters/MdcFilterFeatureTest.java b/feature-mdc-filters/src/test/java/org/onap/policy/drools/mdc/filters/MdcFilterFeatureTest.java
index 51ff3e92..a8e0cf16 100755
--- a/feature-mdc-filters/src/test/java/org/onap/policy/drools/mdc/filters/MdcFilterFeatureTest.java
+++ b/feature-mdc-filters/src/test/java/org/onap/policy/drools/mdc/filters/MdcFilterFeatureTest.java
@@ -57,11 +57,6 @@ public class MdcFilterFeatureTest {
     private static final String TEST_TOPIC_B = "org.onap.policy.test-topic-b";
 
     /**
-     * The mock PolicyController to be used for the junits.
-     */
-    private PolicyController controller;
-
-    /**
      * The mock properties to be used for the junits.
      */
     private Properties props;
@@ -85,12 +80,14 @@ public class MdcFilterFeatureTest {
         message = new String(Files.readAllBytes(Paths.get("src/test/resources/onset.json")));
 
         props = mockFeatureProperties();
-        controller = mock(PolicyController.class);
 
         props.setProperty("dmaap.source.topics", TEST_TOPIC_A);
         props.setProperty("dmaap.source.topics." + TEST_TOPIC_A + ".servers", "http://testing123.com/");
         props.setProperty("noop.sink.topics", TEST_TOPIC_B);
 
+        // The mock PolicyController to be used for the junits.
+        PolicyController controller = mock(PolicyController.class);
+
         List<TopicSource> topicSources = TopicEndpointManager.getManager().addTopicSources(props);
         doReturn(topicSources).when(controller).getTopicSources();