Inherit enclosing @Conditional on scan-discovered nested configs#36819
Open
Dennis-Mircea wants to merge 1 commit into
Open
Inherit enclosing @Conditional on scan-discovered nested configs#36819Dennis-Mircea wants to merge 1 commit into
Dennis-Mircea wants to merge 1 commit into
Conversation
Signed-off-by: Dennis-Mircea Ciupitu <dennis.mircea.ciupitu@gmail.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
ISSUE link: #36820
Summary
ConfigurationClassParserandConfigurationClassBeanDefinitionReaderalready inherit a nested@Configurationclass's enclosing-class@Conditionalannotations via theimportedBychain, but only when the inner is reached throughprocessMemberClassesor@Import. Inners discovered via@ComponentScanor directregister(...)have noimportedByreference and silently escape the inheritance.This PR extends both inheritance points to also walk the lexical enclosing chain (via
MetadataReaderFactory) whenconfigClass.isImported()is false.@Importsemantics are intentionally preserved.Full context, use case, prior-art relation to Spring Boot #37111, and design rationale are in the linked issue.
Test plan
./gradlew checkon the full Spring Framework tree, all green:spring-context:test --tests "*Aot*",:spring-test:test --tests "*Aot*",:spring-beans:test --tests "*Aot*", all green7.0.8-SNAPSHOTFramework with this patch published to~/.m2/repository, all green (~10 min)EnclosingConditionConfigurationTestspass with the patch and fail (6/7) without it; the 7th is the control case