Merge pull request #51712 from gsmet/jackson-leak

Fix two class loader-related leaks, one in Jackson, the other in QuarkusClassLoader

Author: gsmet

extensions/jackson/deployment/src/main/java/io/quarkus/jackson/deployment/JacksonProcessor.java

@@ -56,6 +56,7 @@
 import io.quarkus.deployment.annotations.ExecutionTime;
 import io.quarkus.deployment.annotations.Record;
 import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
+import io.quarkus.deployment.builditem.ShutdownListenerBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveHierarchyBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveMethodBuildItem;
@@ -73,9 +74,8 @@
 import io.quarkus.jackson.ObjectMapperCustomizer;
 import io.quarkus.jackson.runtime.ConfigurationCustomizer;
 import io.quarkus.jackson.runtime.JacksonBuildTimeConfig;
+import io.quarkus.jackson.runtime.JacksonRecorder;
 import io.quarkus.jackson.runtime.JacksonSupport;
-import io.quarkus.jackson.runtime.JacksonSupportRecorder;
-import io.quarkus.jackson.runtime.MixinsRecorder;
 import io.quarkus.jackson.runtime.ObjectMapperProducer;
 import io.quarkus.jackson.runtime.VertxHybridPoolObjectMapperCustomizer;
 import io.quarkus.jackson.spi.ClassPathJacksonModuleBuildItem;
@@ -474,7 +474,7 @@ void generateCustomizer(BuildProducer<GeneratedBeanBuildItem> generatedBeans,
 
     @Record(ExecutionTime.STATIC_INIT)
     @BuildStep
-    public void supportMixins(MixinsRecorder recorder,
+    public void supportMixins(JacksonRecorder recorder,
             CombinedIndexBuildItem combinedIndexBuildItem,
             BuildProducer<SyntheticBeanBuildItem> syntheticBeans,
             BuildProducer<ReflectiveClassBuildItem> reflectiveClass) {
@@ -523,7 +523,7 @@ public void supportMixins(MixinsRecorder recorder,
 
     @Record(ExecutionTime.STATIC_INIT)
     @BuildStep
-    public SyntheticBeanBuildItem jacksonSupport(JacksonSupportRecorder recorder,
+    public SyntheticBeanBuildItem jacksonSupport(JacksonRecorder recorder,
             JacksonBuildTimeConfig jacksonBuildTimeConfig) {
         return SyntheticBeanBuildItem
                 .configure(JacksonSupport.class)
@@ -532,6 +532,12 @@ public SyntheticBeanBuildItem jacksonSupport(JacksonSupportRecorder recorder,
                 .done();
     }
 
+    @Record(ExecutionTime.RUNTIME_INIT)
+    @BuildStep
+    public ShutdownListenerBuildItem clearCachesOnShutdown(JacksonRecorder recorder) {
+        return new ShutdownListenerBuildItem(recorder.clearCachesOnShutdown());
+    }
+
     private Optional<String> determinePropertyNamingStrategyClassName(JacksonBuildTimeConfig jacksonBuildTimeConfig) {
         if (jacksonBuildTimeConfig.propertyNamingStrategy().isEmpty()) {
             return Optional.empty();

…kson/runtime/JacksonSupportRecorder.java …kus/jackson/runtime/JacksonRecorder.javaextensions/jackson/runtime/src/main/java/io/quarkus/jackson/runtime/JacksonSupportRecorder.java renamed to extensions/jackson/runtime/src/main/java/io/quarkus/jackson/runtime/JacksonRecorder.java extensions/jackson/runtime/src/main/java/io/quarkus/jackson/runtime/JacksonSupportRecorder.java renamed to extensions/jackson/runtime/src/main/java/io/quarkus/jackson/runtime/JacksonRecorder.java

@@ -1,15 +1,23 @@
 package io.quarkus.jackson.runtime;
 
+import java.util.Map;
 import java.util.Optional;
 import java.util.function.Supplier;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.PropertyNamingStrategies;
+import com.fasterxml.jackson.databind.type.TypeFactory;
 
+import io.quarkus.jackson.ObjectMapperCustomizer;
 import io.quarkus.runtime.annotations.Recorder;
+import io.quarkus.runtime.annotations.RuntimeInit;
+import io.quarkus.runtime.annotations.StaticInit;
+import io.quarkus.runtime.shutdown.ShutdownListener;
 
 @Recorder
-public class JacksonSupportRecorder {
+public class JacksonRecorder {
 
+    @StaticInit
     public Supplier<JacksonSupport> supplier(Optional<String> propertyNamingStrategyClassName) {
         return new Supplier<>() {
             @Override
@@ -36,4 +44,36 @@ public Optional<PropertyNamingStrategies.NamingBase> configuredNamingStrategy()
             }
         };
     }
+
+    @StaticInit
+    public Supplier<ObjectMapperCustomizer> customizerSupplier(Map<Class<?>, Class<?>> mixinsMap) {
+        return new Supplier<>() {
+            @Override
+            public ObjectMapperCustomizer get() {
+                return new ObjectMapperCustomizer() {
+                    @Override
+                    public void customize(ObjectMapper objectMapper) {
+                        for (var entry : mixinsMap.entrySet()) {
+                            objectMapper.addMixIn(entry.getKey(), entry.getValue());
+                        }
+                    }
+
+                    @Override
+                    public int priority() {
+                        return DEFAULT_PRIORITY + 1;
+                    }
+                };
+            }
+        };
+    }
+
+    @RuntimeInit
+    public ShutdownListener clearCachesOnShutdown() {
+        return new ShutdownListener() {
+            @Override
+            public void shutdown(ShutdownNotification notification) {
+                TypeFactory.defaultInstance().clearCache();
+            }
+        };
+    }
 }

extensions/jackson/runtime/src/main/java/io/quarkus/jackson/runtime/MixinsRecorder.java

@@ -233,6 +233,8 @@ public void reset(Map<String, byte[]> generatedResources, Map<String, byte[]> tr
             throw new IllegalStateException("Classloader is not resettable");
         }
         synchronized (this) {
+            // we don't want the previous MemoryClassPathElement to leak as a key of protectionDomains
+            protectionDomains.remove(this.transformedClasses);
             this.transformedClasses = new MemoryClassPathElement(transformedClasses, true);
             resettableElement.reset(generatedResources);
             classPathResourceIndex = null;