From e29cbd24c8daf67d13e46dbff509d11e2f5d97a6 Mon Sep 17 00:00:00 2001
From: Yanming Zhou <zhouyanming@gmail.com>
Date: Fri, 13 Sep 2024 10:04:53 +0800
Subject: [PATCH] Remove redundant `setPrimary(true)` and wrong
 `setLazyInit(true)`

Both of `@Primary` and `@Lazy` are already processed by `AnnotationConfigUtils.processCommonDefinitionAnnotations(abd)`, and `setLazyInit()` should use value of `@Lazy` not fixed `true`.
---
 .../annotation/AnnotatedBeanDefinitionReader.java      | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

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..f79903075d90 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
  */
@@ -263,13 +264,8 @@ private <T> void doRegisterBean(Class<T> beanClass, @Nullable String name,
 		AnnotationConfigUtils.processCommonDefinitionAnnotations(abd);
 		if (qualifiers != null) {
 			for (Class<? extends Annotation> qualifier : qualifiers) {
-				if (Primary.class == qualifier) {
-					abd.setPrimary(true);
-				}
-				else if (Lazy.class == qualifier) {
-					abd.setLazyInit(true);
-				}
-				else {
+				if (Primary.class != qualifier && Lazy.class != qualifier) {
+					// Primary and Lazy is processed by AnnotationConfigUtils.processCommonDefinitionAnnotations()
 					abd.addQualifier(new AutowireCandidateQualifier(qualifier));
 				}
 			}