Merge branch '6.2.x'

Author: rstoyanchev

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

@@ -1379,6 +1379,9 @@ public interface ValueResolver {
 
 		/**
 		 * Return the names of all property values.
+		 * <p>Useful for proactive checks whether there are property values nested
+		 * further below the path for a constructor arg. If not then the
+		 * constructor arg can be considered missing and not to be instantiated.
 		 * @since 6.1.2
 		 */
 		Set<String> getNames();

spring-web/src/main/java/org/springframework/web/method/HandlerMethod.java

@@ -309,15 +309,19 @@ public HandlerMethod createWithValidateFlags() {
 	}
 
 	/**
-	 * If the provided instance contains a bean name rather than an object instance,
-	 * the bean name is resolved before a {@link HandlerMethod} is created and returned.
+	 * If the {@link #getBean() handler} is a bean name rather than the actual
+	 * handler instance, resolve the bean name through Spring configuration
+	 * (e.g. for prototype beans), and return a new {@link HandlerMethod}
+	 * instance with the resolved handler.
+	 * <p>If the {@link #getBean() handler} is not String, return the same instance.
 	 */
 	public HandlerMethod createWithResolvedBean() {
-		Object handler = this.bean;
-		if (this.bean instanceof String beanName) {
-			Assert.state(this.beanFactory != null, "Cannot resolve bean name without BeanFactory");
-			handler = this.beanFactory.getBean(beanName);
+		if (!(this.bean instanceof String beanName)) {
+			return this;
 		}
+
+		Assert.state(this.beanFactory != null, "Cannot resolve bean name without BeanFactory");
+		Object handler = this.beanFactory.getBean(beanName);
 		Assert.notNull(handler, "No handler instance");
 		return new HandlerMethod(this, handler, false);
 	}

spring-web/src/test/java/org/springframework/web/method/HandlerMethodTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2025 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.
@@ -72,6 +72,13 @@ void classLevelValidatedAnnotation() {
 		testValidateReturnValue(target, List.of("getPerson"), false);
 	}
 
+	@Test // gh-34277
+	void createWithResolvedBeanSameInstance() {
+		MyClass target = new MyClass();
+		HandlerMethod handlerMethod = getHandlerMethod(target, "addPerson");
+		assertThat(handlerMethod.createWithResolvedBean()).isSameAs(handlerMethod);
+	}
+
 	private static void testValidateArgs(Object target, List<String> methodNames, boolean expected) {
 		for (String methodName : methodNames) {
 			assertThat(getHandlerMethod(target, methodName).shouldValidateArguments()).isEqualTo(expected);

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

@@ -125,7 +125,7 @@ protected void addBindValues(MutablePropertyValues mpvs, ServletRequest request)
 				String name = names.nextElement();
 				Object value = getHeaderValue(httpRequest, name);
 				if (value != null) {
-					name = StringUtils.uncapitalize(name.replace("-", ""));
+					name = normalizeHeaderName(name);
 					addValueIfNotPresent(mpvs, "Header", name, value);
 				}
 			}
@@ -171,6 +171,10 @@ private static void addValueIfNotPresent(MutablePropertyValues mpvs, String labe
 		return values;
 	}
 
+	private static String normalizeHeaderName(String name) {
+		return StringUtils.uncapitalize(name.replace("-", ""));
+	}
+
 
 	/**
 	 * Resolver of values that looks up URI path variables.
@@ -206,8 +210,10 @@ protected Set<String> initParameterNames(ServletRequest request) {
 			if (request instanceof HttpServletRequest httpServletRequest) {
 				Enumeration<String> enumeration = httpServletRequest.getHeaderNames();
 				while (enumeration.hasMoreElements()) {
-					String headerName = enumeration.nextElement();
-					set.add(headerName.replaceAll("-", ""));
+					String name = enumeration.nextElement();
+					if (headerPredicate.test(name)) {
+						set.add(normalizeHeaderName(name));
+					}
 				}
 			}
 			return set;

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ExtendedServletRequestDataBinderTests.java

@@ -119,6 +119,23 @@ void filteredHeaders(String headerName) {
 		assertThat(mpvs).isEmpty();
 	}
 
+	@Test
+	void headerPredicateWithConstructorArgs() {
+		ExtendedServletRequestDataBinder binder = new ExtendedServletRequestDataBinder(null);
+		binder.addHeaderPredicate(name -> !name.equalsIgnoreCase("Some-Int-Array"));
+		binder.setTargetType(ResolvableType.forClass(DataBean.class));
+		binder.setNameResolver(new BindParamNameResolver());
+
+		request.addHeader("Some-Int-Array", "1");
+		request.addHeader("Some-Int-Array", "2");
+
+		binder.construct(request);
+
+		DataBean bean = (DataBean) binder.getTarget();
+
+		assertThat(bean.someIntArray()).isNull();
+	}
+
 	@Test
 	void headerPredicate() {
 		TestBinder binder = new TestBinder();

spring-websocket/src/main/java/org/springframework/web/socket/WebSocketSession.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2025 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.
@@ -72,6 +72,12 @@ public interface WebSocketSession extends Closeable {
 
 	/**
 	 * Return the address on which the request was received.
+	 * <p><strong>Note:</strong> The localAddress is not always possible to access,
+	 * which is the case with the Standard WebSocket client. In 6.2.x
+	 * {@link org.springframework.web.socket.client.standard.StandardWebSocketClient}
+	 * returns an address based on the local host and the port of the target
+	 * address (not the same as the local port). In 7.0, the same will return
+	 * {@code null} instead.
 	 */
 	@Nullable InetSocketAddress getLocalAddress();