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

Allow ApplicationContextAotGenerator to generated better class names

Browse Source 
Update `ApplicationContextAotGenerator` so that it can generate class
names based on a `target` class and using the ID of the application
context. Prior to this commit, the generated class name was always
`__.BeanFactoryRegistrations`.

Closes gh-28565
This commit is contained in:
Phillip Webb
2022-06-03 16:43:13 -07:00
parent 243350054b
commit 4bd33cb6e0
9 changed files with 99 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
spring-core/src/test/java/org/springframework/aot/generate/ClassNameGeneratorTests.java
View File

@@ -35,18 +35,9 @@ class ClassNameGeneratorTests {
private final ClassNameGenerator generator = new ClassNameGenerator();
@Test
void generateClassNameWhenTargetClassIsNullThrowsException() {
assertThatIllegalArgumentException()
.isThrownBy(
() -> this.generator.generateClassName((Class<?>) null, "Test"))
.withMessage("'target' must not be null");
}
@Test
void generateClassNameWhenTargetStringIsEmptyThrowsException() {
assertThatIllegalArgumentException()
.isThrownBy(() -> this.generator.generateClassName("", "Test"))
.withMessage("'target' must not be empty");
void generateClassNameWhenTargetClassIsNullUsesAotPackage() {
ClassName generated = this.generator.generateClassName((Class<?>) null, "test");
assertThat(generated).hasToString("__.Test");
}
@Test
@@ -58,17 +49,12 @@ class ClassNameGeneratorTests {
@Test
void generatedClassNameWhenFeatureIsNotAllLettersThrowsException() {
String expectedMessage = "'featureName' must contain only letters";
assertThatIllegalArgumentException().isThrownBy(
() -> this.generator.generateClassName(InputStream.class, "noway!"))
.withMessage(expectedMessage);
assertThatIllegalArgumentException().isThrownBy(
() -> this.generator.generateClassName(InputStream.class, "1WontWork"))
.withMessage(expectedMessage);
assertThatIllegalArgumentException()
.isThrownBy(
() -> this.generator.generateClassName(InputStream.class, "N0pe"))
.withMessage(expectedMessage);
assertThat(this.generator.generateClassName(InputStream.class, "name!"))
.hasToString("java.io.InputStream__Name");
assertThat(this.generator.generateClassName(InputStream.class, "1NameHere"))
.hasToString("java.io.InputStream__NameHere");
assertThat(this.generator.generateClassName(InputStream.class, "Y0pe"))
.hasToString("java.io.InputStream__YPe");
}
@Test
@@ -80,38 +66,21 @@ class ClassNameGeneratorTests {
@Test
void generateClassNameWithClassWhenInnerClassGeneratesName() {
ClassName generated = this.generator.generateClassName(TestBean.class,
"EventListener");
assertThat(generated).hasToString(
"org.springframework.aot.generate.ClassNameGeneratorTests_TestBean__EventListener");
ClassName generated = this.generator.generateClassName(TestBean.class, "EventListener");
assertThat(generated)
.hasToString("org.springframework.aot.generate.ClassNameGeneratorTests_TestBean__EventListener");
}
@Test
void generateClassWithClassWhenMultipleCallsGeneratesSequencedName() {
ClassName generated1 = this.generator.generateClassName(InputStream.class,
"bytes");
ClassName generated2 = this.generator.generateClassName(InputStream.class,
"bytes");
ClassName generated3 = this.generator.generateClassName(InputStream.class,
"bytes");
ClassName generated1 = this.generator.generateClassName(InputStream.class, "bytes");
ClassName generated2 = this.generator.generateClassName(InputStream.class, "bytes");
ClassName generated3 = this.generator.generateClassName(InputStream.class, "bytes");
assertThat(generated1).hasToString("java.io.InputStream__Bytes");
assertThat(generated2).hasToString("java.io.InputStream__Bytes1");
assertThat(generated3).hasToString("java.io.InputStream__Bytes2");
}
@Test
void generateClassNameWithStringGeneratesNameUsingOnlyLetters() {
ClassName generated = this.generator.generateClassName("my-bean--factoryStuff",
"beans");
assertThat(generated).hasToString("__.MyBeanFactoryStuff__Beans");
}
@Test
void generateClassNameWithStringWhenNoLettersGeneratesAotName() {
ClassName generated = this.generator.generateClassName("1234!@#", "beans");
assertThat(generated).hasToString("__.Aot__Beans");
}
static class TestBean {
}

30
spring-core/src/test/java/org/springframework/aot/generate/GeneratedClassesTests.java
View File

@@ -68,36 +68,12 @@ class GeneratedClassesTests {
.withMessage("'featureName' must not be empty");
}
@Test
void getOrGenerateWithStringTargetWhenJavaFileGeneratorIsNullThrowsException() {
assertThatIllegalArgumentException()
.isThrownBy(() -> this.generatedClasses.getOrGenerateClass(null,
TestTarget.class.getName(), "test"))
.withMessage("'javaFileGenerator' must not be null");
}
@Test
void getOrGenerateWithStringTargetWhenTargetIsNullThrowsException() {
assertThatIllegalArgumentException()
.isThrownBy(() -> this.generatedClasses
.getOrGenerateClass(JAVA_FILE_GENERATOR, (String) null, "test"))
.withMessage("'target' must not be empty");
}
@Test
void getOrGenerateWithStringTargetWhenFeatureIsNullThrowsException() {
assertThatIllegalArgumentException()
.isThrownBy(() -> this.generatedClasses.getOrGenerateClass(
JAVA_FILE_GENERATOR, TestTarget.class.getName(), null))
.withMessage("'featureName' must not be empty");
}
@Test
void getOrGenerateWhenNewReturnsGeneratedMethod() {
GeneratedClass generatedClass1 = this.generatedClasses
.getOrGenerateClass(JAVA_FILE_GENERATOR, TestTarget.class, "one");
GeneratedClass generatedClass2 = this.generatedClasses.getOrGenerateClass(
JAVA_FILE_GENERATOR, TestTarget.class.getName(), "two");
GeneratedClass generatedClass2 = this.generatedClasses
.getOrGenerateClass(JAVA_FILE_GENERATOR, TestTarget.class, "two");
assertThat(generatedClass1).isNotNull().isNotEqualTo(generatedClass2);
assertThat(generatedClass2).isNotNull();
}
@@ -110,7 +86,7 @@ class GeneratedClassesTests {
GeneratedClass generatedClass2 = generated.getOrGenerateClass(JAVA_FILE_GENERATOR,
TestTarget.class, "one");
GeneratedClass generatedClass3 = generated.getOrGenerateClass(JAVA_FILE_GENERATOR,
TestTarget.class.getName(), "one");
TestTarget.class, "one");
GeneratedClass generatedClass4 = generated.getOrGenerateClass(JAVA_FILE_GENERATOR,
TestTarget.class, "two");
assertThat(generatedClass1).isNotNull().isSameAs(generatedClass2)