Remove InvalidMethodResponder and update MethodResponderSupplier to throw an exception if no MethodResponder handles the Request, the GeneralResponder then throws a MethodNotAllowedResponse

onlyskin · onlyskin · commit 3dc0ea521e53 · 2018-01-10T18:33:58.000+02:00
diff --git a/src/main/java/httpserver/MethodResponderSupplier.java b/src/main/java/httpserver/MethodResponderSupplier.java
@@ -7,21 +7,19 @@
 import java.util.List;
 
 public class MethodResponderSupplier {
-    private final MethodResponder invalidMethodResponder;
     private final List<MethodResponder> methodResponders;
 
-    public MethodResponderSupplier(MethodResponder invalidMethodResponder) {
-        this.invalidMethodResponder = invalidMethodResponder;
+    public MethodResponderSupplier() {
         this.methodResponders = new ArrayList<>();
     }
 
-    public MethodResponder supplyResponder(Request request) {
+    public MethodResponder supplyResponder(Request request) throws Exception {
         for (MethodResponder methodResponder: methodResponders) {
             if (methodResponder.handles(request)) {
                 return methodResponder;
             }
         }
-        return invalidMethodResponder;
+        throw new Exception();
     }
 
     public void registerResponder(MethodResponder methodResponder) {
diff --git a/src/main/java/httpserver/ResponderSupplierFactory.java b/src/main/java/httpserver/ResponderSupplierFactory.java
@@ -9,7 +9,7 @@
 
 public class ResponderSupplierFactory {
     public MethodResponderSupplier makeResponderSupplier() {
-        MethodResponderSupplier methodResponderSupplier = new MethodResponderSupplier(new InvalidMethodResponder());
+        MethodResponderSupplier methodResponderSupplier = new MethodResponderSupplier();
 
         PathExaminer pathExaminer = new PathExaminer();
         FileOperator fileOperator = new FileOperator();
diff --git a/src/main/java/httpserver/responder/GeneralResponder.java b/src/main/java/httpserver/responder/GeneralResponder.java
@@ -17,7 +17,13 @@ public GeneralResponder(MethodResponderSupplier methodResponderSupplier) {
     }
 
     public Response respond(AppConfig appConfig, Request request) {
-        MethodResponder responder = methodResponderSupplier.supplyResponder(request);
+        MethodResponder responder;
+
+        try {
+            responder = methodResponderSupplier.supplyResponder(request);
+        } catch (Exception e) {
+            return new MethodNotAllowedResponse();
+        }
 
         if (!responder.allows(request)) {
             return new MethodNotAllowedResponse();
diff --git a/src/main/java/httpserver/responder/InvalidMethodResponder.java b/src/main/java/httpserver/responder/InvalidMethodResponder.java
diff --git a/src/test/java/httpserver/MethodResponderSupplierTest.java b/src/test/java/httpserver/MethodResponderSupplierTest.java
@@ -2,7 +2,6 @@
 
 import httpserver.request.Request;
 import httpserver.responder.GetResponder;
-import httpserver.responder.InvalidMethodResponder;
 import httpserver.responder.MethodResponder;
 import httpserver.responder.PostResponder;
 import org.junit.Test;
@@ -15,15 +14,13 @@
 public class MethodResponderSupplierTest {
 
     private final GetResponder getResponderMock;
-    private final InvalidMethodResponder invalidMethodResponderMock;
     private final MethodResponderSupplier methodResponderSupplier;
     private final PostResponder postResponderMock;
 
     public MethodResponderSupplierTest() {
         getResponderMock = mock(GetResponder.class);
         postResponderMock = mock(PostResponder.class);
-        invalidMethodResponderMock = mock(InvalidMethodResponder.class);
-        methodResponderSupplier = new MethodResponderSupplier(invalidMethodResponderMock);
+        methodResponderSupplier = new MethodResponderSupplier();
         methodResponderSupplier.registerResponder(getResponderMock);
         methodResponderSupplier.registerResponder(postResponderMock);
     }
diff --git a/src/test/java/httpserver/responder/GeneralResponderTest.java b/src/test/java/httpserver/responder/GeneralResponderTest.java
@@ -4,7 +4,6 @@
 import httpserver.request.Request;
 import httpserver.MethodResponderSupplier;
 import httpserver.response.Response;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import java.io.IOException;
@@ -49,6 +48,15 @@ public void returns405IfTheResponderCalledDoesntAllowTheRequest() throws Excepti
         assertEquals(405, response.getStatusCode());
     }
 
+    @Test
+    public void returns405IfTheMethodSupplierThrowsAnException() throws Exception {
+        when(methodResponderSupplierMock.supplyResponder(any())).thenThrow(new Exception());
+
+        Response response = generalResponder.respond(appConfigMock, requestMock);
+
+        assertEquals(405, response.getStatusCode());
+    }
+
     @Test
     public void returnsServerErrorResponseIfTheResponderCalledReturnsAnError() throws Exception {
         when(methodResponderMock.allows(any(Request.class))).thenReturn(true);
diff --git a/src/test/java/httpserver/responder/InvalidMethodResponderTest.java b/src/test/java/httpserver/responder/InvalidMethodResponderTest.java
diff --git a/src/test/java/httpserver/responder/OptionsResponderTest.java b/src/test/java/httpserver/responder/OptionsResponderTest.java
@@ -25,7 +25,7 @@ public void responderHasListOfAllowedMethodsInAllowHeader() throws Exception {
         MethodResponder putResponderMock = mock(PutResponder.class);
         when(putResponderMock.allows(any())).thenReturn(false);
 
-        MethodResponderSupplier methodResponderSupplier = new MethodResponderSupplier(mock(InvalidMethodResponder.class));
+        MethodResponderSupplier methodResponderSupplier = new MethodResponderSupplier();
         methodResponderSupplier.registerResponder(getResponderMock);
         methodResponderSupplier.registerResponder(headResponderMock);
         methodResponderSupplier.registerResponder(putResponderMock);

Original file line number	Diff line number	Diff line change
`@@ -7,21 +7,19 @@`
`7`	`7`	`import java.util.List;`
`8`	`8`
`9`	`9`	`public class MethodResponderSupplier {`
`10`		`- private final MethodResponder invalidMethodResponder;`
`11`	`10`	`private final List<MethodResponder> methodResponders;`
`12`	`11`
`13`		`- public MethodResponderSupplier(MethodResponder invalidMethodResponder) {`
`14`		`- this.invalidMethodResponder = invalidMethodResponder;`
	`12`	`+ public MethodResponderSupplier() {`
`15`	`13`	`this.methodResponders = new ArrayList<>();`
`16`	`14`	`}`
`17`	`15`
`18`		`- public MethodResponder supplyResponder(Request request) {`
	`16`	`+ public MethodResponder supplyResponder(Request request) throws Exception {`
`19`	`17`	`for (MethodResponder methodResponder: methodResponders) {`
`20`	`18`	`if (methodResponder.handles(request)) {`
`21`	`19`	`return methodResponder;`
`22`	`20`	`}`
`23`	`21`	`}`
`24`		`- return invalidMethodResponder;`
	`22`	`+ throw new Exception();`
`25`	`23`	`}`
`26`	`24`
`27`	`25`	`public void registerResponder(MethodResponder methodResponder) {`