Add options responder

onlyskin · onlyskin · commit 60eeda674f7c · 2017-12-14T18:33:38.000+02:00
diff --git a/src/main/java/httpserver/Method.java b/src/main/java/httpserver/Method.java
@@ -1,5 +1,5 @@
 package httpserver;
 
 public enum Method {
-    GET, POST, PUT, DELETE
+    GET, POST, PUT, DELETE, OPTIONS
 }
diff --git a/src/main/java/httpserver/ResponderSupplierFactory.java b/src/main/java/httpserver/ResponderSupplierFactory.java
@@ -24,6 +24,7 @@ public ResponderSupplier makeResponderSupplier() {
         methodResponderMap.put(Method.DELETE, new DeleteResponder(
                 new PathExaminer(),
                 new FileOperator()));
+        //methodResponderMap.put(Method.OPTIONS, new OptionsResponder(this));
         return new ResponderSupplier(methodResponderMap, new InvalidMethodResponder());
     }
 
diff --git a/src/main/java/httpserver/responder/OptionsResponder.java b/src/main/java/httpserver/responder/OptionsResponder.java
@@ -0,0 +1,40 @@
+package httpserver.responder;
+
+import httpserver.AppConfig;
+import httpserver.Method;
+import httpserver.Request;
+import httpserver.ResponderSupplier;
+import httpserver.header.Header;
+import httpserver.response.OkResponse;
+import httpserver.response.Response;
+
+import java.io.IOException;
+import java.util.StringJoiner;
+
+public class OptionsResponder implements Responder {
+    private final ResponderSupplier responderSupplier;
+
+    public OptionsResponder(ResponderSupplier responderSupplier) {
+        this.responderSupplier = responderSupplier;
+    }
+
+    @Override
+    public Response respond(AppConfig appConfig, Request request) throws IOException {
+        Method[] methods = Method.values();
+        StringJoiner joiner = new StringJoiner(", ");
+        for (Method method: methods) {
+            Responder responder = responderSupplier.responderForMethodString(method.toString());
+            if (responder.allowed(request.getPathString())) {
+                joiner.add(method.toString());
+            }
+        }
+        Response response = new OkResponse("".getBytes());
+        response.setHeader(new Header("Allow", joiner.toString()));
+        return response;
+    }
+
+    @Override
+    public boolean allowed(String pathString) {
+        return true;
+    }
+}
diff --git a/src/test/java/httpserver/responder/OptionsResponderTest.java b/src/test/java/httpserver/responder/OptionsResponderTest.java
@@ -0,0 +1,49 @@
+package httpserver.responder;
+
+import httpserver.AppConfig;
+import httpserver.Method;
+import httpserver.Request;
+import httpserver.ResponderSupplier;
+import httpserver.header.Header;
+import httpserver.response.Response;
+import org.junit.Test;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
+
+public class OptionsResponderTest {
+    @Test
+    public void responderHasListOfAllowedMethodsInAllowHeader() throws Exception {
+        Map<Method, Responder> methodResponderMapMock = new HashMap<>();
+        Responder trueResponderMock = mock(Responder.class);
+        when(trueResponderMock.allowed(any())).thenReturn(true);
+        Responder falseResponderMock = mock(Responder.class);
+        when(falseResponderMock.allowed(any())).thenReturn(false);
+
+        methodResponderMapMock.put(Method.GET, trueResponderMock);
+        methodResponderMapMock.put(Method.POST, falseResponderMock);
+        methodResponderMapMock.put(Method.PUT, trueResponderMock);
+        methodResponderMapMock.put(Method.DELETE, falseResponderMock);
+        methodResponderMapMock.put(Method.OPTIONS, trueResponderMock);
+        ResponderSupplier responderSupplier = new ResponderSupplier(methodResponderMapMock,
+                mock(InvalidMethodResponder.class));
+
+        Request request = new Request("OPTIONS", "", new Header[0], "");
+
+        OptionsResponder optionsResponder = new OptionsResponder(responderSupplier);
+        Response response = optionsResponder.respond(mock(AppConfig.class), request);
+
+        assertEquals(200, response.getStatusCode());
+        assertEquals(new Header("Allow", "GET, PUT, OPTIONS"), response.getHeaders()[0]);
+    }
+
+    @Test
+    public void formIsAllowed() throws Exception {
+        OptionsResponder optionsResponder = new OptionsResponder(null);
+        assertTrue(optionsResponder.allowed("/form"));
+        assertTrue(optionsResponder.allowed("anything"));
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`package httpserver;`
`2`	`2`
`3`	`3`	`public enum Method {`
`4`		`- GET, POST, PUT, DELETE`
	`4`	`+ GET, POST, PUT, DELETE, OPTIONS`
`5`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ public ResponderSupplier makeResponderSupplier() {`
`24`	`24`	`methodResponderMap.put(Method.DELETE, new DeleteResponder(`
`25`	`25`	`new PathExaminer(),`
`26`	`26`	`new FileOperator()));`
	`27`	`+ //methodResponderMap.put(Method.OPTIONS, new OptionsResponder(this));`
`27`	`28`	`return new ResponderSupplier(methodResponderMap, new InvalidMethodResponder());`
`28`	`29`	`}`
`29`	`30`