Small Fixes in EventProcessor

Change-Id: I545c2ab0fc46d6667b403e840bec2a1f0dde25d5
Issue-ID: DCAEGEN2-466
Signed-off-by: burdziak <olaf.burdziakowski@nokia.com>

diff --git a/src/main/java/org/onap/dcae/commonFunction/EventProcessor.java b/src/main/java/org/onap/dcae/commonFunction/EventProcessor.java
index d41cb23..c7c052f 100644 (file)
--- a/src/main/java/org/onap/dcae/commonFunction/EventProcessor.java
+++ b/src/main/java/org/onap/dcae/commonFunction/EventProcessor.java
@@ -46,7 +46,7 @@ public class EventProcessor implements Runnable {
        private static final String EVENT_LITERAL = "event";\r
        private static final String COMMON_EVENT_HEADER = "commonEventHeader";\r
 \r
-       private static HashMap<String, String[]> streamid_hash = new HashMap<String, String[]>();\r
+       private static HashMap<String, String[]> streamidHash = new HashMap<>();\r
        public JSONObject event;\r
 \r
        public EventProcessor() {\r
@@ -55,11 +55,11 @@ public class EventProcessor implements Runnable {
                String[] list = CommonStartup.streamid.split("\\|");\r
                for (String aList : list) {\r
                        String domain = aList.split("=")[0];\r
-                       // String streamIdList[] = list[i].split("=")[1].split(",");\r
+\r
                        String[] streamIdList = aList.substring(aList.indexOf('=') + 1).split(",");\r
 \r
                        log.debug(String.format("Domain: %s streamIdList:%s", domain, Arrays.toString(streamIdList)));\r
-                       streamid_hash.put(domain, streamIdList);\r
+                       streamidHash.put(domain, streamIdList);\r
                }\r
 \r
        }\r
@@ -70,9 +70,7 @@ public class EventProcessor implements Runnable {
                try {\r
 \r
                        event = CommonStartup.fProcessingInputQueue.take();\r
-                       \r
 \r
-                       // EventPublisher Ep=new EventPublisher();\r
                        while (event != null) {\r
                                // As long as the producer is running we remove elements from\r
                                // the queue.\r
@@ -84,7 +82,7 @@ public class EventProcessor implements Runnable {
 \r
                                log.debug("event.VESuniqueId" + event.get("VESuniqueId") + "event.commonEventHeader.domain:"\r
                                                + event.getJSONObject(EVENT_LITERAL).getJSONObject(COMMON_EVENT_HEADER).getString("domain"));\r
-                               String[] streamIdList = streamid_hash\r
+                               String[] streamIdList = streamidHash\r
                                                .get(event.getJSONObject(EVENT_LITERAL).getJSONObject(COMMON_EVENT_HEADER).getString("domain"));\r
                                log.debug("streamIdList:" + streamIdList);\r
 \r
@@ -94,7 +92,7 @@ public class EventProcessor implements Runnable {
                                        for (String aStreamIdList : streamIdList) {\r
                                                log.info("Invoking publisher for streamId:" + aStreamIdList);\r
                                                this.overrideEvent();\r
-                                               //EventPublisher.getInstance(aStreamIdList).sendEvent(event);\r
+\r
                                                EventPublisherHash.getInstance().sendEvent(event, aStreamIdList);\r
 \r
                                        }\r
@@ -133,7 +131,6 @@ public class EventProcessor implements Runnable {
                                // now convert to org.json\r
                                final String jsonText = jo.toString();\r
                                final JSONArray topLevel = new JSONArray(jsonText);\r
-                               // log.info("topLevel == " + topLevel);\r
 \r
                                Class[] paramJSONObject = new Class[1];\r
                                paramJSONObject[0] = JSONObject.class;\r