From 53f07ac2f4b3699b685b8d009c8949e81fa154a6 Mon Sep 17 00:00:00 2001 From: niamhcore Date: Fri, 19 Feb 2021 13:14:40 +0000 Subject: Rest & Java API layer - Query Datanodes using cpsPath that contains contains a leaf name and a leaf value Issue-ID: CPS-231 Signed-off-by: niamhcore Change-Id: I3bf2a9946746ad06ddb4bc832206a36b78ff2175 --- .../java/org/onap/cps/api/CpsQueryService.java | 15 ++++++++ .../org/onap/cps/api/impl/CpsQueryServiceImpl.java | 40 ++++++++++++++++++++ .../cps/api/impl/CpsQueryServiceImplSpec.groovy | 44 ++++++++++++++++++++++ 3 files changed, 99 insertions(+) create mode 100644 cps-service/src/main/java/org/onap/cps/api/impl/CpsQueryServiceImpl.java create mode 100644 cps-service/src/test/groovy/org/onap/cps/api/impl/CpsQueryServiceImplSpec.groovy (limited to 'cps-service/src') diff --git a/cps-service/src/main/java/org/onap/cps/api/CpsQueryService.java b/cps-service/src/main/java/org/onap/cps/api/CpsQueryService.java index a66e08436..b432af800 100644 --- a/cps-service/src/main/java/org/onap/cps/api/CpsQueryService.java +++ b/cps-service/src/main/java/org/onap/cps/api/CpsQueryService.java @@ -19,9 +19,24 @@ package org.onap.cps.api; +import java.util.Collection; +import org.checkerframework.checker.nullness.qual.NonNull; +import org.onap.cps.spi.model.DataNode; + /* * Query interface for handling cps queries. */ public interface CpsQueryService { + /** + * Get data nodes for the given dataspace and anchor by cps path. + * + * @param dataspaceName dataspace name + * @param anchorName anchor name + * @param cpsPath cps path + * @return a collection of data nodes + */ + Collection queryDataNodes(@NonNull String dataspaceName, @NonNull String anchorName, + @NonNull String cpsPath); + } diff --git a/cps-service/src/main/java/org/onap/cps/api/impl/CpsQueryServiceImpl.java b/cps-service/src/main/java/org/onap/cps/api/impl/CpsQueryServiceImpl.java new file mode 100644 index 000000000..63d0a0fbb --- /dev/null +++ b/cps-service/src/main/java/org/onap/cps/api/impl/CpsQueryServiceImpl.java @@ -0,0 +1,40 @@ +/* + * ============LICENSE_START======================================================= + * Copyright (C) 2021 Nordix Foundation + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * SPDX-License-Identifier: Apache-2.0 + * ============LICENSE_END========================================================= + */ + +package org.onap.cps.api.impl; + +import java.util.Collection; +import org.onap.cps.api.CpsQueryService; +import org.onap.cps.spi.CpsDataPersistenceService; +import org.onap.cps.spi.model.DataNode; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +@Service +public class CpsQueryServiceImpl implements CpsQueryService { + + @Autowired + private CpsDataPersistenceService cpsDataPersistenceService; + + @Override + public Collection queryDataNodes(final String dataspaceName, final String anchorName, + final String cpsPath) { + return cpsDataPersistenceService.queryDataNodes(dataspaceName, anchorName, cpsPath); + } +} \ No newline at end of file diff --git a/cps-service/src/test/groovy/org/onap/cps/api/impl/CpsQueryServiceImplSpec.groovy b/cps-service/src/test/groovy/org/onap/cps/api/impl/CpsQueryServiceImplSpec.groovy new file mode 100644 index 000000000..6e044b044 --- /dev/null +++ b/cps-service/src/test/groovy/org/onap/cps/api/impl/CpsQueryServiceImplSpec.groovy @@ -0,0 +1,44 @@ +/* + * ============LICENSE_START======================================================= + * Copyright (C) 2021 Nordix Foundation + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * SPDX-License-Identifier: Apache-2.0 + * ============LICENSE_END========================================================= + */ + +package org.onap.cps.api.impl + +import org.onap.cps.spi.CpsDataPersistenceService +import spock.lang.Specification + +class CpsQueryServiceImplSpec extends Specification { + def mockCpsDataPersistenceService = Mock(CpsDataPersistenceService) + + def objectUnderTest = new CpsQueryServiceImpl() + + def setup() { + objectUnderTest.cpsDataPersistenceService = mockCpsDataPersistenceService + } + + def 'Query data nodes by cps path.'() { + given: 'a dataspace name, an anchor name and a cps path' + def dataspaceName = 'some dataspace' + def anchorName = 'some anchor' + def cpsPath = '/cps-path' + when: 'queryDataNodes is invoked' + objectUnderTest.queryDataNodes(dataspaceName, anchorName, cpsPath) + then: 'the persistence service is called once with the correct parameters' + 1 * mockCpsDataPersistenceService.queryDataNodes(dataspaceName, anchorName, cpsPath) + } +} \ No newline at end of file -- cgit 1.2.3-korg