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 65310628f75b..83274e6c1118 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 @@ -24,6 +24,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.Objects; import java.util.function.BiFunction; @@ -74,7 +75,6 @@ * * @author Phillip Webb * @author Stephane Nicoll - * @author Olga Maciaszek-Sharma * @since 6.0 */ class BeanDefinitionPropertiesCodeGenerator { @@ -144,17 +144,14 @@ private void addInitDestroyMethods(Builder builder, if (!ObjectUtils.isEmpty(methodNames)) { Class beanType = ClassUtils .getUserClass(beanDefinition.getResolvableType().toClass()); - Builder arguments = CodeBlock.builder(); - String[] filteredMethodNames = Arrays.stream(methodNames) - .filter(methodName -> !AbstractBeanDefinition.INFER_METHOD.equals(methodName)) - .toArray(String[]::new); - for (int i = 0; i < filteredMethodNames.length; i++) { - String methodName = filteredMethodNames[i]; - arguments.add((i != 0) ? ", $S" : "$S", methodName); - addInitDestroyHint(beanType, methodName); - } - if (!arguments.isEmpty()) { - builder.addStatement(format, BEAN_DEFINITION_VARIABLE, arguments.build()); + List filteredMethodNames = Arrays.stream(methodNames) + .filter(candidate -> !AbstractBeanDefinition.INFER_METHOD.equals(candidate)) + .toList(); + if (!ObjectUtils.isEmpty(filteredMethodNames)) { + filteredMethodNames.forEach(methodName -> addInitDestroyHint(beanType, methodName)); + CodeBlock arguments = CodeBlock.join(filteredMethodNames.stream() + .map(name -> CodeBlock.of("$S", name)).toList(), ", "); + builder.addStatement(format, BEAN_DEFINITION_VARIABLE, arguments); } } } @@ -277,11 +274,11 @@ private CodeBlock toStringVarArgs(String[] strings) { private Object toRole(int value) { return switch (value) { - case BeanDefinition.ROLE_INFRASTRUCTURE -> CodeBlock.builder() - .add("$T.ROLE_INFRASTRUCTURE", BeanDefinition.class).build(); - case BeanDefinition.ROLE_SUPPORT -> CodeBlock.builder() - .add("$T.ROLE_SUPPORT", BeanDefinition.class).build(); - default -> value; + case BeanDefinition.ROLE_INFRASTRUCTURE -> CodeBlock.builder() + .add("$T.ROLE_INFRASTRUCTURE", BeanDefinition.class).build(); + case BeanDefinition.ROLE_SUPPORT -> CodeBlock.builder() + .add("$T.ROLE_SUPPORT", BeanDefinition.class).build(); + default -> value; }; } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/aot/BeanDefinitionPropertiesCodeGeneratorTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/aot/BeanDefinitionPropertiesCodeGeneratorTests.java index 76ddb895af5c..035a63b24da2 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/aot/BeanDefinitionPropertiesCodeGeneratorTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/aot/BeanDefinitionPropertiesCodeGeneratorTests.java @@ -245,6 +245,13 @@ void setInitMethodWhenMultipleInitMethods() { assertHasMethodInvokeHints(InitDestroyBean.class, methodNames); } + @Test + void setInitMethodWithInferredMethodFirst() { + this.beanDefinition.setInitMethodNames(AbstractBeanDefinition.INFER_METHOD, "init"); + compile((actual, compiled) -> assertThat(compiled.getSourceFile().getContent()) + .contains("beanDefinition.setInitMethodNames(\"init\");")); + } + @Test void setDestroyMethodWhenDestroyInitMethod() { this.beanDefinition.setTargetType(InitDestroyBean.class); @@ -274,6 +281,13 @@ void setDestroyMethodWhenMultipleDestroyMethods() { assertHasMethodInvokeHints(InitDestroyBean.class, methodNames); } + @Test + void setDestroyMethodWithInferredMethodFirst() { + this.beanDefinition.setDestroyMethodNames(AbstractBeanDefinition.INFER_METHOD, "destroy"); + compile((actual, compiled) -> assertThat(compiled.getSourceFile().getContent()) + .contains("beanDefinition.setDestroyMethodNames(\"destroy\");")); + } + private void assertHasMethodInvokeHints(Class beanType, String... methodNames) { assertThat(methodNames).allMatch(methodName -> RuntimeHintsPredicates.reflection() .onMethod(beanType, methodName).invoke() @@ -395,18 +409,6 @@ void multipleItems() { }); } - @Test - void inferredMethodsAtTheBeginning() { - this.beanDefinition.setInitMethodNames(AbstractBeanDefinition.INFER_METHOD, "init"); - this.beanDefinition.setDestroyMethodNames(AbstractBeanDefinition.INFER_METHOD, "destroy"); - compile((actual, compiled) -> { - assertThat(compiled.getSourceFile().getContent()) - .contains("beanDefinition.setInitMethodNames(\"init\");"); - assertThat(compiled.getSourceFile().getContent()) - .contains("beanDefinition.setDestroyMethodNames(\"destroy\");"); - }); - } - private void compile(BiConsumer result) { compile(attribute -> true, result); }