From 5a8718b84dbd3c6fa78aa644a4695274a0a1ab5d Mon Sep 17 00:00:00 2001 From: Ruslan Kashapov Date: Thu, 10 Dec 2020 10:49:59 +0200 Subject: Create dataspace Issue-ID: CPS-134 Change-Id: Ie7f00f9c322a12a6c2a71c1407f6970a7dd24d2d Signed-off-by: Ruslan Kashapov --- .../java/org/onap/cps/api/CpsAdminService.java | 9 +++++ .../org/onap/cps/api/impl/CpsAdminServiceImpl.java | 5 +++ .../onap/cps/spi/CpsAdminPersistenceService.java | 9 +++++ .../DataspaceAlreadyDefinedException.java | 40 ++++++++++++++++++++++ .../cps/api/impl/CpsAdminServiceImplSpec.groovy | 7 ++++ 5 files changed, 70 insertions(+) create mode 100644 cps-service/src/main/java/org/onap/cps/spi/exceptions/DataspaceAlreadyDefinedException.java (limited to 'cps-service') diff --git a/cps-service/src/main/java/org/onap/cps/api/CpsAdminService.java b/cps-service/src/main/java/org/onap/cps/api/CpsAdminService.java index 5090e3a3c..581550fb5 100644 --- a/cps-service/src/main/java/org/onap/cps/api/CpsAdminService.java +++ b/cps-service/src/main/java/org/onap/cps/api/CpsAdminService.java @@ -23,6 +23,7 @@ package org.onap.cps.api; import java.util.Collection; import org.checkerframework.checker.nullness.qual.NonNull; import org.onap.cps.spi.exceptions.CpsException; +import org.onap.cps.spi.exceptions.DataspaceAlreadyDefinedException; import org.onap.cps.spi.model.Anchor; /** @@ -30,6 +31,14 @@ import org.onap.cps.spi.model.Anchor; */ public interface CpsAdminService { + /** + * Create dataspace. + * + * @param dataspaceName dataspace name + * @throws DataspaceAlreadyDefinedException if dataspace with same name already exists + */ + void createDataspace(@NonNull String dataspaceName); + /** * Create an Anchor. * diff --git a/cps-service/src/main/java/org/onap/cps/api/impl/CpsAdminServiceImpl.java b/cps-service/src/main/java/org/onap/cps/api/impl/CpsAdminServiceImpl.java index f93a82707..0cb85fdf9 100644 --- a/cps-service/src/main/java/org/onap/cps/api/impl/CpsAdminServiceImpl.java +++ b/cps-service/src/main/java/org/onap/cps/api/impl/CpsAdminServiceImpl.java @@ -33,6 +33,11 @@ public class CpsAdminServiceImpl implements CpsAdminService { @Autowired private CpsAdminPersistenceService cpsAdminPersistenceService; + @Override + public void createDataspace(final String dataspaceName) { + cpsAdminPersistenceService.createDataspace(dataspaceName); + } + @Override public void createAnchor(final String dataspaceName, final String schemaSetName, final String anchorName) { cpsAdminPersistenceService.createAnchor(dataspaceName, schemaSetName, anchorName); 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 1b7ddb724..ba53003ac 100644 --- a/cps-service/src/main/java/org/onap/cps/spi/CpsAdminPersistenceService.java +++ b/cps-service/src/main/java/org/onap/cps/spi/CpsAdminPersistenceService.java @@ -23,6 +23,7 @@ package org.onap.cps.spi; import java.util.Collection; import org.checkerframework.checker.nullness.qual.NonNull; +import org.onap.cps.spi.exceptions.DataspaceAlreadyDefinedException; import org.onap.cps.spi.model.Anchor; /* @@ -30,6 +31,14 @@ import org.onap.cps.spi.model.Anchor; */ public interface CpsAdminPersistenceService { + /** + * Create dataspace. + * + * @param dataspaceName dataspace name + * @throws DataspaceAlreadyDefinedException if dataspace with same name already exists + */ + void createDataspace(@NonNull String dataspaceName); + /** * Create an Anchor. * diff --git a/cps-service/src/main/java/org/onap/cps/spi/exceptions/DataspaceAlreadyDefinedException.java b/cps-service/src/main/java/org/onap/cps/spi/exceptions/DataspaceAlreadyDefinedException.java new file mode 100644 index 000000000..d6d933c66 --- /dev/null +++ b/cps-service/src/main/java/org/onap/cps/spi/exceptions/DataspaceAlreadyDefinedException.java @@ -0,0 +1,40 @@ +/* + * ============LICENSE_START======================================================= + * Copyright (C) 2020 Pantheon.tech + * ================================================================================ + * 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; + +/** + * Dataspace already defined exception. Indicates the dataspace with same name already exists. + */ +public class DataspaceAlreadyDefinedException extends CpsAdminException { + + private static final long serialVersionUID = -5813793951842079228L; + + /** + * Constructor. + * + * @param dataspaceName dataspace name + * @param cause the cause of this exception + */ + public DataspaceAlreadyDefinedException(final String dataspaceName, final Throwable cause) { + super("Duplicate Dataspace.", + String.format("Dataspace with name %s already exists.", dataspaceName), + cause); + } +} 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 9e13c771d..022282493 100644 --- 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 @@ -32,6 +32,13 @@ class CpsAdminServiceImplSpec extends Specification { objectUnderTest.cpsAdminPersistenceService = mockCpsAdminPersistenceService } + def 'Create dataspace method invokes persistence service'() { + when: 'Create dataspace method is invoked' + objectUnderTest.createDataspace('someDataspace') + then: 'The persistence service method is invoked with same parameters' + 1 * mockCpsAdminPersistenceService.createDataspace('someDataspace') + } + def 'Create anchor method invokes persistence service'() { when: 'Create anchor method is invoked' objectUnderTest.createAnchor('dummyDataspace', 'dummySchemaSet', 'dummyAnchorName') -- cgit 1.2.3-korg