diff options
Diffstat (limited to 'cps-service/src')
-rwxr-xr-x[-rw-r--r--] | cps-service/src/main/java/org/onap/cps/spi/CpsAdminPersistenceService.java | 12 | ||||
-rwxr-xr-x[-rw-r--r--] | cps-service/src/main/java/org/onap/cps/spi/CpsModulePersistenceService.java | 22 | ||||
-rwxr-xr-x | cps-service/src/main/java/org/onap/cps/spi/exceptions/AnchorNotFoundException.java | 38 | ||||
-rwxr-xr-x[-rw-r--r--] | cps-service/src/test/groovy/org/onap/cps/api/impl/CpsAdminServiceImplSpec.groovy | 9 | ||||
-rwxr-xr-x[-rw-r--r--] | cps-service/src/test/groovy/org/onap/cps/spi/exceptions/CpsExceptionsSpec.groovy | 8 |
5 files changed, 77 insertions, 12 deletions
diff --git a/cps-service/src/main/java/org/onap/cps/spi/CpsAdminPersistenceService.java b/cps-service/src/main/java/org/onap/cps/spi/CpsAdminPersistenceService.java index 5643aedb7..06c04ceb6 100644..100755 --- a/cps-service/src/main/java/org/onap/cps/spi/CpsAdminPersistenceService.java +++ b/cps-service/src/main/java/org/onap/cps/spi/CpsAdminPersistenceService.java @@ -57,4 +57,14 @@ public interface CpsAdminPersistenceService { */ @NonNull Collection<Anchor> getAnchors(@NonNull String dataspaceName); -} + + /** + * Get an anchor in the given dataspace using the anchor name. + * + * @param dataspaceName dataspace name + * @param anchorName anchor name + * @return an anchor + */ + @NonNull + Anchor getAnchor(@NonNull String dataspaceName, @NonNull String anchorName); +}
\ No newline at end of file diff --git a/cps-service/src/main/java/org/onap/cps/spi/CpsModulePersistenceService.java b/cps-service/src/main/java/org/onap/cps/spi/CpsModulePersistenceService.java index a82d69acb..dc4e26b91 100644..100755 --- a/cps-service/src/main/java/org/onap/cps/spi/CpsModulePersistenceService.java +++ b/cps-service/src/main/java/org/onap/cps/spi/CpsModulePersistenceService.java @@ -36,15 +36,27 @@ public interface CpsModulePersistenceService { * @param yangResourcesNameToContentMap YANG resources (files) map where key is a name and value is content */ void storeSchemaSet(@NonNull String dataspaceName, @NonNull String schemaSetName, - @NonNull Map<String, String> yangResourcesNameToContentMap); + @NonNull Map<String, String> yangResourcesNameToContentMap); /** - * Returns YANG resources per specific namespace / schemaSetName. + * Returns YANG resources per specific dataspace / schemaSetName. * - * @param namespace module namespace + * @param dataspaceName dataspace name * @param schemaSetName schema set name * @return YANG resources (files) map where key is a name and value is content */ @NonNull - Map<String, String> getYangSchemaResources(@NonNull String namespace, @NonNull String schemaSetName); -} + Map<String, String> getYangSchemaResources(@NonNull String dataspaceName, + @NonNull String schemaSetName); + + /** + * Returns YANG resources per specific dataspace / anchorName. + * + * @param dataspaceName dataspace name + * @param anchorName anchor name + * @return YANG resources (files) map where key is a name and value is content + */ + @NonNull + Map<String, String> getYangSchemaSetResources(@NonNull String dataspaceName, + @NonNull String anchorName); +}
\ No newline at end of file diff --git a/cps-service/src/main/java/org/onap/cps/spi/exceptions/AnchorNotFoundException.java b/cps-service/src/main/java/org/onap/cps/spi/exceptions/AnchorNotFoundException.java new file mode 100755 index 000000000..847959fc0 --- /dev/null +++ b/cps-service/src/main/java/org/onap/cps/spi/exceptions/AnchorNotFoundException.java @@ -0,0 +1,38 @@ +/*-
+ * ============LICENSE_START=======================================================
+ * Copyright (C) 2021 Nordix Foundation. All rights reserved.
+ * ================================================================================
+ * 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.spi.exceptions;
+
+public class AnchorNotFoundException extends CpsAdminException {
+
+ private static final long serialVersionUID = -1821064664642194882L;
+
+ /**
+ * Constructor.
+ *
+ * @param anchorName the name of the anchor
+ * @param dataspaceName the dataspace name
+ */
+ public AnchorNotFoundException(final String anchorName, final String dataspaceName) {
+ super("Anchor not found",
+ String.format("Anchor with name %s does not exist in dataspace %s.", anchorName,
+ dataspaceName));
+ }
+}
\ No newline at end of file diff --git a/cps-service/src/test/groovy/org/onap/cps/api/impl/CpsAdminServiceImplSpec.groovy b/cps-service/src/test/groovy/org/onap/cps/api/impl/CpsAdminServiceImplSpec.groovy index 022282493..5aaa34027 100644..100755 --- a/cps-service/src/test/groovy/org/onap/cps/api/impl/CpsAdminServiceImplSpec.groovy +++ b/cps-service/src/test/groovy/org/onap/cps/api/impl/CpsAdminServiceImplSpec.groovy @@ -41,17 +41,16 @@ class CpsAdminServiceImplSpec extends Specification { def 'Create anchor method invokes persistence service'() { when: 'Create anchor method is invoked' - objectUnderTest.createAnchor('dummyDataspace', 'dummySchemaSet', 'dummyAnchorName') + objectUnderTest.createAnchor('someDataspace', 'someSchemaSet', 'someAnchorName') then: 'The persistence service method is invoked with same parameters' - 1 * mockCpsAdminPersistenceService.createAnchor('dummyDataspace', 'dummySchemaSet', 'dummyAnchorName') + 1 * mockCpsAdminPersistenceService.createAnchor('someDataspace', 'someSchemaSet', 'someAnchorName') } def 'Retrieve all anchors for dataspace'() { given: 'that anchor is associated with the dataspace' Collection<Anchor> anchorCollection = Arrays.asList(new Anchor()) - mockCpsAdminPersistenceService.getAnchors('dummyDataspace') >> { anchorCollection } + mockCpsAdminPersistenceService.getAnchors('someDataspace') >> { anchorCollection } expect: 'the collection provided by persistence service is returned as result' - objectUnderTest.getAnchors('dummyDataspace') == anchorCollection + objectUnderTest.getAnchors('someDataspace') == anchorCollection } - } diff --git a/cps-service/src/test/groovy/org/onap/cps/spi/exceptions/CpsExceptionsSpec.groovy b/cps-service/src/test/groovy/org/onap/cps/spi/exceptions/CpsExceptionsSpec.groovy index 067556dd5..e00a640d4 100644..100755 --- a/cps-service/src/test/groovy/org/onap/cps/spi/exceptions/CpsExceptionsSpec.groovy +++ b/cps-service/src/test/groovy/org/onap/cps/spi/exceptions/CpsExceptionsSpec.groovy @@ -104,4 +104,10 @@ class CpsExceptionsSpec extends Specification { (new SchemaSetNotFoundException(dataspaceName,schemaSetName)).details == "Schema Set with name ${schemaSetName} was not found for dataspace ${dataspaceName}." } -} + + def 'Creating a exception that an anchor cannot be found.'() { + expect: 'the exception details contains the correct message with dataspace and anchor name' + (new AnchorNotFoundException(anchorName, dataspaceName)).details + == "Anchor with name ${anchorName} does not exist in dataspace ${dataspaceName}." + } +}
\ No newline at end of file |