diff options
author | Bogumil Zebek <bogumil.zebek@nokia.com> | 2020-07-22 08:19:51 +0200 |
---|---|---|
committer | Bartosz Gardziejewski <bartosz.gardziejewski@nokia.com> | 2020-08-06 08:07:39 +0200 |
commit | f6260a26de44a9338ca998626a93c0d0fa56abc3 (patch) | |
tree | 2a3dffaf850a7a934861c0fd10003168324c9f69 /src/main/java/org/onap/dcae/common/EventUpdater.java | |
parent | dc29687c2c83b387718c6a26b227170b17dcf08d (diff) |
StndDefined event routing
Route stndDefined events to streams defined in namespace event field.
Change-Id: I3963e220095665f8ca3fd1b21c5c20b44057cf76
Issue-ID: DCAEGEN2-1771
Signed-off-by: Zebek Bogumil <bogumil.zebek@nokia.com>
Diffstat (limited to 'src/main/java/org/onap/dcae/common/EventUpdater.java')
-rw-r--r-- | src/main/java/org/onap/dcae/common/EventUpdater.java | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/src/main/java/org/onap/dcae/common/EventUpdater.java b/src/main/java/org/onap/dcae/common/EventUpdater.java index 1469d47e..954e4b6e 100644 --- a/src/main/java/org/onap/dcae/common/EventUpdater.java +++ b/src/main/java/org/onap/dcae/common/EventUpdater.java @@ -22,12 +22,14 @@ package org.onap.dcae.common; import java.text.SimpleDateFormat; +import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.UUID; import org.json.JSONArray; import org.json.JSONObject; import org.onap.dcae.ApplicationSettings; +import org.onap.dcae.common.model.VesEvent; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -47,33 +49,33 @@ public class EventUpdater { this.settings = settings; } - public JSONArray convert(JSONObject jsonObject, String version, UUID uuid, String type){ + public List<VesEvent> convert(VesEvent vesEvent, String version, UUID uuid, String type){ if(type.equalsIgnoreCase(EVENT_LIST)){ - return convertEvents(jsonObject, uuid.toString(), version); + return convertEvents(vesEvent, uuid.toString(), version); } else { - return convertEvent(jsonObject, uuid.toString(), version); + return convertEvent(vesEvent, uuid.toString(), version); } } - private JSONArray convertEvents(JSONObject jsonObject, - String uuid, String version) { - JSONArray asArrayEvents = new JSONArray(); + private List<VesEvent> convertEvents(VesEvent vesEvent, String uuid, String version) { + List<VesEvent> asArrayEvents = new ArrayList<>(); - JSONArray events = jsonObject.getJSONArray(EVENT_LIST); + JSONArray events = vesEvent.asJsonObject().getJSONArray(EVENT_LIST); for (int i = 0; i < events.length(); i++) { JSONObject event = new JSONObject().put(EVENT, events.getJSONObject(i)); event.put(VES_UNIQUE_ID, uuid + "-" + i); event.put(VES_VERSION, version); - asArrayEvents.put(overrideEvent(event)); + asArrayEvents.add(new VesEvent(overrideEvent(event))); } return asArrayEvents; } - private JSONArray convertEvent(JSONObject jsonObject, String uuid, String version) { + private List<VesEvent> convertEvent(VesEvent vesEvent, String uuid, String version) { + JSONObject jsonObject = vesEvent.asJsonObject(); jsonObject.put(VES_UNIQUE_ID, uuid); jsonObject.put(VES_VERSION, version); - return new JSONArray().put(overrideEvent(jsonObject)); + return List.of(new VesEvent(overrideEvent(jsonObject))); } private JSONObject overrideEvent(JSONObject event) { |