replace duplicate code with Java.parameterNames()

codeborne · Dec 21, 2016 · e847a29 · e847a29
1 parent e598276
commit e847a29
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/framework/src/play/mvc/Controller.java b/framework/src/play/mvc/Controller.java
@@ -722,10 +722,7 @@ protected static void redirect(String action, boolean permanent, Object... args)
         try {
             Map<String, Object> newArgs = new HashMap<>(args.length);
             Method actionMethod = (Method) ActionInvoker.getActionMethod(action)[1];
-            String[] names = (String[]) actionMethod.getDeclaringClass()
-                    .getDeclaredField(
-                            "$" + actionMethod.getName() + LocalVariablesNamesTracer.computeMethodHash(actionMethod.getParameterTypes()))
-                    .get(null);
+            String[] names = Java.parameterNames(actionMethod);
             for (int i = 0; i < names.length && i < args.length; i++) {
                 Annotation[] annotations = actionMethod.getParameterAnnotations()[i];
                 boolean isDefault = false;

diff --git a/framework/src/play/templates/GroovyTemplate.java b/framework/src/play/templates/GroovyTemplate.java
@@ -540,7 +540,7 @@ public Object invokeMethod(String name, Object param) {
                     try {
                         Map<String, Object> r = new HashMap<>();
                         Method actionMethod = (Method) ActionInvoker.getActionMethod(action)[1];
-                        String[] names = (String[]) actionMethod.getDeclaringClass().getDeclaredField("$" + actionMethod.getName() + LocalVariablesNamesTracer.computeMethodHash(actionMethod.getParameterTypes())).get(null);
+                        String[] names = Java.parameterNames(actionMethod);
                         if (param instanceof Object[]) {
                             if(((Object[])param).length == 1 && ((Object[])param)[0] instanceof Map) {
                                 r = (Map<String,Object>)((Object[])param)[0];