Fix bug with processing event list 15/74915/6
authorZlatko Murgoski <zlatko.murgoski@nokia.com>
Wed, 19 Dec 2018 14:00:14 +0000 (15:00 +0100)
committerZlatko Murgoski <zlatko.murgoski@nokia.com>
Fri, 21 Dec 2018 15:42:15 +0000 (16:42 +0100)
DMaapEventPublisher processing of eventList

Issue-ID: DCAEGEN2-1035
Change-Id: If62ec51d1dc1f0e501fda624dae23c7a83d3727b
Signed-off-by: Zlatko Murgoski <zlatko.murgoski@nokia.com>
src/main/java/org/onap/dcae/VesApplication.java
src/main/java/org/onap/dcae/commonFunction/ConfigProcessorAdapter.java [new file with mode: 0644]
src/main/java/org/onap/dcae/commonFunction/EventProcessor.java
src/main/java/org/onap/dcae/commonFunction/EventSender.java [new file with mode: 0644]
src/test/java/org/onap/dcae/commonFunction/ConfigProcessorAdapterTest.java
src/test/java/org/onap/dcae/commonFunction/EventProcessorTest.java [deleted file]
src/test/java/org/onap/dcae/commonFunction/EventSenderTest.java [new file with mode: 0644]

index a70d093..b57caf3 100644 (file)
@@ -29,6 +29,7 @@ import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 import org.json.JSONObject;
 import org.onap.dcae.commonFunction.EventProcessor;
+import org.onap.dcae.commonFunction.EventSender;
 import org.onap.dcae.commonFunction.event.publishing.DMaaPConfigurationParser;
 import org.onap.dcae.commonFunction.event.publishing.EventPublisher;
 import org.onap.dcae.commonFunction.event.publishing.PublisherConfig;
@@ -66,7 +67,8 @@ public class VesApplication {
                         .parseToDomainMapping(Paths.get(properties.dMaaPConfigurationFileLocation()))
                         .get());
         spawnDynamicConfigUpdateThread(publisher, properties);
-        EventProcessor ep = new EventProcessor(EventPublisher.createPublisher(oplog, getDmapConfig()), properties);
+        EventProcessor ep = new EventProcessor(
+            new EventSender(EventPublisher.createPublisher(oplog, getDmapConfig()), properties));
 
         ExecutorService executor = Executors.newFixedThreadPool(MAX_THREADS);
         for (int i = 0; i < MAX_THREADS; ++i) {
diff --git a/src/main/java/org/onap/dcae/commonFunction/ConfigProcessorAdapter.java b/src/main/java/org/onap/dcae/commonFunction/ConfigProcessorAdapter.java
new file mode 100644 (file)
index 0000000..3df412e
--- /dev/null
@@ -0,0 +1,45 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * org.onap.dcaegen2.collectors.ves
+ * ================================================================================
+ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2018 Nokia. 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.dcae.commonFunction;
+
+import java.lang.reflect.Method;
+import org.json.JSONObject;
+
+class ConfigProcessorAdapter {
+
+  private final ConfigProcessors configProcessors;
+
+    ConfigProcessorAdapter(ConfigProcessors configProcessors) {
+        this.configProcessors = configProcessors;
+    }
+
+    boolean isFilterMet(JSONObject parameter) {
+        return configProcessors.isFilterMet(parameter);
+    }
+
+    void runConfigProcessorFunctionByName(String functionName, JSONObject parameter)
+        throws ReflectiveOperationException {
+        Method method = configProcessors.getClass()
+            .getDeclaredMethod(functionName, parameter.getClass());
+        method.invoke(configProcessors, parameter);
+    }
+}
index 7d27399..bd83045 100644 (file)
@@ -23,151 +23,39 @@ package org.onap.dcae.commonFunction;
 import com.att.nsa.clock.SaClock;\r
 import com.att.nsa.logging.LoggingContext;\r
 import com.att.nsa.logging.log4j.EcompFields;\r
-import com.google.common.reflect.TypeToken;\r
-import com.google.gson.Gson;\r
-import io.vavr.collection.Map;\r
 import org.json.JSONObject;\r
-import org.onap.dcae.ApplicationSettings;\r
 import org.onap.dcae.VesApplication;\r
-import org.onap.dcae.commonFunction.event.publishing.EventPublisher;\r
 import org.slf4j.Logger;\r
 import org.slf4j.LoggerFactory;\r
 \r
-import java.io.FileReader;\r
-import java.io.IOException;\r
-import java.lang.reflect.Method;\r
-import java.lang.reflect.Type;\r
-import java.text.SimpleDateFormat;\r
-import java.util.Date;\r
-import java.util.List;\r
-\r
 public class EventProcessor implements Runnable {\r
 \r
-    static final Type EVENT_LIST_TYPE = new TypeToken<List<Event>>() {\r
-    }.getType();\r
     private static final Logger log = LoggerFactory.getLogger(EventProcessor.class);\r
-    private static final String EVENT_LITERAL = "event";\r
-    private static final String COMMON_EVENT_HEADER = "commonEventHeader";\r
-    private final SimpleDateFormat dateFormat = new SimpleDateFormat("EEE, MM dd yyyy hh:mm:ss z");\r
-\r
-    public JSONObject event;\r
-    private EventPublisher eventPublisher;\r
-    private Map<String, String[]> streamidHash;\r
-    private ApplicationSettings properties;\r
+    private EventSender eventSender;\r
 \r
-\r
-    public EventProcessor(EventPublisher eventPublisher, ApplicationSettings properties) {\r
-        this.eventPublisher = eventPublisher;\r
-        this.properties = properties;\r
-        this.streamidHash = properties.dMaaPStreamsMapping();\r
+    public EventProcessor(EventSender eventSender) {\r
+        this.eventSender = eventSender;\r
     }\r
 \r
     @Override\r
     public void run() {\r
         try {\r
-            while (true) {\r
-                event = VesApplication.fProcessingInputQueue.take();\r
-                // As long as the producer is running we remove elements from\r
-                // the queue.\r
-                log.info("QueueSize:" + VesApplication.fProcessingInputQueue.size() + "\tEventProcessor\tRemoving element: " + event);\r
-\r
-                String uuid = event.get("VESuniqueId").toString();\r
-                LoggingContext localLC = VESLogger.getLoggingContextForThread(uuid);\r
-                localLC.put(EcompFields.kBeginTimestampMs, SaClock.now());\r
-\r
-                String domain = event.getJSONObject(EVENT_LITERAL).getJSONObject(COMMON_EVENT_HEADER).getString("domain");\r
-                log.debug("event.VESuniqueId" + event.get("VESuniqueId") + "event.commonEventHeader.domain:" + domain);\r
-                streamidHash.get(domain)\r
-                        .onEmpty(() -> {\r
-                            log.error("No StreamID defined for publish - Message dropped" + event);\r
-                        }).forEach(streamIds -> {\r
-                    sendEventsToStreams(streamIds);\r
-                });\r
-                log.debug("Message published" + event);\r
-            }\r
+          while (true){\r
+            JSONObject event = VesApplication.fProcessingInputQueue.take();\r
+            log.info("QueueSize:" + VesApplication.fProcessingInputQueue.size() + "\tEventProcessor\tRemoving element: " + event);\r
+            setLoggingContext(event);\r
+            log.debug("event.VESuniqueId" + event.get("VESuniqueId") + "event.commonEventHeader.domain:" + eventSender.getDomain(event));\r
+            eventSender.send(event);\r
+            log.debug("Message published" + event);\r
+          }\r
         } catch (InterruptedException e) {\r
             log.error("EventProcessor InterruptedException" + e.getMessage());\r
             Thread.currentThread().interrupt();\r
         }\r
     }\r
 \r
-    public void overrideEvent() {\r
-        // Set collector timestamp in event payload before publish\r
-        addCurrentTimeToEvent(event);\r
-\r
-        if (properties.eventTransformingEnabled()) {\r
-            // read the mapping json file\r
-            try (FileReader fr = new FileReader("./etc/eventTransform.json")) {\r
-                log.info("parse eventTransform.json");\r
-                List<Event> events = new Gson().fromJson(fr, EVENT_LIST_TYPE);\r
-                parseEventsJson(events, new ConfigProcessorAdapter(new ConfigProcessors(event)));\r
-            } catch (IOException e) {\r
-                log.error("Couldn't find file ./etc/eventTransform.json" + e.toString());\r
-            }\r
-        }\r
-        // Remove VESversion from event. This field is for internal use and must be removed after use.\r
-        if (event.has("VESversion"))\r
-            event.remove("VESversion");\r
-\r
-        log.debug("Modified event:" + event);\r
-    }\r
-\r
-    private void sendEventsToStreams(String[] streamIdList) {\r
-        for (String aStreamIdList : streamIdList) {\r
-            log.info("Invoking publisher for streamId:" + aStreamIdList);\r
-            this.overrideEvent();\r
-            eventPublisher.sendEvent(event, aStreamIdList);\r
-        }\r
-    }\r
-\r
-    private void addCurrentTimeToEvent(JSONObject event) {\r
-        final Date currentTime = new Date();\r
-        JSONObject collectorTimeStamp = new JSONObject().put("collectorTimeStamp", dateFormat.format(currentTime));\r
-        JSONObject commonEventHeaderkey = event.getJSONObject(EVENT_LITERAL).getJSONObject(COMMON_EVENT_HEADER);\r
-        commonEventHeaderkey.put("internalHeaderFields", collectorTimeStamp);\r
-        event.getJSONObject(EVENT_LITERAL).put(COMMON_EVENT_HEADER, commonEventHeaderkey);\r
-    }\r
-\r
-    void parseEventsJson(List<Event> eventsTransform, ConfigProcessorAdapter configProcessorAdapter) {\r
-        // load VESProcessors class at runtime\r
-        for (Event eventTransform : eventsTransform) {\r
-            JSONObject filterObj = new JSONObject(eventTransform.filter.toString());\r
-            if (configProcessorAdapter.isFilterMet(filterObj)) {\r
-                callProcessorsMethod(configProcessorAdapter, eventTransform.processors);\r
-            }\r
-        }\r
-    }\r
-\r
-    private void callProcessorsMethod(ConfigProcessorAdapter configProcessorAdapter, List<Processor> processors) {\r
-        // call the processor method\r
-        for (Processor processor : processors) {\r
-            final String functionName = processor.functionName;\r
-            final JSONObject args = new JSONObject(processor.args.toString());\r
-\r
-            log.info(String.format("functionName==%s | args==%s", functionName, args));\r
-            // reflect method call\r
-            try {\r
-                configProcessorAdapter.runConfigProcessorFunctionByName(functionName, args);\r
-            } catch (ReflectiveOperationException e) {\r
-                log.error("EventProcessor Exception" + e.getMessage() + e + e.getCause());\r
-            }\r
-        }\r
-    }\r
-\r
-    static class ConfigProcessorAdapter {\r
-        private final ConfigProcessors configProcessors;\r
-\r
-        ConfigProcessorAdapter(ConfigProcessors configProcessors) {\r
-            this.configProcessors = configProcessors;\r
-        }\r
-\r
-        boolean isFilterMet(JSONObject parameter) {\r
-            return configProcessors.isFilterMet(parameter);\r
-        }\r
-\r
-        void runConfigProcessorFunctionByName(String functionName, JSONObject parameter) throws ReflectiveOperationException {\r
-            Method method = configProcessors.getClass().getDeclaredMethod(functionName, parameter.getClass());\r
-            method.invoke(configProcessors, parameter);\r
-        }\r
+  private void setLoggingContext(JSONObject event) {\r
+        LoggingContext localLC = VESLogger.getLoggingContextForThread(event.get("VESuniqueId").toString());\r
+        localLC.put(EcompFields.kBeginTimestampMs, SaClock.now());\r
     }\r
 }
\ No newline at end of file
diff --git a/src/main/java/org/onap/dcae/commonFunction/EventSender.java b/src/main/java/org/onap/dcae/commonFunction/EventSender.java
new file mode 100644 (file)
index 0000000..8a9c1ec
--- /dev/null
@@ -0,0 +1,125 @@
+/*
+ * ============LICENSE_START=======================================================
+ * PROJECT
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2018 Nokia. All rights reserved.s
+ * ================================================================================
+ * 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.dcae.commonFunction;
+
+import com.google.common.reflect.TypeToken;
+import com.google.gson.Gson;
+import io.vavr.collection.Map;
+import io.vavr.control.Option;
+import java.io.FileReader;
+import java.io.IOException;
+import java.lang.reflect.Type;
+import java.text.SimpleDateFormat;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.Optional;
+import org.json.JSONObject;
+import org.onap.dcae.ApplicationSettings;
+import org.onap.dcae.commonFunction.event.publishing.EventPublisher;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class EventSender {
+
+  private Map<String, String[]> streamidHash;
+  private ApplicationSettings properties;
+  private EventPublisher eventPublisher;
+
+  static final Type EVENT_LIST_TYPE = new TypeToken<List<Event>>() {}.getType();
+  private static final Logger log = LoggerFactory.getLogger(EventSender.class);
+  private static final String EVENT_LITERAL = "event";
+  private static final String COMMON_EVENT_HEADER = "commonEventHeader";
+  private final SimpleDateFormat dateFormat = new SimpleDateFormat("EEE, MM dd yyyy hh:mm:ss z");
+
+  public EventSender( EventPublisher eventPublisher, ApplicationSettings properties) {
+    this.eventPublisher = eventPublisher;
+    this.streamidHash = properties.dMaaPStreamsMapping();
+    this.properties = properties;
+
+  }
+
+  public void send(JSONObject event) {
+    streamidHash.get(getDomain(event))
+        .onEmpty(() -> log.error("No StreamID defined for publish - Message dropped" + event))
+        .forEach(streamIds -> sendEventsToStreams(event, streamIds));
+  }
+
+  public static String getDomain(JSONObject event) {
+    return event.getJSONObject(EVENT_LITERAL).getJSONObject(COMMON_EVENT_HEADER).getString("domain");
+  }
+
+  private void sendEventsToStreams(JSONObject event, String[] streamIdList) {
+    for (String aStreamIdList : streamIdList) {
+      log.info("Invoking publisher for streamId:" + aStreamIdList);
+      eventPublisher.sendEvent(overrideEvent(event), aStreamIdList);
+    }
+  }
+
+  private JSONObject overrideEvent(JSONObject event) {
+    JSONObject jsonObject = addCurrentTimeToEvent(event);
+    if (properties.eventTransformingEnabled()) {
+      try (FileReader fr = new FileReader("./etc/eventTransform.json")) {
+        log.info("parse eventTransform.json");
+        List<Event> events = new Gson().fromJson(fr, EVENT_LIST_TYPE);
+        parseEventsJson(events, new ConfigProcessorAdapter(new ConfigProcessors(jsonObject)));
+      } catch (IOException e) {
+        log.error("Couldn't find file ./etc/eventTransform.json" + e.toString());
+      }
+    }
+    if (jsonObject.has("VESversion"))
+      jsonObject.remove("VESversion");
+
+    log.debug("Modified event:" + jsonObject);
+    return jsonObject;
+  }
+
+  private JSONObject addCurrentTimeToEvent(JSONObject event) {
+    final Date currentTime = new Date();
+    JSONObject collectorTimeStamp = new JSONObject().put("collectorTimeStamp", dateFormat.format(currentTime));
+    JSONObject commonEventHeaderkey = event.getJSONObject(EVENT_LITERAL).getJSONObject(COMMON_EVENT_HEADER);
+    commonEventHeaderkey.put("internalHeaderFields", collectorTimeStamp);
+    event.getJSONObject(EVENT_LITERAL).put(COMMON_EVENT_HEADER, commonEventHeaderkey);
+    return event;
+  }
+
+  private void parseEventsJson(List<Event> eventsTransform, ConfigProcessorAdapter configProcessorAdapter) {
+    for (Event eventTransform : eventsTransform) {
+      JSONObject filterObj = new JSONObject(eventTransform.filter.toString());
+      if (configProcessorAdapter.isFilterMet(filterObj)) {
+        callProcessorsMethod(configProcessorAdapter, eventTransform.processors);
+      }
+    }
+  }
+
+  private void callProcessorsMethod(ConfigProcessorAdapter configProcessorAdapter, List<Processor> processors) {
+    for (Processor processor : processors) {
+      final String functionName = processor.functionName;
+      final JSONObject args = new JSONObject(processor.args.toString());
+      log.info(String.format("functionName==%s | args==%s", functionName, args));
+      try {
+        configProcessorAdapter.runConfigProcessorFunctionByName(functionName, args);
+      } catch (ReflectiveOperationException e) {
+        log.error("EventProcessor Exception" + e.getMessage() + e + e.getCause());
+      }
+    }
+  }
+}
index 1ad5589..f2cb364 100644 (file)
@@ -38,7 +38,7 @@ public class ConfigProcessorAdapterTest {
     private ConfigProcessors configProcessors;
 
     @InjectMocks
-    private EventProcessor.ConfigProcessorAdapter configProcessorAdapter;
+    private ConfigProcessorAdapter configProcessorAdapter;
 
 
     @Test
diff --git a/src/test/java/org/onap/dcae/commonFunction/EventProcessorTest.java b/src/test/java/org/onap/dcae/commonFunction/EventProcessorTest.java
deleted file mode 100644 (file)
index 697510c..0000000
+++ /dev/null
@@ -1,105 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * org.onap.dcaegen2.collectors.ves
- * ================================================================================
- * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
- * Copyright (C) 2018 Nokia. 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.dcae.commonFunction;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-import static org.onap.dcae.commonFunction.EventProcessor.EVENT_LIST_TYPE;
-
-import com.google.gson.Gson;
-import java.util.List;
-import org.json.JSONObject;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.ArgumentCaptor;
-import org.onap.dcae.ApplicationSettings;
-import org.onap.dcae.CLIUtils;
-import org.onap.dcae.commonFunction.event.publishing.EventPublisher;
-
-
-public class EventProcessorTest {
-
-    private final String ev = "{\"event\": {\"commonEventHeader\": {   \"reportingEntityName\": "
-        + "\"VM name will be provided by ECOMP\",      \"startEpochMicrosec\": 1477012779802988,\"lastEpochMicrosec\": "
-        + "1477012789802988,\"eventId\": \"83\",\"sourceName\": \"Dummy VM name - No Metadata available\","
-        + "\"sequence\": 83,\"priority\": \"Normal\",\"functionalRole\": \"vFirewall\",\"domain\": "
-        + "\"measurementsForVfScaling\",\"reportingEntityId\": \"VM UUID will be provided by ECOMP\","
-        + "\"sourceId\": \"Dummy VM UUID - No Metadata available\",\"version\": 1.1},\"measurementsForVfScalingFields\":"
-        + " {\"measurementInterval\": 10,\"measurementsForVfScalingVersion\": 1.1,\"vNicUsageArray\": "
-        + "[{\"multicastPacketsIn\": 0,\"bytesIn\": 3896,\"unicastPacketsIn\": 0,      "
-        + "\"multicastPacketsOut\": 0,\"broadcastPacketsOut\": 0,              "
-        + "\"packetsOut\": 28,\"bytesOut\": 12178,\"broadcastPacketsIn\": "
-        + "0,\"packetsIn\": 58,\"unicastPacketsOut\": 0,\"vNicIdentifier\": \"eth0\"}]}}}";
-
-    private ApplicationSettings properties;
-
-    @Before
-    public void setUp() {
-        properties = new ApplicationSettings(new String[]{}, CLIUtils::processCmdLine);
-    }
-
-    @Test
-    public void testLoad() {
-        //given
-        EventProcessor ec = new EventProcessor(mock(EventPublisher.class), properties);
-        ec.event = new org.json.JSONObject(ev);
-        //when
-        ec.overrideEvent();
-
-        //then
-        Boolean hasSourceNameNode = ec.event.getJSONObject("event").getJSONObject("commonEventHeader").has("sourceName");
-        assertTrue(hasSourceNameNode);
-    }
-
-    @Test
-    public void shouldParseJsonEvents() throws ReflectiveOperationException {
-        //given
-        EventProcessor eventProcessor = new EventProcessor(mock(EventPublisher.class), properties);
-        String event_json =
-            "[{ \"filter\": {\"event.commonEventHeader.domain\":\"heartbeat\",\"VESversion\":\"v4\"},\"processors\":["
-                + "{\"functionName\": \"concatenateValue\",\"args\":{\"field\":\"event.commonEventHeader.eventName\","
-                + "\"concatenate\": [\"$event.commonEventHeader.domain\",\"$event.commonEventHeader.eventType\","
-                + "\"$event.faultFields.alarmCondition\"], \"delimiter\":\"_\"}}"
-                + ",{\"functionName\": \"addAttribute\",\"args\":{\"field\": "
-                + "\"event.heartbeatFields.heartbeatFieldsVersion\",\"value\": \"1.0\",\"fieldType\": \"number\"}}"
-                + ",{\"functionName\": \"map\",\"args\":{\"field\": \"event.commonEventHeader.nfNamingCode\","
-                + "\"oldField\": \"event.commonEventHeader.functionalRole\"}}]}]";
-        List<Event> events = new Gson().fromJson(event_json, EVENT_LIST_TYPE);
-        EventProcessor.ConfigProcessorAdapter configProcessorAdapter = mock(EventProcessor.ConfigProcessorAdapter.class);
-
-        when(configProcessorAdapter.isFilterMet(any(JSONObject.class))).thenReturn(true);
-        ArgumentCaptor<String> stringArgumentCaptor = ArgumentCaptor.forClass(String.class);
-        ArgumentCaptor<JSONObject> jsonObjectArgumentCaptor = ArgumentCaptor.forClass(JSONObject.class);
-        //when
-        eventProcessor.parseEventsJson(events, configProcessorAdapter);
-
-        //then
-        verify(configProcessorAdapter, times(3)).runConfigProcessorFunctionByName(stringArgumentCaptor.capture(), jsonObjectArgumentCaptor.capture());
-        assertThat(stringArgumentCaptor.getAllValues()).contains("concatenateValue", "addAttribute", "map");
-    }
-
-}
\ No newline at end of file
diff --git a/src/test/java/org/onap/dcae/commonFunction/EventSenderTest.java b/src/test/java/org/onap/dcae/commonFunction/EventSenderTest.java
new file mode 100644 (file)
index 0000000..f3cebdb
--- /dev/null
@@ -0,0 +1,69 @@
+/*
+ * ============LICENSE_START=======================================================
+ * PROJECT
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2018 Nokia. All rights reserved.s
+ * ================================================================================
+ * 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.dcae.commonFunction;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import io.vavr.collection.HashMap;
+import io.vavr.collection.Map;
+import org.json.JSONObject;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+import org.onap.dcae.ApplicationSettings;
+import org.onap.dcae.commonFunction.event.publishing.EventPublisher;
+
+@RunWith(MockitoJUnitRunner.Silent.class)
+public class EventSenderTest {
+
+
+  private String event = "{\"VESversion\":\"v7\",\"VESuniqueId\":\"fd69d432-5cd5-4c15-9d34-407c81c61c6a-0\",\"event\":{\"commonEventHeader\":{\"startEpochMicrosec\":1544016106000000,\"eventId\":\"fault33\",\"timeZoneOffset\":\"UTC+00.00\",\"priority\":\"Normal\",\"version\":\"4.0.1\",\"nfVendorName\":\"Ericsson\",\"reportingEntityName\":\"1\",\"sequence\":1,\"domain\":\"fault\",\"lastEpochMicrosec\":1544016106000000,\"eventName\":\"Fault_KeyFileFault\",\"vesEventListenerVersion\":\"7.0.1\",\"sourceName\":\"1\"},\"faultFields\":{\"eventSeverity\":\"CRITICAL\",\"alarmCondition\":\"KeyFileFault\",\"faultFieldsVersion\":\"4.0\",\"eventCategory\":\"PROCESSINGERRORALARM\",\"specificProblem\":\"License Key File Fault_1\",\"alarmAdditionalInformation\":{\"probableCause\":\"ConfigurationOrCustomizationError\",\"additionalText\":\"test_1\",\"source\":\"ManagedElement=1,SystemFunctions=1,Lm=1\"},\"eventSourceType\":\"Lm\",\"vfStatus\":\"Active\"}}}\n";
+
+  @Mock
+  private EventPublisher eventPublisher;
+  @Mock
+  private ApplicationSettings settings;
+
+  private EventSender eventSender;
+
+
+  @Test
+  public void shouldntSendEventWhenStreamIdsIsEmpty() {
+    when(settings.dMaaPStreamsMapping()).thenReturn(HashMap.empty());
+    eventSender = new EventSender(eventPublisher, settings );
+    eventSender.send(new JSONObject(event));
+    verify(eventPublisher,never()).sendEvent(any(),any());
+  }
+
+  @Test
+  public void shouldSendEvent() {
+    Map<String, String[]> streams = HashMap.of("fault", new String[]{"ves-fault", "fault-ves"});
+    when(settings.dMaaPStreamsMapping()).thenReturn(streams);
+    eventSender = new EventSender(eventPublisher, settings );
+    eventSender.send(new JSONObject(event));
+    verify(eventPublisher, times(2)).sendEvent(any(),any());
+  }
+}
\ No newline at end of file