From 5a1b4b66b68776e0a13c98d2f41fe39f957fdf4b Mon Sep 17 00:00:00 2001 From: "Rishi.Chail" Date: Thu, 19 Nov 2020 06:18:26 +0000 Subject: Fix name inconsistency of classes Issue-ID: CPS-90 Signed-off-by: Rishi.Chail Change-Id: I13196084a6ff4a7c4cd23e9e8ba58fa8fffd43bf --- .../java/org/onap/cps/api/impl/CpServiceImpl.java | 17 ++++---- .../org/onap/cps/spi/DataPersistenceService.java | 49 ++++++++++++++++++++++ .../org/onap/cps/spi/DataPersistencyService.java | 49 ---------------------- .../org/onap/cps/spi/ModelPersistenceService.java | 39 +++++++++++++++++ .../org/onap/cps/spi/ModelPersistencyService.java | 39 ----------------- .../org/onap/cps/api/impl/CpServiceImplSpec.groovy | 19 ++++----- 6 files changed, 105 insertions(+), 107 deletions(-) create mode 100755 cps-service/src/main/java/org/onap/cps/spi/DataPersistenceService.java delete mode 100644 cps-service/src/main/java/org/onap/cps/spi/DataPersistencyService.java create mode 100755 cps-service/src/main/java/org/onap/cps/spi/ModelPersistenceService.java delete mode 100644 cps-service/src/main/java/org/onap/cps/spi/ModelPersistencyService.java (limited to 'cps-service') diff --git a/cps-service/src/main/java/org/onap/cps/api/impl/CpServiceImpl.java b/cps-service/src/main/java/org/onap/cps/api/impl/CpServiceImpl.java index 8cdadbeb5..93ed8b846 100755 --- a/cps-service/src/main/java/org/onap/cps/api/impl/CpServiceImpl.java +++ b/cps-service/src/main/java/org/onap/cps/api/impl/CpServiceImpl.java @@ -29,9 +29,9 @@ import org.onap.cps.api.CpService; import org.onap.cps.api.model.AnchorDetails; import org.onap.cps.exceptions.CpsException; import org.onap.cps.exceptions.CpsValidationException; -import org.onap.cps.spi.DataPersistencyService; +import org.onap.cps.spi.DataPersistenceService; import org.onap.cps.spi.FragmentPersistenceService; -import org.onap.cps.spi.ModelPersistencyService; +import org.onap.cps.spi.ModelPersistenceService; import org.onap.cps.utils.YangUtils; import org.opendaylight.yangtools.yang.common.Revision; import org.opendaylight.yangtools.yang.model.api.Module; @@ -40,15 +40,14 @@ import org.opendaylight.yangtools.yang.model.parser.api.YangParserException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; - @Component public class CpServiceImpl implements CpService { @Autowired - private ModelPersistencyService modelPersistencyService; + private ModelPersistenceService modelPersistenceService; @Autowired - private DataPersistencyService dataPersistencyService; + private DataPersistenceService dataPersistenceService; @Autowired private FragmentPersistenceService fragmentPersistenceService; @@ -80,17 +79,17 @@ public class CpServiceImpl implements CpService { @Override public final Integer storeJsonStructure(final String jsonStructure) { - return dataPersistencyService.storeJsonStructure(jsonStructure); + return dataPersistenceService.storeJsonStructure(jsonStructure); } @Override public final String getJsonById(final int jsonObjectId) { - return dataPersistencyService.getJsonById(jsonObjectId); + return dataPersistenceService.getJsonById(jsonObjectId); } @Override public void deleteJsonById(int jsonObjectId) { - dataPersistencyService.deleteJsonById(jsonObjectId); + dataPersistenceService.deleteJsonById(jsonObjectId); } @Override @@ -98,7 +97,7 @@ public class CpServiceImpl implements CpService { for (final Module module : schemaContext.getModules()) { final Optional optionalRevision = module.getRevision(); final String revisionValue = optionalRevision.map(Object::toString).orElse(null); - modelPersistencyService.storeModule(module.getNamespace().toString(), module.toString(), + modelPersistenceService.storeModule(module.getNamespace().toString(), module.toString(), revisionValue, dataspaceName); } } diff --git a/cps-service/src/main/java/org/onap/cps/spi/DataPersistenceService.java b/cps-service/src/main/java/org/onap/cps/spi/DataPersistenceService.java new file mode 100755 index 000000000..a3cbc28c5 --- /dev/null +++ b/cps-service/src/main/java/org/onap/cps/spi/DataPersistenceService.java @@ -0,0 +1,49 @@ +/* + * ============LICENSE_START======================================================= + * Copyright (C) 2020 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.spi; + +/** + * Defines methods to access and manipulate data using the chosen database solution. + */ +public interface DataPersistenceService { + + /** + * Store the JSON structure in the database. + * + * @param jsonStructure the JSON structure. + * @return jsonEntityID the ID of the JSON entity. + */ + Integer storeJsonStructure(final String jsonStructure); + + /** + * Get the JSON structure from the database using the entity identifier. + * + * @param jsonStructureId the json entity identifier. + * @return a JSON Structure. + */ + String getJsonById(int jsonStructureId); + + /** + * Delete the JSON structure from the database using the entity identifier. + * + * @param jsonStructureId the json entity identifier. + */ + void deleteJsonById(int jsonStructureId); +} \ No newline at end of file diff --git a/cps-service/src/main/java/org/onap/cps/spi/DataPersistencyService.java b/cps-service/src/main/java/org/onap/cps/spi/DataPersistencyService.java deleted file mode 100644 index ce51f40ac..000000000 --- a/cps-service/src/main/java/org/onap/cps/spi/DataPersistencyService.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * ============LICENSE_START======================================================= - * Copyright (C) 2020 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.spi; - -/** - * Defines methods to access and manipulate data using the chosen database solution. - */ -public interface DataPersistencyService { - - /** - * Store the JSON structure in the database. - * - * @param jsonStructure the JSON structure. - * @return jsonEntityID the ID of the JSON entity. - */ - Integer storeJsonStructure(final String jsonStructure); - - /** - * Get the JSON structure from the database using the entity identifier. - * - * @param jsonStructureId the json entity identifier. - * @return a JSON Structure. - */ - String getJsonById(int jsonStructureId); - - /** - * Delete the JSON structure from the database using the entity identifier. - * - * @param jsonStructureId the json entity identifier. - */ - void deleteJsonById(int jsonStructureId); -} \ No newline at end of file diff --git a/cps-service/src/main/java/org/onap/cps/spi/ModelPersistenceService.java b/cps-service/src/main/java/org/onap/cps/spi/ModelPersistenceService.java new file mode 100755 index 000000000..3f0b3c110 --- /dev/null +++ b/cps-service/src/main/java/org/onap/cps/spi/ModelPersistenceService.java @@ -0,0 +1,39 @@ +/* + * ============LICENSE_START======================================================= + * Copyright (C) 2020 Nordix Foundation + * Modifications Copyright (C) 2020 Bell Canada. 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; + +/** + * Defines methods to access and manipulate data using the chosen database solution. + */ +public interface ModelPersistenceService { + + /** + * Store the module from a yang model in the database. + * + * @param namespace module namespace + * @param moduleContent module content + * @param revision module revision + * @param dataspaceName the name of the dataspace the module is associated with + */ + void storeModule(final String namespace, final String moduleContent, final String revision, + final String dataspaceName); + +} diff --git a/cps-service/src/main/java/org/onap/cps/spi/ModelPersistencyService.java b/cps-service/src/main/java/org/onap/cps/spi/ModelPersistencyService.java deleted file mode 100644 index 2afdaa82a..000000000 --- a/cps-service/src/main/java/org/onap/cps/spi/ModelPersistencyService.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * ============LICENSE_START======================================================= - * Copyright (C) 2020 Nordix Foundation - * Modifications Copyright (C) 2020 Bell Canada. 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; - -/** - * Defines methods to access and manipulate data using the chosen database solution. - */ -public interface ModelPersistencyService { - - /** - * Store the module from a yang model in the database. - * - * @param namespace module namespace - * @param moduleContent module content - * @param revision module revision - * @param dataspaceName the name of the dataspace the module is associated with - */ - void storeModule(final String namespace, final String moduleContent, final String revision, - final String dataspaceName); - -} diff --git a/cps-service/src/test/groovy/org/onap/cps/api/impl/CpServiceImplSpec.groovy b/cps-service/src/test/groovy/org/onap/cps/api/impl/CpServiceImplSpec.groovy index 3c51cca59..709378ebe 100755 --- a/cps-service/src/test/groovy/org/onap/cps/api/impl/CpServiceImplSpec.groovy +++ b/cps-service/src/test/groovy/org/onap/cps/api/impl/CpServiceImplSpec.groovy @@ -22,9 +22,8 @@ package org.onap.cps.api.impl import org.onap.cps.TestUtils import org.onap.cps.api.model.AnchorDetails -import org.onap.cps.exceptions.CpsNotFoundException import org.onap.cps.exceptions.CpsValidationException -import org.onap.cps.spi.DataPersistencyService +import org.onap.cps.spi.DataPersistenceService import org.onap.cps.spi.FragmentPersistenceService import org.opendaylight.yangtools.yang.common.Revision import org.opendaylight.yangtools.yang.model.api.SchemaContext @@ -32,18 +31,18 @@ import spock.lang.Specification class CpServiceImplSpec extends Specification { - def mockDataPersistencyService = Mock(DataPersistencyService) + def mockDataPersistenceService = Mock(DataPersistenceService) def mockFragmentPersistenceService = Mock(FragmentPersistenceService) def objectUnderTest = new CpServiceImpl() def setup() { - objectUnderTest.dataPersistencyService = mockDataPersistencyService + objectUnderTest.dataPersistenceService = mockDataPersistenceService objectUnderTest.fragmentPersistenceService = mockFragmentPersistenceService } def 'Cps Service provides to its client the id assigned by the system when storing a data structure'() { - given: 'that data persistency service is giving id 123 to a data structure it is asked to store' - mockDataPersistencyService.storeJsonStructure(_) >> 123 + given: 'that data persistence service is giving id 123 to a data structure it is asked to store' + mockDataPersistenceService.storeJsonStructure(_) >> 123 expect: 'Cps service returns the same id when storing data structure' objectUnderTest.storeJsonStructure('') == 123 } @@ -88,7 +87,7 @@ class CpServiceImplSpec extends Specification { def 'Read a JSON object with a valid identifier'(){ given: 'that the data persistence service returns a JSON structure for identifier 1' - mockDataPersistencyService.getJsonById(1) >> '{name : hello}' + mockDataPersistenceService.getJsonById(1) >> '{name : hello}' expect: 'that the same JSON structure is returned by CPS' objectUnderTest.getJsonById(1) == '{name : hello}' } @@ -96,7 +95,7 @@ class CpServiceImplSpec extends Specification { def 'Read a JSON object with an identifier that does not exist'(){ given: 'that the data persistence service throws an exception' def exceptionThrownByPersistenceService = new IllegalStateException() - mockDataPersistencyService.getJsonById(_) >> {throw exceptionThrownByPersistenceService} + mockDataPersistenceService.getJsonById(_) >> {throw exceptionThrownByPersistenceService} when: 'we try to get the JSON structure' objectUnderTest.getJsonById(1); then: 'the same exception is thrown by CPS' @@ -105,14 +104,14 @@ class CpServiceImplSpec extends Specification { def 'Delete a JSON object with a valid identifier'(){ given: 'that the data persistence service can delete a JSON structure for identifier 1' - mockDataPersistencyService.deleteJsonById(1) + mockDataPersistenceService.deleteJsonById(1) expect: 'No exception is thrown when we delete a JSON structure with identifier 1' objectUnderTest.deleteJsonById(1) } def 'Delete a JSON object with an identifier that does not exist'(){ given: 'that the data persistence service throws an exception' - mockDataPersistencyService.deleteJsonById(_) >> {throw new IllegalStateException()} + mockDataPersistenceService.deleteJsonById(_) >> {throw new IllegalStateException()} when: 'we try to delete a JSON structure' objectUnderTest.deleteJsonById(100); then: 'the same exception is thrown by CPS' -- cgit 1.2.3-korg