From 1d637a4d146b22e9db95ac9888cb42e6343c3429 Mon Sep 17 00:00:00 2001
From: Yanming Zhou <zhouyanming@gmail.com>
Date: Fri, 13 Sep 2024 10:04:53 +0800
Subject: [PATCH] AnnotatedBeanDefinitionReader should respect @Fallback
 qualifier analogous to @Primary

Also add tests to cover qualifier classes.
---
 .../AnnotatedBeanDefinitionReader.java        |  4 ++
 .../AnnotatedBeanDefinitionReaderTests.java   | 68 +++++++++++++++++++
 2 files changed, 72 insertions(+)
 create mode 100644 spring-context/src/test/java/org/springframework/context/annotation/AnnotatedBeanDefinitionReaderTests.java

diff --git a/spring-context/src/main/java/org/springframework/context/annotation/AnnotatedBeanDefinitionReader.java b/spring-context/src/main/java/org/springframework/context/annotation/AnnotatedBeanDefinitionReader.java
index 3ac5edfa5952..eb3ea0aead76 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/AnnotatedBeanDefinitionReader.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/AnnotatedBeanDefinitionReader.java
@@ -43,6 +43,7 @@
  * @author Chris Beams
  * @author Sam Brannen
  * @author Phillip Webb
+ * @author Yanming Zhou
  * @since 3.0
  * @see AnnotationConfigApplicationContext#register
  */
@@ -266,6 +267,9 @@ private <T> void doRegisterBean(Class<T> beanClass, @Nullable String name,
 				if (Primary.class == qualifier) {
 					abd.setPrimary(true);
 				}
+				else if (Fallback.class == qualifier) {
+					abd.setFallback(true);
+				}
 				else if (Lazy.class == qualifier) {
 					abd.setLazyInit(true);
 				}
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/AnnotatedBeanDefinitionReaderTests.java b/spring-context/src/test/java/org/springframework/context/annotation/AnnotatedBeanDefinitionReaderTests.java
new file mode 100644
index 000000000000..c20f09c4679a
--- /dev/null
+++ b/spring-context/src/test/java/org/springframework/context/annotation/AnnotatedBeanDefinitionReaderTests.java
@@ -0,0 +1,68 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.context.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.junit.jupiter.api.Test;
+
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.support.AbstractBeanDefinition;
+import org.springframework.context.support.GenericApplicationContext;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author Yanming Zhou
+ */
+class AnnotatedBeanDefinitionReaderTests {
+
+	@Test
+	void registerBeanWithQualifiers() {
+		GenericApplicationContext context = new GenericApplicationContext();
+		AnnotatedBeanDefinitionReader reader = new AnnotatedBeanDefinitionReader(context);
+
+		reader.registerBean(TestBean.class, "primary", Primary.class);
+		assertThat(context.getBeanDefinition("primary").isPrimary()).isTrue();
+
+		reader.registerBean(TestBean.class, "fallback", Fallback.class);
+		assertThat(context.getBeanDefinition("fallback").isFallback()).isTrue();
+
+		reader.registerBean(TestBean.class, "lazy", Lazy.class);
+		assertThat(context.getBeanDefinition("lazy").isLazyInit()).isTrue();
+
+		reader.registerBean(TestBean.class, "customQualifier", CustomQualifier.class);
+		assertThat(context.getBeanDefinition("customQualifier"))
+				.isInstanceOfSatisfying(AbstractBeanDefinition.class, abd ->
+					assertThat(abd.hasQualifier(CustomQualifier.class.getTypeName())).isTrue());
+	}
+
+	@Lazy(false)
+	static class TestBean {
+
+	}
+
+	@Target({ElementType.TYPE, ElementType.METHOD})
+	@Retention(RetentionPolicy.RUNTIME)
+	@Qualifier
+	@interface CustomQualifier {
+
+	}
+}