Update SocketHandler to return a BadRequest instead of NotFound when there's a parse error

onlyskin · onlyskin · commit 2b3096bf4068 · 2017-12-20T15:56:07.000+02:00
diff --git a/src/main/java/httpserver/ResponseWriter.java b/src/main/java/httpserver/ResponseWriter.java
@@ -19,6 +19,7 @@ public ResponseWriter(OutputStream outputStream) {
         statuses.put(204, "No Content");
         statuses.put(206, "Partial Content");
         statuses.put(302, "Found");
+        statuses.put(400, "Bad Request");
         statuses.put(401, "Unauthorized");
         statuses.put(404, "Not Found");
         statuses.put(405, "Method Not Allowed");
diff --git a/src/main/java/httpserver/SocketHandler.java b/src/main/java/httpserver/SocketHandler.java
@@ -1,7 +1,7 @@
 package httpserver;
 
 import httpserver.responder.GeneralResponder;
-import httpserver.response.NotFoundResponse;
+import httpserver.response.BadRequestResponse;
 import httpserver.response.Response;
 
 import java.io.IOException;
@@ -33,7 +33,7 @@ public void run() {
             Request request = requestParser.parse(inputStream);
             response = generalResponder.respond(appConfig, request);
         } catch (Exception e) {
-            response = new NotFoundResponse();
+            response = new BadRequestResponse();
         }
 
         responseWriter.write(response);
diff --git a/src/main/java/httpserver/response/BadRequestResponse.java b/src/main/java/httpserver/response/BadRequestResponse.java
@@ -0,0 +1,8 @@
+package httpserver.response;
+
+public class BadRequestResponse extends Response {
+    @Override
+    public int getStatusCode() {
+        return 400;
+    }
+}
diff --git a/src/test/java/httpserver/SocketHandlerTest.java b/src/test/java/httpserver/SocketHandlerTest.java
@@ -58,10 +58,10 @@ public void callsInjectedPartsCorrectly() throws Exception {
     }
 
     @Test
-    public void returns404ForMalformedRequestLine() throws Exception {
+    public void returns400ForMalformedRequestLine() throws Exception {
         byte[] request = ("".getBytes());
 
-        String expected = "HTTP/1.1 404 Not Found\r\nContent-Length: 0\r\n\r\n";
+        String expected = "HTTP/1.1 400 Bad Request\r\nContent-Length: 0\r\n\r\n";
         assertEquals(expected, stringOutputForRequestBytes(request));
     }
 
diff --git a/src/test/java/httpserver/response/BadRequestResponseTest.java b/src/test/java/httpserver/response/BadRequestResponseTest.java
@@ -0,0 +1,14 @@
+package httpserver.response;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+public class BadRequestResponseTest {
+    @Test
+    public void has400StatusCode() throws Exception {
+        BadRequestResponse badRequestResponse = new BadRequestResponse();
+
+        assertEquals(400, badRequestResponse.getStatusCode());
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -58,10 +58,10 @@ public void callsInjectedPartsCorrectly() throws Exception {`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`@Test`
`61`		`- public void returns404ForMalformedRequestLine() throws Exception {`
	`61`	`+ public void returns400ForMalformedRequestLine() throws Exception {`
`62`	`62`	`byte[] request = ("".getBytes());`
`63`	`63`
`64`		`- String expected = "HTTP/1.1 404 Not Found\r\nContent-Length: 0\r\n\r\n";`
	`64`	`+ String expected = "HTTP/1.1 400 Bad Request\r\nContent-Length: 0\r\n\r\n";`
`65`	`65`	`assertEquals(expected, stringOutputForRequestBytes(request));`
`66`	`66`	`}`
`67`	`67`