From: Marcin Migdal <marcin.migdal@nokia.com>
Date: Mon, 25 Mar 2019 10:02:18 +0000 (+0100)
Subject: Fix logic and log in DMaapConsumerJsonParser
X-Git-Tag: 1.2.2~20
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=8b0068a7fd94c656402f2ef85f5152a14760cb21;p=dcaegen2%2Fservices%2Fprh.git

Fix logic and log in DMaapConsumerJsonParser

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

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 b628d961..f1483321 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
@@ -83,9 +83,13 @@ public class DmaapConsumerJsonParser {
                 .flatMapMany(this::getConsumerDmaapModelFromJsonArray);
     }
 
-    private Flux<ConsumerDmaapModel> getConsumerDmaapModelFromJsonArray(JsonArray jsonElement) {
+    private Flux<ConsumerDmaapModel> getConsumerDmaapModelFromJsonArray(JsonArray jsonArray) {
+        if(jsonArray.size() == 0) {
+            LOGGER.debug("Nothing to consume from DMaaP");
+            return Flux.empty();
+        }
         return create(
-                Flux.defer(() -> Flux.fromStream(StreamSupport.stream(jsonElement.spliterator(), false)
+                Flux.defer(() -> Flux.fromStream(StreamSupport.stream(jsonArray.spliterator(), false)
                         .map(jsonElementFromArray -> getJsonObjectFromAnArray(jsonElementFromArray)
                                 .orElseGet(JsonObject::new)))));
     }
diff --git a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/AaiProducerTaskImpl.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/AaiProducerTaskImpl.java
index a34549d8..d0926e7a 100644
--- a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/AaiProducerTaskImpl.java
+++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/AaiProducerTaskImpl.java
@@ -30,6 +30,7 @@ import org.onap.dcaegen2.services.prh.model.utils.HttpUtils;
 import org.onap.dcaegen2.services.sdk.rest.services.aai.client.config.AaiClientConfiguration;
 import org.onap.dcaegen2.services.sdk.rest.services.aai.client.service.AaiHttpClientFactory;
 import org.onap.dcaegen2.services.sdk.rest.services.aai.client.service.http.patch.AaiHttpPatchClient;
+import org.onap.dcaegen2.services.sdk.rest.services.adapters.http.CloudHttpClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -69,7 +70,7 @@ public class AaiProducerTaskImpl extends AaiProducerTask {
     @Override
     AaiHttpPatchClient resolveClient() {
         return new AaiHttpPatchClient(resolveConfiguration(),
-                new AaiJsonBodyBuilderImpl()).createAaiHttpClient(new AaiHttpClientFactory(resolveConfiguration()).build());
+                new AaiJsonBodyBuilderImpl(), new CloudHttpClient());
     }
 
     @Override