fix mixins (#253)

Author: SentryMan

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

@@ -9,16 +9,9 @@ final class AdapterName {
   final String fullName;
 
   AdapterName(TypeElement origin) {
-    String originName = origin.getQualifiedName().toString();
-    String name = origin.getSimpleName().toString();
-    String originPackage = Util.packageOf(originName);
-    if (origin.getNestingKind().isNested()) {
-      String parent = Util.shortName(originPackage);
-      originPackage = Util.packageOf(originPackage);
-      shortName = parent + "$" + name;
-    } else {
-      shortName = name;
-    }
+    String originPackage = APContext.elements().getPackageOf(origin).toString();
+    var name = shortName(origin);
+    shortName = name.substring(0, name.length() - 1);
     if ("".equals(originPackage)) {
       this.adapterPackage = "jsonb";
     } else {
@@ -27,6 +20,14 @@ final class AdapterName {
     this.fullName = adapterPackage + "." + shortName + "JsonAdapter";
   }
 
+  private String shortName(TypeElement origin) {
+    var sb = new StringBuilder();
+    if (origin.getNestingKind().isNested()) {
+      sb.append(shortName((TypeElement) origin.getEnclosingElement()));
+    }
+    return sb.append(Util.shortName(origin.getSimpleName().toString())).append("$").toString();
+  }
+
   String shortName() {
     return shortName;
   }

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

@@ -239,7 +239,7 @@ private void addImported(ImportPrism importPrism) {
     for (final TypeMirror importType : importPrism.value()) {
       // if imported by mixin annotation skip
       if (mixInImports.contains(importType.toString())) {
-        return;
+        continue;
       }
       writeAdapterForImportedType(asTypeElement(importType), implementationType(importPrism));
     }

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

@@ -3,6 +3,7 @@
 import javax.lang.model.element.*;
 import javax.lang.model.type.TypeMirror;
 import javax.lang.model.util.ElementFilter;
+
 import java.util.*;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
@@ -170,7 +171,23 @@ void read(TypeElement type) {
 
   private void readField(Element element, List<FieldReader> localFields) {
     final Element mixInField = mixInFields.get(element.getSimpleName().toString());
-    if (mixInField != null && mixInField.asType().equals(element.asType())) {
+    if (mixInField != null && APContext.types().isSameType(mixInField.asType(), element.asType())) {
+
+      var mixinModifiers = new HashSet<>(mixInField.getModifiers());
+      var modifiers = new HashSet<>(mixInField.getModifiers());
+
+      Arrays.stream(Modifier.values())
+          .filter(m -> m != Modifier.PRIVATE || m != Modifier.PROTECTED || m != Modifier.PUBLIC)
+          .forEach(
+              m -> {
+                modifiers.remove(m);
+                mixinModifiers.remove(m);
+              });
+
+      if (!modifiers.equals(mixinModifiers)) {
+       APContext.logError(mixInField, "mixIn fields must have the same modifiers as the target class");
+      }
+
       element = mixInField;
     }
     if (element.asType().toString().contains("java.util.Optional")) {