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

Remove @Nullable on attributes parameter in isStereotypeWithNameValue()

Browse Source
This commit is contained in:
Sam Brannen
2023-09-11 14:54:55 +02:00
parent 8d4ea72e4e
commit fceed9f3e5
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-context/src/main/java/org/springframework/context/annotation/AnnotationBeanNameGenerator.java
View File

@@ -192,7 +192,7 @@ public class AnnotationBeanNameGenerator implements BeanNameGenerator {
* @return whether the annotation qualifies as a stereotype with component name * @return whether the annotation qualifies as a stereotype with component name
*/ */
protected boolean isStereotypeWithNameValue(String annotationType, protected boolean isStereotypeWithNameValue(String annotationType,
Set<String> metaAnnotationTypes, @Nullable Map<String, Object> attributes) { Set<String> metaAnnotationTypes, Map<String, Object> attributes) {
boolean isStereotype = metaAnnotationTypes.contains(COMPONENT_ANNOTATION_CLASSNAME) || boolean isStereotype = metaAnnotationTypes.contains(COMPONENT_ANNOTATION_CLASSNAME) ||
annotationType.equals("jakarta.annotation.ManagedBean") || annotationType.equals("jakarta.annotation.ManagedBean") ||
@@ -200,7 +200,7 @@ public class AnnotationBeanNameGenerator implements BeanNameGenerator {
annotationType.equals("jakarta.inject.Named") || annotationType.equals("jakarta.inject.Named") ||
annotationType.equals("javax.inject.Named"); annotationType.equals("javax.inject.Named");
return (isStereotype && attributes != null && attributes.containsKey("value")); return (isStereotype && attributes.containsKey("value"));
} }
/** /**