Merge pull request #291 from SentryMan/fix-module-import-clash

Fix Repeatable Annotation Name Collision
avaje · Nov 20, 2024 · ecaf94c · ecaf94c
1 parent 3102665
commit ecaf94c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/jsonb-generator/src/main/java/io/avaje/jsonb/generator/Constants.java b/jsonb-generator/src/main/java/io/avaje/jsonb/generator/Constants.java
@@ -6,7 +6,7 @@ final class Constants {
   static final String JSONB = "io.avaje.jsonb.Jsonb";
   static final String JSON = "io.avaje.jsonb.Json";
   static final String JSON_IMPORT = "io.avaje.jsonb.Json.Import";
-  static final String JSON_IMPORT_LIST = "io.avaje.jsonb.Json.Import.List";
+  static final String JSON_IMPORT_LIST = "io.avaje.jsonb.Json.Import.Imports";
   static final String JSON_MIXIN = "io.avaje.jsonb.Json.MixIn";
   static final String IOEXCEPTION = "java.io.IOException";
   static final String METHODHANDLE = "java.lang.invoke.MethodHandle";

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
@@ -245,7 +245,7 @@ private void writeAdaptersForMixInTypes(Set<? extends Element> mixInElements) {
 
   private void writeAdaptersForImportedList(Set<? extends Element> imported) {
     imported.stream()
-      .flatMap(e -> ImportListPrism.getInstanceOn(e).value().stream())
+      .flatMap(e -> ImportsPrism.getInstanceOn(e).value().stream())
       .forEach(this::addImported);
   }
 

diff --git a/jsonb-generator/src/main/java/io/avaje/jsonb/generator/package-info.java b/jsonb-generator/src/main/java/io/avaje/jsonb/generator/package-info.java
@@ -1,7 +1,7 @@
 @GeneratePrism(io.avaje.jsonb.CustomAdapter.class)
 @GeneratePrism(io.avaje.jsonb.Json.class)
 @GeneratePrism(io.avaje.jsonb.Json.Import.class)
-@GeneratePrism(value = io.avaje.jsonb.Json.Import.List.class, name = "ImportListPrism")
+@GeneratePrism(io.avaje.jsonb.Json.Import.Imports.class)
 @GeneratePrism(io.avaje.jsonb.Json.Alias.class)
 @GeneratePrism(io.avaje.jsonb.Json.Creator.class)
 @GeneratePrism(io.avaje.jsonb.Json.Ignore.class)

diff --git a/jsonb/src/main/java/io/avaje/jsonb/Json.java b/jsonb/src/main/java/io/avaje/jsonb/Json.java
@@ -13,7 +13,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import io.avaje.jsonb.Json.Import.List;
+import io.avaje.jsonb.Json.Import.Imports;
 
 /**
  * Marks a type for JSON support.
@@ -73,7 +73,7 @@
    * }</pre>
    */
   @Retention(SOURCE)
-  @Repeatable(List.class)
+  @Repeatable(Imports.class)
   @Target({TYPE, PACKAGE, MODULE})
   @interface Import {
 
@@ -96,7 +96,7 @@
      */
     @Retention(SOURCE)
     @Target({TYPE, PACKAGE, MODULE})
-    @interface List {
+    @interface Imports {
 
       Import[] value();
     }