Add MDC Topic Filtering

A feature to provide configurable properties for network topics
to extrac fields from JSON strings and place them in a mapped
diagnostic context.

Issue-ID: POLICY-1499
Change-Id: Icfca0be3b263ccf1612b79ed617e2b1ffb0317e6
Signed-off-by: Daniel Cruz <dc443y@att.com>

3 files changed, 752 insertions, 0 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
new file mode 100755
index 00000000..afe6df35
--- /dev/null
+++ b/feature-mdc-filters/src/test/java/org/onap/policy/drools/mdc/filters/MdcFilterFeatureTest.java
@@ -0,0 +1,170 @@
+/*

+ * ============LICENSE_START=======================================================

+ * feature-mdc-filters

+ * ================================================================================

+ * Copyright (C) 2019 AT&T Intellectual Property. 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.

+ * You may obtain a copy of the License at

+ *

+ *      http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing, software

+ * distributed under the License is distributed on an "AS IS" BASIS,

+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+ * See the License for the specific language governing permissions and

+ * limitations under the License.

+ * ============LICENSE_END=========================================================

+ */

+

+package org.onap.policy.drools.mdc.filters;

+

+import static org.junit.Assert.assertEquals;

+import static org.junit.Assert.assertNotNull;

+import static org.junit.Assert.assertNull;

+import static org.mockito.Mockito.doReturn;

+import static org.mockito.Mockito.mock;

+

+import java.io.IOException;

+import java.nio.file.Files;

+import java.nio.file.Paths;

+import java.util.List;

+import java.util.Properties;

+

+import org.junit.Before;

+import org.junit.Test;

+import org.onap.policy.common.endpoints.event.comm.Topic.CommInfrastructure;

+import org.onap.policy.common.endpoints.event.comm.TopicEndpoint;

+import org.onap.policy.common.endpoints.event.comm.TopicSink;

+import org.onap.policy.common.endpoints.event.comm.TopicSource;

+import org.onap.policy.common.endpoints.utils.NetLoggerUtil.EventType;

+import org.onap.policy.drools.system.PolicyController;

+import org.slf4j.Logger;

+import org.slf4j.LoggerFactory;

+import org.slf4j.MDC;

+

+public class MdcFilterFeatureTest {

+

+    /**

+     * Logger.

+     */

+    private static final Logger logger = LoggerFactory.getLogger(MdcFilterFeatureTest.class);

+

+    /**

+     * Test topic names for mdc topic filters.

+     */

+    private static final String TEST_TOPIC_A = "org.onap.policy.test-topic-a";

+    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;

+

+    /**

+     * An instance of the MdcFilterFeature.

+     */

+    private MdcFilterFeature mdcFilterFeature;

+

+    /**

+     * Sample json string to be logged.

+     */

+    private String message;

+

+    /**

+     * Setup.

+     * @throws IOException thrown if onset.json file could not be read

+     */

+    @Before

+    public void setUp() throws IOException {

+        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);

+

+        List<TopicSource> topicSources = TopicEndpoint.manager.addTopicSources(props);

+        doReturn(topicSources).when(controller).getTopicSources();

+

+        List<TopicSink> topicSinks = TopicEndpoint.manager.addTopicSinks(props);

+        doReturn(topicSinks).when(controller).getTopicSinks();

+

+        mdcFilterFeature = new MdcFilterFeatureImpl();

+        mdcFilterFeature.afterCreate(controller);

+    }

+

+    /**

+     * Tests extracting fields from a JSON message and place them in the MDC and

+     * then clearing the MDC.

+     */

+    @Test

+    public void mdcLogTest() {

+        mdcFilterFeature.beforeLog(logger, EventType.IN,

+                CommInfrastructure.DMAAP, TEST_TOPIC_A, message);

+

+        assertEquals("8c1b8bd8-06f7-493f-8ed7-daaa4cc481bc", MDC.get("requestID"));

+        assertEquals("CL-TEST", MDC.get("closedLoopControlName"));

+

+        assertNotNull(MDC.getCopyOfContextMap());

+

+        mdcFilterFeature.afterLog(logger, EventType.IN,

+                CommInfrastructure.DMAAP, TEST_TOPIC_A, message);

+

+        assertNull(MDC.getCopyOfContextMap());

+    }

+

+    /**

+     * Tests that the feature does not search for fields in a JSON message

+     * if there is not an MdcTopicFilter object for the generated key.

+     */

+    @Test

+    public void noTopicFilterTest() {

+        mdcFilterFeature.beforeLog(logger, EventType.OUT,

+                CommInfrastructure.NOOP, "no-topic", message);

+

+        assertEquals("OUT", MDC.get("networkEventType"));

+        assertEquals("NOOP", MDC.get("networkProtocol"));

+        assertEquals("no-topic", MDC.get("networkTopic"));

+        assertNull(MDC.get("requestID"));

+    }

+

+    /**

+     * Creates a simple properties map containing an mdc filter for a test

+     * topic.

+     *

+     * @return a properties map with mdc filter properties.

+     */

+    private Properties mockFeatureProperties() {

+        Properties props = new Properties();

+

+        String key = "dmaap.source.topics." + TEST_TOPIC_A + ".mdcFilters";

+        String value = "requestID=$.requestID,closedLoopControlName=$.closedLoopControlName";

+        props.setProperty(key, value);

+

+        return props;

+    }

+

+    /**

+     * Subclass of MdcFilterFeature for junit usage.

+     */

+    private class MdcFilterFeatureImpl extends MdcFilterFeature {

+

+        public MdcFilterFeatureImpl() {

+            super();

+        }

+

+        @Override

+        protected Properties getFeatureProps() {

+            return props;

+        }

+    }

+}

diff --git a/feature-mdc-filters/src/test/java/org/onap/policy/drools/mdc/filters/MdcTopicFilterTest.java b/feature-mdc-filters/src/test/java/org/onap/policy/drools/mdc/filters/MdcTopicFilterTest.java
new file mode 100755
index 00000000..2a5a875d
--- /dev/null
+++ b/feature-mdc-filters/src/test/java/org/onap/policy/drools/mdc/filters/MdcTopicFilterTest.java
@@ -0,0 +1,564 @@
+/*

+ * ============LICENSE_START=======================================================

+ * feature-mdc-filters

+ * ================================================================================

+ * Copyright (C) 2019 AT&T Intellectual Property. 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.

+ * You may obtain a copy of the License at

+ * 

+ *      http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing, software

+ * distributed under the License is distributed on an "AS IS" BASIS,

+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+ * See the License for the specific language governing permissions and

+ * limitations under the License.

+ * ============LICENSE_END=========================================================

+ */

+

+package org.onap.policy.drools.mdc.filters;

+

+import static org.junit.Assert.assertEquals;

+import static org.junit.Assert.assertNotNull;

+

+import java.util.Arrays;

+import java.util.List;

+import java.util.Map;

+

+import org.junit.Test;

+import org.onap.policy.drools.mdc.filters.MdcTopicFilter.FilterRule;

+

+public class MdcTopicFilterTest {

+

+    /**

+     * Test the simple case of having one filter rule for a key.

+     */

+    @Test

+    public void singleFilterOnePathTest() {

+        String topicFilterProp = "requestID=$.requestID";

+        MdcTopicFilter topicFilter = new MdcTopicFilter(topicFilterProp);

+

+        FilterRule rule = topicFilter.getFilterRule("requestID");

+        assertEquals("requestID", rule.getMdcKey());

+        assertEquals("[$.requestID]", rule.getPaths().toString());

+    }

+

+    /**

+     * Tests having one filter rule with a set of potential paths to the key.

+     */

+    @Test

+    public void singleFilterMultiPathTest() {

+        String topicFilterProp = "requestID=$.requestID|$.request-id";

+        MdcTopicFilter topicFilter = new MdcTopicFilter(topicFilterProp);

+

+        FilterRule rule = topicFilter.getFilterRule("requestID");

+        assertEquals("requestID", rule.getMdcKey());

+        assertEquals(2, rule.getPaths().size());

+        assertEquals("[$.requestID, $.request-id]", rule.getPaths().toString());

+    }

+

+    /**

+     * Tests having two filter rules that each have one key/path pair.

+     */

+    @Test

+    public void multiFilterSinglePathTest() {

+        String topicFilterProp = "requestID=$.requestID,closedLoopControlName=$.closedLoopControlName";

+        MdcTopicFilter topicFilter = new MdcTopicFilter(topicFilterProp);

+

+        FilterRule rule = topicFilter.getFilterRule("requestID");

+        assertEquals("requestID", rule.getMdcKey());

+        assertEquals(1, rule.getPaths().size());

+        assertEquals("[$.requestID]", rule.getPaths().toString());

+

+        FilterRule rule2 = topicFilter.getFilterRule("closedLoopControlName");

+        assertEquals("closedLoopControlName", rule2.getMdcKey());

+        assertEquals(1, rule2.getPaths().size());

+        assertEquals("[$.closedLoopControlName]", rule2.getPaths().toString());

+    }

+

+    /**

+     * Tests having two filter rules that each have two key/path pairs.

+     */

+    @Test

+    public void multiFilterMultiPathTest() {

+        String topicFilterProp = "requestID=$.requestID|$.body.request-id," 

+                + "closedLoopControlName=$.closedLoopControlName"

+                + "|$.body.closedLoopControlName";

+        MdcTopicFilter topicFilter = new MdcTopicFilter(topicFilterProp);

+

+        FilterRule rule = topicFilter.getFilterRule("requestID");

+        assertEquals("requestID", rule.getMdcKey());

+        assertEquals(2, rule.getPaths().size());

+        assertEquals("[$.requestID, $.body.request-id]", rule.getPaths().toString());

+

+        FilterRule rule2 = topicFilter.getFilterRule("closedLoopControlName");

+        assertEquals("closedLoopControlName", rule2.getMdcKey());

+        assertEquals(2, rule2.getPaths().size());

+        assertEquals("[$.closedLoopControlName, $.body.closedLoopControlName]", rule2.getPaths().toString());

+    }

+

+    /**

+     * Tests that the regex split logic for '|' in the feature code doesn't

+     * break parsing when "||" is used as a predicate in a JsonPath query.

+     */

+    @Test

+    public void addOrPredicateFilterTest() {

+        String topicFilterProp = "requestID=$.requestID||$.body.requestID";

+        MdcTopicFilter topicFilter = new MdcTopicFilter(topicFilterProp);

+        assertEquals(1, topicFilter.getFilterRule().size());

+        assertEquals("requestID", topicFilter.getFilterRule("requestID").getMdcKey());

+        assertEquals(Arrays.asList("$.requestID||$.body.requestID"), topicFilter

+                .getFilterRule("requestID").getPaths());

+    }

+

+    /**

+     * Tests getting all filter rules for a given topic.

+     */

+    @Test

+    public void getAllFilterRulesTest() {

+        String topicFilterProp = "requestID=$.requestID,subRequestID=$.subRequestID,"

+                + "closedLoopControlName=$.closedLoopControlName";

+        MdcTopicFilter topicFilter = new MdcTopicFilter(topicFilterProp);

+        assertEquals(3, topicFilter.getFilterRule().size());

+    }

+

+    /**

+     * Tests getting a filter rule by its key.

+     */

+    @Test

+    public void getFilterRuleTest() {

+        String topicFilterProp = "requestID=$.requestID,subRequestID=$.subRequestID,"

+                + "closedLoopControlName=$.closedLoopControlName";

+        MdcTopicFilter topicFilter = new MdcTopicFilter(topicFilterProp);

+

+        FilterRule rule = topicFilter.getFilterRule("requestID");

+        assertNotNull(rule);

+    }

+

+    /**

+     * Tests throwing an exception for passing in a null key.

+     */

+    @Test(expected = IllegalArgumentException.class)

+    public void getFilterRuleNullKeyTest() {

+        String topicFilterProp = "requestID=$.requestID,subRequestID=$.subRequestID";

+        MdcTopicFilter topicFilter = new MdcTopicFilter(topicFilterProp);

+        topicFilter.getFilterRule(null);

+    }

+

+    /**

+     * Tests throwing an exception for passing in an empty key.

+     */

+    @Test(expected = IllegalArgumentException.class)

+    public void getFilterRuleEmptyKeyTest() {

+        String topicFilterProp = "requestID=$.requestID,subRequestID=$.subRequestID";

+        MdcTopicFilter topicFilter = new MdcTopicFilter(topicFilterProp);

+        topicFilter.getFilterRule("");

+    }

+

+    /**

+     * Tests adding a filter rule with a single path.

+     */

+    @Test

+    public void addFilterRuleSinglePathTest() {

+        String topicFilterProp = "requestID=$.requestID";

+        MdcTopicFilter topicFilter = new MdcTopicFilter(topicFilterProp);

+

+        String key = "subRequestID";

+        String path = "$.subRequestID";

+        FilterRule rule = topicFilter.addFilterRule(key, path);

+        assertEquals(topicFilter.getFilterRule(key), rule);

+    }

+

+    /**

+     * Tests adding a filter rule with multiple paths.

+     */

+    @Test

+    public void addFilterRuleMultiPathTest() {

+        String topicFilterProp = "requestID=$.requestID";

+        MdcTopicFilter topicFilter = new MdcTopicFilter(topicFilterProp);

+

+        String key = "subRequestID";

+        List<String> paths = Arrays.asList("$.subRequestID", "$.sub-request-id");

+        FilterRule rule = topicFilter.addFilterRule(key, paths);

+        assertEquals(topicFilter.getFilterRule(key), rule);

+    }

+

+    /**

+     * Tests throwing an exception for passing a null key and a

+     * single path.

+     */

+    @Test(expected = IllegalArgumentException.class)

+    public void addFilterRuleNullKeyStringPathTest() {

+        String topicFilterProp = "requestID=$.requestID";

+        MdcTopicFilter topicFilter = new MdcTopicFilter(topicFilterProp);

+        topicFilter.addFilterRule(null, "$.subRequestID");

+    }

+    

+    /**

+     * Tests throwing an exception for passing a null key and a list

+     * of paths.

+     */

+    @Test(expected = IllegalArgumentException.class)

+    public void addFilterRuleNullKeyPathListTest() {

+        String topicFilterProp = "requestID=$.requestID";

+        MdcTopicFilter topicFilter = new MdcTopicFilter(topicFilterProp);

+        topicFilter.addFilterRule(null, Arrays.asList("$.subRequestID"));

+    }

+

+    /**

+     * Tests throwing an exception for passing an empty key and

+     * a single path.

+     */

+    @Test(expected = IllegalArgumentException.class)

+    public void addFilterRuleEmptyKeyStringPathTest() {

+        String topicFilterProp = "requestID=$.requestID";

+        MdcTopicFilter topicFilter = new MdcTopicFilter(topicFilterProp);

+        topicFilter.addFilterRule("", "$.subRequestID");

+    }

+    

+    /**

+     * Tests throwing an exception for passing an empty key and

+     * a list of paths.

+     */

+    @Test(expected = IllegalArgumentException.class)

+    public void addFilterRuleEmptyKeyPathListTest() {

+        String topicFilterProp = "requestID=$.requestID";

+        MdcTopicFilter topicFilter = new MdcTopicFilter(topicFilterProp);

+        topicFilter.addFilterRule("", Arrays.asList("$.subRequestID"));

+    }

+

+    /**

+     * Tests throwing an exception for passing an empty path string.

+     */

+    @Test(expected = IllegalArgumentException.class)

+    public void addFilterRuleEmptyPathTest() {

+        String topicFilterProp = "requestID=$.requestID";

+        MdcTopicFilter topicFilter = new MdcTopicFilter(topicFilterProp);

+        topicFilter.addFilterRule("subRequestID", "");

+    }

+

+    /**

+     * Tests throwing an exception for passing an empty paths list.

+     */

+    @Test(expected = IllegalArgumentException.class)

+    public void addFilterRuleEmptyPathsTest() {

+        String topicFilterProp = "requestID=$.requestID";

+        MdcTopicFilter topicFilter = new MdcTopicFilter(topicFilterProp);

+        topicFilter.addFilterRule("subRequestID", Arrays.asList());

+    }

+

+    /**

+     * Tests throwing an exception for trying to add a filter with a key that

+     * already exists with a single filter.

+     */

+    @Test(expected = IllegalArgumentException.class)

+    public void addExistingFilterRuleStringTest() {

+        String topicFilterProp = "requestID=$.requestID";

+        MdcTopicFilter topicFilter = new MdcTopicFilter(topicFilterProp);

+        topicFilter.addFilterRule("requestID", "$.test");

+    }

+    

+    /**

+     * Tests throwing an exception for trying to add a filter with a key that

+     * already exists with a list of filters.

+     */

+    @Test(expected = IllegalArgumentException.class)

+    public void addExistingFilterRuleListTest() {

+        String topicFilterProp = "requestID=$.requestID";

+        MdcTopicFilter topicFilter = new MdcTopicFilter(topicFilterProp);

+        topicFilter.addFilterRule("requestID", Arrays.asList("$.test"));

+    }

+

+    /**

+     * Tests modifying a filter rule to add a new path.

+     */

+    @Test

+    public void modifyFilterRuleSinglePathTest() {

+        String topicFilterProp = "requestID=$.requestID";

+        MdcTopicFilter topicFilter = new MdcTopicFilter(topicFilterProp);

+

+        FilterRule rule = topicFilter.modifyFilterRule("requestID", "$.request-id");

+        assertEquals(topicFilter.getFilterRule("requestID"), rule);

+        assertEquals(Arrays.asList("$.requestID", "$.request-id"), rule.getPaths());

+    }

+

+    /**

+     * Tests modifying a filter rule to add a list of new paths.

+     */

+    @Test

+    public void modifyFilterRuleMultiPathTest() {

+        String topicFilterProp = "requestID=$.requestID";

+        MdcTopicFilter topicFilter = new MdcTopicFilter(topicFilterProp);

+

+        FilterRule rule = topicFilter.modifyFilterRule("requestID",

+                Arrays.asList("$.request-id", "$.requestId"));

+        assertEquals(topicFilter.getFilterRule("requestID"), rule);

+        assertEquals(

+                Arrays.asList("$.requestID", "$.request-id", "$.requestId"),

+                rule.getPaths());

+    }

+

+    /**

+     * Tests modifying a filter rule key.

+     */

+    @Test

+    public void modifyFilterRuleKeyTest() {

+        String topicFilterProp = "requestID=$.requestID";

+        MdcTopicFilter topicFilter = new MdcTopicFilter(topicFilterProp);

+

+        FilterRule rule = topicFilter.modifyFilterRule("requestID",

+                "request-id", Arrays.asList("$.request-id"));

+        assertEquals(topicFilter.getFilterRule("request-id"), rule);

+        assertEquals("[$.request-id]", rule.getPaths().toString());

+    }

+

+    /**

+     * Tests throwing an exception when passing a null key and

+     * a single path.

+     */

+    @Test(expected = IllegalArgumentException.class)

+    public void modifyFilterRuleNullKeyStringPathTest() {

+        String topicFilterProp = "requestID=$.requestID";

+        MdcTopicFilter topicFilter = new MdcTopicFilter(topicFilterProp);

+        topicFilter.modifyFilterRule(null, "$.request-id");

+    }

+    

+    /**

+     * Tests throwing an exception when passing a null key and

+     * a list of multiple paths.

+     */

+    @Test(expected = IllegalArgumentException.class)

+    public void modifyFilterRuleNullKeyPathListTest() {

+        String topicFilterProp = "requestID=$.requestID";

+        MdcTopicFilter topicFilter = new MdcTopicFilter(topicFilterProp);

+        topicFilter.modifyFilterRule(null, Arrays.asList("$.request-id"));

+    }

+    

+    /**

+     * Tests throwing an exception when passing an empty key and

+     * a single path.

+     */

+    @Test(expected = IllegalArgumentException.class)

+    public void modifyFilterRuleEmptyKeyStringPathTest() {

+        String topicFilterProp = "requestID=$.requestID";

+        MdcTopicFilter topicFilter = new MdcTopicFilter(topicFilterProp);

+        topicFilter.modifyFilterRule("", "$.request-id");

+    }

+    

+    /**

+     * Tests throwing an exception when passing an empty key and

+     * a list of multiple paths.

+     */

+    @Test(expected = IllegalArgumentException.class)

+    public void modifyFilterRuleEmptyKeyPathListTest() {

+        String topicFilterProp = "requestID=$.requestID";

+        MdcTopicFilter topicFilter = new MdcTopicFilter(topicFilterProp);

+        topicFilter.modifyFilterRule("", Arrays.asList("$.request-id"));

+    }

+    

+    /**

+     * Tests throwing an exception when passing an empty string path.

+     */

+    @Test(expected = IllegalArgumentException.class)

+    public void modifyFilterRuleEmptyPathStringTest() {

+        String topicFilterProp = "requestID=$.requestID";

+        MdcTopicFilter topicFilter = new MdcTopicFilter(topicFilterProp);

+        topicFilter.modifyFilterRule("requestID", "");

+    }

+    

+    /**

+     * Tests throwing an exception when passing an empty list of paths.

+     */

+    @Test(expected = IllegalArgumentException.class)

+    public void modifyFilterRuleEmptyPathListTest() {

+        String topicFilterProp = "requestID=$.requestID";

+        MdcTopicFilter topicFilter = new MdcTopicFilter(topicFilterProp);

+        topicFilter.modifyFilterRule("requestID", Arrays.asList());

+    }

+    

+    /**

+     * Tests throwing an exception when passing a key that is 

+     * not in the filter rules map and a string path.

+     */

+    @Test(expected = IllegalArgumentException.class)

+    public void modifyFilterRuleMissingKeyStringPathTest() {

+        String topicFilterProp = "requestID=$.requestID";

+        MdcTopicFilter topicFilter = new MdcTopicFilter(topicFilterProp);

+        topicFilter.modifyFilterRule("request-id", "$.request-id");

+    }

+    

+    /**

+     * Tests throwing an exception when passing a key that is 

+     * not in the filter rules map and a list of paths.

+     */

+    @Test(expected = IllegalArgumentException.class)

+    public void modifyFilterRuleMissingKeyPathListTest() {

+        String topicFilterProp = "requestID=$.requestID";

+        MdcTopicFilter topicFilter = new MdcTopicFilter(topicFilterProp);

+        topicFilter.modifyFilterRule("request-id", Arrays.asList("$.request-id"));

+    }

+    

+    

+    /**

+     * Tests throwing an exception when passing a null oldKey.

+     */

+    @Test(expected = IllegalArgumentException.class)

+    public void modifyFilterRuleNullOldKeyTest() {

+        String topicFilterProp = "requestID=$.requestID";

+        MdcTopicFilter topicFilter = new MdcTopicFilter(topicFilterProp);

+        topicFilter.modifyFilterRule(null, "request-id", Arrays.asList("$.request-id"));

+    }

+    

+    /**

+     * Tests throwing an exception when passing an empty oldKey.

+     */

+    @Test(expected = IllegalArgumentException.class)

+    public void modifyFilterRuleEmptyOldKeyTest() {

+        String topicFilterProp = "requestID=$.requestID";

+        MdcTopicFilter topicFilter = new MdcTopicFilter(topicFilterProp);

+        topicFilter.modifyFilterRule("", "request-id", Arrays.asList("$.request-id"));

+    }

+    

+    /**

+     * Tests throwing an exception when passing a null newKey.

+     */

+    @Test(expected = IllegalArgumentException.class)

+    public void modifyFilterRuleNullNewKeyTest() {

+        String topicFilterProp = "requestID=$.requestID";

+        MdcTopicFilter topicFilter = new MdcTopicFilter(topicFilterProp);

+        topicFilter.modifyFilterRule("requestID", null, Arrays.asList("$.request-id"));

+    }

+    

+    /**

+     * Tests throwing an exception when passing an empty newKey.

+     */

+    @Test(expected = IllegalArgumentException.class)

+    public void modifyFilterRuleEmptyNewKeyTest() {

+        String topicFilterProp = "requestID=$.requestID";

+        MdcTopicFilter topicFilter = new MdcTopicFilter(topicFilterProp);

+        topicFilter.modifyFilterRule("requestID", "", Arrays.asList("$.request-id"));

+    }

+    

+    /**

+     * Tests throwing an exception when the old and new key are the same.

+     */

+    @Test(expected = IllegalArgumentException.class)

+    public void modifyFilterRuleSameKeyTest() {

+        String topicFilterProp = "requestID=$.requestID";

+        MdcTopicFilter topicFilter = new MdcTopicFilter(topicFilterProp);

+        topicFilter.modifyFilterRule("requestID", "requestID",

+                Arrays.asList("$.request-id"));

+    }

+    

+    /**

+     * Tests throwing an exception when passing an empty paths list.

+     */

+    @Test(expected = IllegalArgumentException.class)

+    public void modifyFilterRuleEmptyPathsTest() {

+        String topicFilterProp = "requestID=$.requestID";

+        MdcTopicFilter topicFilter = new MdcTopicFilter(topicFilterProp);

+        topicFilter.modifyFilterRule("requestID", "request-id", Arrays.asList());

+    }

+    

+    /**

+     * Tests throwing an exception when the old key doesn't exist

+     * in the rules map.

+     */

+    @Test(expected = IllegalArgumentException.class)

+    public void modifyFilterRuleNonExistingOldKeyTest() {

+        String topicFilterProp = "requestID=$.requestID";

+        MdcTopicFilter topicFilter = new MdcTopicFilter(topicFilterProp);

+        topicFilter.modifyFilterRule("request-id", "id", Arrays.asList("$.request-id"));

+    }

+

+    /**

+     * Tests deleting all filter rules in the rules map.

+     */

+    @Test

+    public void deleteAllFilterRulesTest() {

+        String topicFilterProp = "requestID=$.requestID,subRequestID=$.subRequestID,"

+                + "closedLoopControlName=$.closedLoopControlName";

+        MdcTopicFilter topicFilter = new MdcTopicFilter(topicFilterProp);

+

+        assertEquals(3, topicFilter.getFilterRule().size());

+        topicFilter.deleteFilterRule();

+        assertEquals(0, topicFilter.getFilterRule().size());

+    }

+

+    /**

+     * Tests deleting a single filter rule by its key from the rules map.

+     */

+    @Test

+    public void deleteFilterRuleTest() {

+        String topicFilterProp = "requestID=$.requestID,subRequestID=$.subRequestID,"

+                + "closedLoopControlName=$.closedLoopControlName";

+        MdcTopicFilter topicFilter = new MdcTopicFilter(topicFilterProp);

+

+        assertEquals(3, topicFilter.getFilterRule().size());

+        topicFilter.deleteFilterRule("closedLoopControlName");

+        assertEquals(2, topicFilter.getFilterRule().size());

+    }

+

+    /**

+     * Tests throwing an exception if the key is null.

+     */

+    @Test(expected = IllegalArgumentException.class)

+    public void deleteFilterRuleNullKeyTest() {

+        String topicFilterProp = "requestID=$.requestID,subRequestID=$.subRequestID,"

+                + "closedLoopControlName=$.closedLoopControlName";

+        MdcTopicFilter topicFilter = new MdcTopicFilter(topicFilterProp);

+        topicFilter.deleteFilterRule(null);

+    }

+    

+    /**

+     * Tests throwing an exception if the key is empty.

+     */

+    @Test(expected = IllegalArgumentException.class)

+    public void deleteFilterRuleEmptyKeyTest() {

+        String topicFilterProp = "requestID=$.requestID,subRequestID=$.subRequestID,"

+                + "closedLoopControlName=$.closedLoopControlName";

+        MdcTopicFilter topicFilter = new MdcTopicFilter(topicFilterProp);

+        topicFilter.deleteFilterRule("");

+    }

+

+    /**

+     * Tests finding all results for each filter rule corresponding to a topic.

+     */

+    @Test

+    public void findAllTest() {

+        String message = "{\"requestID\":\"38adde30-cc22-11e8-a8d5-f2801f1b9fd1\",\"entity\":\"controller\","

+                + "\"controllers\":[{\"name\":\"test-controller\","

+                + "\"drools\":{\"groupId\":\"org.onap.policy.drools.test\","

+                + "\"artifactId\":\"test\",\"version\":\"0.0.1\"},\"operation\":\"update\"}]}";

+

+        String topicFilterProp = "requestID=$.requestID,controllerName=$.controllers[0].name,"

+                + "operation=$.controllers[0].operation";

+        MdcTopicFilter topicFilter = new MdcTopicFilter(topicFilterProp);

+

+        Map<String, List<String>> results = topicFilter.find(message);

+        assertEquals("38adde30-cc22-11e8-a8d5-f2801f1b9fd1",

+                results.get("requestID").get(0));

+        assertEquals("test-controller", results.get("controllerName").get(0));

+        assertEquals("update", results.get("operation").get(0));

+    }

+

+    /**

+     * Tests finding field matches for a filter rule corresponding to a topic.

+     */

+    @Test

+    public void findTest() {

+        String message = "{\"requestID\":\"38adde30-cc22-11e8-a8d5-f2801f1b9fd1\",\"entity\":\"controller\","

+                + "\"controllers\":[{\"name\":\"test-controller\","

+                + "\"drools\":{\"groupId\":\"org.onap.policy.drools.test\","

+                + "\"artifactId\":\"test\",\"version\":\"0.0.1\"},\"operation\":\"update\"}]}";

+

+        String topicFilterProp = "requestID=$.requestID,controllerName=$.controllers[0].name,"

+                + "operation=$.controllers[0].operation";

+        MdcTopicFilter topicFilter = new MdcTopicFilter(topicFilterProp);

+

+        List<String> results = topicFilter.find(message, "requestID");

+        assertEquals("38adde30-cc22-11e8-a8d5-f2801f1b9fd1", results.get(0));

+    }

+}

diff --git a/feature-mdc-filters/src/test/resources/onset.json b/feature-mdc-filters/src/test/resources/onset.json
new file mode 100755
index 00000000..fafc93a3
--- /dev/null
+++ b/feature-mdc-filters/src/test/resources/onset.json
@@ -0,0 +1,18 @@
+{

+    "closedLoopEventClient": "DCAE_INSTANCE_ID.dcae-tca",

+    "policyVersion": "1.0.0.5",

+    "policyName": "policyTest",

+    "policyScope": "type=SampleType,closedLoopControlName=SampleClosedLoop",

+    "target_type": "VM",

+    "AAI": {

+        "vserver.is-closed-loop-disabled": false,

+        "vserver.vserver-name": "example-vserver-name"

+    },

+    "closedLoopAlarmStart": 1484855291527925,

+    "closedLoopEventStatus": "ONSET",

+    "closedLoopControlName": "CL-TEST",

+    "version": "1.0.2",

+    "target": "vserver.vserver-name",

+    "requestID": "8c1b8bd8-06f7-493f-8ed7-daaa4cc481bc",

+    "from": "DCAE"

+}
\ No newline at end of file