From e79a8f6733cf48da982eee323e38476f2c302457 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Wed, 3 Aug 2022 10:53:57 +0200
Subject: [PATCH] Polish

---
 ...BeanDefinitionPropertiesCodeGenerator.java | 22 ++++++++-----------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/aot/BeanDefinitionPropertiesCodeGenerator.java b/spring-beans/src/main/java/org/springframework/beans/factory/aot/BeanDefinitionPropertiesCodeGenerator.java
index d58d3745c0..6ebf25cc4e 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/aot/BeanDefinitionPropertiesCodeGenerator.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/aot/BeanDefinitionPropertiesCodeGenerator.java
@@ -107,7 +107,7 @@ class BeanDefinitionPropertiesCodeGenerator {
 	}
 
 
-	CodeBlock generateCode(BeanDefinition beanDefinition) {
+	CodeBlock generateCode(RootBeanDefinition beanDefinition) {
 		CodeBlock.Builder builder = CodeBlock.builder();
 		addStatementForValue(builder, beanDefinition, BeanDefinition::isPrimary,
 				"$L.setPrimary($L)");
@@ -119,18 +119,14 @@ class BeanDefinitionPropertiesCodeGenerator {
 				"$L.setAutowireCandidate($L)");
 		addStatementForValue(builder, beanDefinition, BeanDefinition::getRole,
 				this::hasRole, "$L.setRole($L)", this::toRole);
-		if (beanDefinition instanceof AbstractBeanDefinition abstractBeanDefinition) {
-			addStatementForValue(builder, beanDefinition,
-					AbstractBeanDefinition::getLazyInit, "$L.setLazyInit($L)");
-			addStatementForValue(builder, beanDefinition,
-					AbstractBeanDefinition::isSynthetic, "$L.setSynthetic($L)");
-			addInitDestroyMethods(builder, abstractBeanDefinition,
-					abstractBeanDefinition.getInitMethodNames(),
-					"$L.setInitMethodNames($L)");
-			addInitDestroyMethods(builder, abstractBeanDefinition,
-					abstractBeanDefinition.getDestroyMethodNames(),
-					"$L.setDestroyMethodNames($L)");
-		}
+		addStatementForValue(builder, beanDefinition, AbstractBeanDefinition::getLazyInit,
+				"$L.setLazyInit($L)");
+		addStatementForValue(builder, beanDefinition, AbstractBeanDefinition::isSynthetic,
+				"$L.setSynthetic($L)");
+		addInitDestroyMethods(builder, beanDefinition, beanDefinition.getInitMethodNames(),
+				"$L.setInitMethodNames($L)");
+		addInitDestroyMethods(builder, beanDefinition, beanDefinition.getDestroyMethodNames(),
+				"$L.setDestroyMethodNames($L)");
 		addConstructorArgumentValues(builder, beanDefinition);
 		addPropertyValues(builder, beanDefinition);
 		addAttributes(builder, beanDefinition);