diff options
Diffstat (limited to 'cps-service/src')
| -rwxr-xr-x | cps-service/src/main/java/org/onap/cps/api/impl/CpServiceImpl.java | 17 | ||||
| -rwxr-xr-x[-rw-r--r--] | cps-service/src/main/java/org/onap/cps/spi/DataPersistenceService.java (renamed from cps-service/src/main/java/org/onap/cps/spi/DataPersistencyService.java) | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | cps-service/src/main/java/org/onap/cps/spi/ModelPersistenceService.java (renamed from cps-service/src/main/java/org/onap/cps/spi/ModelPersistencyService.java) | 2 | ||||
| -rwxr-xr-x | cps-service/src/test/groovy/org/onap/cps/api/impl/CpServiceImplSpec.groovy | 19 |
4 files changed, 19 insertions, 21 deletions
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 8cdadbeb55..93ed8b8468 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<Revision> 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/DataPersistencyService.java b/cps-service/src/main/java/org/onap/cps/spi/DataPersistenceService.java index ce51f40ac6..a3cbc28c55 100644..100755 --- a/cps-service/src/main/java/org/onap/cps/spi/DataPersistencyService.java +++ b/cps-service/src/main/java/org/onap/cps/spi/DataPersistenceService.java @@ -22,7 +22,7 @@ package org.onap.cps.spi; /** * Defines methods to access and manipulate data using the chosen database solution. */ -public interface DataPersistencyService { +public interface DataPersistenceService { /** * Store the JSON structure in the database. diff --git a/cps-service/src/main/java/org/onap/cps/spi/ModelPersistencyService.java b/cps-service/src/main/java/org/onap/cps/spi/ModelPersistenceService.java index 2afdaa82a8..3f0b3c1109 100644..100755 --- a/cps-service/src/main/java/org/onap/cps/spi/ModelPersistencyService.java +++ b/cps-service/src/main/java/org/onap/cps/spi/ModelPersistenceService.java @@ -23,7 +23,7 @@ package org.onap.cps.spi; /** * Defines methods to access and manipulate data using the chosen database solution. */ -public interface ModelPersistencyService { +public interface ModelPersistenceService { /** * Store the module from a yang model in the database. 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 3c51cca597..709378ebee 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' |