Fix Custom Adapter Priority (#447)

* fix custom adapter priority

it seems that custom adapters could be overshadowed in some cases

* Update JsonbProcessor.java

Author: SentryMan

blackbox-test/src/main/java/org/example/other/custom/CustomClashJsonAdapter.java

@@ -0,0 +1,41 @@
+package org.example.other.custom;
+
+import java.lang.reflect.Type;
+import java.util.List;
+
+import io.avaje.json.JsonAdapter;
+import io.avaje.json.JsonReader;
+import io.avaje.json.JsonWriter;
+import io.avaje.jsonb.AdapterFactory;
+import io.avaje.jsonb.CustomAdapter;
+import io.avaje.jsonb.Json;
+import io.avaje.jsonb.Jsonb;
+import io.avaje.jsonb.Types;
+
+@CustomAdapter
+public class CustomClashJsonAdapter<T>
+    implements JsonAdapter<CustomClashJsonAdapter.NestedGeneric<T>> {
+
+  public static final AdapterFactory FACTORY =
+      (type, jsonb) -> {
+        if (Types.isGenericTypeOf(type, NestedGeneric.class)) {
+          return new CustomClashJsonAdapter<>(jsonb, Types.typeArguments(type));
+        }
+        return null;
+      };
+
+  public CustomClashJsonAdapter(Jsonb jsonb, Type[] types) {}
+
+  public record NestedGeneric<T>(T value) {}
+
+  @Json
+  public record NestedGeneric2(List<NestedGeneric<String>> value) {}
+
+  @Override
+  public void toJson(JsonWriter writer, NestedGeneric<T> value) {}
+
+  @Override
+  public NestedGeneric<T> fromJson(JsonReader reader) {
+    return null;
+  }
+}

blackbox-test/src/test/resources/org/example/other/custom/CustomClashJsonAdapterTest.java

@@ -0,0 +1,25 @@
+package org.example.other.custom;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.*;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import io.avaje.jsonb.Jsonb;
+import io.avaje.jsonb.Types;
+
+class CustomClashJsonAdapterTest {
+
+  @Test
+  void test() {
+    assertThat(Jsonb.instance().adapter(CustomClashJsonAdapter.NestedGeneric.class))
+        .isInstanceOf(CustomClashJsonAdapter.class);
+
+    assertThat(
+            Jsonb.instance()
+                .adapter(Types.newParameterizedType(CustomClashJsonAdapter.class, String.class)))
+        .isInstanceOf(CustomClashJsonAdapter.class);
+  }
+}

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

@@ -4,10 +4,12 @@
 import static io.avaje.jsonb.generator.APContext.logError;
 import static io.avaje.jsonb.generator.APContext.logNote;
 import static io.avaje.jsonb.generator.APContext.typeElement;
-import static io.avaje.jsonb.generator.Constants.*;
+import static io.avaje.jsonb.generator.Constants.JSON;
+import static io.avaje.jsonb.generator.Constants.JSON_IMPORT;
+import static io.avaje.jsonb.generator.Constants.JSON_IMPORT_LIST;
+import static io.avaje.jsonb.generator.Constants.JSON_MIXIN;
 import static io.avaje.jsonb.generator.ProcessingContext.addImportedPrism;
 import static io.avaje.jsonb.generator.ProcessingContext.createMetaInfWriterFor;
-import static io.avaje.jsonb.generator.ValuePrism.*;
 import static java.util.stream.Collectors.joining;
 
 import java.io.IOException;
@@ -115,14 +117,13 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
     }
     APContext.setProjectModuleElement(annotations, round);
     readModule();
-
-    getElements(round, CustomAdapterPrism.PRISM_TYPE).ifPresent(this::registerCustomAdapters);
     getElements(round, ValuePrism.PRISM_TYPE).ifPresent(this::writeValueAdapters);
     getElements(round, JSON).ifPresent(this::writeAdapters);
     getElements(round, JSON_MIXIN).ifPresent(this::writeAdaptersForMixInTypes);
     getElements(round, JSON_IMPORT_LIST).ifPresent(this::writeAdaptersForImportedList);
     getElements(round, JSON_IMPORT).ifPresent(this::writeAdaptersForImported);
     getElements(round, "io.avaje.spi.ServiceProvider").ifPresent(this::registerSPI);
+    getElements(round, CustomAdapterPrism.PRISM_TYPE).ifPresent(this::registerCustomAdapters);
 
     metaData.fullName(false);
     cascadeTypes();