From 64748857f3c13464df43900acd6baaa846a90d40 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 7 Jan 2015 16:27:15 -0500
Subject: [PATCH] Relax the validation of HTTP methods on route registration

Despite the availability of API in Router to add a handler for
any HttpMethod, DefaultRouter rejects routes if they do not
specify one of HEAD, GET, PATCH, POST, PUT, or DELETE.
---
 .../pippo/core/route/DefaultRouter.java       | 27 +++++++------------
 .../pippo/core/DefaultRouterTest.java         |  6 ++---
 2 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/pippo-core/src/main/java/ro/fortsoft/pippo/core/route/DefaultRouter.java b/pippo-core/src/main/java/ro/fortsoft/pippo/core/route/DefaultRouter.java
index fcd91027c..4dd71a126 100644
--- a/pippo-core/src/main/java/ro/fortsoft/pippo/core/route/DefaultRouter.java
+++ b/pippo-core/src/main/java/ro/fortsoft/pippo/core/route/DefaultRouter.java
@@ -15,7 +15,7 @@
  */
 package ro.fortsoft.pippo.core.route;
 
-import ro.fortsoft.pippo.core.HttpConstants;
+import ro.fortsoft.pippo.core.PippoRuntimeException;
 import ro.fortsoft.pippo.core.controller.Controller;
 import ro.fortsoft.pippo.core.controller.ControllerHandler;
 import ro.fortsoft.pippo.core.util.StringUtils;
@@ -108,31 +108,22 @@ public List<Route> getRoutes(String requestMethod) {
         return routes;
     }
 
-    protected void validateRoute(Route route) throws Exception {
+    protected void validateRoute(Route route) {
         // validate the request method
-        if (!existsRequestMethod(route.getRequestMethod())) {
-            throw new Exception("Invalid request method: " + route.getRequestMethod());
+        if (StringUtils.isNullOrEmpty(route.getRequestMethod())) {
+            throw new PippoRuntimeException("Unspecified request method!");
         }
 
         // validate the uri pattern
         String uriPattern = route.getUriPattern();
-        if (uriPattern == null || uriPattern.isEmpty()) {
-            throw new Exception("The uri pattern cannot be null or empty");
+        if (StringUtils.isNullOrEmpty(uriPattern)) {
+            throw new PippoRuntimeException("The uri pattern cannot be null or empty");
         }
     }
 
-    private boolean existsRequestMethod(String requestMethod) {
-        return HttpConstants.Method.GET.equals(requestMethod)
-                || HttpConstants.Method.POST.equals(requestMethod)
-                || HttpConstants.Method.PUT.equals(requestMethod)
-                || HttpConstants.Method.HEAD.equals(requestMethod)
-                || HttpConstants.Method.DELETE.equals(requestMethod)
-                || HttpConstants.Method.PATCH.equals(requestMethod);
-    }
-
     @Override
     public List<RouteMatch> findRoutes(String requestUri, String requestMethod) {
-        log.debug("Finding route for '{} {}'", requestUri, requestMethod);
+        log.debug("Finding route matches for {} '{}'", requestMethod, requestUri);
         List<PatternBinding> bindings = bindingsCache.get(requestMethod);
         if (bindings == null) {
             return Collections.emptyList();
@@ -150,8 +141,8 @@ public List<RouteMatch> findRoutes(String requestUri, String requestMethod) {
     }
 
     @Override
-    public void addRoute(Route route) throws Exception {
-        log.debug("Add route for '{} {}'", route.getRequestMethod(), route.getUriPattern());
+    public void addRoute(Route route) {
+        log.debug("Add route for {} '{}'", route.getRequestMethod(), route.getUriPattern());
         validateRoute(route);
         routes.add(route);
 
diff --git a/pippo-core/src/test/java/ro/fortsoft/pippo/core/DefaultRouterTest.java b/pippo-core/src/test/java/ro/fortsoft/pippo/core/DefaultRouterTest.java
index f5120c0ea..feaaa764c 100644
--- a/pippo-core/src/test/java/ro/fortsoft/pippo/core/DefaultRouterTest.java
+++ b/pippo-core/src/test/java/ro/fortsoft/pippo/core/DefaultRouterTest.java
@@ -70,10 +70,10 @@ public void testEmptyUriPatternRoute() throws Exception {
     }
 
     @Test
-    public void testInvalidMethodRequestRoute() throws Exception {
-        Route route = new Route("/.*", "GETT", new EmptyRouteHandler());
+    public void testUnspecifiedMethodRequestRoute() throws Exception {
+        Route route = new Route("/.*", "", new EmptyRouteHandler());
         thrown.expect(Exception.class);
-        thrown.expectMessage("Invalid request method");
+        thrown.expectMessage("Unspecified request method");
         router.addRoute(route);
     }