From dabda661a59fb07c640bfe96bfc4675e3b10f04f Mon Sep 17 00:00:00 2001 From: wasala Date: Mon, 11 Jun 2018 14:16:09 +0200 Subject: Catch empty response from DmaaP Change-Id: Ibd8739c3f9718eec15ff20e0b88d0bfcd4f6d84d Issue-ID: DCAEGEN2-540 Signed-off-by: wasala --- .../services/prh/service/DmaapConsumerJsonParser.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 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 3bac7c36..ab4ec633 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 @@ -40,14 +40,15 @@ public class DmaapConsumerJsonParser { private static final String PNF_VENDOR_NAME = "pnfVendorName"; private static final String PNF_SERIAL_NUMBER = "pnfSerialNumber"; - public ConsumerDmaapModel getJsonObject(String message) throws DmaapNotFoundException { + public Optional getJsonObject(String message) throws DmaapNotFoundException { JsonElement jsonElement = new JsonParser().parse(message); if (jsonElement.isJsonObject()) { - return create(jsonElement.getAsJsonObject()); + return Optional.of(create(jsonElement.getAsJsonObject())); } else { - return create(StreamSupport.stream(jsonElement.getAsJsonArray().spliterator(), false).findFirst() - .flatMap(this::getJsonObjectFromAnArray) - .orElseThrow(() -> new DmaapNotFoundException("Json object not found in json array"))); + return Optional + .of(create(StreamSupport.stream(jsonElement.getAsJsonArray().spliterator(), false).findFirst() + .flatMap(this::getJsonObjectFromAnArray) + .orElse(null))); } } -- cgit 1.2.3-korg