GRAILS-5763 - manually apply all registered factory post processors after each plugin invokes its change handler.

The motivating issue was that the property override mechanism failed when a bean was reloaded by a plugin.

Author: ldaley

src/java/org/codehaus/groovy/grails/plugins/DefaultGrailsPlugin.java

@@ -39,7 +39,10 @@
 import org.codehaus.groovy.grails.documentation.DocumentationContext;
 import org.springframework.beans.BeanWrapper;
 import org.springframework.beans.BeanWrapperImpl;
+import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
+import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.context.ApplicationContext;
+import org.springframework.context.support.GenericApplicationContext;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
 import org.springframework.core.type.filter.TypeFilter;
@@ -1043,6 +1046,16 @@ private void callEvent(Closure closureHook, Map event) {
     private void invokeOnChangeListener(Map event) {
         onChangeListener.setDelegate(this);
         onChangeListener.call(new Object[]{event});
+        
+        // Apply any factory post processors in case the change listener has changed any
+        // bean definitions (GRAILS-5763)
+        if (applicationContext instanceof GenericApplicationContext) {
+            GenericApplicationContext ctx = (GenericApplicationContext) applicationContext;
+            ConfigurableListableBeanFactory beanFactory = ctx.getBeanFactory();
+            for (BeanFactoryPostProcessor postProcessor : ctx.getBeanFactoryPostProcessors()) {
+                postProcessor.postProcessBeanFactory(beanFactory);
+            }
+        }
     }
 
 	public void doArtefactConfiguration() {
@@ -1090,4 +1103,4 @@ public Collection<? extends TypeFilter> getTypeFilters() {
         return this.typeFilters;
     }
 
-}
+}

src/test/org/codehaus/groovy/grails/plugins/CoreGrailsPluginTests.groovy

@@ -85,5 +85,16 @@ class CoreGrailsPluginTests extends AbstractGrailsMockTests {
 
 		assertEquals(1, appCtx.getBean('someTransactionalService').i)
 		assertEquals(2, appCtx.getBean('nonTransactionalService').i)
+
+		// test that the overrides are applied on a reload - GRAILS-5763
+		plugin.manager = [informObservers: { String pluginName, Map event -> }] as GrailsPluginManager
+		plugin.applicationContext = appCtx
+		
+		["SomeTransactionalService", "NonTransactionalService"].each {
+			plugin.notifyOfEvent(GrailsPlugin.EVENT_ON_CHANGE, gcl.loadClass(it))
+		}
+		
+		assertEquals(1, appCtx.getBean('someTransactionalService').i)
+		assertEquals(2, appCtx.getBean('nonTransactionalService').i)
 	}
 }