Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '6.0.x'

Browse Source
This commit is contained in:
Stephane Nicoll
2023-04-26 16:55:10 +02:00
parent 834e694e94 82e5464972
commit 825f160369
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-beans/src/main/java/org/springframework/beans/factory/aot/BeanDefinitionMethodGenerator.java
View File

@@ -152,7 +152,7 @@ class BeanDefinitionMethodGenerator {
GeneratedClass tmp = generatedClass;
for (String nameToProcess : namesToProcess) {
currentTargetClassName = currentTargetClassName.nestedClass(nameToProcess);
tmp = createInnerClass(tmp, nameToProcess + "__BeanDefinitions", currentTargetClassName);
tmp = createInnerClass(tmp, nameToProcess, currentTargetClassName);
}
return tmp;
}

6
spring-beans/src/test/java/org/springframework/beans/factory/aot/BeanDefinitionMethodGeneratorTests.java
View File

@@ -138,7 +138,7 @@ class BeanDefinitionMethodGeneratorTests {
compile(method, (actual, compiled) -> {
SourceFile sourceFile = compiled.getSourceFile(".*BeanDefinitions");
assertThat(sourceFile.getClassName()).endsWith("InnerBeanConfiguration__BeanDefinitions");
assertThat(sourceFile).contains("public static class Simple__BeanDefinitions")
assertThat(sourceFile).contains("public static class Simple")
.contains("Bean definitions for {@link InnerBeanConfiguration.Simple}")
.doesNotContain("Another__BeanDefinitions");
@@ -161,9 +161,9 @@ class BeanDefinitionMethodGeneratorTests {
compile(method, (actual, compiled) -> {
SourceFile sourceFile = compiled.getSourceFile(".*BeanDefinitions");
assertThat(sourceFile.getClassName()).endsWith("InnerBeanConfiguration__BeanDefinitions");
assertThat(sourceFile).contains("public static class Simple__BeanDefinitions")
assertThat(sourceFile).contains("public static class Simple")
.contains("Bean definitions for {@link InnerBeanConfiguration.Simple}")
.contains("public static class Another__BeanDefinitions")
.contains("public static class Another")
.contains("Bean definitions for {@link InnerBeanConfiguration.Simple.Another}");
});
}