API change: Remove Http Verb with a plain String, rename Route.verb -> Route.method fix #54

Author: jknack

coverage-report/src/test/java/org/jooby/HeadRequestFeature.java

@@ -6,7 +6,7 @@
 public class HeadRequestFeature extends ServerFeature {
 
   {
-    get("/", (req, rsp) -> rsp.send(req.route().verb()));
+    get("/", (req, rsp) -> rsp.send(req.route().method()));
 
     // custom head
     head("/head", (req, rsp) -> rsp.send(req.path()));

coverage-report/src/test/java/org/jooby/MvcMethodWithMultipleVerbsFeature.java

@@ -13,7 +13,7 @@ public static class Resource {
     @POST
     @Path("/")
     public String getOrPost(final org.jooby.Request req) {
-      return req.route().verb().toString();
+      return req.route().method().toString();
     }
   }
 

coverage-report/src/test/java/org/jooby/OptionsRequestFeature.java

@@ -6,15 +6,15 @@
 public class OptionsRequestFeature extends ServerFeature {
 
   {
-    get("/", (req, rsp) -> rsp.send(req.route().verb()));
+    get("/", (req, rsp) -> rsp.send(req.route().method()));
 
-    post("/", (req, rsp) -> rsp.send(req.route().verb()));
+    post("/", (req, rsp) -> rsp.send(req.route().method()));
 
-    get("/sub", (req, rsp) -> rsp.send(req.route().verb()));
+    get("/sub", (req, rsp) -> rsp.send(req.route().method()));
 
-    post("/sub", (req, rsp) -> rsp.send(req.route().verb()));
+    post("/sub", (req, rsp) -> rsp.send(req.route().method()));
 
-    delete("/sub", (req, rsp) -> rsp.send(req.route().verb()));
+    delete("/sub", (req, rsp) -> rsp.send(req.route().method()));
 
     options();
   }

coverage-report/src/test/java/org/jooby/RouteReferenceFeature.java

@@ -3,7 +3,6 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
-import org.jooby.Route;
 import org.jooby.test.ServerFeature;
 import org.junit.Test;
 
@@ -15,7 +14,7 @@ public class RouteReferenceFeature extends ServerFeature {
       Route route = req.route();
       assertNotNull(route);
       assertEquals("anonymous", route.name());
-      assertEquals("GET", route.verb().name());
+      assertEquals("GET", route.method());
       assertEquals("/", route.path());
       assertEquals("/", route.pattern());
       assertEquals("GET /\n" +
@@ -31,7 +30,7 @@ public class RouteReferenceFeature extends ServerFeature {
       Route route = req.route();
       assertNotNull(route);
       assertEquals("anonymous", route.name());
-      assertEquals("GET", route.verb().name());
+      assertEquals("GET", route.method());
       assertEquals("/" + req.param("var").value(), route.path());
       assertEquals("/:var", route.pattern());
       rsp.send("done");

coverage-report/src/test/java/org/jooby/TraceRequestFeature.java

@@ -8,11 +8,11 @@
 public class TraceRequestFeature extends ServerFeature {
 
   {
-    get("/", (req, rsp) -> rsp.send(req.route().verb()));
+    get("/", (req, rsp) -> rsp.send(req.route().method()));
 
-    post("/", (req, rsp) -> rsp.send(req.route().verb()));
+    post("/", (req, rsp) -> rsp.send(req.route().method()));
 
-    get("/sub", (req, rsp) -> rsp.send(req.route().verb()));
+    get("/sub", (req, rsp) -> rsp.send(req.route().method()));
 
     trace();
 

jooby/src/main/java/org/jooby/Err.java

@@ -55,7 +55,7 @@ public static class Default implements Err.Handler {
     @Override
     public void handle(final Request req, final Response rsp, final Exception ex)
         throws Exception {
-      log.error("execution of: " + req.verb() + " " + req.path() + " resulted in exception", ex);
+      log.error("execution of: " + req.method() + " " + req.path() + " resulted in exception", ex);
 
       Map<String, Object> err = err(req, rsp, ex);
 

jooby/src/main/java/org/jooby/Request.java

@@ -69,8 +69,8 @@ public String path() {
     }
 
     @Override
-    public Verb verb() {
-      return req.verb();
+    public String method() {
+      return req.method();
     }
 
     @Override
@@ -289,10 +289,10 @@ default String path() {
   }
 
   /**
-   * @return Current request verb.
+   * @return HTTP method.
    */
-  default Verb verb() {
-    return route().verb();
+  default String method() {
+    return route().method();
   }
 
   /**

jooby/src/main/java/org/jooby/Route.java

@@ -390,7 +390,7 @@ class Definition {
     /**
      * A HTTP verb or <code>*</code>.
      */
-    private String verb;
+    private String method;
 
     /**
      * A path pattern.
@@ -447,25 +447,17 @@ public Definition(final @Nonnull String verb, final @Nonnull String pattern,
     /**
      * Creates a new route definition.
      *
-     * @param verb A HTTP verb or <code>*</code>.
+     * @param method A HTTP verb or <code>*</code>.
      * @param pattern A path pattern.
      * @param filter A callback to execute.
      */
-    public Definition(final @Nonnull String verb, final @Nonnull String pattern,
+    public Definition(final @Nonnull String method, final @Nonnull String pattern,
         final @Nonnull Filter filter) {
-      try {
-        requireNonNull(verb, "HTTP verb is required.");
-        Verb.valueOf(verb.toUpperCase());
-      } catch (IllegalArgumentException ex) {
-        if (!"*".equals(verb)) {
-          throw new IllegalArgumentException("Invalid HTTP verb: " + verb);
-        }
-      }
       requireNonNull(pattern, "A route path is required.");
       requireNonNull(filter, "A filter is required.");
 
-      this.verb = verb.toUpperCase();
-      this.compiledPattern = new RoutePattern(verb, pattern);
+      this.method = method.toUpperCase();
+      this.compiledPattern = new RoutePattern(method, pattern);
       // normalized pattern
       this.pattern = compiledPattern.pattern();
       this.filter = filter;
@@ -518,10 +510,10 @@ public Definition(final @Nonnull String verb, final @Nonnull String pattern,
      * @param accept The <code>Accept</code> header.
      * @return A route or an empty optional.
      */
-    public @Nonnull Optional<Route> matches(final @Nonnull Verb verb,
+    public @Nonnull Optional<Route> matches(final @Nonnull String verb,
         final @Nonnull String path, final @Nonnull MediaType contentType,
         final @Nonnull List<MediaType> accept) {
-      RouteMatcher matcher = compiledPattern.matcher(verb.name() + path);
+      RouteMatcher matcher = compiledPattern.matcher(verb.toUpperCase() + path);
       if (matcher.matches()) {
         List<MediaType> result = MediaType.matcher(accept).filter(this.produces);
         if (result.size() > 0 && canConsume(contentType)) {
@@ -535,10 +527,10 @@ public Definition(final @Nonnull String verb, final @Nonnull String pattern,
     }
 
     /**
-     * @return HTTP verb or <code>*</code>
+     * @return HTTP method or <code>*</code>.
      */
-    public @Nonnull String verb() {
-      return verb;
+    public @Nonnull String method() {
+      return method;
     }
 
     /**
@@ -695,7 +687,7 @@ public List<MediaType> produces() {
     @Override
     public String toString() {
       StringBuilder buffer = new StringBuilder();
-      buffer.append(verb()).append(" ").append(pattern()).append("\n");
+      buffer.append(method()).append(" ").append(pattern()).append("\n");
       buffer.append("  name: ").append(name()).append("\n");
       buffer.append("  consume: ").append(consumes()).append("\n");
       buffer.append("  produces: ").append(produces()).append("\n");
@@ -705,14 +697,14 @@ public String toString() {
     /**
      * Creates a new route.
      *
-     * @param verb A HTTP verb.
+     * @param method A HTTP verb.
      * @param matcher A route matcher.
      * @param produces List of produces types.
      * @return A new route.
      */
-    private Route asRoute(final Verb verb, final RouteMatcher matcher,
+    private Route asRoute(final String method, final RouteMatcher matcher,
         final List<MediaType> produces) {
-      return new RouteImpl(filter, verb, matcher.path(), pattern, name, matcher.vars(), consumes,
+      return new RouteImpl(filter, method, matcher.path(), pattern, name, matcher.vars(), consumes,
           produces);
     }
 
@@ -746,8 +738,8 @@ public String path() {
     }
 
     @Override
-    public Verb verb() {
-      return route.verb();
+    public String method() {
+      return route.method();
     }
 
     @Override
@@ -965,15 +957,32 @@ interface Chain {
     void next(@Nonnull Request req, @Nonnull Response rsp) throws Exception;
   }
 
+  /**
+   * Well known HTTP methods.
+   */
+  List<String> METHODS = ImmutableList.<String> builder()
+      .add(
+          "GET",
+          "POST",
+          "PUT",
+          "DELETE",
+          "PATCH",
+          "HEAD",
+          "CONNECT",
+          "OPTIONS",
+          "TRACE"
+      )
+      .build();
+
   /**
    * @return Current request path.
    */
   String path();
 
   /**
-   * @return Current request verb.
+   * @return Current HTTP method.
    */
-  Verb verb();
+  String method();
 
   /**
    * @return The currently matched pattern.

jooby/src/main/java/org/jooby/Verb.java

@@ -59,7 +59,7 @@ public String toString() {
   private void routes(final StringBuilder buffer) {
     int verbMax = 0, routeMax = 0, consumesMax = 0, producesMax = 0;
     for (Route.Definition route : routes) {
-      verbMax = Math.max(verbMax, route.verb().length());
+      verbMax = Math.max(verbMax, route.method().length());
 
       routeMax = Math.max(routeMax, route.pattern().length());
 
@@ -72,7 +72,7 @@ private void routes(final StringBuilder buffer) {
         + producesMax + "s    (%s)\n";
 
     for (Route.Definition route : routes) {
-      buffer.append(String.format(format, route.verb(), route.pattern(),
+      buffer.append(String.format(format, route.method(), route.pattern(),
           route.consumes(), route.produces(), route.name()));
     }