From 4da16cd0717694f41f7c9680c0617dc72e92c3b4 Mon Sep 17 00:00:00 2001 From: tim Date: Mon, 4 Aug 2025 14:25:43 +0800 Subject: [PATCH] Revert "fix: guard against null exception messages" This reverts commit d50e8c0863db1688c1fcb15e4a06c4c01be9e808. --- .../controller/GlobalExceptionHandler.java | 20 +++++-------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/backend/src/main/java/com/openisle/controller/GlobalExceptionHandler.java b/backend/src/main/java/com/openisle/controller/GlobalExceptionHandler.java index cc1106df0..7af18210b 100644 --- a/backend/src/main/java/com/openisle/controller/GlobalExceptionHandler.java +++ b/backend/src/main/java/com/openisle/controller/GlobalExceptionHandler.java @@ -7,40 +7,30 @@ import com.openisle.exception.FieldException; import com.openisle.exception.NotFoundException; import com.openisle.exception.RateLimitException; -import java.util.HashMap; import java.util.Map; -import java.util.Objects; @RestControllerAdvice public class GlobalExceptionHandler { @ExceptionHandler(FieldException.class) public ResponseEntity handleFieldException(FieldException ex) { - Map body = new HashMap<>(); - body.put("error", Objects.toString(ex.getMessage(), null)); - body.put("field", ex.getField()); - return ResponseEntity.badRequest().body(body); + return ResponseEntity.badRequest() + .body(Map.of("error", ex.getMessage(), "field", ex.getField())); } @ExceptionHandler(NotFoundException.class) public ResponseEntity handleNotFoundException(NotFoundException ex) { - Map body = new HashMap<>(); - body.put("error", Objects.toString(ex.getMessage(), null)); - return ResponseEntity.status(404).body(body); + return ResponseEntity.status(404).body(Map.of("error", ex.getMessage())); } @ExceptionHandler(RateLimitException.class) public ResponseEntity handleRateLimitException(RateLimitException ex) { - Map body = new HashMap<>(); - body.put("error", Objects.toString(ex.getMessage(), null)); - return ResponseEntity.status(429).body(body); + return ResponseEntity.status(429).body(Map.of("error", ex.getMessage())); } @ExceptionHandler(Exception.class) public ResponseEntity handleException(Exception ex) { - Map body = new HashMap<>(); - body.put("error", Objects.toString(ex.getMessage(), null)); - return ResponseEntity.badRequest().body(body); + return ResponseEntity.badRequest().body(Map.of("error", ex.getMessage())); } }