Retrieve All anchors for a given Dataspace

[cps.git] / cps-rest / src / main / java / org / onap / cps / rest / exceptions / CpsRestExceptionHandler.java

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 9cf4935..00e72a1 100644 (file)
--- 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
@@ -20,12 +20,15 @@
 package org.onap.cps.rest.exceptions;
 
 import org.apache.commons.lang3.exception.ExceptionUtils;
-import org.hibernate.exception.ConstraintViolationException;
-import org.onap.cps.exceptions.CpsException;
-import org.onap.cps.exceptions.CpsNotFoundException;
-import org.onap.cps.exceptions.CpsValidationException;
 import org.onap.cps.rest.controller.CpsRestController;
-import org.springframework.dao.EmptyResultDataAccessException;
+import org.onap.cps.rest.model.ErrorMessage;
+import org.onap.cps.spi.exceptions.AnchorAlreadyDefinedException;
+import org.onap.cps.spi.exceptions.CpsAdminException;
+import org.onap.cps.spi.exceptions.CpsException;
+import org.onap.cps.spi.exceptions.DataValidationException;
+import org.onap.cps.spi.exceptions.ModelValidationException;
+import org.onap.cps.spi.exceptions.NotFoundInDataspaceException;
+import org.onap.cps.spi.exceptions.SchemaSetAlreadyDefinedException;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ExceptionHandler;
@@ -40,57 +43,41 @@ public class CpsRestExceptionHandler {
      * @param exception the exception to handle
      * @return response with response code 500.
      */
-    @ExceptionHandler
-    public ResponseEntity<Object> handleInternalErrorException(Exception exception) {
+    @ExceptionHandler public static ResponseEntity<Object> handleInternalServerErrorExceptions(
+        final Exception exception) {
         return buildErrorResponse(HttpStatus.INTERNAL_SERVER_ERROR, exception);
     }
 
-    /*
-        TODO: Rid off extra dependencies.
-
-        Generic exception handler and CpsException (incl. children) are the only
-        exceptions to be handled here. All the other exceptions which require a special
-        treatment should be rethrown as CpsException in the place of occurrence ->
-        e.g. persistence exceptions are to be handled in cps-ri module.
-     */
-
-    @ExceptionHandler({ConstraintViolationException.class})
-    public ResponseEntity<Object> handleBadRequestException(Exception exception) {
-        return buildErrorResponse(HttpStatus.BAD_REQUEST, exception);
+    @ExceptionHandler({ModelValidationException.class, DataValidationException.class,
+        SchemaSetAlreadyDefinedException.class, AnchorAlreadyDefinedException.class, CpsAdminException.class})
+    public static ResponseEntity<Object> handleBadRequestExceptions(final CpsException exception) {
+        return buildErrorResponse(HttpStatus.BAD_REQUEST, exception.getMessage(), extractDetails(exception));
     }
 
-    @ExceptionHandler({EmptyResultDataAccessException.class})
-    public ResponseEntity<Object> handleNotFoundException(Exception exception) {
-        return buildErrorResponse(HttpStatus.NOT_FOUND, exception);
+    @ExceptionHandler({NotFoundInDataspaceException.class})
+    public static ResponseEntity<Object> handleNotFoundExceptions(final CpsException exception) {
+        return buildErrorResponse(HttpStatus.NOT_FOUND, exception.getMessage(), extractDetails(exception));
     }
 
     @ExceptionHandler({CpsException.class})
-    public ResponseEntity<Object> handleCpsException(CpsException exception) {
+    public static ResponseEntity<Object> handleAnyOtherCpsExceptions(final CpsException exception) {
         return buildErrorResponse(HttpStatus.INTERNAL_SERVER_ERROR, exception.getMessage(), extractDetails(exception));
     }
 
-    @ExceptionHandler({CpsValidationException.class})
-    public ResponseEntity<Object> handleCpsValidationException(CpsException exception) {
-        return buildErrorResponse(HttpStatus.BAD_REQUEST, exception.getMessage(), extractDetails(exception));
-    }
-
-    @ExceptionHandler({CpsNotFoundException.class})
-    public ResponseEntity<Object> handleCpsNotFoundException(CpsException exception) {
-        return buildErrorResponse(HttpStatus.NOT_FOUND, exception.getMessage(), extractDetails(exception));
-    }
-
-    private static ResponseEntity<Object> buildErrorResponse(HttpStatus status, Exception exception) {
+    private static ResponseEntity<Object> buildErrorResponse(final HttpStatus status, final Exception exception) {
         return buildErrorResponse(status, exception.getMessage(), ExceptionUtils.getStackTrace(exception));
     }
 
-    private static ResponseEntity<Object> buildErrorResponse(HttpStatus status, String message, String details) {
-        return new ResponseEntity<>(
-            ErrorMessage.builder().status(status.toString()).message(message).details(details).build(),
-            status
-        );
+    private static ResponseEntity<Object> 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());