From 6da081cc0667795cd7872582a8795cf0bbd56c17 Mon Sep 17 00:00:00 2001 From: Ruslan Kashapov Date: Thu, 22 Apr 2021 11:47:41 +0300 Subject: JSON data fragment into DataNode collection parsing support Issue-ID: CPS-358 Change-Id: I92f46504e5f3623131844616945069f70712ed61 Signed-off-by: Ruslan Kashapov --- .../java/org/onap/cps/spi/model/DataNodeBuilder.java | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) (limited to 'cps-service/src/main') diff --git a/cps-service/src/main/java/org/onap/cps/spi/model/DataNodeBuilder.java b/cps-service/src/main/java/org/onap/cps/spi/model/DataNodeBuilder.java index 253d4c624..6530e724e 100644 --- a/cps-service/src/main/java/org/onap/cps/spi/model/DataNodeBuilder.java +++ b/cps-service/src/main/java/org/onap/cps/spi/model/DataNodeBuilder.java @@ -119,6 +119,19 @@ public class DataNodeBuilder { } } + /** + * To build a {@link Collection} of {@link DataNode} objects. + * + * @return {@link DataNode} {@link Collection} + */ + public Collection buildCollection() { + if (normalizedNodeTree != null) { + return buildCollectionFromNormalizedNodeTree(); + } else { + return ImmutableSet.of(buildFromAttributes()); + } + } + private DataNode buildFromAttributes() { final var dataNode = new DataNode(); dataNode.setXpath(xpath); @@ -128,9 +141,14 @@ public class DataNodeBuilder { } private DataNode buildFromNormalizedNodeTree() { + final Collection dataNodeCollection = buildCollectionFromNormalizedNodeTree(); + return dataNodeCollection.iterator().next(); + } + + private Collection buildCollectionFromNormalizedNodeTree() { final var parentDataNode = new DataNodeBuilder().withXpath(parentNodeXpath).build(); addDataNodeFromNormalizedNode(parentDataNode, normalizedNodeTree); - return parentDataNode.getChildDataNodes().iterator().next(); + return parentDataNode.getChildDataNodes(); } private static void addDataNodeFromNormalizedNode(final DataNode currentDataNode, -- cgit 1.2.3-korg