root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Honor default values for implicit aliases in composed annotations 

Spring Framework 5.2 introduced a regression for implicit aliases
declared via @AliasFor. Specifically, Spring's merged annotation
algorithms stopped honoring default values for implicit alias pairs if
the composed annotation was used without specifying the aliased
attributes.

This commit fixes this regression.

Closes gh-24110
This commit is contained in:
wanxiangming1994 2019-12-01 20:22:41 +08:00 committed by Sam Brannen
parent 1bff7ce141
commit 6f15f32be3
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spring-core/src/main/java/org/springframework/core/annotation/AnnotationTypeMapping.java
View File

@ -646,6 +646,9 @@ final class AnnotationTypeMapping {
boolean isDefaultValue = (value == null || boolean isDefaultValue = (value == null ||
isEquivalentToDefaultValue(attribute, value, valueExtractor)); isEquivalentToDefaultValue(attribute, value, valueExtractor));
if (isDefaultValue || ObjectUtils.nullSafeEquals(lastValue, value)) { if (isDefaultValue || ObjectUtils.nullSafeEquals(lastValue, value)) {
if (result == -1) {
result = this.indexes[i];
}
continue; continue;
} }
if (lastValue != null && !ObjectUtils.nullSafeEquals(lastValue, value)) { if (lastValue != null && !ObjectUtils.nullSafeEquals(lastValue, value)) {

6
spring-core/src/test/java/org/springframework/core/annotation/AnnotationTypeMappingsTests.java
View File

@ -368,13 +368,13 @@ class AnnotationTypeMappingsTests {
} }
@Test @Test
void resolveMirrorsWhenOnlyHasDefaultValuesResolvesNone() { void resolveMirrorsWhenOnlyHasDefaultValuesUsesFirst() {
AnnotationTypeMapping mapping = AnnotationTypeMappings.forAnnotationType( AnnotationTypeMapping mapping = AnnotationTypeMappings.forAnnotationType(
AliasPair.class).get(0); AliasPair.class).get(0);
Method[] resolved = resolveMirrorSets(mapping, WithDefaultValueAliasPair.class, Method[] resolved = resolveMirrorSets(mapping, WithDefaultValueAliasPair.class,
AliasPair.class); AliasPair.class);
assertThat(resolved[0]).isNull(); assertThat(resolved[0].getName()).isEqualTo("a");
assertThat(resolved[1]).isNull(); assertThat(resolved[1].getName()).isEqualTo("a");
} }
@Test @Test