Use reflection in development mode to invoke actions. Fixes #9686

Author: graemerocher

grails-core/src/main/groovy/org/grails/core/DefaultGrailsControllerClass.java

@@ -18,6 +18,7 @@
 import grails.config.Settings;
 import grails.core.GrailsApplication;
 import grails.core.GrailsControllerClass;
+import grails.util.Environment;
 import grails.util.GrailsClassUtils;
 import grails.web.Action;
 import grails.web.UrlConverter;
@@ -52,7 +53,7 @@ public class DefaultGrailsControllerClass extends AbstractInjectableGrailsClass
     public static final String SCOPE = "scope";
     public static final String SCOPE_SINGLETON = "singleton";
     private String scope;
-    private Map<String, MethodHandle> actions = new HashMap<String, MethodHandle>();
+    private Map<String, ActionInvoker> actions = new HashMap<String, ActionInvoker>();
     private String defaultActionName;
     private String namespace;
     protected Map<String, String> actionUriToViewName = new HashMap<String, String>();
@@ -104,23 +105,27 @@ public String getDefaultAction() {
         return this.defaultActionName;
     }
 
-    private void methodStrategy(Map<String, MethodHandle> methodNames) {
+    private void methodStrategy(Map<String, ActionInvoker> methodNames) {
 
         Class superClass = getClazz();
         MethodHandles.Lookup lookup = MethodHandles.lookup();
         while (superClass != Object.class && superClass != GroovyObject.class) {
             for (Method method : superClass.getMethods()) {
                 if (Modifier.isPublic(method.getModifiers()) && method.getAnnotation(Action.class) != null) {
                     String methodName = method.getName();
-
-                    ReflectionUtils.makeAccessible(method);
-                    MethodHandle mh;
-                    try {
-                        mh = lookup.findVirtual(superClass, methodName, MethodType.methodType(method.getReturnType()));
-                        methodNames.put(methodName, mh);
-                    } catch (NoSuchMethodException | IllegalAccessException e) {
-                        throw new GrailsConfigurationException("Cannot find invokable controller action: " + methodName, e);
+                    if(Environment.isDevelopmentMode()) {
+                        methodNames.put(methodName, new ReflectionInvoker(method));
                     }
+                    else {
+                        MethodHandle mh;
+                        try {
+                            mh = lookup.findVirtual(superClass, methodName, MethodType.methodType(method.getReturnType()));
+                            methodNames.put(methodName, new MethodHandleInvoker(mh));
+                        } catch (NoSuchMethodException | IllegalAccessException e) {
+                            methodNames.put(methodName, new ReflectionInvoker(method));
+                        }
+                    }
+
                 }
             }
             superClass = superClass.getSuperclass();
@@ -177,7 +182,7 @@ public void registerUrlConverter(UrlConverter urlConverter) {
     @Override
     public Object invoke(Object controller, String action) throws Throwable {
         if(action == null) action = this.defaultActionName;
-        MethodHandle handle = actions.get(action);
+        ActionInvoker handle = actions.get(action);
         if(handle == null) throw new IllegalArgumentException("Invalid action name: " + action);
         return handle.invoke(controller);
     }
@@ -187,4 +192,34 @@ public String actionUriToViewName(String actionUri) {
 
         return actionName != null ? actionName : actionUri;
     }
+
+    private interface ActionInvoker {
+        Object invoke(Object controller) throws Throwable;
+    }
+
+    private class ReflectionInvoker implements ActionInvoker {
+        private final Method method;
+
+        public ReflectionInvoker(Method method) {
+            this.method = method;
+            ReflectionUtils.makeAccessible(method);
+        }
+
+        @Override
+        public Object invoke(Object controller) throws Throwable {
+            return method.invoke(controller);
+        }
+    }
+    private class MethodHandleInvoker implements ActionInvoker {
+        private final MethodHandle handle;
+
+        public MethodHandleInvoker(MethodHandle handle) {
+            this.handle = handle;
+        }
+
+        @Override
+        public Object invoke(Object controller) throws Throwable{
+            return handle.invoke(controller);
+        }
+    }
 }