Merge branch '6.1.x'

# Conflicts:
#	spring-web/src/main/java/org/springframework/web/method/annotation/AbstractNamedValueMethodArgumentResolver.java
#	spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/AbstractNamedValueArgumentResolver.java

Author: jhoeller

spring-web/src/main/java/org/springframework/http/codec/ServerSentEvent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * 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.
@@ -104,13 +104,13 @@ public T data() {
 
 	@Override
 	public String toString() {
-		return ("ServerSentEvent [id = '" + this.id + "\', event='" + this.event + "\', retry=" +
+		return ("ServerSentEvent [id = '" + this.id + "', event='" + this.event + "', retry=" +
 				this.retry + ", comment='" + this.comment + "', data=" + this.data + ']');
 	}
 
 
 	/**
-	 * Return a builder for a {@code SseEvent}.
+	 * Return a builder for a {@code ServerSentEvent}.
 	 * @param <T> the type of data that this event contains
 	 * @return the builder
 	 */
@@ -119,7 +119,7 @@ public static <T> Builder<T> builder() {
 	}
 
 	/**
-	 * Return a builder for a {@code SseEvent}, populated with the given {@linkplain #data() data}.
+	 * Return a builder for a {@code ServerSentEvent}, populated with the given {@linkplain #data() data}.
 	 * @param <T> the type of data that this event contains
 	 * @return the builder
 	 */
@@ -129,7 +129,7 @@ public static <T> Builder<T> builder(T data) {
 
 
 	/**
-	 * A mutable builder for a {@code SseEvent}.
+	 * A mutable builder for a {@code ServerSentEvent}.
 	 *
 	 * @param <T> the type of data that this event contains
 	 */

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

@@ -35,7 +35,6 @@
 import org.springframework.core.KotlinDetector;
 import org.springframework.core.MethodParameter;
 import org.springframework.lang.Nullable;
-import org.springframework.util.Assert;
 import org.springframework.web.bind.ServletRequestBindingException;
 import org.springframework.web.bind.WebDataBinder;
 import org.springframework.web.bind.annotation.ValueConstants;
@@ -107,9 +106,9 @@ public final Object resolveArgument(MethodParameter parameter, @Nullable ModelAn
 
 		NamedValueInfo namedValueInfo = getNamedValueInfo(parameter);
 		MethodParameter nestedParameter = parameter.nestedIfOptional();
-		boolean hasDefaultValue = KotlinDetector.isKotlinReflectPresent()
-				&& KotlinDetector.isKotlinType(parameter.getDeclaringClass())
-				&& KotlinDelegate.hasDefaultValue(nestedParameter);
+		boolean hasDefaultValue = KotlinDetector.isKotlinReflectPresent() &&
+				KotlinDetector.isKotlinType(parameter.getDeclaringClass()) &&
+				KotlinDelegate.hasDefaultValue(nestedParameter);
 
 		Object resolvedName = resolveEmbeddedValuesAndExpressions(namedValueInfo.name);
 		if (resolvedName == null) {
@@ -336,6 +335,7 @@ public NamedValueInfo(String name, boolean required, @Nullable String defaultVal
 		}
 	}
 
+
 	/**
 	 * Inner class to avoid a hard dependency on Kotlin at runtime.
 	 */
@@ -347,7 +347,9 @@ private static class KotlinDelegate {
 		 */
 		public static boolean hasDefaultValue(MethodParameter parameter) {
 			Method method = parameter.getMethod();
-			Assert.notNull(method, () -> "Retrieved null method from MethodParameter: " + parameter);
+			if (method == null) {
+				return false;
+			}
 			KFunction<?> function = ReflectJvmMapping.getKotlinFunction(method);
 			if (function != null) {
 				int index = 0;
@@ -360,4 +362,5 @@ public static boolean hasDefaultValue(MethodParameter parameter) {
 			return false;
 		}
 	}
+
 }

spring-web/src/main/java/org/springframework/web/service/invoker/AbstractNamedValueArgumentResolver.java

@@ -48,7 +48,6 @@ public abstract class AbstractNamedValueArgumentResolver implements HttpServiceA
 
 	protected final Log logger = LogFactory.getLog(getClass());
 
-
 	@Nullable
 	private final ConversionService conversionService;
 
@@ -263,7 +262,6 @@ public NamedValueInfo(
 		public NamedValueInfo update(String name, boolean required, @Nullable String defaultValue) {
 			return new NamedValueInfo(name, required, defaultValue, this.label, this.multiValued);
 		}
-
 	}
 
 }

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

@@ -37,7 +37,6 @@
 import org.springframework.core.ReactiveAdapterRegistry;
 import org.springframework.lang.Nullable;
 import org.springframework.ui.Model;
-import org.springframework.util.Assert;
 import org.springframework.web.bind.WebDataBinder;
 import org.springframework.web.bind.annotation.ValueConstants;
 import org.springframework.web.reactive.BindingContext;
@@ -227,9 +226,9 @@ private Mono<Object> getDefaultValue(NamedValueInfo namedValueInfo, String resol
 
 		return Mono.fromSupplier(() -> {
 			Object value = null;
-			boolean hasDefaultValue = KotlinDetector.isKotlinReflectPresent()
-					&& KotlinDetector.isKotlinType(parameter.getDeclaringClass())
-					&& KotlinDelegate.hasDefaultValue(parameter);
+			boolean hasDefaultValue = KotlinDetector.isKotlinReflectPresent() &&
+					KotlinDetector.isKotlinType(parameter.getDeclaringClass()) &&
+					KotlinDelegate.hasDefaultValue(parameter);
 			if (namedValueInfo.defaultValue != null) {
 				value = resolveEmbeddedValuesAndExpressions(namedValueInfo.defaultValue);
 			}
@@ -328,6 +327,7 @@ public NamedValueInfo(String name, boolean required, @Nullable String defaultVal
 		}
 	}
 
+
 	/**
 	 * Inner class to avoid a hard dependency on Kotlin at runtime.
 	 */
@@ -339,7 +339,9 @@ private static class KotlinDelegate {
 		 */
 		public static boolean hasDefaultValue(MethodParameter parameter) {
 			Method method = parameter.getMethod();
-			Assert.notNull(method, () -> "Retrieved null method from MethodParameter: " + parameter);
+			if (method == null) {
+				return false;
+			}
 			KFunction<?> function = ReflectJvmMapping.getKotlinFunction(method);
 			if (function != null) {
 				int index = 0;