diff options
Diffstat (limited to 'cps-rest')
| -rwxr-xr-x[-rw-r--r--] | cps-rest/docs/api/swagger/cpsAdmin.yml | 2 | ||||
| -rw-r--r-- | cps-rest/docs/api/swagger/cpsData.yml | 43 | ||||
| -rwxr-xr-x[-rw-r--r--] | cps-rest/src/main/java/org/onap/cps/rest/controller/AdminRestController.java | 3 | ||||
| -rw-r--r-- | cps-rest/src/main/java/org/onap/cps/rest/controller/DataRestController.java | 18 | ||||
| -rwxr-xr-x[-rw-r--r--] | cps-rest/src/test/groovy/org/onap/cps/rest/controller/AdminRestControllerSpec.groovy | 204 | ||||
| -rw-r--r-- | cps-rest/src/test/groovy/org/onap/cps/rest/controller/DataRestControllerSpec.groovy | 72 | ||||
| -rw-r--r-- | cps-rest/src/test/groovy/org/onap/cps/rest/exceptions/CpsRestExceptionHandlerSpec.groovy | 4 |
7 files changed, 228 insertions, 118 deletions
diff --git a/cps-rest/docs/api/swagger/cpsAdmin.yml b/cps-rest/docs/api/swagger/cpsAdmin.yml index d33c8e55ce..18ed1a2ecb 100644..100755 --- a/cps-rest/docs/api/swagger/cpsAdmin.yml +++ b/cps-rest/docs/api/swagger/cpsAdmin.yml @@ -146,7 +146,7 @@ anchorByDataspaceAndAnchorName: get: tags: - cps-admin - summary: Read an anchor given a anchor and a dataspace - DRAFT + summary: Read an anchor given a anchor and a dataspace operationId: getAnchor parameters: - $ref: 'components.yaml#/components/parameters/dataspaceNameInPath' diff --git a/cps-rest/docs/api/swagger/cpsData.yml b/cps-rest/docs/api/swagger/cpsData.yml index c33cf168e2..dcdb99adcb 100644 --- a/cps-rest/docs/api/swagger/cpsData.yml +++ b/cps-rest/docs/api/swagger/cpsData.yml @@ -20,46 +20,47 @@ nodesByDataspaceAndAnchor: $ref: 'components.yaml#/components/responses/NotFound' x-codegen-request-body-name: xpath -nodesByDataspace: - get: + post: tags: - cps-data - summary: Get all nodes for a given dataspace using an xpath or schema node identifier - DRAFT - operationId: getNode + summary: Create a node for a given anchor for the given dataspace + operationId: createNode parameters: - $ref: 'components.yaml#/components/parameters/dataspaceNameInPath' + - $ref: 'components.yaml#/components/parameters/anchorNameInPath' + requestBody: + required: true + content: + application/json: + schema: + type: string responses: - 200: - $ref: 'components.yaml#/components/responses/Ok' + 201: + $ref: 'components.yaml#/components/responses/Created' 400: $ref: 'components.yaml#/components/responses/BadRequest' 401: $ref: 'components.yaml#/components/responses/Unauthorized' 403: $ref: 'components.yaml#/components/responses/Forbidden' - 404: - $ref: 'components.yaml#/components/responses/NotFound' - x-codegen-request-body-name: requestBody - post: +nodesByDataspace: + get: tags: - cps-data - summary: Create a node for a given anchor for the given dataspace - DRAFT - operationId: createNode + summary: Get all nodes for a given dataspace using an xpath or schema node identifier - DRAFT + operationId: getNode parameters: - $ref: 'components.yaml#/components/parameters/dataspaceNameInPath' - requestBody: - content: - multipart/form-data: - schema: - $ref: 'components.yaml#/components/schemas/MultipartFile' - required: true responses: - 201: - $ref: 'components.yaml#/components/responses/Created' + 200: + $ref: 'components.yaml#/components/responses/Ok' 400: $ref: 'components.yaml#/components/responses/BadRequest' 401: $ref: 'components.yaml#/components/responses/Unauthorized' 403: - $ref: 'components.yaml#/components/responses/Forbidden'
\ No newline at end of file + $ref: 'components.yaml#/components/responses/Forbidden' + 404: + $ref: 'components.yaml#/components/responses/NotFound' + x-codegen-request-body-name: requestBody
\ No newline at end of file diff --git a/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 index 8f4bdb716f..d74e9b1cf8 100644..100755 --- a/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 @@ -102,7 +102,8 @@ public class AdminRestController implements CpsAdminApi { @Override public ResponseEntity<Object> getAnchor(final String dataspaceName, final String anchorName) { - return null; + final Anchor anchor = cpsAdminService.getAnchor(dataspaceName, anchorName); + return new ResponseEntity<>(anchor, HttpStatus.OK); } @Override diff --git a/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 index 61f9399e7e..9b31df5637 100644 --- a/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 @@ -20,28 +20,27 @@ package org.onap.cps.rest.controller; import javax.validation.Valid; -import org.modelmapper.ModelMapper; -import org.onap.cps.api.CpsAdminService; +import javax.validation.constraints.NotNull; +import org.onap.cps.api.CpsDataService; import org.onap.cps.rest.api.CpsDataApi; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; 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.cps-base-path}") public class DataRestController implements CpsDataApi { @Autowired - private CpsAdminService cpsAdminService; - - @Autowired - private ModelMapper modelMapper; + private CpsDataService cpsDataService; @Override - public ResponseEntity<String> createNode(@Valid final MultipartFile multipartFile, final String dataspaceName) { - return null; + public ResponseEntity<String> createNode(@Valid final String jsonData, @NotNull final String dataspaceName, + @NotNull @Valid final String anchorName) { + cpsDataService.saveData(dataspaceName, anchorName, jsonData); + return new ResponseEntity<>(HttpStatus.CREATED); } @Override @@ -53,4 +52,5 @@ public class DataRestController implements CpsDataApi { public ResponseEntity<Object> getNodeByDataspaceAndAnchor(final String dataspaceName, final String anchorName) { return null; } + } diff --git a/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 index 88adf10efa..926021e817 100644..100755 --- a/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 @@ -20,8 +20,15 @@ package org.onap.cps.rest.controller +import static org.onap.cps.spi.CascadeDeleteAllowed.CASCADE_DELETE_PROHIBITED +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.multipart +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post + import org.modelmapper.ModelMapper import org.onap.cps.api.CpsAdminService +import org.onap.cps.api.CpsDataService import org.onap.cps.api.CpsModuleService import org.onap.cps.spi.exceptions.DataspaceAlreadyDefinedException import org.onap.cps.spi.exceptions.SchemaSetInUseException @@ -40,12 +47,6 @@ import org.springframework.util.MultiValueMap import spock.lang.Specification import spock.lang.Unroll -import static org.onap.cps.spi.CascadeDeleteAllowed.CASCADE_DELETE_PROHIBITED -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.multipart -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post - @WebMvcTest class AdminRestControllerSpec extends Specification { @@ -56,6 +57,9 @@ class AdminRestControllerSpec extends Specification { CpsAdminService mockCpsAdminService = Mock() @SpringBean + CpsDataService mockCpsDataService = Mock() + + @SpringBean ModelMapper modelMapper = Mock() @Autowired @@ -64,29 +68,33 @@ class AdminRestControllerSpec extends Specification { @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() } - def 'Create dataspace over existing with same name'() { - given: + def 'Create dataspace over existing with same name.'() { + given: 'an endpoint' + def createDataspaceEndpoint = "$basePath/v1/dataspaces"; + and: 'the service method throws an exception indicating the dataspace is already defined' def thrownException = new DataspaceAlreadyDefinedException("", new RuntimeException()) - mockCpsAdminService.createDataspace("existing-dataspace") >> { throw thrownException } - when: - def response = performCreateDataspaceRequest("existing-dataspace") - then: 'Dataspace creation fails' + mockCpsAdminService.createDataspace(dataspaceName) >> { throw thrownException } + when: 'post is invoked' + def response = mvc.perform(post(createDataspaceEndpoint).param('dataspace-name', dataspaceName)).andReturn().response + then: 'dataspace creation fails' response.status == HttpStatus.BAD_REQUEST.value() } @@ -94,10 +102,13 @@ class AdminRestControllerSpec extends Specification { def yangResourceMapCapture given: 'single yang file' def multipartFile = createMultipartFile("filename.yang", "content") + and: 'an endpoint' + def schemaSetEndpoint = "$basePath/v1/dataspaces/$dataspaceName/schema-sets" when: 'file uploaded with schema set create request' - def response = performCreateSchemaSetRequest(multipartFile) + def response = mvc.perform(multipart(schemaSetEndpoint) + .file(multipartFile).param('schema-set-name', schemaSetName)).andReturn().response then: 'associated service method is invoked with expected parameters' - 1 * mockCpsModuleService.createSchemaSet('test-dataspace', 'test-schema-set', _) >> + 1 * mockCpsModuleService.createSchemaSet(dataspaceName, schemaSetName, _) >> { args -> yangResourceMapCapture = args[2] } yangResourceMapCapture['filename.yang'] == 'content' and: 'response code indicates success' @@ -108,10 +119,13 @@ class AdminRestControllerSpec extends Specification { def yangResourceMapCapture given: 'zip archive with multiple .yang files inside' def multipartFile = createZipMultipartFileFromResource("/yang-files-set.zip") + and: 'an endpoint' + def schemaSetEndpoint = "$basePath/v1/dataspaces/$dataspaceName/schema-sets" when: 'file uploaded with schema set create request' - def response = performCreateSchemaSetRequest(multipartFile) + def response = mvc.perform(multipart(schemaSetEndpoint) + .file(multipartFile).param('schema-set-name', schemaSetName)).andReturn().response then: 'associated service method is invoked with expected parameters' - 1 * mockCpsModuleService.createSchemaSet('test-dataspace', 'test-schema-set', _) >> + 1 * mockCpsModuleService.createSchemaSet(dataspaceName, schemaSetName, _) >> { args -> yangResourceMapCapture = args[2] } yangResourceMapCapture['assembly.yang'] == "fake assembly content 1\n" yangResourceMapCapture['component.yang'] == "fake component content 1\n" @@ -121,8 +135,11 @@ class AdminRestControllerSpec extends Specification { @Unroll def 'Create schema set from zip archive having #caseDescriptor.'() { + given: 'an endpoint' + def schemaSetEndpoint = "$basePath/v1/dataspaces/$dataspaceName/schema-sets" when: 'zip archive having #caseDescriptor is uploaded with create schema set request' - def response = performCreateSchemaSetRequest(multipartFile) + def response = mvc.perform(multipart(schemaSetEndpoint) + .file(multipartFile).param('schema-set-name', schemaSetName)).andReturn().response then: 'create schema set rejected' response.status == HttpStatus.BAD_REQUEST.value() where: 'following cases are tested' @@ -134,16 +151,23 @@ class AdminRestControllerSpec extends Specification { def 'Create schema set from file with unsupported filename extension.'() { given: 'file with unsupported filename extension (.doc)' def multipartFile = createMultipartFile("filename.doc", "content") + and: 'an endpoint' + def schemaSetEndpoint = "$basePath/v1/dataspaces/$dataspaceName/schema-sets" when: 'file uploaded with schema set create request' - def response = performCreateSchemaSetRequest(multipartFile) + def response = mvc.perform(multipart(schemaSetEndpoint) + .file(multipartFile).param('schema-set-name', schemaSetName)).andReturn().response then: 'create schema set rejected' response.status == HttpStatus.BAD_REQUEST.value() } @Unroll def 'Create schema set from #fileType file with IOException occurrence on processing.'() { + given: 'an endpoint' + def schemaSetEndpoint = "$basePath/v1/dataspaces/$dataspaceName/schema-sets" when: 'file uploaded with schema set create request' - def response = performCreateSchemaSetRequest(createMultipartFileForIOException(fileType)) + def multipartFile = createMultipartFileForIOException(fileType) + def response = mvc.perform(multipart(schemaSetEndpoint) + .file(multipartFile).param('schema-set-name', schemaSetName)).andReturn().response then: 'the error response returned indicating internal server error occurrence' response.status == HttpStatus.INTERNAL_SERVER_ERROR.value() where: 'following file types are used' @@ -151,29 +175,84 @@ class AdminRestControllerSpec extends Specification { } def 'Delete schema set.'() { + given: 'an endpoint' + def schemaSetEndpoint = "$basePath/v1/dataspaces/$dataspaceName/schema-sets/$schemaSetName" when: 'delete schema set endpoint is invoked' - def response = performDeleteRequest(schemaSetEndpoint) + def response = mvc.perform(delete(schemaSetEndpoint)).andReturn().response then: 'associated service method is invoked with expected parameters' - 1 * mockCpsModuleService.deleteSchemaSet('test-dataspace', 'my_schema_set', CASCADE_DELETE_PROHIBITED) + 1 * mockCpsModuleService.deleteSchemaSet(dataspaceName, schemaSetName, CASCADE_DELETE_PROHIBITED) and: 'response code indicates success' response.status == HttpStatus.NO_CONTENT.value() } def 'Delete schema set which is in use.'() { - given: 'the service method throws an exception indicating the schema set is in use' - def thrownException = new SchemaSetInUseException('test-dataspace', 'my_schema_set') - mockCpsModuleService.deleteSchemaSet('test-dataspace', 'my_schema_set', CASCADE_DELETE_PROHIBITED) >> + given: 'service method throws an exception indicating the schema set is in use' + def thrownException = new SchemaSetInUseException(dataspaceName, schemaSetName) + mockCpsModuleService.deleteSchemaSet(dataspaceName, schemaSetName, CASCADE_DELETE_PROHIBITED) >> { throw thrownException } + and: 'an endpoint' + def schemaSetEndpoint = "$basePath/v1/dataspaces/$dataspaceName/schema-sets/$schemaSetName" when: 'delete schema set endpoint is invoked' - def response = performDeleteRequest(schemaSetEndpoint) + def response = mvc.perform(delete(schemaSetEndpoint)).andReturn().response then: 'schema set deletion fails with conflict response code' response.status == HttpStatus.CONFLICT.value() } - def performCreateDataspaceRequest(String dataspaceName) { - return mvc.perform( - post("$basePath/v1/dataspaces").param('dataspace-name', dataspaceName) - ).andReturn().response + def 'Get existing schema set.'() { + given: 'service method returns a new schema set' + mockCpsModuleService.getSchemaSet(dataspaceName, schemaSetName) >> + new SchemaSet(name: schemaSetName, dataspaceName: dataspaceName) + and: 'an endpoint' + def schemaSetEndpoint = "$basePath/v1/dataspaces/$dataspaceName/schema-sets/$schemaSetName" + when: 'get schema set API is invoked' + def response = mvc.perform(get(schemaSetEndpoint)).andReturn().response + then: 'the correct schema set is returned' + response.status == HttpStatus.OK.value() + response.getContentAsString().contains(schemaSetName) + } + + def 'Create Anchor.'() { + given: 'request parameters' + def requestParams = new LinkedMultiValueMap<>() + requestParams.add('schema-set-name', schemaSetName) + requestParams.add('anchor-name', anchorName) + and: 'an endpoint' + def anchorEndpoint = "$basePath/v1/dataspaces/$dataspaceName/anchors" + when: 'post is invoked' + def response = mvc.perform(post(anchorEndpoint).contentType(MediaType.APPLICATION_JSON) + .params(requestParams as MultiValueMap)).andReturn().response + then: 'anchor is created successfully' + 1 * mockCpsAdminService.createAnchor(dataspaceName, schemaSetName, anchorName) + response.status == HttpStatus.CREATED.value() + response.getContentAsString().contains(anchorName) + } + + def 'Get existing anchor.'() { + given: 'service method returns a list of anchors' + mockCpsAdminService.getAnchors(dataspaceName) >> anchorList + and: 'an endpoint' + def anchorEndpoint = "$basePath/v1/dataspaces/$dataspaceName/anchors" + when: 'get all anchors API is invoked' + def response = mvc.perform(get(anchorEndpoint)).andReturn().response + then: 'the correct anchor is returned' + response.status == HttpStatus.OK.value() + response.getContentAsString().contains(anchorName) + } + + def 'Get existing anchor by dataspace and anchor name.'() { + given: 'service method returns an anchor' + mockCpsAdminService.getAnchor(dataspaceName,anchorName) >> new Anchor(name: anchorName, dataspaceName: dataspaceName, schemaSetName:schemaSetName) + and: 'an endpoint' + def anchorEndpoint = "$basePath/v1/dataspaces/$dataspaceName/anchors/$anchorName" + when: 'get anchor API is invoked' + def response = mvc.perform(get(anchorEndpoint)) + .andReturn().response + def responseContent = response.getContentAsString() + then: 'the correct anchor is returned' + response.status == HttpStatus.OK.value() + responseContent.contains(anchorName) + responseContent.contains(dataspaceName) + responseContent.contains(schemaSetName) } def createMultipartFile(filename, content) { @@ -192,51 +271,4 @@ class AdminRestControllerSpec extends Specification { multipartFile.getInputStream() >> { throw new IOException() } return multipartFile } - - def performCreateSchemaSetRequest(multipartFile) { - return mvc.perform( - multipart("$basePath$schemaSetsEndpoint") - .file(multipartFile) - .param('schema-set-name', 'test-schema-set') - ).andReturn().response - } - - def performDeleteRequest(String deleteEndpoint) { - return mvc.perform(delete("$basePath$deleteEndpoint")).andReturn().response - } - - def 'Get existing schema set'() { - given: - mockCpsModuleService.getSchemaSet('test-dataspace', 'my_schema_set') >> - new SchemaSet(name: 'my_schema_set', dataspaceName: 'test-dataspace') - when: 'get schema set API is invoked' - def response = mvc.perform(get("$basePath$schemaSetEndpoint")).andReturn().response - then: 'the correct schema set is returned' - response.status == HttpStatus.OK.value() - response.getContentAsString().contains('my_schema_set') - } - - def 'Create Anchor'() { - given: - def requestParams = new LinkedMultiValueMap<>() - requestParams.add('schema-set-name', 'my_schema-set') - requestParams.add('anchor-name', 'my_anchor') - when: 'post is invoked' - def response = mvc.perform(post("$basePath$anchorsEndpoint").contentType(MediaType.APPLICATION_JSON) - .params(requestParams as MultiValueMap)).andReturn().response - then: 'Anchor is created successfully' - 1 * mockCpsAdminService.createAnchor('my_dataspace', 'my_schema-set', 'my_anchor') - response.status == HttpStatus.CREATED.value() - response.getContentAsString().contains('my_anchor') - } - - def 'Get existing anchor'() { - given: - mockCpsAdminService.getAnchors('my_dataspace') >> anchorList - when: 'get all anchors API is invoked' - def response = mvc.perform(get("$basePath$anchorsEndpoint")).andReturn().response - then: 'the correct anchor is returned' - response.status == HttpStatus.OK.value() - response.getContentAsString().contains('my_anchor') - } } diff --git a/cps-rest/src/test/groovy/org/onap/cps/rest/controller/DataRestControllerSpec.groovy b/cps-rest/src/test/groovy/org/onap/cps/rest/controller/DataRestControllerSpec.groovy new file mode 100644 index 0000000000..bed3ba2c90 --- /dev/null +++ b/cps-rest/src/test/groovy/org/onap/cps/rest/controller/DataRestControllerSpec.groovy @@ -0,0 +1,72 @@ +/* + * ============LICENSE_START======================================================= + * Copyright (C) 2021 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.rest.controller + +import org.modelmapper.ModelMapper +import org.onap.cps.api.CpsAdminService +import org.onap.cps.api.CpsDataService +import org.onap.cps.api.CpsModuleService +import org.spockframework.spring.SpringBean +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.beans.factory.annotation.Value +import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest +import org.springframework.http.HttpStatus +import org.springframework.http.MediaType +import org.springframework.test.web.servlet.MockMvc +import spock.lang.Specification + +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post + +@WebMvcTest +class DataRestControllerSpec extends Specification { + + @SpringBean + CpsDataService mockCpsDataService = Mock() + + @SpringBean + CpsModuleService mockCpsModuleService = Mock() + + @SpringBean + CpsAdminService mockCpsAdminService = Mock() + + @SpringBean + ModelMapper modelMapper = Mock() + + @Autowired + MockMvc mvc + + @Value('${rest.api.base-path}') + def basePath + + def dataspaceName = 'my_dataspace' + def anchorName = 'my_anchor' + + def 'Create a node.'() { + given:'an endpoint' + def nodeEndpoint ="$basePath/v1/dataspaces/$dataspaceName/anchors/$anchorName/nodes" + def json = 'some json (this is not validated)' + when: 'post is invoked' + def response = mvc.perform(post(nodeEndpoint).contentType(MediaType.APPLICATION_JSON).content(json)) + .andReturn().response + then: 'the java API is called with the correct parameters' + 1 * mockCpsDataService.saveData(dataspaceName, anchorName, json) + response.status == HttpStatus.CREATED.value() + } +}
\ No newline at end of file diff --git a/cps-rest/src/test/groovy/org/onap/cps/rest/exceptions/CpsRestExceptionHandlerSpec.groovy b/cps-rest/src/test/groovy/org/onap/cps/rest/exceptions/CpsRestExceptionHandlerSpec.groovy index 45f6102a2f..8b02d73e84 100644 --- a/cps-rest/src/test/groovy/org/onap/cps/rest/exceptions/CpsRestExceptionHandlerSpec.groovy +++ b/cps-rest/src/test/groovy/org/onap/cps/rest/exceptions/CpsRestExceptionHandlerSpec.groovy @@ -22,6 +22,7 @@ package org.onap.cps.rest.exceptions import groovy.json.JsonSlurper import org.modelmapper.ModelMapper import org.onap.cps.api.CpsAdminService +import org.onap.cps.api.CpsDataService import org.onap.cps.api.CpsModuleService import org.onap.cps.spi.exceptions.AnchorAlreadyDefinedException import org.onap.cps.spi.exceptions.CpsException @@ -56,6 +57,9 @@ class CpsRestExceptionHandlerSpec extends Specification { CpsModuleService mockCpsModuleService = Mock() @SpringBean + CpsDataService mockCpsDataService = Mock() + + @SpringBean ModelMapper modelMapper = Mock() @Autowired |