Defensively check MethodParameter.getMethod() in KotlinDelegate

Closes gh-33609
spring-projects · Sep 30, 2024 · 95f1813 · 95f1813
1 parent e32a2f3
commit 95f1813
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 10 deletions.
diff --git a/...a/org/springframework/web/method/annotation/AbstractNamedValueMethodArgumentResolver.java b/...a/org/springframework/web/method/annotation/AbstractNamedValueMethodArgumentResolver.java
@@ -19,7 +19,6 @@
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 import java.util.Map;
-import java.util.Objects;
 import java.util.concurrent.ConcurrentHashMap;
 
 import jakarta.servlet.ServletException;
@@ -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.
 	 */
@@ -346,7 +346,10 @@ private static class KotlinDelegate {
 		 * or an optional parameter (with a default value in the Kotlin declaration).
 		 */
 		public static boolean hasDefaultValue(MethodParameter parameter) {
-			Method method = Objects.requireNonNull(parameter.getMethod());
+			Method method = parameter.getMethod();
+			if (method == null) {
+				return false;
+			}
 			KFunction<?> function = ReflectJvmMapping.getKotlinFunction(method);
 			if (function != null) {
 				int index = 0;
@@ -359,4 +362,5 @@ public static boolean hasDefaultValue(MethodParameter parameter) {
 			return false;
 		}
 	}
+
 }
diff --git a/...ngframework/web/reactive/result/method/annotation/AbstractNamedValueArgumentResolver.java b/...ngframework/web/reactive/result/method/annotation/AbstractNamedValueArgumentResolver.java
@@ -19,7 +19,6 @@
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 import java.util.Map;
-import java.util.Objects;
 import java.util.concurrent.ConcurrentHashMap;
 
 import kotlin.reflect.KFunction;
@@ -227,9 +226,9 @@ private Mono<Object> getDefaultValue(NamedValueInfo namedValueInfo, MethodParame
 
 		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.
 	 */
@@ -338,7 +338,10 @@ private static class KotlinDelegate {
 		 * or an optional parameter (with a default value in the Kotlin declaration).
 		 */
 		public static boolean hasDefaultValue(MethodParameter parameter) {
-			Method method = Objects.requireNonNull(parameter.getMethod());
+			Method method = parameter.getMethod();
+			if (method == null) {
+				return false;
+			}
 			KFunction<?> function = ReflectJvmMapping.getKotlinFunction(method);
 			if (function != null) {
 				int index = 0;