Merge pull request #9903 from grails/issue_9883

The onStartup() hook wasn't called on Plugins

Author: graemerocher

grails-core/src/main/groovy/grails/boot/config/GrailsApplicationPostProcessor.groovy

@@ -37,9 +37,6 @@ import org.springframework.core.convert.converter.Converter
 import org.springframework.core.env.AbstractEnvironment
 import org.springframework.core.env.ConfigurableEnvironment
 import org.springframework.core.env.EnumerablePropertySource
-import org.springframework.core.env.MapPropertySource
-import org.springframework.core.env.PropertySource
-import org.springframework.util.ClassUtils
 
 /**
  * A {@link BeanDefinitionRegistryPostProcessor} that enhances any ApplicationContext with plugin manager capabilities
@@ -236,6 +233,7 @@ class GrailsApplicationPostProcessor implements BeanDefinitionRegistryPostProces
             Map<String,Object> eventMap = [:]
             eventMap.put('source', pluginManager)
 
+            pluginManager.onStartup(eventMap)
             for(GrailsApplicationLifeCycle lifeCycle in lifeCycleBeans) {
                 lifeCycle.onStartup(eventMap)
             }

grails-core/src/main/groovy/grails/plugins/GrailsPluginManager.java

@@ -108,6 +108,13 @@ public interface GrailsPluginManager extends ApplicationContextAware {
      */
     void doDynamicMethods();
 
+    /**
+     * Executes the {@link Plugin#onStartup(Map)} hook for all plugins
+     *
+     * @param event the Event
+     */
+    void onStartup(Map<String, Object> event);
+
     /**
      * Retrieves a name Grails plugin instance
      *

grails-core/src/main/groovy/org/grails/plugins/AbstractGrailsPluginManager.java

@@ -16,6 +16,7 @@
 package org.grails.plugins;
 
 import grails.artefact.Enhanced;
+import grails.plugins.Plugin;
 import grails.plugins.PluginFilter;
 import org.grails.config.NavigableMap;
 import grails.plugins.GrailsPlugin;
@@ -338,6 +339,14 @@ protected boolean isPluginDisabledForProfile(GrailsPlugin plugin) {
         return applicationContext != null && !plugin.isEnabled(applicationContext.getEnvironment().getActiveProfiles());
     }
 
+    public void onStartup(Map<String, Object> event) {
+        for (GrailsPlugin plugin : pluginList) {
+            if (plugin.getInstance() instanceof Plugin) {
+                ((Plugin)plugin.getInstance()).onStartup(event);
+            }
+        }
+    }
+
     public void shutdown() {
         checkInitialised();
         try {

grails-plugin-testing/src/main/groovy/grails/test/runtime/NoOpGrailsPluginManager.java

@@ -56,6 +56,11 @@ public void doDynamicMethods() {
 
     }
 
+    @Override
+    public void onStartup(Map<String, Object> event) {
+        
+    }
+
     @Override
     public GrailsPlugin getGrailsPlugin(String name) {
         return null;