fix: after spring-boot upgrade HandlerMethodValidationException is us…

…ed for validation errors
rocketbase-io · Apr 2, 2024 · b25d434 · b25d434
1 parent c9b781d
commit b25d434
Showing 1 changed file with 28 additions and 1 deletion.
diff --git a/...ava/io/rocketbase/commons/controller/exceptionhandler/BeanValidationExceptionHandler.java b/...ava/io/rocketbase/commons/controller/exceptionhandler/BeanValidationExceptionHandler.java
@@ -4,6 +4,7 @@
 import io.rocketbase.commons.exception.ErrorCodes;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.MessageSourceResolvable;
 import org.springframework.http.HttpStatus;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.FieldError;
@@ -13,6 +14,9 @@
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.method.annotation.HandlerMethodValidationException;
+
+import java.util.List;
 
 
 @ControllerAdvice
@@ -23,7 +27,30 @@ public class BeanValidationExceptionHandler extends BaseExceptionHandler {
     @ExceptionHandler
     @ResponseStatus(HttpStatus.BAD_REQUEST)
     @ResponseBody
-    public ErrorResponse handleBeanValidationException(HttpServletRequest request, MethodArgumentNotValidException e) {
+    public ErrorResponse handleHandlerMethodValidation(HttpServletRequest request, HandlerMethodValidationException e) {
+        ErrorResponse result = new ErrorResponse(ErrorCodes.FORM_ERROR.getStatus(), null);
+        result.setMessage(translate(request, "400", e.getMessage()));
+
+        List<? extends MessageSourceResolvable> errors = e.getAllErrors();
+        for (MessageSourceResolvable error : errors) {
+            if (error instanceof FieldError fieldError) {
+                String code = fieldError.getCode();
+                String defaultMessage = fieldError.getDefaultMessage();
+                result.addField(fieldError.getField(), translate(request, "error.form." + code, defaultMessage));
+            }
+        }
+
+        if (log.isDebugEnabled()) {
+            log.debug("[{}] {} throws HandlerMethodValidationException fieldErrors: {}", request.getMethod(), request.getContextPath(), result.getFields());
+        }
+
+        return result;
+    }
+
+    @ExceptionHandler
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    @ResponseBody
+    public ErrorResponse handleMethodArgumentNotValid(HttpServletRequest request, MethodArgumentNotValidException e) {
         ErrorResponse result = new ErrorResponse(ErrorCodes.FORM_ERROR.getStatus(), null);
 
         BindingResult bindingResult = e.getBindingResult();