Hook in PatchResponder

onlyskin · onlyskin · commit 41d03526a18e · 2017-12-18T17:58:48.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, HEAD, POST, PUT, DELETE, OPTIONS
+    GET, HEAD, POST, PUT, PATCH, DELETE, OPTIONS
 }
diff --git a/src/main/java/httpserver/ResponderSupplierFactory.java b/src/main/java/httpserver/ResponderSupplierFactory.java
@@ -23,6 +23,10 @@ public ResponderSupplier makeResponderSupplier() {
         responderSupplier.registerResponder(Method.PUT, new PutResponder(
                 new PathExaminer(),
                 new FileOperator()));
+        responderSupplier.registerResponder(Method.PATCH, new PatchResponder(
+                new PathExaminer(),
+                new FileOperator(),
+                new Hasher()));
         responderSupplier.registerResponder(Method.DELETE, new DeleteResponder(
                 new PathExaminer(),
                 new FileOperator()));
diff --git a/src/main/java/httpserver/ResponseWriter.java b/src/main/java/httpserver/ResponseWriter.java
@@ -20,6 +20,8 @@ public ResponseWriter(OutputStream outputStream) {
         statuses.put(405, "Method Not Allowed");
         statuses.put(418, "I'm a teapot");
         statuses.put(500, "Internal Server Error");
+        statuses.put(204, "No Content");
+        statuses.put(409, "Conflict");
     }
 
     public void write(Response response) {
diff --git a/src/main/java/httpserver/Server.java b/src/main/java/httpserver/Server.java
@@ -23,11 +23,7 @@ public void acceptConnection(ExecutorService executorService, SocketHandlerFacto
             Future<?> future = executorService.submit(socketHandler);
             future.get();
             clientSocket.close();
-        } catch (IOException e) {
-            e.printStackTrace();
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        } catch (ExecutionException e) {
+        } catch (IOException | InterruptedException | ExecutionException e) {
             e.printStackTrace();
         }
     }
diff --git a/src/test/java/httpserver/responder/OptionsResponderTest.java b/src/test/java/httpserver/responder/OptionsResponderTest.java
@@ -24,6 +24,7 @@ public void responderHasListOfAllowedMethodsInAllowHeader() throws Exception {
         responderSupplier.registerResponder(Method.HEAD, trueResponderMock);
         responderSupplier.registerResponder(Method.POST, falseResponderMock);
         responderSupplier.registerResponder(Method.PUT, trueResponderMock);
+        responderSupplier.registerResponder(Method.PATCH, falseResponderMock);
         responderSupplier.registerResponder(Method.DELETE, falseResponderMock);
         responderSupplier.registerResponder(Method.OPTIONS, trueResponderMock);
 

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, HEAD, POST, PUT, DELETE, OPTIONS`
	`4`	`+ GET, HEAD, POST, PUT, PATCH, DELETE, OPTIONS`
`5`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,8 @@ public ResponseWriter(OutputStream outputStream) {`
`20`	`20`	`statuses.put(405, "Method Not Allowed");`
`21`	`21`	`statuses.put(418, "I'm a teapot");`
`22`	`22`	`statuses.put(500, "Internal Server Error");`
	`23`	`+ statuses.put(204, "No Content");`
	`24`	`+ statuses.put(409, "Conflict");`
`23`	`25`	`}`
`24`	`26`
`25`	`27`	`public void write(Response response) {`
Original file line number	Diff line number	Diff line change
`@@ -23,11 +23,7 @@ public void acceptConnection(ExecutorService executorService, SocketHandlerFacto`
`23`	`23`	`Future<?> future = executorService.submit(socketHandler);`
`24`	`24`	`future.get();`
`25`	`25`	`clientSocket.close();`
`26`		`- } catch (IOException e) {`
`27`		`- e.printStackTrace();`
`28`		`- } catch (InterruptedException e) {`
`29`		`- e.printStackTrace();`
`30`		`- } catch (ExecutionException e) {`
	`26`	`+ } catch (IOException \| InterruptedException \| ExecutionException e) {`
`31`	`27`	`e.printStackTrace();`
`32`	`28`	`}`
`33`	`29`	`}`