From 79984d737c71d3c92f3cd283eaf2b9b6157c2ce2 Mon Sep 17 00:00:00 2001
From: wasala <przemyslaw.wasala@nokia.com>
Date: Wed, 27 Jun 2018 14:29:06 +0200
Subject: Refactor Optional in MonoResponse

Added JUnit tests for DmaapConsumer
Reactive Client.

Added property for spring to run
PRH as none-web application

Change-Id: I8b762389927151387da5b79e8b75b670600ee5e8
Issue-ID: DCAEGEN2-563
Signed-off-by: wasala <przemyslaw.wasala@nokia.com>
---
 .../prh/service/DmaapConsumerJsonParser.java         | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/service/DmaapConsumerJsonParser.java')

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 22acf547..1d215c62 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
@@ -30,6 +30,7 @@ import org.onap.dcaegen2.services.prh.model.ConsumerDmaapModel;
 import org.onap.dcaegen2.services.prh.model.ImmutableConsumerDmaapModel;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.util.StringUtils;
 import reactor.core.publisher.Mono;
 
 /**
@@ -46,21 +47,20 @@ public class DmaapConsumerJsonParser {
     private static final String PNF_SERIAL_NUMBER = "pnfSerialNumber";
 
 
-    public Mono<Optional<ConsumerDmaapModel>> getJsonObject(Mono<Optional<String>> monoMessage) {
+    public Mono<ConsumerDmaapModel> getJsonObject(Mono<String> monoMessage) {
         return monoMessage.flatMap(message ->
         {
-            if (message.isPresent()) {
-                JsonElement jsonElement = new JsonParser().parse(message.orElse(""));
-                Optional<ConsumerDmaapModel> consumerDmaapModel;
+            if (!StringUtils.isEmpty(message)) {
+                JsonElement jsonElement = new JsonParser().parse(message);
+                ConsumerDmaapModel consumerDmaapModel;
                 try {
                     if (jsonElement.isJsonObject()) {
-                        consumerDmaapModel = Optional.of(create(jsonElement.getAsJsonObject()));
+                        consumerDmaapModel = create(jsonElement.getAsJsonObject());
                     } else {
-                        consumerDmaapModel = Optional
-                            .of(create(
-                                StreamSupport.stream(jsonElement.getAsJsonArray().spliterator(), false).findFirst()
-                                    .flatMap(this::getJsonObjectFromAnArray)
-                                    .orElseThrow(DmaapEmptyResponseException::new)));
+                        consumerDmaapModel = create(
+                            StreamSupport.stream(jsonElement.getAsJsonArray().spliterator(), false).findFirst()
+                                .flatMap(this::getJsonObjectFromAnArray)
+                                .orElseThrow(DmaapEmptyResponseException::new));
                     }
                     logger.info("Parsed model from DmaaP after getting it: {}", consumerDmaapModel);
                     return Mono.just(consumerDmaapModel);
-- 
cgit 1.2.3-korg