From c564c0dc72f1c4afe060fa4e9486a712dc1d1059 Mon Sep 17 00:00:00 2001 From: dekingorg <77146161+dekingorg@users.noreply.github.com> Date: Wed, 4 Oct 2023 16:15:05 +0800 Subject: [PATCH 1/3] Update pom.xml add cdi-api dependency --- pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pom.xml b/pom.xml index d3375ad..ef38d8a 100644 --- a/pom.xml +++ b/pom.xml @@ -69,6 +69,11 @@ ${junit.version} test + + javax.enterprise + cdi-api + 2.0.SP1 + From cf12498b6c86671017acb48f3b90604c90f7216a Mon Sep 17 00:00:00 2001 From: dekingorg <77146161+dekingorg@users.noreply.github.com> Date: Sun, 8 Oct 2023 23:10:33 +0800 Subject: [PATCH 2/3] Update JacksonJsonbBuilder.java add support for cdi --- .../devcon5/jsonb/jackson/JacksonJsonbBuilder.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/main/java/io/devcon5/jsonb/jackson/JacksonJsonbBuilder.java b/src/main/java/io/devcon5/jsonb/jackson/JacksonJsonbBuilder.java index 4e8aa64..9eae4f9 100644 --- a/src/main/java/io/devcon5/jsonb/jackson/JacksonJsonbBuilder.java +++ b/src/main/java/io/devcon5/jsonb/jackson/JacksonJsonbBuilder.java @@ -15,7 +15,11 @@ */ package io.devcon5.jsonb.jackson; +import java.util.Optional; +import javax.enterprise.context.ApplicationScoped; +import javax.inject.Inject; +import javax.inject.Provider; import javax.json.bind.Jsonb; import javax.json.bind.JsonbBuilder; import javax.json.bind.JsonbConfig; @@ -27,6 +31,7 @@ /** * Jackson2 based implmentation of Jsonb API */ +@ApplicationScoped public class JacksonJsonbBuilder implements JsonbBuilder { /** @@ -60,11 +65,13 @@ public JsonbBuilder withProvider(final JsonProvider jsonProvider) { //noop return this; } - + + @Inject + private Provider mapper; + @Override public Jsonb build() { - - final ObjectMapper mapper = new ObjectMapper(); + final ObjectMapper mapper=Optional.ofNullable(this.mapper).map(Provider::get).orElseGet(ObjectMapper::new); if(!includeNulls){ mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); if(!includeEmpty){ From 6ca1038d83bc9d9180c80c639d14fd8125045ea4 Mon Sep 17 00:00:00 2001 From: dekingorg <77146161+dekingorg@users.noreply.github.com> Date: Sun, 8 Oct 2023 23:13:07 +0800 Subject: [PATCH 3/3] Add files via upload add beans.xml for cdi --- src/main/resources/META-INF/beans.xml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 src/main/resources/META-INF/beans.xml diff --git a/src/main/resources/META-INF/beans.xml b/src/main/resources/META-INF/beans.xml new file mode 100644 index 0000000..6661375 --- /dev/null +++ b/src/main/resources/META-INF/beans.xml @@ -0,0 +1,6 @@ + + + \ No newline at end of file