From be21595d53636e2c9b912bfbe8dfdefb81edc70f Mon Sep 17 00:00:00 2001 From: JosephKeenan Date: Tue, 3 Aug 2021 18:24:32 +0100 Subject: [PATCH] Upgrade Swager Codegen-maven-plugin - Removed swagger annotations dependency as latest plugin generates code using v3 annotations. - updated the method signature as per the new generated code - removed unnecessary mock springbeans from the WebMvcTest Issue-ID: CPS-205 Change-Id: Ie7911d7389dca587bde945d913f458de46027e0f Signed-off-by: JosephKeenan --- cps-dependencies/pom.xml | 6 ------ cps-ncmp-rest/pom.xml | 4 ---- .../rest/controller/NetworkCmProxyController.java | 13 +++++++------ cps-parent/pom.xml | 2 +- cps-rest/pom.xml | 4 ---- .../cps/rest/controller/AdminRestController.java | 12 +++++++----- .../cps/rest/controller/DataRestController.java | 22 ++++++++++++---------- .../rest/controller/AdminRestControllerSpec.groovy | 8 +------- .../rest/controller/DataRestControllerSpec.groovy | 14 +------------- .../rest/controller/QueryRestControllerSpec.groovy | 14 +------------- 10 files changed, 30 insertions(+), 69 deletions(-) diff --git a/cps-dependencies/pom.xml b/cps-dependencies/pom.xml index 8d147abeb..1cd36f683 100755 --- a/cps-dependencies/pom.xml +++ b/cps-dependencies/pom.xml @@ -87,12 +87,6 @@ swagger-annotations 2.1.4 - - - io.swagger - swagger-annotations - 1.6.2 - io.springfox springfox-boot-starter diff --git a/cps-ncmp-rest/pom.xml b/cps-ncmp-rest/pom.xml index e0c4f6fbe..dbe1af097 100644 --- a/cps-ncmp-rest/pom.xml +++ b/cps-ncmp-rest/pom.xml @@ -68,10 +68,6 @@ io.springfox springfox-boot-starter - - io.swagger - swagger-annotations - org.codehaus.groovy diff --git a/cps-ncmp-rest/src/main/java/org/onap/cps/ncmp/rest/controller/NetworkCmProxyController.java b/cps-ncmp-rest/src/main/java/org/onap/cps/ncmp/rest/controller/NetworkCmProxyController.java index e9e022345..3d771b6c5 100755 --- a/cps-ncmp-rest/src/main/java/org/onap/cps/ncmp/rest/controller/NetworkCmProxyController.java +++ b/cps-ncmp-rest/src/main/java/org/onap/cps/ncmp/rest/controller/NetworkCmProxyController.java @@ -27,6 +27,7 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; import java.util.Collection; import javax.validation.Valid; +import javax.validation.constraints.NotNull; import org.onap.cps.ncmp.api.NetworkCmProxyDataService; import org.onap.cps.ncmp.api.models.DmiPluginRegistration; import org.onap.cps.ncmp.rest.api.NetworkCmProxyApi; @@ -66,8 +67,8 @@ public class NetworkCmProxyController implements NetworkCmProxyApi { */ @Override @Deprecated(forRemoval = false) - public ResponseEntity createNode(final String jsonData, final String cmHandle, - final String parentNodeXpath) { + public ResponseEntity createNode(final String cmHandle, @Valid final String jsonData, + @Valid final String parentNodeXpath) { networkCmProxyDataService.createDataNode(cmHandle, parentNodeXpath, jsonData); return new ResponseEntity<>(HttpStatus.CREATED); } @@ -78,8 +79,8 @@ public class NetworkCmProxyController implements NetworkCmProxyApi { */ @Override @Deprecated(forRemoval = false) - public ResponseEntity addListNodeElements(final String jsonData, final String parentNodeXpath, - final String cmHandle) { + public ResponseEntity addListNodeElements(@NotNull @Valid final String parentNodeXpath, + final String cmHandle, @Valid final String jsonData) { networkCmProxyDataService.addListNodeElements(cmHandle, parentNodeXpath, jsonData); return new ResponseEntity<>(HttpStatus.CREATED); } @@ -132,7 +133,7 @@ public class NetworkCmProxyController implements NetworkCmProxyApi { */ @Override @Deprecated(forRemoval = false) - public ResponseEntity replaceNode(@Valid final String jsonData, final String cmHandle, + public ResponseEntity replaceNode(final String cmHandle, @Valid final String jsonData, @Valid final String parentNodeXpath) { networkCmProxyDataService.replaceNodeTree(cmHandle, parentNodeXpath, jsonData); return new ResponseEntity<>(HttpStatus.OK); @@ -144,7 +145,7 @@ public class NetworkCmProxyController implements NetworkCmProxyApi { */ @Override @Deprecated(forRemoval = false) - public ResponseEntity updateNodeLeaves(@Valid final String jsonData, final String cmHandle, + public ResponseEntity updateNodeLeaves(final String cmHandle, @Valid final String jsonData, @Valid final String parentNodeXpath) { networkCmProxyDataService.updateNodeLeaves(cmHandle, parentNodeXpath, jsonData); return new ResponseEntity<>(HttpStatus.OK); diff --git a/cps-parent/pom.xml b/cps-parent/pom.xml index 59b42903c..938e75eb4 100755 --- a/cps-parent/pom.xml +++ b/cps-parent/pom.xml @@ -122,7 +122,7 @@ io.swagger.codegen.v3 swagger-codegen-maven-plugin - 3.0.18 + 3.0.27 com.github.spotbugs diff --git a/cps-rest/pom.xml b/cps-rest/pom.xml index 9a131176d..9e29074f7 100755 --- a/cps-rest/pom.xml +++ b/cps-rest/pom.xml @@ -70,10 +70,6 @@ io.springfox springfox-boot-starter - - io.swagger - swagger-annotations - org.springdoc springdoc-openapi-ui 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 879d5dc6e..a1287b2bd 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 @@ -28,6 +28,8 @@ import static org.onap.cps.spi.CascadeDeleteAllowed.CASCADE_DELETE_PROHIBITED; import java.util.Collection; import java.util.List; import java.util.stream.Collectors; +import javax.validation.Valid; +import javax.validation.constraints.NotNull; import org.modelmapper.ModelMapper; import org.onap.cps.api.CpsAdminService; import org.onap.cps.api.CpsModuleService; @@ -63,7 +65,7 @@ public class AdminRestController implements CpsAdminApi { * @return a {@Link ResponseEntity} of created dataspace name & {@link HttpStatus} CREATED */ @Override - public ResponseEntity createDataspace(final String dataspaceName) { + public ResponseEntity createDataspace(@NotNull @Valid final String dataspaceName) { cpsAdminService.createDataspace(dataspaceName); return new ResponseEntity<>(dataspaceName, HttpStatus.CREATED); } @@ -88,8 +90,8 @@ public class AdminRestController implements CpsAdminApi { * @return a {@Link ResponseEntity} of created schemaset name & {@link HttpStatus} CREATED */ @Override - public ResponseEntity createSchemaSet(final MultipartFile multipartFile, - final String schemaSetName, final String dataspaceName) { + public ResponseEntity createSchemaSet(@NotNull @Valid final String schemaSetName, + final String dataspaceName, @Valid final MultipartFile multipartFile) { cpsModuleService.createSchemaSet(dataspaceName, schemaSetName, extractYangResourcesMap(multipartFile)); return new ResponseEntity<>(schemaSetName, HttpStatus.CREATED); } @@ -130,8 +132,8 @@ public class AdminRestController implements CpsAdminApi { * @return a ResponseEntity with the anchor name & {@link HttpStatus} CREATED */ @Override - public ResponseEntity createAnchor(final String dataspaceName, final String schemaSetName, - final String anchorName) { + public ResponseEntity createAnchor(final String dataspaceName, @NotNull @Valid final String schemaSetName, + @NotNull @Valid final String anchorName) { cpsAdminService.createAnchor(dataspaceName, schemaSetName, anchorName); return new ResponseEntity<>(anchorName, HttpStatus.CREATED); } 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 64b441829..bad66dd4e 100755 --- 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 @@ -21,6 +21,8 @@ package org.onap.cps.rest.controller; +import javax.validation.Valid; +import javax.validation.constraints.NotNull; import org.onap.cps.api.CpsDataService; import org.onap.cps.rest.api.CpsDataApi; import org.onap.cps.spi.FetchDescendantsOption; @@ -41,8 +43,8 @@ public class DataRestController implements CpsDataApi { private CpsDataService cpsDataService; @Override - public ResponseEntity createNode(final String jsonData, final String dataspaceName, final String anchorName, - final String parentNodeXpath) { + public ResponseEntity createNode(final String dataspaceName, final String anchorName, + final String jsonData, final String parentNodeXpath) { if (isRootXpath(parentNodeXpath)) { cpsDataService.saveData(dataspaceName, anchorName, jsonData); } else { @@ -52,8 +54,8 @@ public class DataRestController implements CpsDataApi { } @Override - public ResponseEntity addListNodeElements(final String jsonData, final String parentNodeXpath, - final String dataspaceName, final String anchorName) { + public ResponseEntity addListNodeElements(final String parentNodeXpath, + final String dataspaceName, final String anchorName, final String jsonData) { cpsDataService.saveListNodeData(dataspaceName, anchorName, parentNodeXpath, jsonData); return new ResponseEntity<>(HttpStatus.CREATED); } @@ -74,22 +76,22 @@ public class DataRestController implements CpsDataApi { } @Override - public ResponseEntity updateNodeLeaves(final String jsonData, final String dataspaceName, - final String anchorName, final String parentNodeXpath) { + public ResponseEntity updateNodeLeaves(final String dataspaceName, + final String anchorName, final String jsonData, final String parentNodeXpath) { cpsDataService.updateNodeLeaves(dataspaceName, anchorName, parentNodeXpath, jsonData); return new ResponseEntity<>(HttpStatus.OK); } @Override - public ResponseEntity replaceNode(final String jsonData, final String dataspaceName, - final String anchorName, final String parentNodeXpath) { + public ResponseEntity replaceNode(final String dataspaceName, + final String anchorName, @Valid final String jsonData, @Valid final String parentNodeXpath) { cpsDataService.replaceNodeTree(dataspaceName, anchorName, parentNodeXpath, jsonData); return new ResponseEntity<>(HttpStatus.OK); } @Override - public ResponseEntity replaceListNodeElements(final String jsonData, final String parentNodeXpath, - final String dataspaceName, final String anchorName) { + public ResponseEntity replaceListNodeElements(@NotNull @Valid final String parentNodeXpath, + final String dataspaceName, final String anchorName, @Valid final String jsonData) { cpsDataService.replaceListNodeData(dataspaceName, anchorName, parentNodeXpath, jsonData); return new ResponseEntity<>(HttpStatus.OK); } 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 2f97a31dc..84da2db5d 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 @@ -49,7 +49,7 @@ import org.springframework.util.LinkedMultiValueMap import org.springframework.util.MultiValueMap import spock.lang.Specification -@WebMvcTest +@WebMvcTest(AdminRestController) class AdminRestControllerSpec extends Specification { @SpringBean @@ -58,12 +58,6 @@ class AdminRestControllerSpec extends Specification { @SpringBean CpsAdminService mockCpsAdminService = Mock() - @SpringBean - CpsDataService mockCpsDataService = Mock() - - @SpringBean - CpsQueryService mockCpsQueryService = Mock() - @SpringBean ModelMapper modelMapper = Spy() 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 index ec31c7fe0..8675f42a5 100755 --- 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 @@ -46,24 +46,12 @@ import org.springframework.test.web.servlet.MockMvc import spock.lang.Shared import spock.lang.Specification -@WebMvcTest +@WebMvcTest(DataRestController) class DataRestControllerSpec extends Specification { @SpringBean CpsDataService mockCpsDataService = Mock() - @SpringBean - CpsModuleService mockCpsModuleService = Mock() - - @SpringBean - CpsAdminService mockCpsAdminService = Mock() - - @SpringBean - CpsQueryService mockCpsQueryService = Mock() - - @SpringBean - ModelMapper modelMapper = Mock() - @Autowired MockMvc mvc diff --git a/cps-rest/src/test/groovy/org/onap/cps/rest/controller/QueryRestControllerSpec.groovy b/cps-rest/src/test/groovy/org/onap/cps/rest/controller/QueryRestControllerSpec.groovy index 6b6bdeeeb..d43e02b31 100644 --- a/cps-rest/src/test/groovy/org/onap/cps/rest/controller/QueryRestControllerSpec.groovy +++ b/cps-rest/src/test/groovy/org/onap/cps/rest/controller/QueryRestControllerSpec.groovy @@ -41,24 +41,12 @@ import org.springframework.http.HttpStatus import org.springframework.test.web.servlet.MockMvc import spock.lang.Specification -@WebMvcTest +@WebMvcTest(QueryRestController) class QueryRestControllerSpec extends Specification { - @SpringBean - CpsDataService mockCpsDataService = Mock() - - @SpringBean - CpsModuleService mockCpsModuleService = Mock() - - @SpringBean - CpsAdminService mockCpsAdminService = Mock() - @SpringBean CpsQueryService mockCpsQueryService = Mock() - @SpringBean - ModelMapper modelMapper = Mock() - @Autowired MockMvc mvc -- 2.16.6