From 2569aa157e280e53395da2f1b6a65025d6dd6197 Mon Sep 17 00:00:00 2001
From: Sam Brannen <104798+sbrannen@users.noreply.github.com>
Date: Fri, 4 Oct 2024 14:54:20 +0200
Subject: [PATCH] Make use of Executable abstraction in
 ProxyRuntimeHintsRegistrar

---
 .../aot/InstanceSupplierCodeGenerator.java    | 31 +++----------------
 1 file changed, 5 insertions(+), 26 deletions(-)

diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/aot/InstanceSupplierCodeGenerator.java b/spring-beans/src/main/java/org/springframework/beans/factory/aot/InstanceSupplierCodeGenerator.java
index e5c12b9a140..fa36d5d0ec1 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/aot/InstanceSupplierCodeGenerator.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/aot/InstanceSupplierCodeGenerator.java
@@ -151,12 +151,7 @@ public class InstanceSupplierCodeGenerator {
 		if (registeredBean.getBeanFactory() instanceof DefaultListableBeanFactory dlbf) {
 			RuntimeHints runtimeHints = this.generationContext.getRuntimeHints();
 			ProxyRuntimeHintsRegistrar registrar = new ProxyRuntimeHintsRegistrar(dlbf.getAutowireCandidateResolver());
-			if (constructorOrFactoryMethod instanceof Method method) {
-				registrar.registerRuntimeHints(runtimeHints, method);
-			}
-			else if (constructorOrFactoryMethod instanceof Constructor<?> constructor) {
-				registrar.registerRuntimeHints(runtimeHints, constructor);
-			}
+			registrar.registerRuntimeHints(runtimeHints, constructorOrFactoryMethod);
 		}
 	}
 
@@ -419,33 +414,17 @@ public class InstanceSupplierCodeGenerator {
 	}
 
 
-	private static class ProxyRuntimeHintsRegistrar {
-
-		private final AutowireCandidateResolver candidateResolver;
-
-		public ProxyRuntimeHintsRegistrar(AutowireCandidateResolver candidateResolver) {
-			this.candidateResolver = candidateResolver;
-		}
+	private record ProxyRuntimeHintsRegistrar(AutowireCandidateResolver candidateResolver) {
 
-		public void registerRuntimeHints(RuntimeHints runtimeHints, Method method) {
-			Class<?>[] parameterTypes = method.getParameterTypes();
+		public void registerRuntimeHints(RuntimeHints runtimeHints, Executable executable) {
+			Class<?>[] parameterTypes = executable.getParameterTypes();
 			for (int i = 0; i < parameterTypes.length; i++) {
-				MethodParameter methodParam = new MethodParameter(method, i);
+				MethodParameter methodParam = MethodParameter.forExecutable(executable, i);
 				DependencyDescriptor dependencyDescriptor = new DependencyDescriptor(methodParam, true);
 				registerProxyIfNecessary(runtimeHints, dependencyDescriptor);
 			}
 		}
 
-		public void registerRuntimeHints(RuntimeHints runtimeHints, Constructor<?> constructor) {
-			Class<?>[] parameterTypes = constructor.getParameterTypes();
-			for (int i = 0; i < parameterTypes.length; i++) {
-				MethodParameter methodParam = new MethodParameter(constructor, i);
-				DependencyDescriptor dependencyDescriptor = new DependencyDescriptor(
-						methodParam, true);
-				registerProxyIfNecessary(runtimeHints, dependencyDescriptor);
-			}
-		}
-
 		private void registerProxyIfNecessary(RuntimeHints runtimeHints, DependencyDescriptor dependencyDescriptor) {
 			Class<?> proxyType = this.candidateResolver.getLazyResolutionProxyClass(dependencyDescriptor, null);
 			if (proxyType != null && Proxy.isProxyClass(proxyType)) {