From 1ce22bdcc1f30d3ce5e5fa6c466d793df20b8911 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Deleuze?= Date: Tue, 30 May 2023 12:45:01 +0200 Subject: [PATCH] Remove MethodArgumentNotValidException(Executable, BindingResult) Closes gh-30559 --- .../bind/MethodArgumentNotValidException.java | 34 ++----------------- 1 file changed, 3 insertions(+), 31 deletions(-) diff --git a/spring-web/src/main/java/org/springframework/web/bind/MethodArgumentNotValidException.java b/spring-web/src/main/java/org/springframework/web/bind/MethodArgumentNotValidException.java index 8dda0674b32..92d882e38c5 100644 --- a/spring-web/src/main/java/org/springframework/web/bind/MethodArgumentNotValidException.java +++ b/spring-web/src/main/java/org/springframework/web/bind/MethodArgumentNotValidException.java @@ -16,7 +16,6 @@ package org.springframework.web.bind; -import java.lang.reflect.Executable; import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; @@ -49,12 +48,8 @@ import org.springframework.web.ErrorResponse; @SuppressWarnings("serial") public class MethodArgumentNotValidException extends BindException implements ErrorResponse { - @Nullable private final MethodParameter parameter; - @Nullable - private final Executable executable; - private final ProblemDetail body; @@ -66,22 +61,6 @@ public class MethodArgumentNotValidException extends BindException implements Er public MethodArgumentNotValidException(MethodParameter parameter, BindingResult bindingResult) { super(bindingResult); this.parameter = parameter; - this.executable = null; - this.body = ProblemDetail.forStatusAndDetail(getStatusCode(), "Invalid request content."); - } - - /** - * Constructor for {@link MethodArgumentNotValidException}. - * @param executable the executable that failed validation - * @param bindingResult the results of the validation - * @since 6.0.5 - * @deprecated in favor of {@link #MethodArgumentNotValidException(MethodParameter, BindingResult)} - */ - @Deprecated(since = "6.0.10", forRemoval = true) - public MethodArgumentNotValidException(Executable executable, BindingResult bindingResult) { - super(bindingResult); - this.parameter = null; - this.executable = executable; this.body = ProblemDetail.forStatusAndDetail(getStatusCode(), "Invalid request content."); } @@ -105,16 +84,9 @@ public class MethodArgumentNotValidException extends BindException implements Er @Override public String getMessage() { - StringBuilder sb = new StringBuilder("Validation failed "); - if (this.parameter != null) { - sb.append("for argument [") - .append(this.parameter.getParameterIndex()).append("] in ") - .append(this.parameter.getExecutable().toGenericString()); - } - else { - sb.append("in ") - .append(this.executable.toGenericString()); - } + StringBuilder sb = new StringBuilder("Validation failed for argument [") + .append(this.parameter.getParameterIndex()).append("] in ") + .append(this.parameter.getExecutable().toGenericString()); BindingResult bindingResult = getBindingResult(); if (bindingResult.getErrorCount() > 1) { sb.append(" with ").append(bindingResult.getErrorCount()).append(" errors");