Consistent validation logic

Issue: SPR-12655

Author: jhoeller

spring-web/src/main/java/org/springframework/web/method/annotation/ModelAttributeMethodProcessor.java

@@ -107,10 +107,8 @@ public final Object resolveArgument(MethodParameter parameter, ModelAndViewConta
 		if (binder.getTarget() != null) {
 			bindRequestParameters(binder, webRequest);
 			validateIfApplicable(binder, parameter);
-			if (binder.getBindingResult().hasErrors()) {
-				if (isBindExceptionRequired(binder, parameter)) {
-					throw new BindException(binder.getBindingResult());
-				}
+			if (binder.getBindingResult().hasErrors() && isBindExceptionRequired(binder, parameter)) {
+				throw new BindException(binder.getBindingResult());
 			}
 		}
 
@@ -166,7 +164,7 @@ protected void validateIfApplicable(WebDataBinder binder, MethodParameter method
 	}
 
 	/**
-	 * Whether to raise a {@link BindException} on validation errors.
+	 * Whether to raise a fatal bind exception on validation errors.
 	 * @param binder the data binder used to perform data binding
 	 * @param methodParam the method argument
 	 * @return {@code true} if the next method argument is not of type {@link Errors}

spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolver.java

@@ -76,6 +76,7 @@ public RequestPartMethodArgumentResolver(List<HttpMessageConverter<?>> messageCo
 		super(messageConverters);
 	}
 
+
 	/**
 	 * Supports the following:
 	 * <ul>
@@ -111,7 +112,7 @@ public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer m
 		assertIsMultipartRequest(servletRequest);
 
 		MultipartHttpServletRequest multipartRequest =
-			WebUtils.getNativeRequest(servletRequest, MultipartHttpServletRequest.class);
+				WebUtils.getNativeRequest(servletRequest, MultipartHttpServletRequest.class);
 
 		String partName = getPartName(parameter);
 		Object arg;
@@ -161,8 +162,8 @@ private static void assertIsMultipartRequest(HttpServletRequest request) {
 	}
 
 	private String getPartName(MethodParameter methodParam) {
-		RequestPart annot = methodParam.getParameterAnnotation(RequestPart.class);
-		String partName = (annot != null ? annot.value() : "");
+		RequestPart ann = methodParam.getParameterAnnotation(RequestPart.class);
+		String partName = (ann != null ? ann.value() : "");
 		if (partName.length() == 0) {
 			partName = methodParam.getParameterName();
 			if (partName == null) {
@@ -202,17 +203,16 @@ private void validate(WebDataBinder binder, MethodParameter methodParam) throws
 				Object hints = AnnotationUtils.getValue(ann);
 				binder.validate(hints instanceof Object[] ? (Object[]) hints : new Object[] {hints});
 				BindingResult bindingResult = binder.getBindingResult();
-				if (bindingResult.hasErrors()) {
-					if (isBindExceptionRequired(binder, methodParam)) {
-						throw new MethodArgumentNotValidException(methodParam, bindingResult);
-					}
+				if (bindingResult.hasErrors() && isBindExceptionRequired(binder, methodParam)) {
+					throw new MethodArgumentNotValidException(methodParam, bindingResult);
 				}
+				break;
 			}
 		}
 	}
 
 	/**
-	 * Whether to raise a {@link MethodArgumentNotValidException} on validation errors.
+	 * Whether to raise a fatal bind exception on validation errors.
 	 * @param binder the data binder used to perform data binding
 	 * @param methodParam the method argument
 	 * @return {@code true} if the next method argument is not of type {@link Errors}

spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessor.java

@@ -89,14 +89,14 @@ public boolean supportsReturnType(MethodParameter returnType) {
 	public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer,
 			NativeWebRequest webRequest, WebDataBinderFactory binderFactory) throws Exception {
 
-		Object argument = readWithMessageConverters(webRequest, parameter, parameter.getGenericParameterType());
+		Object arg = readWithMessageConverters(webRequest, parameter, parameter.getGenericParameterType());
 		String name = Conventions.getVariableNameForParameter(parameter);
-		WebDataBinder binder = binderFactory.createBinder(webRequest, argument, name);
-		if (argument != null) {
+		WebDataBinder binder = binderFactory.createBinder(webRequest, arg, name);
+		if (arg != null) {
 			validate(binder, parameter);
 		}
 		mavContainer.addAttribute(BindingResult.MODEL_KEY_PREFIX + name, binder.getBindingResult());
-		return argument;
+		return arg;
 	}
 
 	/**
@@ -116,18 +116,16 @@ private void validate(WebDataBinder binder, MethodParameter methodParam) throws
 				Object hints = AnnotationUtils.getValue(ann);
 				binder.validate(hints instanceof Object[] ? (Object[]) hints : new Object[] {hints});
 				BindingResult bindingResult = binder.getBindingResult();
-				if (bindingResult.hasErrors()) {
-					if (isBindExceptionRequired(binder, methodParam)) {
-						throw new MethodArgumentNotValidException(methodParam, bindingResult);
-					}
+				if (bindingResult.hasErrors() && isBindExceptionRequired(binder, methodParam)) {
+					throw new MethodArgumentNotValidException(methodParam, bindingResult);
 				}
 				break;
 			}
 		}
 	}
 
 	/**
-	 * Whether to raise a {@link MethodArgumentNotValidException} on validation errors.
+	 * Whether to raise a fatal bind exception on validation errors.
 	 * @param binder the data binder used to perform data binding
 	 * @param methodParam the method argument
 	 * @return {@code true} if the next method argument is not of type {@link Errors}