Merge pull request #41604 from gsmet/introspector-cache

Clear the Introspector caches in tests
quarkusio · Jul 2, 2024 · 0fb113e · 0fb113e
2 parents ca73df4 + bff1924
commit 0fb113e
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/test-framework/junit5-internal/src/main/java/io/quarkus/test/ClearCache.java b/test-framework/junit5-internal/src/main/java/io/quarkus/test/ClearCache.java
@@ -1,5 +1,6 @@
 package io.quarkus.test;
 
+import java.beans.Introspector;
 import java.lang.reflect.Field;
 import java.util.Map;
 
@@ -10,14 +11,28 @@ public class ClearCache {
 
     private static final Logger log = Logger.getLogger(ClearCache.class);
 
-    public static void clearAnnotationCache() {
+    public static void clearCaches() {
+        clearAnnotationCache();
+        clearBeansIntrospectorCache();
+    }
+
+    private static void clearAnnotationCache() {
         try {
             Field f = AnnotationUtils.class.getDeclaredField("repeatableAnnotationContainerCache");
             f.setAccessible(true);
             ((Map) (f.get(null))).clear();
         } catch (NoSuchFieldException | IllegalAccessException e) {
             //ignore
-            log.debug("Failed to clear cache", e);
+            log.debug("Failed to clear annotation cache", e);
+        }
+    }
+
+    private static void clearBeansIntrospectorCache() {
+        try {
+            Introspector.flushCaches();
+        } catch (Exception e) {
+            //ignore
+            log.debug("Failed to clear java.beans.Introspector cache", e);
         }
     }
 }
diff --git a/test-framework/junit5-internal/src/main/java/io/quarkus/test/QuarkusDevModeTest.java b/test-framework/junit5-internal/src/main/java/io/quarkus/test/QuarkusDevModeTest.java
@@ -324,7 +324,7 @@ public void afterAll(ExtensionContext context) throws Exception {
         rootLogger.setHandlers(originalRootLoggerHandlers);
         inMemoryLogHandler.clearRecords();
         inMemoryLogHandler.setFilter(null);
-        ClearCache.clearAnnotationCache();
+        ClearCache.clearCaches();
         TestConfigUtil.cleanUp();
     }
 

diff --git a/test-framework/junit5-internal/src/main/java/io/quarkus/test/QuarkusUnitTest.java b/test-framework/junit5-internal/src/main/java/io/quarkus/test/QuarkusUnitTest.java
@@ -769,7 +769,7 @@ public void afterAll(ExtensionContext extensionContext) throws Exception {
             if (afterAllCustomizer != null) {
                 afterAllCustomizer.run();
             }
-            ClearCache.clearAnnotationCache();
+            ClearCache.clearCaches();
             TestConfigUtil.cleanUp();
         }
         if (records != null) {