Merge pull request #150 from SentryMan/log

More Logging for Custom Adapter Errors

Author: rob-bygrave

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

@@ -79,12 +79,31 @@ private void registerCustomAdapters(Set<? extends Element> elements) {
       final var type = typeElement.getQualifiedName().toString();
       if (CustomAdapterPrism.getInstanceOn(typeElement).isGeneric()) {
         ElementFilter.fieldsIn(typeElement.getEnclosedElements()).stream()
-          .filter(isStaticFactory())
-          .findFirst()
-          .orElseThrow(() -> new IllegalStateException("Generic Adapters require a public static JsonAdapter.Factory FACTORY field"));
+            .filter(isStaticFactory())
+            .findFirst()
+            .ifPresentOrElse(
+                x -> {},
+                () ->
+                    logError(
+                        typeElement,
+                        "Generic adapters require a public static JsonAdapter.Factory FACTORY field"));
 
         metaData.addFactory(type);
       } else {
+        ElementFilter.constructorsIn(typeElement.getEnclosedElements()).stream()
+            .filter(m -> m.getModifiers().contains(Modifier.PUBLIC))
+            .filter(m -> m.getParameters().size() == 1)
+            .map(m -> m.getParameters().get(0).asType().toString())
+            .map(Util::trimAnnotations)
+            .filter("io.avaje.jsonb.Jsonb"::equals)
+            .findAny()
+            .ifPresentOrElse(
+                x -> {},
+                () ->
+                    logError(
+                        typeElement,
+                        "Non-Generic adapters must have a public constructor with a single Jsonb parameter"));
+
         metaData.add(type);
       }
     }

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

@@ -3,6 +3,7 @@
 import javax.lang.model.element.TypeElement;
 
 import static io.avaje.jsonb.generator.ProcessingContext.element;
+import static io.avaje.jsonb.generator.ProcessingContext.logError;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -139,18 +140,29 @@ static String initLower(String name) {
 
   /** Return the base type given the JsonAdapter type. */
   static String baseTypeOfAdapter(String adapterFullName) {
-    TypeElement element = element(adapterFullName);
+    final var element = element(adapterFullName);
     if (element == null) {
       throw new NullPointerException("Element not found for [" + adapterFullName + "]");
     }
-    return element(adapterFullName).getInterfaces().stream()
-      .filter(t -> t.toString().contains("io.avaje.jsonb.JsonAdapter"))
-      .findFirst()
-      .map(Object::toString)
-      .map(GenericType::parse)
-      .map(GenericType::firstParamType)
-      .map(Util::extractTypeWithNest)
-      .orElseThrow(() -> new IllegalStateException("Adapter: " + adapterFullName + " does not directly implement JsonAdapter"));
+    return baseTypeOfAdapter(element);
+  }
+
+  static String baseTypeOfAdapter(TypeElement element) {
+
+    return element.getInterfaces().stream()
+        .filter(t -> t.toString().contains("io.avaje.jsonb.JsonAdapter"))
+        .findFirst()
+        .map(Object::toString)
+        .map(GenericType::parse)
+        .map(GenericType::firstParamType)
+        .map(Util::extractTypeWithNest)
+        .orElseGet(
+            () -> {
+              logError(
+                  element,
+                  "Custom Adapters must implement JsonAdapter");
+              return "Invalid";
+            });
   }
 
   static String extractTypeWithNest(String fullType) {