spring-framework

Spring Framework

Tree: 26da0e49e4

Sam Brannen 74130d007b Ensure direct @PropertySource annotations override meta-annotations Prior to this commit, there was an issue with the semantics of property source overrides. Specifically, a @PropertySource annotation present as a meta-annotation on a @Configuration class was registered with higher precedence than a @PropertySource annotation declared closer to (or directly on) the @Configuration class. Consequently, there was no way for a "local" @PropertySource annotation to override properties registered via @PropertySource as a meta-annotation. This commit addresses this issue by introducing a new overloaded getMergedRepeatableAnnotationAttributes() variant in AnnotatedTypeMetadata that allows the caller to supply a sortByReversedMetaDistance flag. When set to `true`, the annotation search results will be sorted in reversed order based on each annotation's meta distance, which effectively orders meta-annotations before annotations that are declared directly on the underlying element. ConfigurationClassParser and AnnotationConfigUtils have been updated to use this new repeatable annotation search method for @PropertySource. Closes gh-31074		2 years ago
..
src	Ensure direct @PropertySource annotations override meta-annotations	2 years ago
.springBeans	…
spring-context.gradle	Merge branch '6.0.x'	3 years ago