Merge pull request #1420 from kazuki43zoo

* pr/1420:
  Polish "Fix StackOverflowError when processing ConfigurationProperties"
  Fix StackOverflowError when processing ConfigurationProperties

Closes gh-1420

Author: snicoll

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 the original author or authors.
+ * Copyright 2019-2022 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.
@@ -26,8 +26,10 @@
 import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 import org.springframework.aot.context.bootstrap.generator.infrastructure.nativex.BeanFactoryNativeConfigurationProcessor;
@@ -67,7 +69,7 @@ public void process(ConfigurableListableBeanFactory beanFactory, NativeConfigura
 
 	private void processConfigurationProperties(NativeConfigurationRegistry registry, BeanDefinition beanDefinition) {
 		Class<?> type = ClassUtils.getUserClass(beanDefinition.getResolvableType().toClass());
-		TypeProcessor.process(type, registry);
+		TypeProcessor.processConfigurationProperties(type, registry);
 	}
 
 	/**
@@ -84,21 +86,36 @@ private static class TypeProcessor {
 
 		private final BeanInfo beanInfo;
 
-		private TypeProcessor(Class<?> type, boolean constructorBinding) {
+		private final Set<Class<?>> seen;
+
+		private TypeProcessor(Class<?> type, boolean constructorBinding, Set<Class<?>> seen) {
 			this.type = type;
 			this.constructorBinding = constructorBinding;
 			this.beanInfo = getBeanInfo(type);
+			this.seen = seen;
+		}
+
+		public static void processConfigurationProperties(Class<?> type, NativeConfigurationRegistry registry) {
+			new TypeProcessor(type, hasConstructorBinding(type), new HashSet<>()).process(registry);
 		}
 
-		public static void process(Class<?> type, NativeConfigurationRegistry registry) {
-			new TypeProcessor(type, hasConstructorBinding(type)).process(registry);
+		private void processNestedType(Class<?> type, NativeConfigurationRegistry registry) {
+			processNestedType(type, hasConstructorBinding(type), registry);
+		}
+
+		private void processNestedType(Class<?> type, boolean constructorBinding, NativeConfigurationRegistry registry) {
+			new TypeProcessor(type, constructorBinding, this.seen).process(registry);
 		}
 
 		private static boolean hasConstructorBinding(AnnotatedElement element) {
 			return MergedAnnotations.from(element).isPresent(ConstructorBinding.class);
 		}
 
 		private void process(NativeConfigurationRegistry registry) {
+			if (this.seen.contains(this.type)) {
+				return;
+			}
+			this.seen.add(this.type);
 			Builder reflection = registry.reflection().forType(this.type);
 			if (isClassOnlyReflectionType()) {
 				return;
@@ -139,10 +156,10 @@ private void handleValueObjectProperties(NativeConfigurationRegistry registry, C
 				if (propertyClass.equals(beanInfo.getBeanDescriptor().getBeanClass())) {
 					return; // Prevent infinite recursion
 				}
-				new TypeProcessor(propertyType.resolve(), true).process(registry);
+				processNestedType(propertyType.resolve(), true, registry);
 				Class<?> nestedType = getNestedType(constructor.getParameters()[i].getName(), propertyType);
 				if (nestedType != null) {
-					new TypeProcessor(nestedType, true).process(registry);
+					processNestedType(nestedType, true, registry);
 				}
 			}
 		}
@@ -156,10 +173,10 @@ private void handleJavaBeanProperties(NativeConfigurationRegistry registry) {
 					if (propertyClass.equals(beanInfo.getBeanDescriptor().getBeanClass())) {
 						return; // Prevent infinite recursion
 					}
-					TypeProcessor.process(propertyClass, registry);
+					processNestedType(propertyClass, registry);
 					Class<?> nestedType = getNestedType(propertyDescriptor.getName(), propertyType);
 					if (nestedType != null) {
-						TypeProcessor.process(nestedType, registry);
+						processNestedType(nestedType, registry);
 					}
 				}
 			}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 the original author or authors.
+ * Copyright 2019-2022 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.
@@ -235,6 +235,17 @@ void processConfigurationPropertiesWithWellKnownTypes() {
 				.anySatisfy(classOnlyBinding(Environment.class)).hasSize(3);
 	}
 
+	@Test
+	void processConfigurationPropertiesWithCrossReference() {
+		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
+		beanFactory.registerBeanDefinition("beanA", BeanDefinitionBuilder.rootBeanDefinition(SamplePropertiesWithCrossReference.class).getBeanDefinition());
+		NativeConfigurationRegistry registry = process(beanFactory);
+		assertThat(registry.reflection().reflectionEntries())
+				.anySatisfy(javaBeanBinding(SamplePropertiesWithCrossReference.class))
+				.anySatisfy(javaBeanBinding(CrossReferenceA.class))
+				.anySatisfy(javaBeanBinding(CrossReferenceB.class)).hasSize(3);
+	}
+
 	private Consumer<DefaultNativeReflectionEntry> classOnlyBinding(Class<?> type) {
 		return (entry) -> {
 			assertThat(entry.getType()).isEqualTo(type);
@@ -523,4 +534,47 @@ public ImmutableRecursive(ImmutableRecursive recursive) {
 
 	}
 
+	@ConfigurationProperties("crossreference")
+	static class SamplePropertiesWithCrossReference {
+
+		@NestedConfigurationProperty
+		private CrossReferenceA crossReferenceA;
+
+		public void setCrossReferenceA(CrossReferenceA crossReferenceA) {
+			this.crossReferenceA = crossReferenceA;
+		}
+
+		public CrossReferenceA getCrossReferenceA() {
+			return crossReferenceA;
+		}
+	}
+
+	static class CrossReferenceA {
+
+		private CrossReferenceB crossReferenceB;
+
+		public void setCrossReferenceB(CrossReferenceB crossReferenceB) {
+			this.crossReferenceB = crossReferenceB;
+		}
+
+		public CrossReferenceB getCrossReferenceB() {
+			return crossReferenceB;
+		}
+
+	}
+
+	static class CrossReferenceB {
+
+		private CrossReferenceA crossReferenceA;
+
+		public void setCrossReferenceA(CrossReferenceA crossReferenceA) {
+			this.crossReferenceA = crossReferenceA;
+		}
+
+		public CrossReferenceA getCrossReferenceA() {
+			return crossReferenceA;
+		}
+
+	}
+
 }