Update GeneralResponder to check whether the MethodResponder allows a Request and return a MethodNotAllowedResponse if it doesn't

onlyskin · onlyskin · commit 1bfb3ee4deff · 2018-01-10T17:06:41.000+02:00
diff --git a/src/main/java/httpserver/responder/GeneralResponder.java b/src/main/java/httpserver/responder/GeneralResponder.java
@@ -3,6 +3,7 @@
 import httpserver.AppConfig;
 import httpserver.request.Request;
 import httpserver.MethodResponderSupplier;
+import httpserver.response.MethodNotAllowedResponse;
 import httpserver.response.Response;
 import httpserver.response.ServerErrorResponse;
 
@@ -16,7 +17,12 @@ public GeneralResponder(MethodResponderSupplier methodResponderSupplier) {
     }
 
     public Response respond(AppConfig appConfig, Request request) {
-        Responder responder = methodResponderSupplier.supplyResponder(request);
+        MethodResponder responder = methodResponderSupplier.supplyResponder(request);
+
+        if (!responder.allows(request)) {
+            return new MethodNotAllowedResponse();
+        }
+
         try {
             return responder.respond(appConfig, request);
         } catch (IOException e) {
diff --git a/src/test/java/httpserver/responder/GeneralResponderTest.java b/src/test/java/httpserver/responder/GeneralResponderTest.java
@@ -4,6 +4,7 @@
 import httpserver.request.Request;
 import httpserver.MethodResponderSupplier;
 import httpserver.response.Response;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import java.io.IOException;
@@ -29,6 +30,7 @@ public GeneralResponderTest() {
 
     @Test
     public void callsSupplyResponderOnResponderSupplierWithRequest() throws Exception {
+        when(methodResponderMock.allows(any(Request.class))).thenReturn(true);
         when(methodResponderSupplierMock.supplyResponder(any())).thenReturn(methodResponderMock);
 
         generalResponder.respond(appConfigMock, requestMock);
@@ -37,8 +39,19 @@ public void callsSupplyResponderOnResponderSupplierWithRequest() throws Exceptio
         verify(methodResponderMock).respond(appConfigMock, requestMock);
     }
 
+    @Test
+    public void returns405IfTheResponderCalledDoesntAllowTheRequest() throws Exception {
+        when(methodResponderSupplierMock.supplyResponder(any())).thenReturn(methodResponderMock);
+        when(methodResponderMock.allows(any(Request.class))).thenReturn(false);
+
+        Response response = generalResponder.respond(appConfigMock, requestMock);
+
+        assertEquals(405, response.getStatusCode());
+    }
+
     @Test
     public void returnsServerErrorResponseIfTheResponderCalledReturnsAnError() throws Exception {
+        when(methodResponderMock.allows(any(Request.class))).thenReturn(true);
         when(methodResponderMock.respond(any(), any())).thenThrow(new IOException());
         when(methodResponderSupplierMock.supplyResponder(any())).thenReturn(methodResponderMock);
 
