From 9d0852485a6da9ffab7735ba798724fa80c82488 Mon Sep 17 00:00:00 2001
From: Georgios Andrianakis <geoand@gmail.com>
Date: Fri, 8 Sep 2023 08:54:05 +0300
Subject: [PATCH] Polish ContextResolver beans

---
 .../QuarkusObjectMapperContextResolver.java       |  8 +++++---
 .../jsonb/QuarkusJsonbContextResolver.java        |  8 +++++---
 .../jaxb/runtime/JAXBContextContextResolver.java  | 15 +++++++++------
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/jackson/QuarkusObjectMapperContextResolver.java b/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/jackson/QuarkusObjectMapperContextResolver.java
index 4cae4c3c70865..8222e25907e99 100644
--- a/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/jackson/QuarkusObjectMapperContextResolver.java
+++ b/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/jackson/QuarkusObjectMapperContextResolver.java
@@ -2,7 +2,6 @@
 
 import jakarta.annotation.Priority;
 import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.inject.Inject;
 import jakarta.ws.rs.Priorities;
 import jakarta.ws.rs.ext.ContextResolver;
 import jakarta.ws.rs.ext.Provider;
@@ -14,8 +13,11 @@
 @Priority(Priorities.USER + 10) // give it a priority that ensures that user supplied ContextResolver classes override this one
 public class QuarkusObjectMapperContextResolver implements ContextResolver<ObjectMapper> {
 
-    @Inject
-    ObjectMapper objectMapper;
+    private final ObjectMapper objectMapper;
+
+    public QuarkusObjectMapperContextResolver(ObjectMapper objectMapper) {
+        this.objectMapper = objectMapper;
+    }
 
     @Override
     public ObjectMapper getContext(Class<?> type) {
diff --git a/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/jsonb/QuarkusJsonbContextResolver.java b/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/jsonb/QuarkusJsonbContextResolver.java
index 437f2f09359e1..c04e472d0cb46 100644
--- a/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/jsonb/QuarkusJsonbContextResolver.java
+++ b/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/jsonb/QuarkusJsonbContextResolver.java
@@ -2,7 +2,6 @@
 
 import jakarta.annotation.Priority;
 import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.inject.Inject;
 import jakarta.json.bind.Jsonb;
 import jakarta.ws.rs.Priorities;
 import jakarta.ws.rs.ext.ContextResolver;
@@ -13,8 +12,11 @@
 @Priority(Priorities.USER + 10) // give it a priority that ensures that user supplied ContextResolver classes override this one
 public class QuarkusJsonbContextResolver implements ContextResolver<Jsonb> {
 
-    @Inject
-    Jsonb jsonb;
+    private final Jsonb jsonb;
+
+    public QuarkusJsonbContextResolver(Jsonb jsonb) {
+        this.jsonb = jsonb;
+    }
 
     @Override
     public Jsonb getContext(Class<?> type) {
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jaxb/runtime/src/main/java/io/quarkus/resteasy/reactive/jaxb/runtime/JAXBContextContextResolver.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jaxb/runtime/src/main/java/io/quarkus/resteasy/reactive/jaxb/runtime/JAXBContextContextResolver.java
index e6143488a9566..187e3bfbd36c0 100644
--- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jaxb/runtime/src/main/java/io/quarkus/resteasy/reactive/jaxb/runtime/JAXBContextContextResolver.java
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jaxb/runtime/src/main/java/io/quarkus/resteasy/reactive/jaxb/runtime/JAXBContextContextResolver.java
@@ -3,7 +3,6 @@
 import java.util.concurrent.ConcurrentHashMap;
 
 import jakarta.enterprise.inject.Instance;
-import jakarta.inject.Inject;
 import jakarta.ws.rs.ext.ContextResolver;
 import jakarta.xml.bind.JAXBContext;
 
@@ -12,13 +11,17 @@
 
 public class JAXBContextContextResolver implements ContextResolver<JAXBContext> {
 
-    private ConcurrentHashMap<Class<?>, JAXBContext> cache = new ConcurrentHashMap<>();
+    private final ConcurrentHashMap<Class<?>, JAXBContext> cache = new ConcurrentHashMap<>();
 
-    @Inject
-    Instance<JaxbContextCustomizer> customizers;
+    private final Instance<JaxbContextCustomizer> customizers;
 
-    @Inject
-    JaxbContextProducer jaxbContextProducer;
+    private final JaxbContextProducer jaxbContextProducer;
+
+    public JAXBContextContextResolver(Instance<JaxbContextCustomizer> customizers,
+            JaxbContextProducer jaxbContextProducer) {
+        this.customizers = customizers;
+        this.jaxbContextProducer = jaxbContextProducer;
+    }
 
     @Override
     public JAXBContext getContext(Class<?> clazz) {