Fix name inconsistency of classes

Issue-ID: CPS-90

Signed-off-by: Rishi.Chail <rishi.chail@est.tech>
Change-Id: I13196084a6ff4a7c4cd23e9e8ba58fa8fffd43bf

3 files changed, 10 insertions, 11 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.