Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Track only qualifier annotations in BeanOverrideHandler

Browse Source 
Closes gh-34260
This commit is contained in:
Sam Brannen
2025-01-14 11:35:00 +01:00
parent 5a68d1f029
commit 3c3b8c7aac
1 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
spring-test/src/main/java/org/springframework/test/context/bean/override/BeanOverrideHandler.java
View File

@@ -19,7 +19,6 @@ package org.springframework.test.context.bean.override;
import java.lang.annotation.Annotation;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
import java.util.LinkedList;
@@ -72,7 +71,7 @@ public abstract class BeanOverrideHandler {
private final Field field;
private final Set<Annotation> fieldAnnotations;
private final Set<Annotation> qualifierAnnotations;
private final ResolvableType beanType;
@@ -86,7 +85,7 @@ public abstract class BeanOverrideHandler {
BeanOverrideStrategy strategy) {
this.field = field;
this.fieldAnnotations = annotationSet(field);
this.qualifierAnnotations = getQualifierAnnotations(field);
this.beanType = beanType;
this.beanName = beanName;
this.strategy = strategy;
@@ -251,14 +250,14 @@ public abstract class BeanOverrideHandler {
// by-type lookup
return (Objects.equals(this.field.getName(), that.field.getName()) &&
this.fieldAnnotations.equals(that.fieldAnnotations));
this.qualifierAnnotations.equals(that.qualifierAnnotations));
}
@Override
public int hashCode() {
int hash = Objects.hash(getClass(), this.beanType.getType(), this.beanName, this.strategy);
return (this.beanName != null ? hash : hash +
Objects.hash(this.field.getName(), this.fieldAnnotations));
Objects.hash(this.field.getName(), this.qualifierAnnotations));
}
@Override
@@ -271,9 +270,24 @@ public abstract class BeanOverrideHandler {
.toString();
}
private static Set<Annotation> annotationSet(Field field) {
Annotation[] annotations = field.getAnnotations();
return (annotations.length != 0 ? new HashSet<>(Arrays.asList(annotations)) : Collections.emptySet());
private static Set<Annotation> getQualifierAnnotations(Field field) {
Annotation[] candidates = field.getDeclaredAnnotations();
if (candidates.length == 0) {
return Collections.emptySet();
}
Set<Annotation> annotations = new HashSet<>(candidates.length - 1);
for (Annotation candidate : candidates) {
// Assume all non-BeanOverride annotations are "qualifiers".
if (!isBeanOverrideAnnotation(candidate.annotationType())) {
annotations.add(candidate);
}
}
return annotations;
}
private static boolean isBeanOverrideAnnotation(Class<? extends Annotation> type) {
return MergedAnnotations.from(type).isPresent(BeanOverride.class);
}
}