Merge "Replacing ModelMapper with MapStruct"

diff --cc cps-ncmp-rest/docs/openapi/components.yaml
Simple merge

diff --cc cps-ncmp-rest/docs/openapi/ncmp.yml
Simple merge

diff --cc cps-ncmp-rest/src/main/java/org/onap/cps/ncmp/rest/controller/NetworkCmProxyController.java
Simple merge

diff --cc cps-ncmp-rest/src/test/groovy/org/onap/cps/ncmp/rest/controller/NetworkCmProxyControllerSpec.groovy
index 9cbf626,a506e6a..d5c3cd9
--- 1/cps-ncmp-rest/src/test/groovy/org/onap/cps/ncmp/rest/controller/NetworkCmProxyControllerSpec.groovy
--- 2/cps-ncmp-rest/src/test/groovy/org/onap/cps/ncmp/rest/controller/NetworkCmProxyControllerSpec.groovy
+++ b/cps-ncmp-rest/src/test/groovy/org/onap/cps/ncmp/rest/controller/NetworkCmProxyControllerSpec.groovy
@@@ -22,9 -22,8 +22,9 @@@
  
  package org.onap.cps.ncmp.rest.controller
  
- 
+ import org.mapstruct.factory.Mappers
  import org.onap.cps.ncmp.api.models.NcmpServiceCmHandle
 +import spock.lang.Shared
  
  import static org.onap.cps.ncmp.api.impl.operations.DmiRequestBody.OperationEnum.PATCH
  import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete

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