fix: Clear Spring caches for beans created using createBean

Fixes #630
HotswapProjects · Jan 20, 2025 · 013a4d9 · 013a4d9
1 parent a86384c
commit 013a4d9
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 5 deletions.
diff --git a/...ugin/src/main/java/org/hotswap/agent/plugin/spring/core/ResetBeanPostProcessorCaches.java b/...ugin/src/main/java/org/hotswap/agent/plugin/spring/core/ResetBeanPostProcessorCaches.java
@@ -99,23 +99,44 @@ public static void resetInitDestroyAnnotationBeanPostProcessorCache(InitDestroyA
         }
     }
 
+    public static boolean isCached(Class<?> clazz, DefaultListableBeanFactory beanFactory) {
+        for (BeanPostProcessor bpp : beanFactory.getBeanPostProcessors()) {
+            if (bpp instanceof AutowiredAnnotationBeanPostProcessor) {
+                if (isCached(clazz, (AutowiredAnnotationBeanPostProcessor) bpp)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    private static boolean isCached(Class<?> clazz, AutowiredAnnotationBeanPostProcessor bpp) {
+        return getAutowiredAnnotationBeanPostProcessorConstructorCache(bpp).containsKey(clazz);
+    }
+
     // @Autowired cache
     public static void resetAutowiredAnnotationBeanPostProcessorCache(AutowiredAnnotationBeanPostProcessor bpp) {
+        getAutowiredAnnotationBeanPostProcessorConstructorCache(bpp).clear();
+        LOGGER.trace("Cache cleared: AutowiredAnnotationBeanPostProcessor.candidateConstructorsCache");
+        resetAnnotationBeanPostProcessorCache(bpp, AutowiredAnnotationBeanPostProcessor.class);
+    }
+
+    private static Map<Class<?>, Constructor<?>[]> getAutowiredAnnotationBeanPostProcessorConstructorCache(
+            AutowiredAnnotationBeanPostProcessor bpp) {
         try {
             Field field = AutowiredAnnotationBeanPostProcessor.class.getDeclaredField("candidateConstructorsCache");
             field.setAccessible(true);
             // noinspection unchecked
-            Map<Class<?>, Constructor<?>[]> candidateConstructorsCache = (Map<Class<?>, Constructor<?>[]>) field.get(bpp);
-            candidateConstructorsCache.clear();
-            LOGGER.trace("Cache cleared: AutowiredAnnotationBeanPostProcessor.candidateConstructorsCache");
+            return (Map<Class<?>, Constructor<?>[]>) field.get(bpp);
         } catch (Exception e) {
-            throw new IllegalStateException("Unable to clear AutowiredAnnotationBeanPostProcessor.candidateConstructorsCache", e);
+            throw new IllegalStateException(
+                    "Unable to access AutowiredAnnotationBeanPostProcessor.candidateConstructorsCache", e);
         }
-        resetAnnotationBeanPostProcessorCache(bpp, AutowiredAnnotationBeanPostProcessor.class);
     }
 
     /**
      * deal injectionMetadataCache field of
+     * 
      * @see org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor
      * @see org.springframework.context.annotation.CommonAnnotationBeanPostProcessor
      */

diff --git a/...-spring-plugin/src/main/java/org/hotswap/agent/plugin/spring/reload/SpringBeanReload.java b/...-spring-plugin/src/main/java/org/hotswap/agent/plugin/spring/reload/SpringBeanReload.java
@@ -328,6 +328,11 @@ private boolean preCheckReload() {
                     if ((names == null || names.length == 0) && !isFactoryMethod(clazz)) {
                         LOGGER.trace("the class '{}' is not spring bean or factory class", clazz.getName());
                         iterator.remove();
+
+                        // The class might still be cached if it was created using createBean
+                        if (ResetBeanPostProcessorCaches.isCached(clazz, beanFactory)) {
+                            clearSpringCache();
+                        }
                     } else {
                         LOGGER.debug("the class '{}' is spring bean or factory class", clazz.getName());
                     }