Merge pull request #108 from rchodava/ic/any-route

Added the possibility to define any route.

core/src/main/java/foundation/stack/datamill/http/ResponseBuilder.java

@@ -36,6 +36,9 @@ public interface ResponseBuilder {
     /** Build a response with a 404 Not Found status, and an empty body. */
     Response notFound();
 
+    /** Build a response with a 404 Not Found status, and the given string body. */
+    Response notFound(String content);
+
     /** Build a response with a 200 OK status, and an empty body. */
     Response ok();
 

core/src/main/java/foundation/stack/datamill/http/builder/ElseBuilder.java

@@ -14,6 +14,7 @@
  * @author Ravi Chodavarapu (rchodava@gmail.com)
  */
 public interface ElseBuilder {
+    ElseBuilder elseAny(Route route);
     ElseBuilder elseIfMethodMatches(foundation.stack.datamill.http.Method method, Route route);
     ElseBuilder elseIfUriMatches(String pattern, Route route);
     ElseBuilder elseIfMethodAndUriMatch(foundation.stack.datamill.http.Method method, String pattern, Route route);

core/src/main/java/foundation/stack/datamill/http/builder/RouteBuilder.java

@@ -13,6 +13,7 @@
  * @author Ravi Chodavarapu (rchodava@gmail.com)
  */
 public interface RouteBuilder {
+    ElseBuilder any(Route route);
     ElseBuilder ifUriMatches(String pattern, Route route);
     ElseBuilder ifMethodMatches(Method method, Route route);
     ElseBuilder ifMethodAndUriMatch(Method method, String pattern, Route route);

core/src/main/java/foundation/stack/datamill/http/impl/ResponseBuilderImpl.java

@@ -61,6 +61,11 @@ public Response notFound() {
         return new ResponseImpl(Status.NOT_FOUND, headers, body);
     }
 
+    @Override
+    public Response notFound(String content) {
+        return new ResponseImpl(Status.NOT_FOUND, headers, new ValueBody(new StringValue(content)));
+    }
+
     @Override
     public Response ok() {
         return new ResponseImpl(Status.OK, headers, body);

core/src/main/java/foundation/stack/datamill/http/impl/RouteBuilderImpl.java

@@ -106,4 +106,16 @@ public PostProcessedRoute orElse(Response response) {
         matchers.add(new TautologyMatcher(response));
         return new MatcherBasedRoute(matchers);
     }
+
+    @Override
+    public ElseBuilder any(Route route) {
+        matchers.add(new TautologyMatcher(route));
+        return this;
+    }
+
+    @Override
+    public ElseBuilder elseAny(Route route) {
+        matchers.add(new TautologyMatcher(route));
+        return this;
+    }
 }

core/src/test/java/foundation/stack/datamill/http/builder/RouteBuilderTest.java

@@ -0,0 +1,111 @@
+package foundation.stack.datamill.http.builder;
+
+import foundation.stack.datamill.http.Method;
+import foundation.stack.datamill.http.Response;
+import foundation.stack.datamill.http.Route;
+import foundation.stack.datamill.http.ServerRequest;
+import foundation.stack.datamill.http.impl.RouteBuilderImpl;
+import org.junit.Before;
+import org.junit.Test;
+import rx.Observable;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+/**
+ * @author Israel Colomer (israelcolomer@gmail.com)
+ */
+public class RouteBuilderTest {
+
+    private RouteBuilder routeBuilder;
+    private ElseBuilder elseBuilder;
+
+    private Route anyRoute = mock(Route.class);
+    private Route orElseRoute = mock(Route.class);
+
+    @Before
+    public void setup() {
+        routeBuilder = new RouteBuilderImpl();
+        elseBuilder = new RouteBuilderImpl();
+    }
+
+    @Test
+    public void anyRouteHonoredIfObservableReturned() {
+        Response anyRouteMockResponse = mock(Response.class);
+        when(anyRoute.apply(any(ServerRequest.class))).thenReturn(Observable.just(anyRouteMockResponse));
+
+        Response elseRouteMockResponse = mock(Response.class);
+        when(orElseRoute.apply(any(ServerRequest.class))).thenReturn(Observable.just(elseRouteMockResponse));
+
+        Route route = routeBuilder.any(anyRoute).orElse(orElseRoute);
+
+        ServerRequest serverRequest = mock(ServerRequest.class);
+        when(serverRequest.method()).thenReturn(Method.GET);
+
+        Observable<Response> responseObservable = route.apply(serverRequest);
+        Response actualResponse = responseObservable.toBlocking().lastOrDefault(null);
+
+        assertThat(anyRouteMockResponse, is(actualResponse));
+
+    }
+
+    @Test
+    public void elseOfAnyRouteHonoredIfNoObservableReturned() {
+        when(anyRoute.apply(any(ServerRequest.class))).thenReturn(null);
+
+        Response elseRouteMockResponse = mock(Response.class);
+        when(orElseRoute.apply(any(ServerRequest.class))).thenReturn(Observable.just(elseRouteMockResponse));
+
+        Route route = routeBuilder.any(anyRoute).orElse(orElseRoute);
+
+        ServerRequest serverRequest = mock(ServerRequest.class);
+        when(serverRequest.method()).thenReturn(Method.GET);
+
+        Observable<Response> responseObservable = route.apply(serverRequest);
+        Response actualResponse = responseObservable.toBlocking().lastOrDefault(null);
+
+        assertThat(elseRouteMockResponse, is(actualResponse));
+    }
+
+
+    @Test
+    public void elseAnyRouteHonoredIfObservableReturned() {
+        Response anyRouteMockResponse = mock(Response.class);
+        when(anyRoute.apply(any(ServerRequest.class))).thenReturn(Observable.just(anyRouteMockResponse));
+
+        Response elseRouteMockResponse = mock(Response.class);
+        when(orElseRoute.apply(any(ServerRequest.class))).thenReturn(Observable.just(elseRouteMockResponse));
+
+        Route route = elseBuilder.elseAny(anyRoute).orElse(orElseRoute);
+
+        ServerRequest serverRequest = mock(ServerRequest.class);
+        when(serverRequest.method()).thenReturn(Method.GET);
+
+        Observable<Response> responseObservable = route.apply(serverRequest);
+        Response actualResponse = responseObservable.toBlocking().lastOrDefault(null);
+
+        assertThat(anyRouteMockResponse, is(actualResponse));
+
+    }
+
+    @Test
+    public void elseOfElseAnyRouteHonoredIfNoObservableReturned() {
+        when(anyRoute.apply(any(ServerRequest.class))).thenReturn(null);
+
+        Response elseRouteMockResponse = mock(Response.class);
+        when(orElseRoute.apply(any(ServerRequest.class))).thenReturn(Observable.just(elseRouteMockResponse));
+
+        Route route = elseBuilder.elseAny(anyRoute).orElse(orElseRoute);
+
+        ServerRequest serverRequest = mock(ServerRequest.class);
+        when(serverRequest.method()).thenReturn(Method.GET);
+
+        Observable<Response> responseObservable = route.apply(serverRequest);
+        Response actualResponse = responseObservable.toBlocking().lastOrDefault(null);
+
+        assertThat(elseRouteMockResponse, is(actualResponse));
+    }
+}

core/src/test/java/foundation/stack/datamill/http/impl/ResponseBuilderTest.java

@@ -31,6 +31,7 @@ public void responseCodes() {
         assertEquals(Status.UNAUTHORIZED, builder.unauthorized("Content").status());
         assertEquals("Content", builder.unauthorized("Content").body().get().asString().toBlocking().last());
         assertEquals(Status.NO_CONTENT, builder.noContent().status());
+        assertEquals("Content", builder.notFound("Content").body().get().asString().toBlocking().last());
         assertEquals(Status.FORBIDDEN, builder.forbidden().status());
         assertEquals(Status.FORBIDDEN, builder.forbidden("Content").status());
         assertEquals("Content", builder.forbidden("Content").body().get().asString().toBlocking().last());