Merge "Improvements in JsonUtilForPnfCorrelationId"

1 files changed, 8 insertions, 4 deletions

diff --git a/bpmn/so-bpmn-infrastructure-common/src/main/java/org/onap/so/bpmn/infrastructure/pnf/dmaap/JsonUtilForPnfCorrelationId.java b/bpmn/so-bpmn-infrastructure-common/src/main/java/org/onap/so/bpmn/infrastructure/pnf/dmaap/JsonUtilForPnfCorrelationId.java
index 7cb78a10e5..8010ce62ab 100644
--- a/bpmn/so-bpmn-infrastructure-common/src/main/java/org/onap/so/bpmn/infrastructure/pnf/dmaap/JsonUtilForPnfCorrelationId.java
+++ b/bpmn/so-bpmn-infrastructure-common/src/main/java/org/onap/so/bpmn/infrastructure/pnf/dmaap/JsonUtilForPnfCorrelationId.java
@@ -5,6 +5,7 @@
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Copyright (C) 2018 Nokia.
+ * Modifications Copyright (c) 2019 Samsung
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,15 +36,18 @@ public final class JsonUtilForPnfCorrelationId {
 
     private static final String JSON_PNF_CORRELATION_ID_FIELD_NAME = "correlationId";
 
+    private JsonUtilForPnfCorrelationId() {
+        throw new IllegalStateException("Utility class");
+    }
+
     static List<String> parseJsonToGelAllPnfCorrelationId(String json) {
         JsonElement je = new JsonParser().parse(json);
         JsonArray array = je.getAsJsonArray();
         List<String> list = new ArrayList<>();
         Spliterator<JsonElement> spliterator = array.spliterator();
-        spliterator.forEachRemaining(jsonElement -> {
-            handleEscapedCharacters(jsonElement).ifPresent(jsonObject -> getPnfCorrelationId(jsonObject)
-                    .ifPresent(pnfCorrelationId -> list.add(pnfCorrelationId)));
-        });
+        spliterator.forEachRemaining(jsonElement -> handleEscapedCharacters(jsonElement)
+                .ifPresent(jsonObject -> getPnfCorrelationId(jsonObject)
+                        .ifPresent(pnfCorrelationId -> list.add(pnfCorrelationId))));
         return list;
     }