allow simple custom adapters

avaje · Aug 3, 2024 · c3f217d · c3f217d
1 parent c117e1a
commit c3f217d
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 3 deletions.
diff --git a/jsonb-generator/src/main/java/io/avaje/jsonb/generator/JsonbProcessor.java b/jsonb-generator/src/main/java/io/avaje/jsonb/generator/JsonbProcessor.java
@@ -136,7 +136,7 @@ private void registerCustomAdapters(Set<? extends Element> elements) {
           .findAny()
           .ifPresentOrElse(
             x -> {},
-            () -> logError(typeElement, "Non-Generic adapters must have a public constructor with a single Jsonb parameter"));
+            () -> logNote(typeElement, "Non-Generic adapters should have a public constructor with a single Jsonb parameter"));
 
         metaData.add(type);
       }

diff --git a/jsonb-generator/src/test/java/io/avaje/jsonb/generator/models/valid/CustomJsonAdapter.java b/jsonb-generator/src/test/java/io/avaje/jsonb/generator/models/valid/CustomJsonAdapter.java
@@ -4,13 +4,12 @@
 import io.avaje.jsonb.JsonAdapter;
 import io.avaje.jsonb.JsonReader;
 import io.avaje.jsonb.JsonWriter;
-import io.avaje.jsonb.Jsonb;
 import io.avaje.jsonb.generator.models.valid.Example3Packet.Example2Packet;
 
 @CustomAdapter
 public class CustomJsonAdapter implements JsonAdapter<Example2Packet> {
 
-  public CustomJsonAdapter(Jsonb jsonb) {}
+//  public CustomJsonAdapter(Jsonb jsonb) {}
 
   @Override
   public void toJson(JsonWriter writer, Example2Packet value) {}

diff --git a/jsonb/src/main/java/io/avaje/jsonb/Jsonb.java b/jsonb/src/main/java/io/avaje/jsonb/Jsonb.java
@@ -13,6 +13,7 @@
 import java.io.Reader;
 import java.io.Writer;
 import java.lang.reflect.Type;
+import java.util.function.Supplier;
 
 /**
  * Provides access to json adapters by type.
@@ -386,6 +387,11 @@ interface Builder {
      */
     <T> Builder add(Type type, JsonAdapter<T> jsonAdapter);
 
+    /**
+     * Add a Supplier which provides a JsonAdapter to use for the given type.
+     */
+    <T> Builder add(Type type, Supplier<JsonAdapter<T>> builder);
+
     /**
      * Add a AdapterBuilder which provides a JsonAdapter to use for the given type.
      */

diff --git a/jsonb/src/main/java/io/avaje/jsonb/core/DJsonb.java b/jsonb/src/main/java/io/avaje/jsonb/core/DJsonb.java
@@ -13,6 +13,7 @@
 import java.lang.reflect.Type;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Supplier;
 
 import static io.avaje.jsonb.core.Util.*;
 import static java.util.Objects.requireNonNull;
@@ -276,6 +277,11 @@ public <T> Builder add(Type type, JsonAdapter<T> jsonAdapter) {
       return add(newAdapterFactory(type, jsonAdapter));
     }
 
+    @Override
+    public <T> Builder add(Type type, Supplier<JsonAdapter<T>> jsonAdapter) {
+      return add(newAdapterFactory(type, jsonAdapter));
+    }
+
     @Override
     public Builder add(JsonbComponent component) {
       component.register(this);
@@ -317,6 +323,12 @@ static <T> JsonAdapter.Factory newAdapterFactory(Type type, JsonAdapter<T> jsonA
       return (targetType, jsonb) -> simpleMatch(type, targetType) ? jsonAdapter : null;
     }
 
+    static <T> JsonAdapter.Factory newAdapterFactory(Type type, Supplier<JsonAdapter<T>> jsonAdapter) {
+      requireNonNull(type);
+      requireNonNull(jsonAdapter);
+      return (targetType, jsonb) -> simpleMatch(type, targetType) ? jsonAdapter.get() : null;
+    }
+
     static JsonAdapter.Factory newAdapterFactory(Type type, AdapterBuilder builder) {
       requireNonNull(type);
       requireNonNull(builder);