From 24c72db6b3674bde16eb5a7313d71f507a880de9 Mon Sep 17 00:00:00 2001 From: Ruslan Kashapov Date: Tue, 9 Feb 2021 17:25:18 +0200 Subject: Data fragment update by xpath #3 - rest and service layers Issue-ID: CPS-58 Change-Id: Ie224da95b07748b63648226df6484cebae91cdec Signed-off-by: Ruslan Kashapov --- .../main/java/org/onap/cps/api/CpsDataService.java | 21 +++++++++ .../org/onap/cps/api/impl/CpsDataServiceImpl.java | 50 +++++++++++++++++---- .../cps/api/impl/CpsDataServiceImplSpec.groovy | 51 ++++++++++++++++++++-- 3 files changed, 109 insertions(+), 13 deletions(-) (limited to 'cps-service') diff --git a/cps-service/src/main/java/org/onap/cps/api/CpsDataService.java b/cps-service/src/main/java/org/onap/cps/api/CpsDataService.java index 7960d12ef..54d925891 100644 --- a/cps-service/src/main/java/org/onap/cps/api/CpsDataService.java +++ b/cps-service/src/main/java/org/onap/cps/api/CpsDataService.java @@ -53,4 +53,25 @@ public interface CpsDataService { DataNode getDataNode(@NonNull String dataspaceName, @NonNull String anchorName, @NonNull String xpath, @NonNull FetchDescendantsOption fetchDescendantsOption); + /** + * Updates data node for given dataspace and anchor using xpath to parent node. + * + * @param dataspaceName dataspace name + * @param anchorName anchor name + * @param parentNodeXpath xpath to parent node + * @param jsonData json data + */ + void updateNodeLeaves(@NonNull String dataspaceName, @NonNull String anchorName, @NonNull String parentNodeXpath, + @NonNull String jsonData); + + /** + * Replaces existing data node content including descendants. + * + * @param dataspaceName dataspace name + * @param anchorName anchor name + * @param parentNodeXpath xpath to parent node + * @param jsonData json data + */ + void replaceNodeTree(@NonNull String dataspaceName, @NonNull String anchorName, @NonNull String parentNodeXpath, + @NonNull String jsonData); } diff --git a/cps-service/src/main/java/org/onap/cps/api/impl/CpsDataServiceImpl.java b/cps-service/src/main/java/org/onap/cps/api/impl/CpsDataServiceImpl.java index d7d25b98b..6f7d6439b 100755 --- a/cps-service/src/main/java/org/onap/cps/api/impl/CpsDataServiceImpl.java +++ b/cps-service/src/main/java/org/onap/cps/api/impl/CpsDataServiceImpl.java @@ -38,6 +38,8 @@ import org.springframework.stereotype.Service; @Service public class CpsDataServiceImpl implements CpsDataService { + private static final String ROOT_NODE_XPATH = "/"; + @Autowired private CpsDataPersistenceService cpsDataPersistenceService; @@ -52,15 +54,8 @@ public class CpsDataServiceImpl implements CpsDataService { @Override public void saveData(final String dataspaceName, final String anchorName, final String jsonData) { - final Anchor anchor = cpsAdminService.getAnchor(dataspaceName, anchorName); - final SchemaContext schemaContext = getSchemaContext(dataspaceName, anchor.getSchemaSetName()); - final NormalizedNode normalizedNode = YangUtils.parseJsonData(jsonData, schemaContext); - final DataNode dataNode = new DataNodeBuilder().withNormalizedNodeTree(normalizedNode).build(); - cpsDataPersistenceService.storeDataNode(dataspaceName, anchor.getName(), dataNode); - } - - private SchemaContext getSchemaContext(final String dataspaceName, final String schemaSetName) { - return yangTextSchemaSourceSetCache.get(dataspaceName, schemaSetName).getSchemaContext(); + final DataNode dataNode = buildDataNodeFromJson(dataspaceName, anchorName, ROOT_NODE_XPATH, jsonData); + cpsDataPersistenceService.storeDataNode(dataspaceName, anchorName, dataNode); } @Override @@ -68,4 +63,41 @@ public class CpsDataServiceImpl implements CpsDataService { final FetchDescendantsOption fetchDescendantsOption) { return cpsDataPersistenceService.getDataNode(dataspaceName, anchorName, xpath, fetchDescendantsOption); } + + @Override + public void updateNodeLeaves(final String dataspaceName, final String anchorName, final String parentNodeXpath, + final String jsonData) { + final DataNode dataNode = buildDataNodeFromJson(dataspaceName, anchorName, parentNodeXpath, jsonData); + cpsDataPersistenceService + .updateDataLeaves(dataspaceName, anchorName, dataNode.getXpath(), dataNode.getLeaves()); + } + + @Override + public void replaceNodeTree(final String dataspaceName, final String anchorName, final String parentNodeXpath, + final String jsonData) { + final DataNode dataNode = buildDataNodeFromJson(dataspaceName, anchorName, parentNodeXpath, jsonData); + cpsDataPersistenceService.replaceDataNodeTree(dataspaceName, anchorName, dataNode); + } + + private DataNode buildDataNodeFromJson(final String dataspaceName, final String anchorName, + final String parentNodeXpath, final String jsonData) { + + final Anchor anchor = cpsAdminService.getAnchor(dataspaceName, anchorName); + final SchemaContext schemaContext = getSchemaContext(dataspaceName, anchor.getSchemaSetName()); + + if (ROOT_NODE_XPATH.equals(parentNodeXpath)) { + final NormalizedNode normalizedNode = YangUtils.parseJsonData(jsonData, schemaContext); + return new DataNodeBuilder().withNormalizedNodeTree(normalizedNode).build(); + } + + final NormalizedNode normalizedNode = YangUtils.parseJsonData(jsonData, schemaContext, parentNodeXpath); + return new DataNodeBuilder() + .withParentNodeXpath(parentNodeXpath) + .withNormalizedNodeTree(normalizedNode) + .build(); + } + + private SchemaContext getSchemaContext(final String dataspaceName, final String schemaSetName) { + return yangTextSchemaSourceSetCache.get(dataspaceName, schemaSetName).getSchemaContext(); + } } \ No newline at end of file diff --git a/cps-service/src/test/groovy/org/onap/cps/api/impl/CpsDataServiceImplSpec.groovy b/cps-service/src/test/groovy/org/onap/cps/api/impl/CpsDataServiceImplSpec.groovy index 65a0d54f4..d56147527 100644 --- a/cps-service/src/test/groovy/org/onap/cps/api/impl/CpsDataServiceImplSpec.groovy +++ b/cps-service/src/test/groovy/org/onap/cps/api/impl/CpsDataServiceImplSpec.groovy @@ -52,9 +52,7 @@ class CpsDataServiceImplSpec extends Specification { def 'Saving json data.'() { given: 'that the admin service will return an anchor' - def anchor = new Anchor() - anchor.name = anchorName - anchor.schemaSetName = schemaSetName + def anchor = Anchor.builder().name(anchorName).schemaSetName(schemaSetName).build() mockCpsAdminService.getAnchor(dataspaceName, anchorName) >> anchor and: 'the schema source set cache returns a schema source set' def mockYangTextSchemaSourceSet = Mock(YangTextSchemaSourceSet) @@ -72,7 +70,7 @@ class CpsDataServiceImplSpec extends Specification { } @Unroll - def 'Get data node with option #fetchChildrenOption'() { + def 'Get data node with option #fetchDescendantsOption.'() { def xpath = '/xpath' def dataNode = new DataNodeBuilder().withXpath(xpath).build() given: 'persistence service returns data for get data request' @@ -82,4 +80,49 @@ class CpsDataServiceImplSpec extends Specification { where: 'all fetch options are supported' fetchDescendantsOption << FetchDescendantsOption.values() } + + @Unroll + def 'Update data node leaves: #scenario.'() { + given: 'that the admin service will return an anchor' + def anchor = Anchor.builder().name(anchorName).schemaSetName(schemaSetName).build() + mockCpsAdminService.getAnchor(dataspaceName, anchorName) >> anchor + and: 'the schema source set cache returns a schema source set' + def mockYangTextSchemaSourceSet = Mock(YangTextSchemaSourceSet) + mockYangTextSchemaSourceSetCache.get(dataspaceName, schemaSetName) >> mockYangTextSchemaSourceSet + and: 'the schema source sets returns the test-tree schema context' + def yangResourceNameToContent = TestUtils.getYangResourcesAsMap('test-tree.yang') + def schemaContext = YangTextSchemaSourceSetBuilder.of(yangResourceNameToContent).getSchemaContext() + mockYangTextSchemaSourceSet.getSchemaContext() >> schemaContext + when: 'update data method is invoked with json data #jsonData and parent node xpath #parentNodeXpath' + objectUnderTest.updateNodeLeaves(dataspaceName, anchorName, parentNodeXpath, jsonData) + then: 'the persistence service method is invoked with correct parameters' + 1 * mockCpsDataPersistenceService.updateDataLeaves(dataspaceName, anchorName, nodeXpath, leaves) + where: 'following parameters were used' + scenario | parentNodeXpath | jsonData | nodeXpath | leaves + 'top level node' | '/' | '{ "test-tree": {"branch": []}}' | '/test-tree' | Collections.emptyMap() + 'level 2 node' | '/test-tree' | '{"branch": [{"name":"Name"}]}' | '/test-tree/branch[@name=\'Name\']' | ['name': 'Name'] + } + + @Unroll + def 'Replace data node: #scenario.'() { + given: 'that the admin service will return an anchor' + def anchor = Anchor.builder().name(anchorName).schemaSetName(schemaSetName).build() + mockCpsAdminService.getAnchor(dataspaceName, anchorName) >> anchor + and: 'the schema source set cache returns a schema source set' + def mockYangTextSchemaSourceSet = Mock(YangTextSchemaSourceSet) + mockYangTextSchemaSourceSetCache.get(dataspaceName, schemaSetName) >> mockYangTextSchemaSourceSet + and: 'the schema source sets returns the test-tree schema context' + def yangResourceNameToContent = TestUtils.getYangResourcesAsMap('test-tree.yang') + def schemaContext = YangTextSchemaSourceSetBuilder.of(yangResourceNameToContent).getSchemaContext() + mockYangTextSchemaSourceSet.getSchemaContext() >> schemaContext + when: 'replace data method is invoked with json data #jsonData and parent node xpath #parentNodeXpath' + objectUnderTest.replaceNodeTree(dataspaceName, anchorName, parentNodeXpath, jsonData) + then: 'the persistence service method is invoked with correct parameters' + 1 * mockCpsDataPersistenceService.replaceDataNodeTree(dataspaceName, anchorName, + { dataNode -> dataNode.xpath == nodeXpath }) + where: 'following parameters were used' + scenario | parentNodeXpath | jsonData | nodeXpath + 'top level node' | '/' | '{ "test-tree": {"branch": []}}' | '/test-tree' + 'level 2 node' | '/test-tree' | '{"branch": [{"name":"Name"}]}' | '/test-tree/branch[@name=\'Name\']' + } } \ No newline at end of file -- cgit 1.2.3-korg