Merge pull request #45408 from geoand/rr-jackson-beans

Make Quarkus REST Jackson beans ApplicationScoped
quarkusio · Jan 10, 2025 · 8da6801 · 8da6801
2 parents dc41fd1 + 1e63ad9
commit 8da6801
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 1 deletion.
diff --git a/...rkus/resteasy/reactive/jackson/deployment/processor/ResteasyReactiveJacksonProcessor.java b/...rkus/resteasy/reactive/jackson/deployment/processor/ResteasyReactiveJacksonProcessor.java
@@ -47,6 +47,7 @@
 import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
 import io.quarkus.arc.deployment.SynthesisFinishedBuildItem;
 import io.quarkus.arc.deployment.SyntheticBeanBuildItem;
+import io.quarkus.arc.processor.DotNames;
 import io.quarkus.builder.item.SimpleBuildItem;
 import io.quarkus.deployment.Capabilities;
 import io.quarkus.deployment.Capability;
@@ -163,7 +164,9 @@ AdditionalBeanBuildItem beans() {
                 // just because it's a bean.
                 // Whether it is used in RESTEasy Reactive is determined elsewhere
                 .addBeanClass(FullyFeaturedServerJacksonMessageBodyWriter.class)
-                .setUnremovable().build();
+                .setDefaultScope(DotNames.APPLICATION_SCOPED)
+                .setUnremovable()
+                .build();
     }
 
     @BuildStep

diff --git a/...resteasy/reactive/jackson/runtime/serialisers/AbstractServerJacksonMessageBodyReader.java b/...resteasy/reactive/jackson/runtime/serialisers/AbstractServerJacksonMessageBodyReader.java
@@ -23,6 +23,11 @@ public abstract class AbstractServerJacksonMessageBodyReader extends AbstractJso
 
     protected final LazyValue<ObjectReader> defaultReader;
 
+    // used by Arc
+    protected AbstractServerJacksonMessageBodyReader() {
+        defaultReader = null;
+    }
+
     public AbstractServerJacksonMessageBodyReader(Instance<ObjectMapper> mapper) {
         this.defaultReader = new LazyValue<>(new Supplier<>() {
             @Override

diff --git a/...us/resteasy/reactive/jackson/runtime/serialisers/BasicServerJacksonMessageBodyWriter.java b/...us/resteasy/reactive/jackson/runtime/serialisers/BasicServerJacksonMessageBodyWriter.java
@@ -34,6 +34,11 @@ public class BasicServerJacksonMessageBodyWriter extends ServerMessageBodyWriter
     private final LazyValue<ObjectWriter> defaultWriter;
     private final Map<JavaType, ObjectWriter> genericWriters = new ConcurrentHashMap<>();
 
+    // used by Arc
+    public BasicServerJacksonMessageBodyWriter() {
+        defaultWriter = null;
+    }
+
     @Inject
     public BasicServerJacksonMessageBodyWriter(Instance<ObjectMapper> mapper) {
         this.defaultWriter = new LazyValue<>(new Supplier<>() {

diff --git a/...asy/reactive/jackson/runtime/serialisers/FullyFeaturedServerJacksonMessageBodyReader.java b/...asy/reactive/jackson/runtime/serialisers/FullyFeaturedServerJacksonMessageBodyReader.java
@@ -46,6 +46,12 @@ public class FullyFeaturedServerJacksonMessageBodyReader extends AbstractServerJ
     private final ConcurrentMap<Class<?>, ObjectMapper> contextResolverMap = new ConcurrentHashMap<>();
     private final ConcurrentMap<ObjectMapper, ObjectReader> objectReaderMap = new ConcurrentHashMap<>();
 
+    // used by Arc
+    public FullyFeaturedServerJacksonMessageBodyReader() {
+        originalMapper = null;
+        providers = null;
+    }
+
     @Inject
     public FullyFeaturedServerJacksonMessageBodyReader(Instance<ObjectMapper> mapper, Providers providers) {
         super(mapper);

diff --git a/...asy/reactive/jackson/runtime/serialisers/FullyFeaturedServerJacksonMessageBodyWriter.java b/...asy/reactive/jackson/runtime/serialisers/FullyFeaturedServerJacksonMessageBodyWriter.java
@@ -46,6 +46,13 @@ public class FullyFeaturedServerJacksonMessageBodyWriter extends ServerMessageBo
     private final ConcurrentMap<Class<?>, ObjectMapper> contextResolverMap = new ConcurrentHashMap<>();
     private final ConcurrentMap<ObjectMapper, ObjectWriter> objectWriterMap = new ConcurrentHashMap<>();
 
+    // used by Arc
+    public FullyFeaturedServerJacksonMessageBodyWriter() {
+        originalMapper = null;
+        providers = null;
+        defaultWriter = null;
+    }
+
     @Inject
     public FullyFeaturedServerJacksonMessageBodyWriter(Instance<ObjectMapper> mapper, Providers providers) {
         this.originalMapper = mapper;

diff --git a/...quarkus/resteasy/reactive/jackson/runtime/serialisers/ServerJacksonMessageBodyReader.java b/...quarkus/resteasy/reactive/jackson/runtime/serialisers/ServerJacksonMessageBodyReader.java
@@ -27,6 +27,11 @@
 public class ServerJacksonMessageBodyReader extends AbstractServerJacksonMessageBodyReader
         implements ServerMessageBodyReader<Object> {
 
+    // used by Arc
+    public ServerJacksonMessageBodyReader() {
+
+    }
+
     @Inject
     public ServerJacksonMessageBodyReader(Instance<ObjectMapper> mapper) {
         super(mapper);