Polish

See gh-1246

Author: snicoll

spring-aot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesNativeConfigurationProcessor.java

@@ -65,7 +65,7 @@ public void process(ConfigurableListableBeanFactory beanFactory, NativeConfigura
 
 	private void processConfigurationProperties(NativeConfigurationRegistry registry, BeanDefinition beanDefinition) {
 		Class<?> type = ClassUtils.getUserClass(beanDefinition.getResolvableType().toClass());
-		new TypeProcessor(type).process(registry);
+		TypeProcessor.process(type, registry);
 	}
 
 	/**
@@ -82,31 +82,32 @@ private static class TypeProcessor {
 
 		private final BeanInfo beanInfo;
 
-		TypeProcessor(Class<?> type) {
-			this(type, hasConstructorBinding(type));
-		}
-
 		private TypeProcessor(Class<?> type, boolean constructorBinding) {
 			this.type = type;
 			this.constructorBinding = constructorBinding;
 			this.beanInfo = getBeanInfo(type);
 		}
 
+		public static void process(Class<?> type, NativeConfigurationRegistry registry) {
+			if (type.getPackageName().startsWith("java.")) {
+				return; // No reflection entries required for core types
+			}
+			new TypeProcessor(type, hasConstructorBinding(type)).process(registry);
+		}
+
 		private static boolean hasConstructorBinding(AnnotatedElement element) {
 			return MergedAnnotations.from(element).isPresent(ConstructorBinding.class);
 		}
 
-		public void process(NativeConfigurationRegistry registry) {
+		private void process(NativeConfigurationRegistry registry) {
 			Builder reflection = registry.reflection().forType(this.type);
-			if (!this.type.getPackageName().startsWith("java.")) {
-				reflection.withFlags(Flag.allDeclaredMethods);
-				Constructor<?> constructor = handleConstructor(reflection);
-				if (this.constructorBinding && constructor != null) {
-					handleValueObjectProperties(registry, constructor);
-				}
-				else if (this.beanInfo != null) {
-					handleJavaBeanProperties(registry);
-				}
+			reflection.withFlags(Flag.allDeclaredMethods);
+			Constructor<?> constructor = handleConstructor(reflection);
+			if (this.constructorBinding && constructor != null) {
+				handleValueObjectProperties(registry, constructor);
+			}
+			else if (this.beanInfo != null) {
+				handleJavaBeanProperties(registry);
 			}
 		}
 
@@ -139,7 +140,7 @@ private void handleJavaBeanProperties(NativeConfigurationRegistry registry) {
 					ResolvableType propertyType = ResolvableType.forMethodReturnType(readMethod, this.type);
 					Class<?> nestedType = getNestedType(propertyDescriptor.getName(), propertyType);
 					if (nestedType != null) {
-						new TypeProcessor(nestedType).process(registry);
+						TypeProcessor.process(nestedType, registry);
 					}
 				}
 			}

spring-aot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesNativeConfigurationProcessorTests.java

@@ -100,6 +100,16 @@ void processJavaBeanConfigurationPropertiesWitArrayOfPojo() {
 		assertThat(entries).hasSize(2);
 	}
 
+	@Test
+	void processJavaBeanConfigurationPropertiesWithListOfJavaType() {
+		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
+		beanFactory.registerBeanDefinition("beanA", BeanDefinitionBuilder
+				.rootBeanDefinition(SamplePropertiesWithSimpleList.class).getBeanDefinition());
+		NativeConfigurationRegistry registry = process(beanFactory);
+		assertThat(registry.reflection().reflectionEntries()).singleElement()
+				.satisfies(javaBeanBinding(SamplePropertiesWithSimpleList.class));
+	}
+
 	@Test
 	void processValueObjectConfigurationProperties() {
 		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
@@ -232,6 +242,15 @@ public List<Address> getAllAddresses() {
 
 	}
 
+	@ConfigurationProperties("test")
+	static class SamplePropertiesWithSimpleList {
+
+		public List<String> getNames() {
+			return Collections.emptyList();
+		}
+
+	}
+
 	@ConfigurationProperties("test")
 	static class SamplePropertiesWithArray {