Merge branch '6.2.x'

spring-context/src/main/java/org/springframework/validation/DataBinder.java

@@ -937,7 +937,7 @@ public class DataBinder implements PropertyEditorRegistry, TypeConverter {
 						value = createMap(paramPath, paramType, resolvableType, valueResolver);
 					}
 					else if (paramType.isArray()) {
-						value = createArray(paramPath, resolvableType, valueResolver);
+						value = createArray(paramPath, paramType, resolvableType, valueResolver);
 					}
 				}
 
@@ -954,11 +954,9 @@ public class DataBinder implements PropertyEditorRegistry, TypeConverter {
 						}
 					}
 					catch (TypeMismatchException ex) {
-						ex.initPropertyName(paramPath);
 						args[i] = null;
 						failedParamNames.add(paramPath);
-						getBindingResult().recordFieldValue(paramPath, paramType, value);
-						getBindingErrorProcessor().processPropertyAccessException(ex, getBindingResult());
+						handleTypeMismatchException(ex, paramPath, paramType, value);
 					}
 				}
 			}
@@ -1021,8 +1019,7 @@ public class DataBinder implements PropertyEditorRegistry, TypeConverter {
 		return false;
 	}
 
-	@SuppressWarnings("unchecked")
-	private <V> @Nullable List<V> createList(
+	private @Nullable List<?> createList(
 			String paramPath, Class<?> paramType, ResolvableType type, ValueResolver valueResolver) {
 
 		ResolvableType elementType = type.getNested(2);
@@ -1030,18 +1027,21 @@ public class DataBinder implements PropertyEditorRegistry, TypeConverter {
 		if (indexes == null) {
 			return null;
 		}
+
 		int size = (indexes.last() < this.autoGrowCollectionLimit ? indexes.last() + 1 : 0);
-		List<V> list = (List<V>) CollectionFactory.createCollection(paramType, size);
+		List<?> list = (List<?>) CollectionFactory.createCollection(paramType, size);
 		for (int i = 0; i < size; i++) {
 			list.add(null);
 		}
+
 		for (int index : indexes) {
-			list.set(index, (V) createObject(elementType, paramPath + "[" + index + "].", valueResolver));
+			String indexedPath = paramPath + "[" + index + "]";
+			list.set(index, createIndexedValue(paramPath, paramType, elementType, indexedPath, valueResolver));
 		}
+
 		return list;
 	}
 
-	@SuppressWarnings("unchecked")
 	private <V> @Nullable Map<String, V> createMap(
 			String paramPath, Class<?> paramType, ResolvableType type, ValueResolver valueResolver) {
 
@@ -1051,33 +1051,41 @@ public class DataBinder implements PropertyEditorRegistry, TypeConverter {
 			if (!name.startsWith(paramPath + "[")) {
 				continue;
 			}
+
 			int startIdx = paramPath.length() + 1;
 			int endIdx = name.indexOf(']', startIdx);
-			String nestedPath = ((name.length() > endIdx + 1) ? name.substring(0, endIdx + 2) : "");
 			boolean quoted = (endIdx - startIdx > 2 && name.charAt(startIdx) == '\'' && name.charAt(endIdx - 1) == '\'');
 			String key = (quoted ? name.substring(startIdx + 1, endIdx - 1) : name.substring(startIdx, endIdx));
+
 			if (map == null) {
 				map = CollectionFactory.createMap(paramType, 16);
 			}
-			if (!map.containsKey(key)) {
-				map.put(key, (V) createObject(elementType, nestedPath, valueResolver));
-			}
+
+			String indexedPath = name.substring(0, endIdx + 1);
+			map.put(key, createIndexedValue(paramPath, paramType, elementType, indexedPath, valueResolver));
 		}
+
 		return map;
 	}
 
 	@SuppressWarnings("unchecked")
-	private <V> @Nullable V @Nullable [] createArray(String paramPath, ResolvableType type, ValueResolver valueResolver) {
+	private <V> @Nullable V @Nullable [] createArray(
+			String paramPath, Class<?> paramType, ResolvableType type, ValueResolver valueResolver) {
+
 		ResolvableType elementType = type.getNested(2);
 		SortedSet<Integer> indexes = getIndexes(paramPath, valueResolver);
 		if (indexes == null) {
 			return null;
 		}
+
 		int size = (indexes.last() < this.autoGrowCollectionLimit ? indexes.last() + 1: 0);
 		@Nullable V[] array = (V[]) Array.newInstance(elementType.resolve(), size);
+
 		for (int index : indexes) {
-			array[index] = (V) createObject(elementType, paramPath + "[" + index + "].", valueResolver);
+			String indexedPath = paramPath + "[" + index + "]";
+			array[index] = createIndexedValue(paramPath, paramType, elementType, indexedPath, valueResolver);
 		}
+
 		return array;
 	}
 
@@ -1085,16 +1093,48 @@ public class DataBinder implements PropertyEditorRegistry, TypeConverter {
 		SortedSet<Integer> indexes = null;
 		for (String name : valueResolver.getNames()) {
 			if (name.startsWith(paramPath + "[")) {
-				int endIndex = name.indexOf(']', paramPath.length() + 1);
+				int endIndex = name.indexOf(']', paramPath.length() + 2);
 				String rawIndex = name.substring(paramPath.length() + 1, endIndex);
-				int index = Integer.parseInt(rawIndex);
-				indexes = (indexes != null ? indexes : new TreeSet<>());
-				indexes.add(index);
+				if (StringUtils.hasLength(rawIndex)) {
+					int index = Integer.parseInt(rawIndex);
+					indexes = (indexes != null ? indexes : new TreeSet<>());
+					indexes.add(index);
+				}
 			}
 		}
 		return indexes;
 	}
 
+	@SuppressWarnings("unchecked")
+	private <V> @Nullable V createIndexedValue(
+			String paramPath, Class<?> paramType, ResolvableType elementType,
+			String indexedPath, ValueResolver valueResolver) {
+
+		Object value = null;
+		Class<?> elementClass = elementType.resolve(Object.class);
+		Object rawValue = valueResolver.resolveValue(indexedPath, elementClass);
+		if (rawValue != null) {
+			try {
+				value = convertIfNecessary(rawValue, elementClass);
+			}
+			catch (TypeMismatchException ex) {
+				handleTypeMismatchException(ex, paramPath, paramType, rawValue);
+			}
+		}
+		else {
+			value = createObject(elementType, indexedPath + ".", valueResolver);
+		}
+		return (V) value;
+	}
+
+	private void handleTypeMismatchException(
+			TypeMismatchException ex, String paramPath, Class<?> paramType, @Nullable Object value) {
+
+		ex.initPropertyName(paramPath);
+		getBindingResult().recordFieldValue(paramPath, paramType, value);
+		getBindingErrorProcessor().processPropertyAccessException(ex, getBindingResult());
+	}
+
 	private void validateConstructorArgument(
 			Class<?> constructorClass, String nestedPath, @Nullable String name, @Nullable Object value) {
 

spring-context/src/test/java/org/springframework/validation/DataBinderConstructTests.java

@@ -103,17 +103,17 @@ class DataBinderConstructTests {
 	}
 
 	@Test
-	void listBinding() {
+	void dataClassWithListBinding() {
 		MapValueResolver valueResolver = new MapValueResolver(Map.of(
 				"dataClassList[0].param1", "value1", "dataClassList[0].param2", "true",
 				"dataClassList[1].param1", "value2", "dataClassList[1].param2", "true",
 				"dataClassList[2].param1", "value3", "dataClassList[2].param2", "true"));
 
-		DataBinder binder = initDataBinder(ListDataClass.class);
+		DataBinder binder = initDataBinder(DataClassListRecord.class);
 		binder.construct(valueResolver);
 
-		ListDataClass dataClass = getTarget(binder);
-		List<DataClass> list = dataClass.dataClassList();
+		DataClassListRecord target = getTarget(binder);
+		List<DataClass> list = target.dataClassList();
 
 		assertThat(list).hasSize(3);
 		assertThat(list.get(0).param1()).isEqualTo("value1");
@@ -122,17 +122,17 @@ class DataBinderConstructTests {
 	}
 
 	@Test // gh-34145
-	void listBindingWithNonconsecutiveIndices() {
+	void dataClassWithListBindingWithNonconsecutiveIndices() {
 		MapValueResolver valueResolver = new MapValueResolver(Map.of(
 				"dataClassList[0].param1", "value1", "dataClassList[0].param2", "true",
 				"dataClassList[1].param1", "value2", "dataClassList[1].param2", "true",
 				"dataClassList[3].param1", "value3", "dataClassList[3].param2", "true"));
 
-		DataBinder binder = initDataBinder(ListDataClass.class);
+		DataBinder binder = initDataBinder(DataClassListRecord.class);
 		binder.construct(valueResolver);
 
-		ListDataClass dataClass = getTarget(binder);
-		List<DataClass> list = dataClass.dataClassList();
+		DataClassListRecord target = getTarget(binder);
+		List<DataClass> list = target.dataClassList();
 
 		assertThat(list.get(0).param1()).isEqualTo("value1");
 		assertThat(list.get(1).param1()).isEqualTo("value2");
@@ -140,17 +140,17 @@ class DataBinderConstructTests {
 	}
 
 	@Test
-	void mapBinding() {
+	void dataClassWithMapBinding() {
 		MapValueResolver valueResolver = new MapValueResolver(Map.of(
 				"dataClassMap[a].param1", "value1", "dataClassMap[a].param2", "true",
 				"dataClassMap[b].param1", "value2", "dataClassMap[b].param2", "true",
 				"dataClassMap['c'].param1", "value3", "dataClassMap['c'].param2", "true"));
 
-		DataBinder binder = initDataBinder(MapDataClass.class);
+		DataBinder binder = initDataBinder(DataClassMapRecord.class);
 		binder.construct(valueResolver);
 
-		MapDataClass dataClass = getTarget(binder);
-		Map<String, DataClass> map = dataClass.dataClassMap();
+		DataClassMapRecord target = getTarget(binder);
+		Map<String, DataClass> map = target.dataClassMap();
 
 		assertThat(map).hasSize(3);
 		assertThat(map.get("a").param1()).isEqualTo("value1");
@@ -159,17 +159,17 @@ class DataBinderConstructTests {
 	}
 
 	@Test
-	void arrayBinding() {
+	void dataClassWithArrayBinding() {
 		MapValueResolver valueResolver = new MapValueResolver(Map.of(
 				"dataClassArray[0].param1", "value1", "dataClassArray[0].param2", "true",
 				"dataClassArray[1].param1", "value2", "dataClassArray[1].param2", "true",
 				"dataClassArray[2].param1", "value3", "dataClassArray[2].param2", "true"));
 
-		DataBinder binder = initDataBinder(ArrayDataClass.class);
+		DataBinder binder = initDataBinder(DataClassArrayRecord.class);
 		binder.construct(valueResolver);
 
-		ArrayDataClass dataClass = getTarget(binder);
-		DataClass[] array = dataClass.dataClassArray();
+		DataClassArrayRecord target = getTarget(binder);
+		DataClass[] array = target.dataClassArray();
 
 		assertThat(array).hasSize(3);
 		assertThat(array[0].param1()).isEqualTo("value1");
@@ -177,6 +177,40 @@ class DataBinderConstructTests {
 		assertThat(array[2].param1()).isEqualTo("value3");
 	}
 
+	@Test
+	void simpleListBinding() {
+		MapValueResolver valueResolver = new MapValueResolver(Map.of("integerList[0]", "1", "integerList[1]", "2"));
+
+		DataBinder binder = initDataBinder(IntegerListRecord.class);
+		binder.construct(valueResolver);
+
+		IntegerListRecord target = getTarget(binder);
+		assertThat(target.integerList()).containsExactly(1, 2);
+	}
+
+	@Test
+	void simpleMapBinding() {
+		MapValueResolver valueResolver = new MapValueResolver(Map.of("integerMap[a]", "1", "integerMap[b]", "2"));
+
+		DataBinder binder = initDataBinder(IntegerMapRecord.class);
+		binder.construct(valueResolver);
+
+		IntegerMapRecord target = getTarget(binder);
+		assertThat(target.integerMap()).hasSize(2).containsEntry("a", 1).containsEntry("b", 2);
+	}
+
+	@Test
+	void simpleArrayBinding() {
+		MapValueResolver valueResolver = new MapValueResolver(Map.of("integerArray[0]", "1", "integerArray[1]", "2"));
+
+		DataBinder binder = initDataBinder(IntegerArrayRecord.class);
+		binder.construct(valueResolver);
+
+		IntegerArrayRecord target = getTarget(binder);
+		assertThat(target.integerArray()).containsExactly(1, 2);
+	}
+
+
 	@SuppressWarnings("SameParameterValue")
 	private static DataBinder initDataBinder(Class<?> targetType) {
 		DataBinder binder = new DataBinder(null);
@@ -246,15 +280,27 @@ class DataBinderConstructTests {
 	}
 
 
-	private record ListDataClass(List<DataClass> dataClassList) {
+	private record DataClassListRecord(List<DataClass> dataClassList) {
+	}
+
+
+	private record DataClassMapRecord(Map<String, DataClass> dataClassMap) {
+	}
+
+
+	private record DataClassArrayRecord(DataClass[] dataClassArray) {
+	}
+
+
+	private record IntegerListRecord(List<Integer> integerList) {
 	}
 
 
-	private record MapDataClass(Map<String, DataClass> dataClassMap) {
+	private record IntegerMapRecord(Map<String, Integer> integerMap) {
 	}
 
 
-	private record ArrayDataClass(DataClass[] dataClassArray) {
+	private record IntegerArrayRecord(Integer[] integerArray) {
 	}
 
 

spring-test/src/test/java/org/springframework/test/web/servlet/samples/spr/ServletRequestDataBinderIntegrationTests.java

@@ -1,135 +0,0 @@
-/*
- * Copyright 2002-2024 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.test.web.servlet.samples.spr;
-
-import java.util.List;
-import java.util.Map;
-
-import org.junit.jupiter.api.Test;
-
-import org.springframework.test.context.junit.jupiter.web.SpringJUnitWebConfig;
-import org.springframework.test.web.servlet.MockMvc;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.context.WebApplicationContext;
-
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-import static org.springframework.test.web.servlet.setup.MockMvcBuilders.webAppContextSetup;
-
-@SpringJUnitWebConfig(ServletRequestDataBinderIntegrationTests.SpringWebKeyValueController.class)
-class ServletRequestDataBinderIntegrationTests {
-
-	@Test // gh-34043
-	void postMap(WebApplicationContext wac) throws Exception {
-		MockMvc mockMvc = webAppContextSetup(wac).build();
-		mockMvc.perform(post("/map")
-						.param("someMap[a]", "valueA")
-						.param("someMap[b]", "valueB"))
-				.andExpect(status().isOk())
-				.andExpect(content().string("valueB"));
-	}
-
-	@Test
-	void postArray(WebApplicationContext wac) throws Exception {
-		MockMvc mockMvc = webAppContextSetup(wac).build();
-		mockMvc.perform(post("/array")
-						.param("someArray[0]", "valueA")
-						.param("someArray[1]", "valueB"))
-				.andExpect(status().isOk())
-				.andExpect(content().string("valueB"));
-	}
-
-	@Test // gh-34121
-	void postArrayWithEmptyIndex(WebApplicationContext wac) throws Exception {
-		MockMvc mockMvc = webAppContextSetup(wac).build();
-		mockMvc.perform(post("/array")
-						.param("someArray[]", "valueA")
-						.param("someArray[]", "valueB"))
-				.andExpect(status().isOk())
-				.andExpect(content().string("valueB"));
-	}
-
-	@Test
-	void postArrayWithoutIndex(WebApplicationContext wac) throws Exception {
-		MockMvc mockMvc = webAppContextSetup(wac).build();
-		mockMvc.perform(post("/array")
-						.param("someArray", "valueA")
-						.param("someArray", "valueB"))
-				.andExpect(status().isOk())
-				.andExpect(content().string("valueB"));
-	}
-
-	@Test
-	void postList(WebApplicationContext wac) throws Exception {
-		MockMvc mockMvc = webAppContextSetup(wac).build();
-		mockMvc.perform(post("/list")
-						.param("someList[0]", "valueA")
-						.param("someList[1]", "valueB"))
-				.andExpect(status().isOk())
-				.andExpect(content().string("valueB"));
-	}
-
-	@Test // gh-34121
-	void postListWithEmptyIndex(WebApplicationContext wac) throws Exception {
-		MockMvc mockMvc = webAppContextSetup(wac).build();
-		mockMvc.perform(post("/list")
-						.param("someList[]", "valueA")
-						.param("someList[]", "valueB"))
-				.andExpect(status().isOk())
-				.andExpect(content().string("valueB"));
-	}
-
-	@Test
-	void postListWithoutIndex(WebApplicationContext wac) throws Exception {
-		MockMvc mockMvc = webAppContextSetup(wac).build();
-		mockMvc.perform(post("/list")
-						.param("someList", "valueA")
-						.param("someList", "valueB"))
-				.andExpect(status().isOk())
-				.andExpect(content().string("valueB"));
-	}
-
-	record PayloadWithMap(Map<String, String> someMap) {}
-
-	record PayloadWithArray(String[] someArray) {}
-
-	record PayloadWithList(List<String> someList) {}
-
-	@RestController
-	@SuppressWarnings("unused")
-	static class SpringWebKeyValueController {
-
-		@PostMapping("/map")
-		String postMap(@ModelAttribute("payload") PayloadWithMap payload) {
-			return payload.someMap.get("b");
-		}
-
-		@PostMapping("/array")
-		String postArray(@ModelAttribute("payload") PayloadWithArray payload) {
-			return payload.someArray[1];
-		}
-
-		@PostMapping("/list")
-		String postList(@ModelAttribute("payload") PayloadWithList payload) {
-			return payload.someList.get(1);
-		}
-	}
-
-}

spring-web/src/main/java/org/springframework/web/bind/ServletRequestDataBinder.java

@@ -241,10 +241,6 @@ public class ServletRequestDataBinder extends WebDataBinder {
 
 		protected @Nullable Object getRequestParameter(String name, Class<?> type) {
 			Object value = this.request.getParameterValues(name);
-			if (value == null && !name.endsWith("[]") &&
-					(List.class.isAssignableFrom(type) || type.isArray())) {
-				value = this.request.getParameterValues(name + "[]");
-			}
 			return (ObjectUtils.isArray(value) && Array.getLength(value) == 1 ? Array.get(value, 0) : value);
 		}
 

spring-web/src/test/java/org/springframework/web/bind/ServletRequestDataBinderTests.java

@@ -93,32 +93,6 @@ class ServletRequestDataBinderTests {
 		assertThat(target.isPostProcessed()).isFalse();
 	}
 
-	@Test
-	public void testFieldWithArrayIndex() {
-		TestBean target = new TestBean();
-		ServletRequestDataBinder binder = new ServletRequestDataBinder(target);
-		binder.setIgnoreUnknownFields(false);
-
-		MockHttpServletRequest request = new MockHttpServletRequest();
-		request.addParameter("stringArray[0]", "ONE");
-		request.addParameter("stringArray[1]", "TWO");
-		binder.bind(request);
-		assertThat(target.getStringArray()).containsExactly("ONE", "TWO");
-	}
-
-	@Test
-	public void testFieldWithEmptyArrayIndex() {
-		TestBean target = new TestBean();
-		ServletRequestDataBinder binder = new ServletRequestDataBinder(target);
-		binder.setIgnoreUnknownFields(false);
-
-		MockHttpServletRequest request = new MockHttpServletRequest();
-		request.addParameter("stringArray[]", "ONE");
-		request.addParameter("stringArray[]", "TWO");
-		binder.bind(request);
-		assertThat(target.getStringArray()).containsExactly("ONE", "TWO");
-	}
-
 	@Test
 	void testFieldDefault() {
 		TestBean target = new TestBean();

spring-webflux/src/main/java/org/springframework/web/reactive/result/method/InvocableHandlerMethod.java

@@ -40,6 +40,7 @@ import reactor.core.publisher.Mono;
 import reactor.core.publisher.SynchronousSink;
 import reactor.core.scheduler.Scheduler;
 
+import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.core.CoroutinesUtils;
 import org.springframework.core.DefaultParameterNameDiscoverer;
 import org.springframework.core.KotlinDetector;
@@ -184,8 +185,14 @@ public class InvocableHandlerMethod extends HandlerMethod {
 
 		return getMethodArgumentValuesOnScheduler(exchange, bindingContext, providedArgs).flatMap(args -> {
 			if (shouldValidateArguments() && this.methodValidator != null) {
-				this.methodValidator.applyArgumentValidation(
-						getBean(), getBridgedMethod(), getMethodParameters(), args, this.validationGroups);
+				try {
+					LocaleContextHolder.setLocaleContext(exchange.getLocaleContext());
+					this.methodValidator.applyArgumentValidation(
+							getBean(), getBridgedMethod(), getMethodParameters(), args, this.validationGroups);
+				}
+				finally {
+					LocaleContextHolder.resetLocaleContext();
+				}
 			}
 			Object value;
 			Method method = getBridgedMethod();