Code Review
/
externalapi
/
nbi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Format Java code with respect to ONAP Code Style
[externalapi/nbi.git]
/
src
/
main
/
java
/
org
/
onap
/
nbi
/
apis
/
serviceorder
/
ServiceOrderResource.java
diff --git
a/src/main/java/org/onap/nbi/apis/serviceorder/ServiceOrderResource.java
b/src/main/java/org/onap/nbi/apis/serviceorder/ServiceOrderResource.java
index
c48965a
..
2f0717d
100644
(file)
--- a/
src/main/java/org/onap/nbi/apis/serviceorder/ServiceOrderResource.java
+++ b/
src/main/java/org/onap/nbi/apis/serviceorder/ServiceOrderResource.java
@@
-10,6
+10,7
@@
* 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.
*/
* 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.
*/
+
package org.onap.nbi.apis.serviceorder;
import java.util.List;
package org.onap.nbi.apis.serviceorder;
import java.util.List;
@@
-80,10
+81,10
@@
public class ServiceOrderResource extends ResourceManagement {
@Autowired
EWInterfaceUtils eWInterfaceUtils;
@Autowired
EWInterfaceUtils eWInterfaceUtils;
-
@GetMapping(value = "/{serviceOrderId}", produces = MediaType.APPLICATION_JSON_VALUE)
public ResponseEntity<Object> getServiceOrder(@PathVariable String serviceOrderId,
@GetMapping(value = "/{serviceOrderId}", produces = MediaType.APPLICATION_JSON_VALUE)
public ResponseEntity<Object> getServiceOrder(@PathVariable String serviceOrderId,
- @RequestParam MultiValueMap<String, String> params,@RequestHeader(value="Target",required = false)String targetUrl) {
+ @RequestParam MultiValueMap<String, String> params,
+ @RequestHeader(value = "Target", required = false) String targetUrl) {
if (targetUrl != null) {
targetUrl = targetUrl + OnapComponentsUrlPaths.SERVICE_ORDER_PATH + "/" + serviceOrderId;
return eWInterfaceUtils.callGetRequestTarget(targetUrl);
if (targetUrl != null) {
targetUrl = targetUrl + OnapComponentsUrlPaths.SERVICE_ORDER_PATH + "/" + serviceOrderId;
return eWInterfaceUtils.callGetRequestTarget(targetUrl);
@@
-124,7
+125,8
@@
public class ServiceOrderResource extends ResourceManagement {
@PostMapping(consumes = MediaType.APPLICATION_JSON_VALUE)
public ResponseEntity<Object> createServiceOrder(@Valid @RequestBody ServiceOrder serviceOrder, Errors errors,
@PostMapping(consumes = MediaType.APPLICATION_JSON_VALUE)
public ResponseEntity<Object> createServiceOrder(@Valid @RequestBody ServiceOrder serviceOrder, Errors errors,
- @RequestParam MultiValueMap<String, String> params, @RequestHeader(value="Target",required = false)String targetUrl) {
+ @RequestParam MultiValueMap<String, String> params,
+ @RequestHeader(value = "Target", required = false) String targetUrl) {
if (targetUrl != null) {
targetUrl = targetUrl + OnapComponentsUrlPaths.SERVICE_ORDER_PATH;
return eWInterfaceUtils.callPostRequestTarget(serviceOrder, targetUrl);
if (targetUrl != null) {
targetUrl = targetUrl + OnapComponentsUrlPaths.SERVICE_ORDER_PATH;
return eWInterfaceUtils.callPostRequestTarget(serviceOrder, targetUrl);
@@
-140,10
+142,9
@@
public class ServiceOrderResource extends ResourceManagement {
}
}
-
@PutMapping(value = "/test/{serviceOrderId}", consumes = MediaType.APPLICATION_JSON_VALUE)
public ResponseEntity<Object> checkServiceOrderRessource(@PathVariable String serviceOrderId,
@PutMapping(value = "/test/{serviceOrderId}", consumes = MediaType.APPLICATION_JSON_VALUE)
public ResponseEntity<Object> checkServiceOrderRessource(@PathVariable String serviceOrderId,
- @RequestParam MultiValueMap<String, String> params) {
+
@RequestParam MultiValueMap<String, String> params) {
Optional<ServiceOrder> optionalServiceOrder = serviceOrderService.findServiceOrderById(serviceOrderId);
if (!optionalServiceOrder.isPresent()) {
return ResponseEntity.notFound().build();
Optional<ServiceOrder> optionalServiceOrder = serviceOrderService.findServiceOrderById(serviceOrderId);
if (!optionalServiceOrder.isPresent()) {
return ResponseEntity.notFound().build();
@@
-153,7
+154,6
@@
public class ServiceOrderResource extends ResourceManagement {
return this.createResponse(serviceOrder, filter);
}
return this.createResponse(serviceOrder, filter);
}
-
public ServiceOrder checkServiceOrder(ServiceOrder serviceOrder) {
ServiceOrderInfo serviceOrderInfo = checkOrderConsistenceManager.checkServiceOrder(serviceOrder);
if (serviceOrderInfo.isServiceOrderRejected()) {
public ServiceOrder checkServiceOrder(ServiceOrder serviceOrder) {
ServiceOrderInfo serviceOrderInfo = checkOrderConsistenceManager.checkServiceOrder(serviceOrder);
if (serviceOrderInfo.isServiceOrderRejected()) {