MVC: favor local attribute over locals fix jooby-project#1121

jknack · jknack · commit e331eedf591f · 2018-06-12T11:27:13.000-03:00
diff --git a/jooby/src/main/java/org/jooby/internal/mvc/RequestParam.java b/jooby/src/main/java/org/jooby/internal/mvc/RequestParam.java
@@ -203,27 +203,33 @@
  */
 package org.jooby.internal.mvc;
 
+import com.google.common.base.Strings;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableMap.Builder;
+import com.google.inject.TypeLiteral;
+import com.google.inject.util.Types;
+import org.jooby.Cookie;
+import org.jooby.Err;
+import org.jooby.Mutant;
+import org.jooby.Request;
+import org.jooby.Response;
+import org.jooby.Route;
+import org.jooby.Session;
+import org.jooby.Status;
+import org.jooby.Upload;
+import org.jooby.mvc.Body;
+import org.jooby.mvc.Flash;
+import org.jooby.mvc.Header;
+import org.jooby.mvc.Local;
+
+import javax.inject.Named;
 import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Parameter;
 import java.lang.reflect.Type;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
-import javax.inject.Named;
-
-import org.jooby.*;
-import org.jooby.mvc.Body;
-import org.jooby.mvc.Flash;
-import org.jooby.mvc.Header;
-import org.jooby.mvc.Local;
-
-import com.google.common.base.Strings;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableMap.Builder;
-import com.google.inject.TypeLiteral;
-import com.google.inject.util.Types;
-
 @SuppressWarnings({"rawtypes", "unchecked" })
 public class RequestParam {
 
@@ -302,18 +308,17 @@ private interface GetValue {
      * Local
      */
     builder.put(localType, (req, rsp, chain, param) -> {
-      if (param.type.getRawType() == Map.class) {
-        return req.attributes();
-      }
       Optional local = req.ifGet(param.name);
       if (param.optional) {
         return local;
       }
       if(local.isPresent()) {
         return local.get();
-      } else {
-        throw new Err(Status.SERVER_ERROR, "Could not find required local '" + param.name + "', which was required on " + req.path());
       }
+      if (param.type.getRawType() == Map.class) {
+        return req.attributes();
+      }
+      throw new Err(Status.SERVER_ERROR, "Could not find required local '" + param.name + "', which was required on " + req.path());
     });
 
     /**
diff --git a/modules/coverage-report/src/test/java/org/jooby/issues/Issue1121.java b/modules/coverage-report/src/test/java/org/jooby/issues/Issue1121.java
@@ -0,0 +1,35 @@
+package org.jooby.issues;
+
+import com.google.common.collect.ImmutableMap;
+import org.jooby.mvc.GET;
+import org.jooby.mvc.Local;
+import org.jooby.mvc.Path;
+import org.jooby.test.ServerFeature;
+import org.junit.Test;
+
+import java.util.Map;
+
+public class Issue1121 extends ServerFeature {
+
+  @Path("/1121")
+  public static class MVC {
+    @GET
+    public String locals(@Local Map<String, Object> something) {
+      return something.toString();
+    }
+  }
+
+  {
+    use("*", (req, rsp) -> {
+      req.set("something", ImmutableMap.of("foo", "bar"));
+    });
+
+    use(MVC.class);
+  }
+
+  @Test
+  public void localShouldFavorExistingMap() throws Exception {
+    request().get("/1121")
+        .expect("{foo=bar}");
+  }
+}
diff --git a/modules/coverage-report/src/test/java/org/jooby/issues/Issue278c.java b/modules/coverage-report/src/test/java/org/jooby/issues/Issue278c.java
@@ -1,21 +1,21 @@
 package org.jooby.issues;
 
-import java.util.Map;
-
 import org.jooby.mvc.GET;
 import org.jooby.mvc.Local;
 import org.jooby.mvc.Path;
 import org.jooby.test.ServerFeature;
 import org.junit.Test;
 
+import java.util.Map;
+
 public class Issue278c extends ServerFeature {
 
   @Path("/issue278")
   public static class Resource {
 
     @GET
-    public Object local(@Local final Map<String, Object> local) {
-      return local;
+    public Object local(@Local final Map<String, Object> locals) {
+      return locals;
     }
   }
 
