Allow to register generated Jackson serializers at any moment during quarkus strartup

Author: mariofusco

extensions/resteasy-reactive/rest-jackson/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/runtime/ResteasyReactiveServerJacksonRecorder.java

@@ -2,9 +2,7 @@
 
 import java.lang.reflect.Type;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Map;
-import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.BiConsumer;
 import java.util.function.BiFunction;
@@ -18,6 +16,7 @@
 
 import io.quarkus.arc.Arc;
 import io.quarkus.resteasy.reactive.jackson.runtime.security.RolesAllowedConfigExpStorage;
+import io.quarkus.resteasy.reactive.jackson.runtime.serialisers.GeneratedSerializersRegister;
 import io.quarkus.runtime.RuntimeValue;
 import io.quarkus.runtime.ShutdownContext;
 import io.quarkus.runtime.annotations.Recorder;
@@ -29,9 +28,6 @@ public class ResteasyReactiveServerJacksonRecorder {
     private static final Map<String, Class<?>> customSerializationMap = new HashMap<>();
     private static final Map<String, Class<?>> customDeserializationMap = new HashMap<>();
 
-    private static final Set<Class<? extends StdSerializer>> generatedSerializers = new HashSet<>();
-    private static final Set<Class<? extends StdDeserializer>> generatedDeserializers = new HashSet<>();
-
     /* STATIC INIT */
     public RuntimeValue<Map<String, Supplier<String[]>>> createConfigExpToAllowedRoles() {
         return new RuntimeValue<>(new ConcurrentHashMap<>());
@@ -84,11 +80,11 @@ public void recordCustomDeserialization(String target, String className) {
     }
 
     public void recordGeneratedSerializer(String className) {
-        generatedSerializers.add((Class<? extends StdSerializer>) loadClass(className));
+        GeneratedSerializersRegister.addSerializer((Class<? extends StdSerializer>) loadClass(className));
     }
 
     public void recordGeneratedDeserializer(String className) {
-        generatedDeserializers.add((Class<? extends StdDeserializer>) loadClass(className));
+        GeneratedSerializersRegister.addDeserializer((Class<? extends StdDeserializer>) loadClass(className));
     }
 
     public void configureShutdown(ShutdownContext shutdownContext) {
@@ -131,14 +127,6 @@ public static Class<? extends BiFunction<ObjectMapper, Type, ObjectReader>> cust
         return (Class<? extends BiFunction<ObjectMapper, Type, ObjectReader>>) customDeserializationMap.get(clazz.getName());
     }
 
-    public static Set<Class<? extends StdSerializer>> getGeneratedSerializers() {
-        return generatedSerializers;
-    }
-
-    public static Set<Class<? extends StdDeserializer>> getGeneratedDeserializers() {
-        return generatedDeserializers;
-    }
-
     private Class<?> loadClass(String className) {
         try {
             return Thread.currentThread().getContextClassLoader().loadClass(className);

extensions/resteasy-reactive/rest-jackson/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/runtime/serialisers/GeneratedSerializersRegister.java

@@ -9,7 +9,6 @@
 import com.fasterxml.jackson.databind.BeanDescription;
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.Module;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationConfig;
 import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
@@ -18,51 +17,42 @@
 import com.fasterxml.jackson.databind.ser.std.StdSerializer;
 
 import io.quarkus.jackson.ObjectMapperCustomizer;
-import io.quarkus.resteasy.reactive.jackson.runtime.ResteasyReactiveServerJacksonRecorder;
 
 @Singleton
 public class GeneratedSerializersRegister implements ObjectMapperCustomizer {
 
+    private static final SimpleModule mappingModule = new SimpleModule();
+    private static final ExactSerializers serializers = new ExactSerializers();
+
+    static {
+        // Use a custom SimpleSerializers to use a json serializer only if it has been generated for that
+        // exact class and not one of its sublclasses. This is already the default behaviour for deserializers.
+        mappingModule.setSerializers(serializers);
+    }
+
     @Override
     public void customize(ObjectMapper objectMapper) {
-        objectMapper.registerModule(MappingModuleHolder.mappingModule);
+        objectMapper.registerModule(mappingModule);
     }
 
-    static class MappingModuleHolder {
-        static final Module mappingModule = createMappingModule();
-
-        private static Module createMappingModule() {
-            SimpleModule module = new SimpleModule();
-            // Use a custom SimpleSerializers to use a json serializer only if it has been generated for that
-            // exact class and not one of its sublclasses. This is already the default behaviour for deserializers.
-            ExactSerializers serializers = new ExactSerializers();
-
-            for (Class<? extends StdSerializer> serClass : ResteasyReactiveServerJacksonRecorder.getGeneratedSerializers()) {
-                try {
-                    StdSerializer serializer = serClass.getConstructor().newInstance();
-                    serializers.addExactSerializer(serializer.handledType(), serializer);
-                } catch (InstantiationException | IllegalAccessException | InvocationTargetException
-                        | NoSuchMethodException e) {
-                    throw new RuntimeException(e);
-                }
-            }
-
-            module.setSerializers(serializers);
-
-            for (Class<? extends StdDeserializer> deserClass : ResteasyReactiveServerJacksonRecorder
-                    .getGeneratedDeserializers()) {
-                try {
-                    StdDeserializer deserializer = deserClass.getConstructor().newInstance();
-                    module.addDeserializer(deserializer.handledType(), deserializer);
-                } catch (InstantiationException | IllegalAccessException | InvocationTargetException
-                        | NoSuchMethodException e) {
-                    throw new RuntimeException(e);
-                }
-            }
-
-            return module;
+    public static void addSerializer(Class<? extends StdSerializer> serClass) {
+        try {
+            StdSerializer serializer = serClass.getConstructor().newInstance();
+            serializers.addExactSerializer(serializer.handledType(), serializer);
+        } catch (InstantiationException | IllegalAccessException | InvocationTargetException
+                | NoSuchMethodException e) {
+            throw new RuntimeException(e);
         }
+    }
 
+    public static void addDeserializer(Class<? extends StdDeserializer> deserClass) {
+        try {
+            StdDeserializer deserializer = deserClass.getConstructor().newInstance();
+            mappingModule.addDeserializer(deserializer.handledType(), deserializer);
+        } catch (InstantiationException | IllegalAccessException | InvocationTargetException
+                | NoSuchMethodException e) {
+            throw new RuntimeException(e);
+        }
     }
 
     public static class ExactSerializers extends SimpleSerializers {