From ad22b09877f1e260ec00af1c80ef66a3e41c3078 Mon Sep 17 00:00:00 2001 From: Julius Sula Date: Thu, 1 Jun 2023 12:32:22 +0200 Subject: [PATCH] add userMessage for unspecified exception --- .../errorhandling/GlobalExceptionHandler.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/backend/src/main/java/com/nttdata/calender/errorhandling/GlobalExceptionHandler.java b/backend/src/main/java/com/nttdata/calender/errorhandling/GlobalExceptionHandler.java index d4a06d0..bf6b213 100644 --- a/backend/src/main/java/com/nttdata/calender/errorhandling/GlobalExceptionHandler.java +++ b/backend/src/main/java/com/nttdata/calender/errorhandling/GlobalExceptionHandler.java @@ -19,23 +19,24 @@ public class GlobalExceptionHandler { @ExceptionHandler(ARException.class) public ResponseEntity handleARException(ARException e, HttpServletRequest request) { var errorMessage = "Remedy server error: " + e.getMessage(); - return entityResponse(errorMessage, e, HttpStatus.INTERNAL_SERVER_ERROR); + return entityResponse(errorMessage, errorMessage, e, HttpStatus.INTERNAL_SERVER_ERROR); } @ExceptionHandler(Exception.class) public ResponseEntity handleGenericException(Exception e, HttpServletRequest request) { - var errorMessage = "Backend internal server error: " + e.getMessage(); - return entityResponse(errorMessage, e, HttpStatus.INTERNAL_SERVER_ERROR); + var userMessage = "Backend internal server error"; + return entityResponse(userMessage, e.getMessage(), e, HttpStatus.INTERNAL_SERVER_ERROR); } @ExceptionHandler(BackendError.class) public ResponseEntity handleBackendErrorException(BackendError e, HttpServletRequest request) { var errorMessage = "Backend internal server error: " + e.getMessage(); - return entityResponse(errorMessage, e, e.getHttpStatus()); + return entityResponse(errorMessage, errorMessage, e, e.getHttpStatus()); } - private ResponseEntity entityResponse(String errorMessage, Exception e, HttpStatus status) { - var errorResponse = new ErrorResponse(errorMessage, e.getClass().getSimpleName()); + private ResponseEntity entityResponse(String userMessage, String errorMessage, Exception e, + HttpStatus status) { + var errorResponse = new ErrorResponse(userMessage, e.getClass().getSimpleName()); errorLogger.error(errorMessage, e); return new ResponseEntity<>(errorResponse, status); }