Merge "Decouple configuration from application"

diff --cc cps-rest/src/main/java/org/onap/cps/rest/controller/AdminRestController.java
index 0f8e041,8f4bdb7..d74e9b1
mode 100755,100644..100755
--- 1/cps-rest/src/main/java/org/onap/cps/rest/controller/AdminRestController.java
--- 2/cps-rest/src/main/java/org/onap/cps/rest/controller/AdminRestController.java
+++ b/cps-rest/src/main/java/org/onap/cps/rest/controller/AdminRestController.java

diff --cc cps-rest/src/main/java/org/onap/cps/rest/controller/DataRestController.java
index 07f5553,61f9399..9b31df5
--- 1/cps-rest/src/main/java/org/onap/cps/rest/controller/DataRestController.java
--- 2/cps-rest/src/main/java/org/onap/cps/rest/controller/DataRestController.java
+++ b/cps-rest/src/main/java/org/onap/cps/rest/controller/DataRestController.java
@@@ -28,9 -27,10 +28,9 @@@ import org.springframework.http.HttpSta
  import org.springframework.http.ResponseEntity;
  import org.springframework.web.bind.annotation.RequestMapping;
  import org.springframework.web.bind.annotation.RestController;
 -import org.springframework.web.multipart.MultipartFile;
  
  @RestController
- @RequestMapping("${rest.api.base-path}")
+ @RequestMapping("${rest.api.cps-base-path}")
  public class DataRestController implements CpsDataApi {
  
      @Autowired

diff --cc cps-rest/src/test/groovy/org/onap/cps/rest/controller/AdminRestControllerSpec.groovy
index e0db106,88adf10..926021e
mode 100755,100644..100755
--- 1/cps-rest/src/test/groovy/org/onap/cps/rest/controller/AdminRestControllerSpec.groovy
--- 2/cps-rest/src/test/groovy/org/onap/cps/rest/controller/AdminRestControllerSpec.groovy
+++ b/cps-rest/src/test/groovy/org/onap/cps/rest/controller/AdminRestControllerSpec.groovy
@@@ -65,24 -61,22 +65,24 @@@ class AdminRestControllerSpec extends S
      @Autowired
      MockMvc mvc
  
-     @Value('${rest.api.base-path}')
+     @Value('${rest.api.cps-base-path}')
      def basePath
  
 -    def anchorsEndpoint = '/v1/dataspaces/my_dataspace/anchors'
 -    def schemaSetsEndpoint = '/v1/dataspaces/test-dataspace/schema-sets'
 -    def schemaSetEndpoint = schemaSetsEndpoint + '/my_schema_set'
 -
 +    def dataspaceName = 'my_dataspace'
      def anchor = new Anchor(name: 'my_anchor')
      def anchorList = [anchor]
 +    def anchorName = 'my_anchor'
 +    def schemaSetName = 'my_schema_set'
  
 -    def 'Create new dataspace'() {
 -        when:
 -            def response = performCreateDataspaceRequest("new-dataspace")
 -        then: 'Service method is invoked with expected parameters'
 -            1 * mockCpsAdminService.createDataspace("new-dataspace")
 -        and: 'Dataspace is create successfully'
 +    def 'Create new dataspace.'() {
 +        given: 'an endpoint'
 +            def createDataspaceEndpoint = "$basePath/v1/dataspaces";
 +        when: 'post is invoked'
 +            def response = mvc.perform(
 +                    post(createDataspaceEndpoint).param('dataspace-name', dataspaceName)).andReturn().response
 +        then: 'service method is invoked with expected parameters'
 +            1 * mockCpsAdminService.createDataspace(dataspaceName)
 +        and: 'dataspace is create successfully'
              response.status == HttpStatus.CREATED.value()
      }
  

diff --cc cps-rest/src/test/groovy/org/onap/cps/rest/exceptions/CpsRestExceptionHandlerSpec.groovy
Simple merge