Skip to content

Fix reserveMethodNames to reserve each supplied name #36912

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
junhyeong9812 wants to merge 1 commit into
base: main
Choose a base branch
from
+9 −1
Open

Fix reserveMethodNames to reserve each supplied name #36912

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion spring-core/src/main/java/org/springframework/aot/generate/GeneratedClass.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ private GeneratedClass(@Nullable GeneratedClass enclosingClass, ClassName name,
*/
public void reserveMethodNames(String... reservedMethodNames) {
for (String reservedMethodName : reservedMethodNames) {
String generatedName = generateSequencedMethodName(MethodName.of(reservedMethodNames));
String generatedName = generateSequencedMethodName(MethodName.of(reservedMethodName));
Assert.state(generatedName.equals(reservedMethodName),
() -> String.format("Unable to reserve method name '%s'", reservedMethodName));
}
Expand Down
8 changes: 8 additions & 0 deletions spring-core/src/test/java/org/springframework/aot/generate/GeneratedClassTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,14 @@ void reserveMethodNamesReservesNames() {
assertThat(generatedMethod.getName()).isEqualTo("apply1");
}

@Test
void reserveMethodNamesWhenMultipleNamesReservesEachName() {
GeneratedClass generatedClass = createGeneratedClass(TEST_CLASS_NAME);
generatedClass.reserveMethodNames("apply", "test");
assertThat(generatedClass.getMethods().add("apply", emptyMethodCustomizer).getName()).isEqualTo("apply1");
assertThat(generatedClass.getMethods().add("test", emptyMethodCustomizer).getName()).isEqualTo("test1");
}

@Test
void generateMethodNameWhenAllEmptyPartsGeneratesSetName() {
GeneratedClass generatedClass = createGeneratedClass(TEST_CLASS_NAME);
Expand Down