50 files changed, 2 insertions, 36 deletions
diff --git a/cps/Dockerfile b/Dockerfile
index 81fdf16d3..81fdf16d3 100644
--- a/cps/Dockerfile
+++ b/Dockerfile
diff --git a/cps/LICENSE.txt b/LICENSE.txt
index 2bb9ad240..2bb9ad240 100644
--- a/cps/LICENSE.txt
+++ b/LICENSE.txt
diff --git a/README.md b/README.md
index d1bf49d8c..d5f0c66f4 100644
--- a/README.md
+++ b/README.md
@@ -29,6 +29,5 @@ java -DDB_HOST=localhost -DDB_USERNAME=cps -DDB_PASSWORD=cps -jar cps-rest/targe
 ```
 
 * Browse
-  * [Swagger UI](http://localhost:8080/swagger-ui/index.html)
-  * OpenAPI Specification in [JSON](http://localhost:8080/api/cps/openapi.json)
-   or [YAML](http://localhost:8080/api/cps/openapi.yaml) format
+  * [Swagger UI](http://localhost:8080/api/cps/swagger-ui/index.html)
+  * [Api Documentation](http://localhost:8080/api/cps/v3/api-docs)
diff --git a/cps/cps-bom/pom.xml b/cps-bom/pom.xml
index ae9e806f3..ae9e806f3 100644
--- a/cps/cps-bom/pom.xml
+++ b/cps-bom/pom.xml
diff --git a/cps/cps-dependencies/pom.xml b/cps-dependencies/pom.xml
index ee37b1e0a..ee37b1e0a 100644
--- a/cps/cps-dependencies/pom.xml
+++ b/cps-dependencies/pom.xml
diff --git a/cps/cps-parent/pom.xml b/cps-parent/pom.xml
index 0fe2e101a..0fe2e101a 100644
--- a/cps/cps-parent/pom.xml
+++ b/cps-parent/pom.xml
diff --git a/cps/cps-rest/docs/api/swagger/openapi.yml b/cps-rest/docs/api/swagger/openapi.yml
index 9b2ac1ec5..9b2ac1ec5 100644
--- a/cps/cps-rest/docs/api/swagger/openapi.yml
+++ b/cps-rest/docs/api/swagger/openapi.yml
diff --git a/cps/cps-rest/pom.xml b/cps-rest/pom.xml
index 4f8746a36..4f8746a36 100644
--- a/cps/cps-rest/pom.xml
+++ b/cps-rest/pom.xml
diff --git a/cps/cps-rest/src/main/java/org/onap/cps/Application.java b/cps-rest/src/main/java/org/onap/cps/Application.java
index 9f6c2edce..9f6c2edce 100644
--- a/cps/cps-rest/src/main/java/org/onap/cps/Application.java
+++ b/cps-rest/src/main/java/org/onap/cps/Application.java
diff --git a/cps/cps-rest/src/main/java/org/onap/cps/rest/controller/CpsRestController.java b/cps-rest/src/main/java/org/onap/cps/rest/controller/CpsRestController.java
index 90c287cda..90c287cda 100644
--- a/cps/cps-rest/src/main/java/org/onap/cps/rest/controller/CpsRestController.java
+++ b/cps-rest/src/main/java/org/onap/cps/rest/controller/CpsRestController.java
diff --git a/cps/cps-rest/src/main/java/org/onap/cps/rest/exceptions/CpsRestExceptionHandler.java b/cps-rest/src/main/java/org/onap/cps/rest/exceptions/CpsRestExceptionHandler.java
index 9cf4935d4..9cf4935d4 100644
--- a/cps/cps-rest/src/main/java/org/onap/cps/rest/exceptions/CpsRestExceptionHandler.java
+++ b/cps-rest/src/main/java/org/onap/cps/rest/exceptions/CpsRestExceptionHandler.java
diff --git a/cps/cps-rest/src/main/java/org/onap/cps/rest/exceptions/ErrorMessage.java b/cps-rest/src/main/java/org/onap/cps/rest/exceptions/ErrorMessage.java
index 1f2a0b786..1f2a0b786 100644
--- a/cps/cps-rest/src/main/java/org/onap/cps/rest/exceptions/ErrorMessage.java
+++ b/cps-rest/src/main/java/org/onap/cps/rest/exceptions/ErrorMessage.java
diff --git a/cps/cps-rest/src/main/java/org/onap/cps/swagger/config/SpringFoxConfig.java b/cps-rest/src/main/java/org/onap/cps/swagger/config/SpringFoxConfig.java
index 73e179511..73e179511 100644
--- a/cps/cps-rest/src/main/java/org/onap/cps/swagger/config/SpringFoxConfig.java
+++ b/cps-rest/src/main/java/org/onap/cps/swagger/config/SpringFoxConfig.java
diff --git a/cps/cps-rest/src/main/resources/application.yml b/cps-rest/src/main/resources/application.yml
index e8af0bcfb..e8af0bcfb 100644
--- a/cps/cps-rest/src/main/resources/application.yml
+++ b/cps-rest/src/main/resources/application.yml
diff --git a/cps/cps-rest/src/main/resources/logback-spring.xml b/cps-rest/src/main/resources/logback-spring.xml
index 8a4ae07c5..8a4ae07c5 100644
--- a/cps/cps-rest/src/main/resources/logback-spring.xml
+++ b/cps-rest/src/main/resources/logback-spring.xml
diff --git a/cps/cps-rest/src/main/resources/openapi-configuration.json b/cps-rest/src/main/resources/openapi-configuration.json
index ad5998feb..ad5998feb 100644
--- a/cps/cps-rest/src/main/resources/openapi-configuration.json
+++ b/cps-rest/src/main/resources/openapi-configuration.json
diff --git a/cps/cps-ri/lombok.config b/cps-ri/lombok.config
index a23edb413..a23edb413 100644
--- a/cps/cps-ri/lombok.config
+++ b/cps-ri/lombok.config
diff --git a/cps/cps-ri/pom.xml b/cps-ri/pom.xml
index 2c28212af..2c28212af 100644
--- a/cps/cps-ri/pom.xml
+++ b/cps-ri/pom.xml
diff --git a/cps/cps-ri/src/main/java/org/onap/cps/spi/entities/Dataspace.java b/cps-ri/src/main/java/org/onap/cps/spi/entities/Dataspace.java
index 627a14467..627a14467 100644
--- a/cps/cps-ri/src/main/java/org/onap/cps/spi/entities/Dataspace.java
+++ b/cps-ri/src/main/java/org/onap/cps/spi/entities/Dataspace.java
diff --git a/cps/cps-ri/src/main/java/org/onap/cps/spi/entities/Fragment.java b/cps-ri/src/main/java/org/onap/cps/spi/entities/Fragment.java
index 12422dc5f..12422dc5f 100644
--- a/cps/cps-ri/src/main/java/org/onap/cps/spi/entities/Fragment.java
+++ b/cps-ri/src/main/java/org/onap/cps/spi/entities/Fragment.java
diff --git a/cps/cps-ri/src/main/java/org/onap/cps/spi/entities/JsonDataEntity.java b/cps-ri/src/main/java/org/onap/cps/spi/entities/JsonDataEntity.java
index 413362e38..413362e38 100644
--- a/cps/cps-ri/src/main/java/org/onap/cps/spi/entities/JsonDataEntity.java
+++ b/cps-ri/src/main/java/org/onap/cps/spi/entities/JsonDataEntity.java
diff --git a/cps/cps-ri/src/main/java/org/onap/cps/spi/entities/ModuleEntity.java b/cps-ri/src/main/java/org/onap/cps/spi/entities/ModuleEntity.java
index d2130aeec..d2130aeec 100644
--- a/cps/cps-ri/src/main/java/org/onap/cps/spi/entities/ModuleEntity.java
+++ b/cps-ri/src/main/java/org/onap/cps/spi/entities/ModuleEntity.java
diff --git a/cps/cps-ri/src/main/java/org/onap/cps/spi/impl/DataPersistencyServiceImpl.java b/cps-ri/src/main/java/org/onap/cps/spi/impl/DataPersistencyServiceImpl.java
index 2b4f1357d..2b4f1357d 100644
--- a/cps/cps-ri/src/main/java/org/onap/cps/spi/impl/DataPersistencyServiceImpl.java
+++ b/cps-ri/src/main/java/org/onap/cps/spi/impl/DataPersistencyServiceImpl.java
diff --git a/cps/cps-ri/src/main/java/org/onap/cps/spi/impl/ModelPersistencyServiceImpl.java b/cps-ri/src/main/java/org/onap/cps/spi/impl/ModelPersistencyServiceImpl.java
index 01c7a7b53..01c7a7b53 100644
--- a/cps/cps-ri/src/main/java/org/onap/cps/spi/impl/ModelPersistencyServiceImpl.java
+++ b/cps-ri/src/main/java/org/onap/cps/spi/impl/ModelPersistencyServiceImpl.java
diff --git a/cps/cps-ri/src/main/java/org/onap/cps/spi/repository/DataRepository.java b/cps-ri/src/main/java/org/onap/cps/spi/repository/DataRepository.java
index f3dd58600..f3dd58600 100644
--- a/cps/cps-ri/src/main/java/org/onap/cps/spi/repository/DataRepository.java
+++ b/cps-ri/src/main/java/org/onap/cps/spi/repository/DataRepository.java
diff --git a/cps/cps-ri/src/main/java/org/onap/cps/spi/repository/DataspaceRepository.java b/cps-ri/src/main/java/org/onap/cps/spi/repository/DataspaceRepository.java
index 46a526610..46a526610 100644
--- a/cps/cps-ri/src/main/java/org/onap/cps/spi/repository/DataspaceRepository.java
+++ b/cps-ri/src/main/java/org/onap/cps/spi/repository/DataspaceRepository.java
diff --git a/cps/cps-ri/src/main/java/org/onap/cps/spi/repository/ModuleRepository.java b/cps-ri/src/main/java/org/onap/cps/spi/repository/ModuleRepository.java
index f9078d7c1..f9078d7c1 100644
--- a/cps/cps-ri/src/main/java/org/onap/cps/spi/repository/ModuleRepository.java
+++ b/cps-ri/src/main/java/org/onap/cps/spi/repository/ModuleRepository.java
diff --git a/cps/cps-ri/src/main/resources/hibernate.properties b/cps-ri/src/main/resources/hibernate.properties
index a22fe63cf..a22fe63cf 100644
--- a/cps/cps-ri/src/main/resources/hibernate.properties
+++ b/cps-ri/src/main/resources/hibernate.properties
diff --git a/cps/cps-ri/src/main/resources/logback-spring.xml b/cps-ri/src/main/resources/logback-spring.xml
index 8a4ae07c5..8a4ae07c5 100644
--- a/cps/cps-ri/src/main/resources/logback-spring.xml
+++ b/cps-ri/src/main/resources/logback-spring.xml
diff --git a/cps/cps-ri/src/main/resources/schema.sql b/cps-ri/src/main/resources/schema.sql
index 6a76fbd19..6a76fbd19 100644
--- a/cps/cps-ri/src/main/resources/schema.sql
+++ b/cps-ri/src/main/resources/schema.sql
diff --git a/cps/cps-service/pom.xml b/cps-service/pom.xml
index 3e8cc2deb..3e8cc2deb 100644
--- a/cps/cps-service/pom.xml
+++ b/cps-service/pom.xml
diff --git a/cps/cps-service/src/main/java/org/onap/cps/api/CpService.java b/cps-service/src/main/java/org/onap/cps/api/CpService.java
index 4d94a4654..4d94a4654 100644
--- a/cps/cps-service/src/main/java/org/onap/cps/api/CpService.java
+++ b/cps-service/src/main/java/org/onap/cps/api/CpService.java
diff --git a/cps/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 c33746e86..c33746e86 100644
--- a/cps/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
diff --git a/cps/cps-service/src/main/java/org/onap/cps/exceptions/CpsException.java b/cps-service/src/main/java/org/onap/cps/exceptions/CpsException.java
index b54453cd9..b54453cd9 100644
--- a/cps/cps-service/src/main/java/org/onap/cps/exceptions/CpsException.java
+++ b/cps-service/src/main/java/org/onap/cps/exceptions/CpsException.java
diff --git a/cps/cps-service/src/main/java/org/onap/cps/exceptions/CpsNotFoundException.java b/cps-service/src/main/java/org/onap/cps/exceptions/CpsNotFoundException.java
index f44fe806c..f44fe806c 100644
--- a/cps/cps-service/src/main/java/org/onap/cps/exceptions/CpsNotFoundException.java
+++ b/cps-service/src/main/java/org/onap/cps/exceptions/CpsNotFoundException.java
diff --git a/cps/cps-service/src/main/java/org/onap/cps/exceptions/CpsValidationException.java b/cps-service/src/main/java/org/onap/cps/exceptions/CpsValidationException.java
index dba9c165b..dba9c165b 100644
--- a/cps/cps-service/src/main/java/org/onap/cps/exceptions/CpsValidationException.java
+++ b/cps-service/src/main/java/org/onap/cps/exceptions/CpsValidationException.java
diff --git a/cps/cps-service/src/main/java/org/onap/cps/spi/DataPersistencyService.java b/cps-service/src/main/java/org/onap/cps/spi/DataPersistencyService.java
index ce51f40ac..ce51f40ac 100644
--- a/cps/cps-service/src/main/java/org/onap/cps/spi/DataPersistencyService.java
+++ b/cps-service/src/main/java/org/onap/cps/spi/DataPersistencyService.java
diff --git a/cps/cps-service/src/main/java/org/onap/cps/spi/ModelPersistencyService.java b/cps-service/src/main/java/org/onap/cps/spi/ModelPersistencyService.java
index 2afdaa82a..2afdaa82a 100644
--- a/cps/cps-service/src/main/java/org/onap/cps/spi/ModelPersistencyService.java
+++ b/cps-service/src/main/java/org/onap/cps/spi/ModelPersistencyService.java
diff --git a/cps/cps-service/src/main/java/org/onap/cps/utils/YangUtils.java b/cps-service/src/main/java/org/onap/cps/utils/YangUtils.java
index e9757eca0..e9757eca0 100644
--- a/cps/cps-service/src/main/java/org/onap/cps/utils/YangUtils.java
+++ b/cps-service/src/main/java/org/onap/cps/utils/YangUtils.java
diff --git a/cps/cps-service/src/main/resources/logback-spring.xml b/cps-service/src/main/resources/logback-spring.xml
index 8a4ae07c5..8a4ae07c5 100644
--- a/cps/cps-service/src/main/resources/logback-spring.xml
+++ b/cps-service/src/main/resources/logback-spring.xml
diff --git a/cps/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 5f42810bd..5f42810bd 100644
--- a/cps/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
diff --git a/cps/cps-service/src/test/groovy/org/onap/cps/utils/YangUtilsSpec.groovy b/cps-service/src/test/groovy/org/onap/cps/utils/YangUtilsSpec.groovy
index 8aabc4844..8aabc4844 100644
--- a/cps/cps-service/src/test/groovy/org/onap/cps/utils/YangUtilsSpec.groovy
+++ b/cps-service/src/test/groovy/org/onap/cps/utils/YangUtilsSpec.groovy
diff --git a/cps/cps-service/src/test/java/org/onap/cps/TestUtils.java b/cps-service/src/test/java/org/onap/cps/TestUtils.java
index 07647520b..07647520b 100644
--- a/cps/cps-service/src/test/java/org/onap/cps/TestUtils.java
+++ b/cps-service/src/test/java/org/onap/cps/TestUtils.java
diff --git a/cps/cps-service/src/test/resources/bookstore.json b/cps-service/src/test/resources/bookstore.json
index 44d5d424c..44d5d424c 100644
--- a/cps/cps-service/src/test/resources/bookstore.json
+++ b/cps-service/src/test/resources/bookstore.json
diff --git a/cps/cps-service/src/test/resources/bookstore.yang b/cps-service/src/test/resources/bookstore.yang
index 01eac5f33..01eac5f33 100644
--- a/cps/cps-service/src/test/resources/bookstore.yang
+++ b/cps-service/src/test/resources/bookstore.yang
diff --git a/cps/cps-service/src/test/resources/invalid.yang b/cps-service/src/test/resources/invalid.yang
index 66cfd1079..66cfd1079 100644
--- a/cps/cps-service/src/test/resources/invalid.yang
+++ b/cps-service/src/test/resources/invalid.yang
diff --git a/cps/cps-service/src/test/resources/someOtherFile.txt b/cps-service/src/test/resources/someOtherFile.txt
index e69de29bb..e69de29bb 100644
--- a/cps/cps-service/src/test/resources/someOtherFile.txt
+++ b/cps-service/src/test/resources/someOtherFile.txt
diff --git a/cps/README.md b/cps/README.md
deleted file mode 100644
index d5f0c66f4..000000000
--- a/cps/README.md
+++ /dev/null
@@ -1,33 +0,0 @@
-# Configuration Persistence Service
-
-This folder contains all files for
-[Configuration Persistence Service](https://wiki.onap.org/pages/viewpage.action?pageId=81406119).
-
-The code here is related to CPS POC, then it must be kept self contained in this cps folder to prevent any impact on
-current ccsdk components and to be ready to be moved in its own repo once CPS becomes a standalone project.
-
-
-## Running Locally
-
-* Run a postgres container instance and create `cpsdb' database:
-
-```
-CREATE USER cps WITH PASSWORD 'cps';
-CREATE DATABASE cpsdb OWNER cps;
-```
-
-* Build (from cps root folder)
-
-```bash
-mvn clean package
-```
-
-* Run (from cps root folder)
-
-```bash
-java -DDB_HOST=localhost -DDB_USERNAME=cps -DDB_PASSWORD=cps -jar cps-rest/target/cps-rest-0.0.1-SNAPSHOT.jar
-```
-
-* Browse
-  * [Swagger UI](http://localhost:8080/api/cps/swagger-ui/index.html)
-  * [Api Documentation](http://localhost:8080/api/cps/v3/api-docs)
diff --git a/cps/pom.xml b/pom.xml
index c2d6c7994..c2d6c7994 100644
--- a/cps/pom.xml
+++ b/pom.xml
diff --git a/cps/version.properties b/version.properties
index 12156a9a6..12156a9a6 100644
--- a/cps/version.properties
+++ b/version.properties