Use SDK DMaaP Client generic

Change-Id: I031de4f59b7045f3bc45562edf3f58b86eace6bd
Issue-ID: DCAEGEN2-1361
Signed-off-by: Marcin Migdal <marcin.migdal@nokia.com>

1 files changed, 7 insertions, 2 deletions

diff --git a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/service/DmaapConsumerJsonParser.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/service/DmaapConsumerJsonParser.java
index f1483321..7f2cc696 100644
--- a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/service/DmaapConsumerJsonParser.java
+++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/service/DmaapConsumerJsonParser.java
@@ -78,12 +78,17 @@ public class DmaapConsumerJsonParser {
      * @param monoMessage - results from DMaaP
      * @return reactive DMaaPModel
      */
-    public Flux<ConsumerDmaapModel> getJsonObject(Mono<JsonArray> monoMessage) {
+    public Flux<ConsumerDmaapModel> getJsonObject(Mono<JsonElement> monoMessage) {
         return monoMessage
                 .flatMapMany(this::getConsumerDmaapModelFromJsonArray);
     }
 
-    private Flux<ConsumerDmaapModel> getConsumerDmaapModelFromJsonArray(JsonArray jsonArray) {
+    private Flux<ConsumerDmaapModel> getConsumerDmaapModelFromJsonArray(JsonElement jsonElement) {
+
+        if(jsonElement instanceof JsonObject)
+            return create(Flux.just((JsonObject) jsonElement));
+
+        JsonArray jsonArray = (JsonArray) jsonElement;
         if(jsonArray.size() == 0) {
             LOGGER.debug("Nothing to consume from DMaaP");
             return Flux.empty();