Code Review
/
portal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "lowered code smells"
[portal.git]
/
ecomp-portal-BE-common
/
src
/
main
/
java
/
org
/
onap
/
portalapp
/
portal
/
controller
/
MicroserviceController.java
diff --git
a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/MicroserviceController.java
b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/MicroserviceController.java
index
89e8fe7
..
6bb5b69
100644
(file)
--- a/
ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/MicroserviceController.java
+++ b/
ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/MicroserviceController.java
@@
-4,6
+4,8
@@
* ===================================================================
* Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
* ===================================================================
* ===================================================================
* Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
* ===================================================================
+ * Modification Copyright © 2020 IBM.
+ * ===================================================================
*
* Unless otherwise specified, all software contained herein is licensed
* under the Apache License, Version 2.0 (the "License");
*
* Unless otherwise specified, all software contained herein is licensed
* under the Apache License, Version 2.0 (the "License");
@@
-64,6
+66,10
@@
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.client.RestTemplate;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.client.RestTemplate;
@@
-85,7
+91,7
@@
public class MicroserviceController extends EPRestrictedBaseController {
@Autowired
private MicroserviceService microserviceService;
@Autowired
private MicroserviceService microserviceService;
- @
RequestMapping(value = { "/portalApi/microservices" }, method = RequestMethod.POST
)
+ @
PostMapping(value = { "/portalApi/microservices" }
)
public PortalRestResponse<String> createMicroservice(HttpServletRequest request, HttpServletResponse response,
@Valid @RequestBody MicroserviceData newServiceData) throws Exception {
if (newServiceData == null) {
public PortalRestResponse<String> createMicroservice(HttpServletRequest request, HttpServletResponse response,
@Valid @RequestBody MicroserviceData newServiceData) throws Exception {
if (newServiceData == null) {
@@
-108,13
+114,13
@@
public class MicroserviceController extends EPRestrictedBaseController {
return new PortalRestResponse<>(PortalRestStatusEnum.OK, "SUCCESS", "");
}
return new PortalRestResponse<>(PortalRestStatusEnum.OK, "SUCCESS", "");
}
- @
RequestMapping(value = { "/portalApi/microservices" }, method = RequestMethod.GET
)
+ @
GetMapping(value = { "/portalApi/microservices" }
)
public List<MicroserviceData> getMicroservice(HttpServletRequest request, HttpServletResponse response)
throws Exception {
return microserviceService.getMicroserviceData();
}
public List<MicroserviceData> getMicroservice(HttpServletRequest request, HttpServletResponse response)
throws Exception {
return microserviceService.getMicroserviceData();
}
- @
RequestMapping(value = { "/portalApi/microservices/{serviceId}" }, method = RequestMethod.PUT
)
+ @
PutMapping(value = { "/portalApi/microservices/{serviceId}" }
)
public PortalRestResponse<String> updateMicroservice(HttpServletRequest request, HttpServletResponse response,
@PathVariable("serviceId") long serviceId, @Valid @RequestBody MicroserviceData newServiceData) {
public PortalRestResponse<String> updateMicroservice(HttpServletRequest request, HttpServletResponse response,
@PathVariable("serviceId") long serviceId, @Valid @RequestBody MicroserviceData newServiceData) {
@@
-135,7
+141,7
@@
public class MicroserviceController extends EPRestrictedBaseController {
return new PortalRestResponse<>(PortalRestStatusEnum.OK, "SUCCESS", "");
}
return new PortalRestResponse<>(PortalRestStatusEnum.OK, "SUCCESS", "");
}
- @
RequestMapping(value = { "/portalApi/microservices/{serviceId}" }, method = RequestMethod.DELETE
)
+ @
DeleteMapping(value = { "/portalApi/microservices/{serviceId}" }
)
public PortalRestResponse<String> deleteMicroservice(HttpServletRequest request, HttpServletResponse response,
@PathVariable("serviceId") long serviceId) {
try {
public PortalRestResponse<String> deleteMicroservice(HttpServletRequest request, HttpServletResponse response,
@PathVariable("serviceId") long serviceId) {
try {