handle nested types

Author: SentryMan

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

@@ -53,8 +53,14 @@ void write() throws IOException {
 
   private void writeFactory() {
     if (genericParamsCount > 0) {
+
+      String typeName = adapterShortName;
+      int nestedIndex = adapterShortName.indexOf("$");
+      if (nestedIndex != -1) {
+        typeName = typeName.substring(nestedIndex + 1);
+      }
       writer.append("  public static final JsonAdapter.Factory Factory = (type, jsonb) -> {").eol();
-      writer.append("    if (type instanceof ParameterizedType && Types.rawType(type) == %s.class) {", adapterShortName).eol();
+      writer.append("    if (type instanceof ParameterizedType && Types.rawType(type) == %s.class) {", typeName).eol();
       writer.append("      Type[] args = Types.typeArguments(type);").eol();
       writer.append("      return new %sJsonAdapter(jsonb", adapterShortName);
       for (int i = 0; i < genericParamsCount; i++) {

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

@@ -53,11 +53,12 @@ void writeMetaInf() throws IOException {
   private void writeRegister() {
     writer.append("  @Override").eol();
     writer.append("  public void register(Jsonb.Builder builder) {").eol();
-    List<String> strings = metaData.allFactories();
-    for (String adapterFullName : strings) {
-      String adapterShortName = Util.shortName(adapterFullName);
-      String typeName = typeShortName(adapterShortName);
-      writer.append("    builder.add(%sJsonAdapter.Factory);", typeName).eol();
+    final List<String> strings = metaData.allFactories();
+    for (final String adapterFullName : strings) {
+      final String adapterShortName = Util.shortName(adapterFullName);
+      final String typeName = typeShortName(adapterShortName);
+
+      writer.append("    builder.add(%s.Factory);", adapterShortName).eol();
     }
     for (String adapterFullName : metaData.all()) {
       String adapterShortName = Util.shortName(adapterFullName);