Skip to content

Commit a00daa8

Browse files
authored
Merge pull request #55 from SentryMan/inner
Lengthen Inner Type short names
2 parents 3b49f9d + cb7ac03 commit a00daa8

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

jsonb-generator/src/main/java/io/avaje/jsonb/generator/SimpleComponentWriter.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,8 @@ private void writeRegister() {
6767
}
6868

6969
private String typeShortName(String adapterShortName) {
70-
String typeName = adapterShortName.substring(0, adapterShortName.length() - 11);
71-
int pos = typeName.lastIndexOf('$');
72-
if (pos > -1) {
73-
return typeName.substring(pos + 1);
74-
}
75-
return typeName;
70+
final String typeName = adapterShortName.substring(0, adapterShortName.length() - 11);
71+
return typeName.replace("$", ".");
7672
}
7773

7874
private void writeClassEnd() {

jsonb-generator/src/main/java/io/avaje/jsonb/generator/Util.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,13 @@ static String baseTypeOfAdapter(String adapterFullName) {
9191
if (posPrior == -1) {
9292
return adapterFullName.substring(posLast + 1, nameEnd);
9393
}
94-
return adapterFullName.substring(0, posPrior)
95-
+ adapterFullName.substring(posLast, nameEnd).replace('$', '.');
94+
95+
final String className =
96+
adapterFullName.substring(0, posPrior) + adapterFullName.substring(posLast, nameEnd);
97+
final int $index = className.indexOf("$");
98+
99+
if ($index != -1) return className.substring(0, $index);
100+
101+
return className;
96102
}
97103
}

0 commit comments

Comments
 (0)