From b1740000e774ca633309e640f190cdcd74aa8241 Mon Sep 17 00:00:00 2001 From: Claudio David Gasparini Date: Tue, 1 Dec 2020 15:28:25 +0100 Subject: Fix checkstyle violations for "final" keyword Issue-ID: CPS-119 Signed-off-by: Claudio David Gasparini Change-Id: I871a361937ed30047fe89ff2d2b17499cddad56c --- .../src/main/java/org/onap/cps/Application.java | 2 +- .../cps/rest/controller/CpsRestController.java | 27 +++++++++++----------- .../rest/exceptions/CpsRestExceptionHandler.java | 17 +++++++------- 3 files changed, 23 insertions(+), 23 deletions(-) (limited to 'cps-rest') diff --git a/cps-rest/src/main/java/org/onap/cps/Application.java b/cps-rest/src/main/java/org/onap/cps/Application.java index 9f6c2edce..d8e849d53 100644 --- a/cps-rest/src/main/java/org/onap/cps/Application.java +++ b/cps-rest/src/main/java/org/onap/cps/Application.java @@ -26,7 +26,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication public class Application { - public static void main(String[] args) { + public static void main(final String[] args) { SpringApplication.run(Application.class, args); } } \ No newline at end of file diff --git a/cps-rest/src/main/java/org/onap/cps/rest/controller/CpsRestController.java b/cps-rest/src/main/java/org/onap/cps/rest/controller/CpsRestController.java index 9e57408fb..549760d2f 100755 --- a/cps-rest/src/main/java/org/onap/cps/rest/controller/CpsRestController.java +++ b/cps-rest/src/main/java/org/onap/cps/rest/controller/CpsRestController.java @@ -63,7 +63,7 @@ public class CpsRestController implements CpsRestApi { * @return a ResponseEntity with the anchor name. */ @Override - public final ResponseEntity createAnchor(@Valid Anchor anchor, String dataspaceName) { + public final ResponseEntity createAnchor(@Valid final Anchor anchor, final String dataspaceName) { final AnchorDetails anchorDetails = modelMapper.map(anchor, AnchorDetails.class); anchorDetails.setDataspace(dataspaceName); final String anchorName = cpService.createAnchor(anchorDetails); @@ -71,7 +71,7 @@ public class CpsRestController implements CpsRestApi { } @Override - public ResponseEntity createModules(@Valid MultipartFile multipartFile, String dataspaceName) { + public ResponseEntity createModules(@Valid final MultipartFile multipartFile, final String dataspaceName) { final File fileToParse = saveToFile(multipartFile); final SchemaContext schemaContext = cpService.parseAndValidateModel(fileToParse); cpService.storeSchemaContext(schemaContext, dataspaceName); @@ -79,42 +79,43 @@ public class CpsRestController implements CpsRestApi { } @Override - public ResponseEntity createNode(@Valid MultipartFile multipartFile, String dataspaceName) { + public ResponseEntity createNode(@Valid final MultipartFile multipartFile, final String dataspaceName) { return null; } @Override - public ResponseEntity deleteAnchor(String dataspaceName, String anchorName) { + public ResponseEntity deleteAnchor(final String dataspaceName, final String anchorName) { return null; } @Override - public ResponseEntity deleteDataspace(String dataspaceName) { + public ResponseEntity deleteDataspace(final String dataspaceName) { return null; } @Override - public ResponseEntity getAnchor(String dataspaceName, String anchorName) { + public ResponseEntity getAnchor(final String dataspaceName, final String anchorName) { return null; } @Override - public ResponseEntity getAnchors(String dataspaceName) { + public ResponseEntity getAnchors(final String dataspaceName) { return null; } @Override - public ResponseEntity getModule(String dataspaceName, @Valid String namespaceName, @Valid String revision) { + public ResponseEntity getModule(final String dataspaceName, @Valid final String namespaceName, + @Valid final String revision) { return null; } @Override - public ResponseEntity getNode(String dataspaceName) { + public ResponseEntity getNode(final String dataspaceName) { return null; } @Override - public ResponseEntity getNodeByDataspaceAndAnchor(String dataspaceName, String anchorName) { + public ResponseEntity getNodeByDataspaceAndAnchor(final String dataspaceName, final String anchorName) { return null; } @@ -129,13 +130,11 @@ public class CpsRestController implements CpsRestApi { * @return a ResponseEntity. */ @PostMapping("/upload-yang-json-data-file") - public final ResponseEntity uploadYangJsonDataFile( - @RequestParam("file") MultipartFile uploadedFile) { + public final ResponseEntity uploadYangJsonDataFile(@RequestParam("file") final MultipartFile uploadedFile) { validateJsonStructure(uploadedFile); final int persistenceObjectId = cpService.storeJsonStructure(getJsonString(uploadedFile)); - return new ResponseEntity( + return new ResponseEntity<>( "Object stored in CPS with identity: " + persistenceObjectId, HttpStatus.OK); - } /** diff --git a/cps-rest/src/main/java/org/onap/cps/rest/exceptions/CpsRestExceptionHandler.java b/cps-rest/src/main/java/org/onap/cps/rest/exceptions/CpsRestExceptionHandler.java index 2b9ee51fa..94226b78c 100644 --- a/cps-rest/src/main/java/org/onap/cps/rest/exceptions/CpsRestExceptionHandler.java +++ b/cps-rest/src/main/java/org/onap/cps/rest/exceptions/CpsRestExceptionHandler.java @@ -40,38 +40,39 @@ public class CpsRestExceptionHandler { * @return response with response code 500. */ @ExceptionHandler - public ResponseEntity handleInternalErrorException(Exception exception) { + public ResponseEntity handleInternalErrorException(final Exception exception) { return buildErrorResponse(HttpStatus.INTERNAL_SERVER_ERROR, exception); } @ExceptionHandler({CpsException.class}) - public ResponseEntity handleCpsException(CpsException exception) { + public ResponseEntity handleCpsException(final CpsException exception) { return buildErrorResponse(HttpStatus.INTERNAL_SERVER_ERROR, exception.getMessage(), extractDetails(exception)); } @ExceptionHandler({CpsValidationException.class}) - public ResponseEntity handleCpsValidationException(CpsException exception) { + public ResponseEntity handleCpsValidationException(final CpsException exception) { return buildErrorResponse(HttpStatus.BAD_REQUEST, exception.getMessage(), extractDetails(exception)); } @ExceptionHandler({CpsNotFoundException.class}) - public ResponseEntity handleCpsNotFoundException(CpsException exception) { + public ResponseEntity handleCpsNotFoundException(final CpsException exception) { return buildErrorResponse(HttpStatus.NOT_FOUND, exception.getMessage(), extractDetails(exception)); } - private static ResponseEntity buildErrorResponse(HttpStatus status, Exception exception) { + private static ResponseEntity buildErrorResponse(final HttpStatus status, final Exception exception) { return buildErrorResponse(status, exception.getMessage(), ExceptionUtils.getStackTrace(exception)); } - private static ResponseEntity buildErrorResponse(HttpStatus status, String message, String details) { - ErrorMessage errorMessage = new ErrorMessage(); + private static ResponseEntity buildErrorResponse(final HttpStatus status, final String message, + final String details) { + final ErrorMessage errorMessage = new ErrorMessage(); errorMessage.setStatus(status.toString()); errorMessage.setMessage(message); errorMessage.setDetails(details); return new ResponseEntity<>(errorMessage, status); } - private static String extractDetails(CpsException exception) { + private static String extractDetails(final CpsException exception) { return exception.getCause() == null ? exception.getDetails() : ExceptionUtils.getStackTrace(exception.getCause()); -- cgit 1.2.3-korg