Skip to content

Fix Repeatable Annotation Name Collision #291

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 20, 2024
Merged

Fix Repeatable Annotation Name Collision #291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c261ded
fix name collision with java base list
SentryMan Nov 20, 2024
b0a3e63
Update JsonbProcessor.java
SentryMan Nov 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion jsonb-generator/src/main/java/io/avaje/jsonb/generator/Constants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion jsonb-generator/src/main/java/io/avaje/jsonb/generator/JsonbProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
2 changes: 1 addition & 1 deletion jsonb-generator/src/main/java/io/avaje/jsonb/generator/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
6 changes: 3 additions & 3 deletions jsonb/src/main/java/io/avaje/jsonb/Json.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -73,7 +73,7 @@
* }</pre>
*/
@Retention(SOURCE)
@Repeatable(List.class)
@Repeatable(Imports.class)
@Target({TYPE, PACKAGE, MODULE})
@interface Import {

Expand All @@ -96,7 +96,7 @@
*/
@Retention(SOURCE)
@Target({TYPE, PACKAGE, MODULE})
@interface List {
@interface Imports {

Import[] value();
}
Expand Down
Loading