Ensure that Amazon Lambda uses the ObjectMapper bean when available

extensions/amazon-lambda/runtime/src/main/java/io/quarkus/amazon/lambda/runtime/AmazonLambdaRecorder.java

@@ -22,6 +22,8 @@
 import com.fasterxml.jackson.databind.ObjectReader;
 import com.fasterxml.jackson.databind.ObjectWriter;
 
+import io.quarkus.arc.Arc;
+import io.quarkus.arc.InstanceHandle;
 import io.quarkus.arc.runtime.BeanContainer;
 import io.quarkus.runtime.Application;
 import io.quarkus.runtime.ShutdownContext;
@@ -45,14 +47,22 @@ public class AmazonLambdaRecorder {
     public void setHandlerClass(Class<? extends RequestHandler<?, ?>> handler, BeanContainer container) {
         handlerClass = handler;
         beanContainer = container;
-        objectMapper = new ObjectMapper()
+        AmazonLambdaRecorder.objectMapper = getObjectMapper()
                 .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
                 .configure(MapperFeature.ACCEPT_CASE_INSENSITIVE_PROPERTIES, true);
         Method handlerMethod = discoverHandlerMethod(handlerClass);
         objectReader = objectMapper.readerFor(handlerMethod.getParameterTypes()[0]);
         objectWriter = objectMapper.writerFor(handlerMethod.getReturnType());
     }
 
+    private ObjectMapper getObjectMapper() {
+        InstanceHandle<ObjectMapper> instance = Arc.container().instance(ObjectMapper.class);
+        if (instance.isAvailable()) {
+            return instance.get().copy();
+        }
+        return new ObjectMapper();
+    }
+
     /**
      * Called by JVM handler wrapper
      *

test-framework/amazon-lambda/src/main/java/io/quarkus/amazon/lambda/test/LambdaClient.java

@@ -9,6 +9,10 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import io.quarkus.arc.Arc;
+import io.quarkus.arc.ArcContainer;
+import io.quarkus.arc.InstanceHandle;
+
 public class LambdaClient {
 
     private static final AtomicInteger REQUEST_ID_GENERATOR = new AtomicInteger();
@@ -46,7 +50,7 @@ public static <T> T invoke(Class<T> returnType, Object input) {
             throw new RuntimeException(problem);
         }
         try {
-            final ObjectMapper mapper = new ObjectMapper();
+            final ObjectMapper mapper = getObjectMapper();
             String id = "aws-request-" + REQUEST_ID_GENERATOR.incrementAndGet();
             CompletableFuture<String> result = new CompletableFuture<>();
             REQUESTS.put(id, result);
@@ -82,4 +86,16 @@ public String setValue(String value) {
         }
     }
 
+    private static ObjectMapper getObjectMapper() {
+        ArcContainer container = Arc.container();
+        if (container == null) {
+            return new ObjectMapper();
+        }
+        InstanceHandle<ObjectMapper> instance = container.instance(ObjectMapper.class);
+        if (instance.isAvailable()) {
+            return instance.get();
+        }
+        return new ObjectMapper();
+    }
+
 }