Fix RouteArgs priority (you can override them for a specific call)

Author: guillaumebort

framework/src/play/mvc/Router.java

@@ -35,7 +35,6 @@ public class Router {
      * Pattern used to locate a method override instruction in request.querystring
      */
     static Pattern methodOverride = new Pattern("^.*x-http-method-override=({method}GET|PUT|POST|DELETE).*$");
-
     /**
      * Timestamp the routes file was last loaded at.
      */
@@ -165,6 +164,11 @@ static void parse(VirtualFile routeFile, String prefix) {
             // Mutable map needs to be passed in.
             content = TemplateLoader.load(routeFile).render(new HashMap<String, Object>(16));
         }
+        parse(content, prefix, fileAbsolutePath);
+    }
+
+    static void parse(String content, String prefix, String fileAbsolutePath) {
+        int lineNumber = 0;
         for (String line : content.split("\n")) {
             lineNumber++;
             line = line.trim().replaceAll("\\s+", " ");
@@ -225,7 +229,6 @@ public static void detectChanges(String prefix) {
             }
         }
     }
-
     /**
      * All the loaded routes.
      */
@@ -372,7 +375,11 @@ public static ActionDefinition reverse(String action, Map<String, Object> args)
         Map<String, Object> argsbackup = new HashMap<String, Object>(args);
         // Add routeArgs
         if (Scope.RouteArgs.current() != null) {
-            args.putAll(Scope.RouteArgs.current().data);
+            for (String key : Scope.RouteArgs.current().data.keySet()) {
+                if (!args.containsKey(key)) {
+                    args.put(key, Scope.RouteArgs.current().data.get(key));
+                }               
+            }
         }
         for (Route route : routes) {
             if (route.actionPattern != null) {
@@ -437,14 +444,14 @@ public static ActionDefinition reverse(String action, Map<String, Object> args)
                                     List<Object> vals = (List<Object>) value;
                                     try {
                                         path = path.replaceAll("\\{(<[^>]+>)?" + key + "\\}", URLEncoder.encode(vals.get(0).toString().replace("$", "\\$"), "utf-8"));
-                                    } catch(UnsupportedEncodingException e) {
+                                    } catch (UnsupportedEncodingException e) {
                                         throw new UnexpectedException(e);
                                     }
                                 } else {
                                     try {
                                         path = path.replaceAll("\\{(<[^>]+>)?" + key + "\\}", URLEncoder.encode(value.toString().replace("$", "\\$"), "utf-8").replace("%3A", ":").replace("%40", "@"));
                                         host = host.replaceAll("\\{(<[^>]+>)?" + key + "\\}", URLEncoder.encode(value.toString().replace("$", "\\$"), "utf-8").replace("%3A", ":").replace("%40", "@"));
-                                    } catch(UnsupportedEncodingException e) {
+                                    } catch (UnsupportedEncodingException e) {
                                         throw new UnexpectedException(e);
                                     }
                                 }
@@ -506,31 +513,27 @@ public static ActionDefinition reverse(String action, Map<String, Object> args)
     }
 
     public static class ActionDefinition {
+
         /**
          * The domain/host name.
          */
         public String host;
-
         /**
          * The HTTP method, e.g. "GET".
          */
         public String method;
-
         /**
          * @todo - what is this? does it include the domain?
          */
         public String url;
-
         /**
          * Whether the route contains an astericks *.
          */
         public boolean star;
-
         /**
          * @todo - what is this? does it include the class and package?
          */
         public String action;
-
         /**
          * @todo - are these the required args in the routing file, or the query string in a request?
          */
@@ -644,7 +647,7 @@ public void compute() {
                     if (m.matches()) {
                         if (this.host.contains("{")) {
                             String name = m.group(1).replace("{", "").replace("}", "");
-                            if(!name.equals("_")) {
+                            if (!name.equals("_")) {
                                 hostArg = new Arg();
                                 hostArg.name = name;
                                 Logger.trace("hostArg name [" + name + "]");
@@ -703,7 +706,6 @@ public void addParams(String params) {
         }
 
         // TODO: Add args names
-
         public void addFormat(String params) {
             if (params == null || params.length() < 1) {
                 return;