Add LocalVariableNameFactory. #3271
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
christophstrobl
force-pushed
the
issue/3270
branch
from
10f4ee9 to
9d146dc
Compare
onobc
requested changes
Apr 29, 2025
There was a problem hiding this comment.
Looks good @christophstrobl . I made a few minor suggestions. PTAL.
src/main/java/org/springframework/data/repository/aot/generate/LocalVariableNameFactory.java
Show resolved
Hide resolved
src/main/java/org/springframework/data/repository/aot/generate/VariableNameFactory.java
Show resolved
Hide resolved
src/main/java/org/springframework/data/repository/aot/generate/VariableNameFactory.java
Outdated
Show resolved
Hide resolved
...java/org/springframework/data/repository/aot/generate/LocalVariableNameFactoryUnitTests.java
Show resolved
Hide resolved
| return new LocalVariableNameFactory(variables); | ||
| } | ||
|
|
||
| LocalVariableNameFactory(Iterable<String> predefinedVariableNames) { |
There was a problem hiding this comment.
A simplification of this could be:
LocalVariableNameFactory(Iterable<String> predefinedVariableNames) {
predefinedVariableNames.forEach((paramName) -> variables.put(paramName, 0L));
}Wdyt?
Add a variable name factory that considers predefined names and resolves name clashes. Expose variable name clash resolution via the generation context of a single method.
christophstrobl
force-pushed
the
issue/3270
branch
from
9d146dc to
4a48edc
Compare
onobc
reviewed
May 2, 2025
| } | ||
|
|
||
| String targetName = suggestTargetName(intendedVariableName); | ||
| variables.add(intendedVariableName, targetName); |
There was a problem hiding this comment.
Do we need to update the original intendedVariableName?
This code is fine but concurrency aside, I still think something like the following that would replace line62-86 would simplify things:
@Override
public String generateName(String suggestedName) {
var counter = variables.compute(suggestedName,
(__, currentCount) -> currentCount == null ? 0 : currentCount.longValue() + 1);
return counter == 0 ? suggestedName : "%s_%s".formatted(suggestedName, counter));
}
onobc
approved these changes
May 2, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add a variable name factory that considers predefined names and resolves name clashes.
Expose variable name clash resolution via the generation context of a single method.