Compare qualifier value arrays with equality semantics

Closes gh-32106

(cherry picked from commit c5a75219ce)

spring-beans/src/main/java/org/springframework/beans/factory/annotation/QualifierAnnotationAutowireCandidateResolver.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -292,7 +292,7 @@ public class QualifierAnnotationAutowireCandidateResolver extends GenericTypeAwa
 			if (actualValue != null) {
 				actualValue = typeConverter.convertIfNecessary(actualValue, expectedValue.getClass());
 			}
-			if (!expectedValue.equals(actualValue)) {
+			if (!ObjectUtils.nullSafeEquals(expectedValue, actualValue)) {
 				return false;
 			}
 		}

spring-context/src/test/java/org/springframework/beans/factory/support/QualifierAnnotationAutowireContextTests.java

@@ -63,8 +63,8 @@ public class QualifierAnnotationAutowireContextTests {
 				new RootBeanDefinition(QualifiedFieldTestBean.class));
 		AnnotationConfigUtils.registerAnnotationConfigProcessors(context);
 
-		assertThatExceptionOfType(BeanCreationException.class).isThrownBy(
+		assertThatExceptionOfType(BeanCreationException.class)
-				context::refresh)
+				.isThrownBy(context::refresh)
 				.satisfies(ex -> {
 					assertThat(ex.getRootCause()).isInstanceOf(NoSuchBeanDefinitionException.class);
 					assertThat(ex.getBeanName()).isEqualTo("autowired");
@@ -81,8 +81,9 @@ public class QualifierAnnotationAutowireContextTests {
 		context.registerBeanDefinition("autowired",
 				new RootBeanDefinition(QualifiedMethodParameterTestBean.class));
 		AnnotationConfigUtils.registerAnnotationConfigProcessors(context);
-		assertThatExceptionOfType(BeanCreationException.class).isThrownBy(
+
-				context::refresh)
+		assertThatExceptionOfType(BeanCreationException.class)
+				.isThrownBy(context::refresh)
 				.satisfies(ex -> {
 					assertThat(ex.getRootCause()).isInstanceOf(NoSuchBeanDefinitionException.class);
 					assertThat(ex.getBeanName()).isEqualTo("autowired");
@@ -100,8 +101,9 @@ public class QualifierAnnotationAutowireContextTests {
 		context.registerBeanDefinition("autowired",
 				new RootBeanDefinition(QualifiedConstructorArgumentTestBean.class));
 		AnnotationConfigUtils.registerAnnotationConfigProcessors(context);
-		assertThatExceptionOfType(UnsatisfiedDependencyException.class).isThrownBy(
+
-				context::refresh)
+		assertThatExceptionOfType(UnsatisfiedDependencyException.class)
+				.isThrownBy(context::refresh)
 				.satisfies(ex -> assertThat(ex.getBeanName()).isEqualTo("autowired"));
 	}
 
@@ -205,8 +207,9 @@ public class QualifierAnnotationAutowireContextTests {
 		context.registerBeanDefinition("autowired",
 				new RootBeanDefinition(QualifiedFieldTestBean.class));
 		AnnotationConfigUtils.registerAnnotationConfigProcessors(context);
-		assertThatExceptionOfType(BeanCreationException.class).isThrownBy(
+
-				context::refresh)
+		assertThatExceptionOfType(BeanCreationException.class)
+				.isThrownBy(context::refresh)
 				.satisfies(ex -> {
 					assertThat(ex.getRootCause()).isInstanceOf(NoSuchBeanDefinitionException.class);
 					assertThat(ex.getBeanName()).isEqualTo("autowired");
@@ -227,8 +230,9 @@ public class QualifierAnnotationAutowireContextTests {
 		context.registerBeanDefinition("autowired",
 				new RootBeanDefinition(QualifiedMethodParameterTestBean.class));
 		AnnotationConfigUtils.registerAnnotationConfigProcessors(context);
-		assertThatExceptionOfType(BeanCreationException.class).isThrownBy(
+
-				context::refresh)
+		assertThatExceptionOfType(BeanCreationException.class)
+				.isThrownBy(context::refresh)
 				.satisfies(ex -> {
 					assertThat(ex.getRootCause()).isInstanceOf(NoSuchBeanDefinitionException.class);
 					assertThat(ex.getBeanName()).isEqualTo("autowired");
@@ -249,8 +253,9 @@ public class QualifierAnnotationAutowireContextTests {
 		context.registerBeanDefinition("autowired",
 				new RootBeanDefinition(QualifiedConstructorArgumentTestBean.class));
 		AnnotationConfigUtils.registerAnnotationConfigProcessors(context);
-		assertThatExceptionOfType(UnsatisfiedDependencyException.class).isThrownBy(
+
-				context::refresh)
+		assertThatExceptionOfType(UnsatisfiedDependencyException.class)
+				.isThrownBy(context::refresh)
 				.satisfies(ex -> assertThat(ex.getBeanName()).isEqualTo("autowired"));
 	}
 
@@ -374,8 +379,9 @@ public class QualifierAnnotationAutowireContextTests {
 		context.registerBeanDefinition("autowired",
 				new RootBeanDefinition(QualifiedFieldWithDefaultValueTestBean.class));
 		AnnotationConfigUtils.registerAnnotationConfigProcessors(context);
-		assertThatExceptionOfType(BeanCreationException.class).isThrownBy(
+
-				context::refresh)
+		assertThatExceptionOfType(BeanCreationException.class)
+				.isThrownBy(context::refresh)
 				.satisfies(ex -> {
 					assertThat(ex.getRootCause()).isInstanceOf(NoSuchBeanDefinitionException.class);
 					assertThat(ex.getBeanName()).isEqualTo("autowired");
@@ -451,8 +457,9 @@ public class QualifierAnnotationAutowireContextTests {
 		context.registerBeanDefinition("autowired",
 				new RootBeanDefinition(QualifiedFieldWithMultipleAttributesTestBean.class));
 		AnnotationConfigUtils.registerAnnotationConfigProcessors(context);
-		assertThatExceptionOfType(BeanCreationException.class).isThrownBy(
+
-				context::refresh)
+		assertThatExceptionOfType(BeanCreationException.class)
+				.isThrownBy(context::refresh)
 				.satisfies(ex -> {
 					assertThat(ex.getRootCause()).isInstanceOf(NoSuchBeanDefinitionException.class);
 					assertThat(ex.getBeanName()).isEqualTo("autowired");
@@ -507,8 +514,9 @@ public class QualifierAnnotationAutowireContextTests {
 		context.registerBeanDefinition("autowired",
 				new RootBeanDefinition(QualifiedFieldWithMultipleAttributesTestBean.class));
 		AnnotationConfigUtils.registerAnnotationConfigProcessors(context);
-		assertThatExceptionOfType(BeanCreationException.class).isThrownBy(
+
-				context::refresh)
+		assertThatExceptionOfType(BeanCreationException.class)
+				.isThrownBy(context::refresh)
 				.satisfies(ex -> {
 					assertThat(ex.getRootCause()).isInstanceOf(NoSuchBeanDefinitionException.class);
 					assertThat(ex.getBeanName()).isEqualTo("autowired");
@@ -574,8 +582,9 @@ public class QualifierAnnotationAutowireContextTests {
 		context.registerBeanDefinition("autowired",
 				new RootBeanDefinition(QualifiedConstructorArgumentWithBaseQualifierNonDefaultValueTestBean.class));
 		AnnotationConfigUtils.registerAnnotationConfigProcessors(context);
-		assertThatExceptionOfType(UnsatisfiedDependencyException.class).isThrownBy(
+
-				context::refresh)
+		assertThatExceptionOfType(UnsatisfiedDependencyException.class)
+				.isThrownBy(context::refresh)
 				.satisfies(ex -> assertThat(ex.getBeanName()).isEqualTo("autowired"));
 	}
 
@@ -752,7 +761,7 @@ public class QualifierAnnotationAutowireContextTests {
 	@Qualifier
 	@interface TestQualifierWithMultipleAttributes {
 
-		String value() default "default";
+		String[] value() default "default";
 
 		int number();
 	}

spring-context/src/test/java/org/springframework/beans/factory/xml/QualifierAnnotationTests.java

@@ -58,8 +58,9 @@ public class QualifierAnnotationTests {
 		BeanDefinitionReader reader = new XmlBeanDefinitionReader(context);
 		reader.loadBeanDefinitions(CONFIG_LOCATION);
 		context.registerSingleton("testBean", NonQualifiedTestBean.class);
-		assertThatExceptionOfType(BeanCreationException.class).isThrownBy(
+
-				context::refresh)
+		assertThatExceptionOfType(BeanCreationException.class)
+				.isThrownBy(context::refresh)
 				.withMessageContaining("found 6");
 	}
 
@@ -191,8 +192,9 @@ public class QualifierAnnotationTests {
 		BeanDefinitionReader reader = new XmlBeanDefinitionReader(context);
 		reader.loadBeanDefinitions(CONFIG_LOCATION);
 		context.registerSingleton("testBean", QualifiedByAttributesTestBean.class);
-		assertThatExceptionOfType(BeanCreationException.class).isThrownBy(
+
-				context::refresh)
+		assertThatExceptionOfType(BeanCreationException.class)
+				.isThrownBy(context::refresh)
 				.withMessageContaining("found 6");
 	}