From 96895c7759a3a5fe06ae35beefb74205a4b51fa4 Mon Sep 17 00:00:00 2001
From: rstoyanchev <rstoyanchev@vmware.com>
Date: Tue, 13 Jun 2023 07:49:37 +0100
Subject: [PATCH] Polishing in MethodArgumentNotValidException

See gh-30198
---
 .../bind/MethodArgumentNotValidException.java | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 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 9ab4be80d73..5c29926b8dd 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
@@ -121,24 +121,13 @@ public class MethodArgumentNotValidException extends BindException implements Er
 	 * @return a Map with errors as keys and resolved messages as values
 	 * @since 6.0.3
 	 */
-	public Map<ObjectError, String> resolveErrorMessages(MessageSource messageSource, Locale locale) {
-		Map<ObjectError, String> map = new LinkedHashMap<>();
-		addMessages(map, getGlobalErrors(), messageSource, locale);
-		addMessages(map, getFieldErrors(), messageSource, locale);
+	public Map<ObjectError, String> resolveErrorMessages(MessageSource source, Locale locale) {
+		Map<ObjectError, String> map = new LinkedHashMap<>(getErrorCount());
+		getGlobalErrors().forEach(error -> map.put(error, formatError(error, source, locale)));
+		getFieldErrors().forEach(error -> map.put(error, formatError(error, source, locale)));
 		return map;
 	}
 
-	private static void addMessages(
-			Map<ObjectError, String> map, List<? extends ObjectError> errors,
-			MessageSource messageSource, Locale locale) {
-
-		List<String> messages = errorsToStringList(errors, messageSource, locale);
-		for (int i = 0; i < errors.size(); i++) {
-			map.put(errors.get(i), messages.get(i));
-		}
-	}
-
-
 	/**
 	 * Convert each given {@link ObjectError} to a String in single quotes, taking
 	 * either the error's default message, or its error code.