Enhance constructor resolution with use of SpEL

Closes gh-1229

Author: snicoll

spring-aot/src/main/java/org/springframework/aot/context/bootstrap/generator/bean/descriptor/BeanInstanceExecutableSupplier.java

@@ -267,13 +267,23 @@ private ResolvableType extractElementType(ResolvableType parameterType) {
 
 	private Predicate<ResolvableType> typeConversionFallback(ResolvableType valueType) {
 		return (parameterType) -> {
-			if (isStringForClassFallback(valueType).test(parameterType)) {
+			if (valueOrCollection(valueType, this::isStringForClassFallback).test(parameterType)) {
 				return true;
 			}
-			if (isStringForClassFallback(extractElementType(valueType)).test(extractElementType(parameterType))) {
+			return valueOrCollection(valueType, this::isSimpleConvertibleType).test(parameterType);
+		};
+	}
+
+	private Predicate<ResolvableType> valueOrCollection(ResolvableType valueType,
+			Function<ResolvableType, Predicate<ResolvableType>> predicateProvider) {
+		return (parameterType) -> {
+			if (predicateProvider.apply(valueType).test(parameterType)) {
+				return true;
+			}
+			if (predicateProvider.apply(extractElementType(valueType)).test(extractElementType(parameterType))) {
 				return true;
 			}
-			return (isStringForClassFallback(valueType).test(extractElementType(parameterType)));
+			return (predicateProvider.apply(valueType).test(extractElementType(parameterType)));
 		};
 	}
 
@@ -289,6 +299,10 @@ private Predicate<ResolvableType> isStringForClassFallback(ResolvableType valueT
 				&& parameterType.isAssignableFrom(Class.class));
 	}
 
+	private Predicate<ResolvableType> isSimpleConvertibleType(ResolvableType valueType) {
+		return (parameterType) -> isSimpleConvertibleType(parameterType.toClass()) && isSimpleConvertibleType(valueType.toClass());
+	}
+
 	private Class<?> getFactoryBeanClass(BeanDefinition beanDefinition) {
 		if (beanDefinition instanceof RootBeanDefinition) {
 			RootBeanDefinition rbd = (RootBeanDefinition) beanDefinition;
@@ -333,6 +347,14 @@ private <T> T getField(BeanDefinition beanDefinition, String fieldName, Class<T>
 		return targetType.cast(ReflectionUtils.getField(field, beanDefinition));
 	}
 
+	public static boolean isSimpleConvertibleType(Class<?> type) {
+		return (type.isPrimitive() && type != void.class) ||
+				type == Double.class || type == Float.class || type == Long.class ||
+				type == Integer.class || type == Short.class || type == Character.class ||
+				type == Byte.class || type == Boolean.class || type == String.class;
+	}
+
+
 	enum FallbackMode {
 
 		NONE,

spring-aot/src/test/java/org/springframework/aot/context/bootstrap/generator/bean/descriptor/BeanInstanceExecutableSupplierTests.java

@@ -19,6 +19,7 @@
 import java.lang.reflect.Executable;
 import java.util.List;
 import java.util.Locale;
+import java.util.concurrent.Executor;
 
 import org.junit.jupiter.api.Test;
 
@@ -249,6 +250,14 @@ void beanDefinitionWithClassArrayFactoryMethodArgAndAnotherMatchingConstructor()
 				.findMethod(ClassArrayFactoryMethodSampleWithAnotherFactoryMethod.class, "of", String[].class));
 	}
 
+	@Test
+	void beanDefinitionWithMultiArgConstructorAndPrimitiveConversion() throws NoSuchMethodException {
+		BeanDefinition beanDefinition = BeanDefinitionBuilder.rootBeanDefinition(ConstructorPrimitiveFallback.class)
+				.addConstructorArgValue("true").getBeanDefinition();
+		Executable executable = detectBeanInstanceExecutable(new DefaultListableBeanFactory(), beanDefinition);
+		assertThat(executable).isEqualTo(ConstructorPrimitiveFallback.class.getDeclaredConstructor(boolean.class));
+	}
+
 	private Executable detectBeanInstanceExecutable(DefaultListableBeanFactory beanFactory, BeanDefinition beanDefinition) {
 		return new BeanInstanceExecutableSupplier(beanFactory).detectBeanInstanceExecutable(beanDefinition);
 	}
@@ -322,7 +331,7 @@ static class ConstructorClassArraySample {
 		ConstructorClassArraySample(Class<?>... classArrayArg) {
 		}
 
-		ConstructorClassArraySample(Integer somethingElse) {
+		ConstructorClassArraySample(Executor somethingElse) {
 		}
 	}
 
@@ -357,4 +366,15 @@ static String of(String[] classArrayArg) {
 		}
 
 	}
+
+	@SuppressWarnings("unnused")
+	static class ConstructorPrimitiveFallback {
+
+		public ConstructorPrimitiveFallback(boolean useDefaultExecutor) {
+		}
+
+		public ConstructorPrimitiveFallback(Executor executor) {
+		}
+
+	}
 }