Skip to content

Lengthen Inner Type short names #55

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

Merged
merged 1 commit into from
Jan 30, 2023
Merged

Lengthen Inner Type short names #55

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
8 changes: 2 additions & 6 deletions jsonb-generator/src/main/java/io/avaje/jsonb/generator/SimpleComponentWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,8 @@ private void writeRegister() {
}

private String typeShortName(String adapterShortName) {
String typeName = adapterShortName.substring(0, adapterShortName.length() - 11);
int pos = typeName.lastIndexOf('$');
if (pos > -1) {
return typeName.substring(pos + 1);
}
return typeName;
final String typeName = adapterShortName.substring(0, adapterShortName.length() - 11);
return typeName.replace("$", ".");
}

private void writeClassEnd() {
Expand Down
10 changes: 8 additions & 2 deletions jsonb-generator/src/main/java/io/avaje/jsonb/generator/Util.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,13 @@ static String baseTypeOfAdapter(String adapterFullName) {
if (posPrior == -1) {
return adapterFullName.substring(posLast + 1, nameEnd);
}
return adapterFullName.substring(0, posPrior)
+ adapterFullName.substring(posLast, nameEnd).replace('$', '.');

final String className =
adapterFullName.substring(0, posPrior) + adapterFullName.substring(posLast, nameEnd);
final int $index = className.indexOf("$");

if ($index != -1) return className.substring(0, $index);

return className;
}
}