Add Content Length header class and update to implement getter on abstract Response class

onlyskin · onlyskin · commit fe716714e0fb · 2017-12-12T13:51:01.000+02:00
diff --git a/src/main/java/httpserver/ContentLengthHeader.java b/src/main/java/httpserver/ContentLengthHeader.java
@@ -0,0 +1,7 @@
+package httpserver;
+
+public class ContentLengthHeader extends Header {
+    public ContentLengthHeader(byte[] payload) {
+        super("Content-Length", String.valueOf(payload.length));
+    }
+}
diff --git a/src/main/java/httpserver/ResponseWriter.java b/src/main/java/httpserver/ResponseWriter.java
@@ -23,7 +23,6 @@ public ResponseWriter(OutputStream outputStream) {
     public void write(Response response) {
         try {
             writeStatusCode(response);
-            writeContentLengthHeader(response);
             writeHeaders(response);
             writeEmptyLine();
             writePayload(response);
@@ -36,16 +35,18 @@ private void writeStatusCode(Response response) throws IOException {
         write(statusLine(response.getStatusCode()).getBytes());
     }
 
-    private void writeContentLengthHeader(Response response) throws IOException {
-        write(contentLengthHeader(response.getPayload()).getBytes());
-    }
-
     private void writeHeaders(Response response) throws IOException {
+        writeContentLengthHeader(response);
         for (Header header: response.getHeaders()) {
             write((header.toString() + "\r\n").getBytes());
         }
     }
 
+    private void writeContentLengthHeader(Response response) throws IOException {
+        String header = response.getContentLengthHeader().toString() + "\r\n";
+        write(header.getBytes());
+    }
+
     private void writeEmptyLine() throws IOException {
         write(("\r\n").getBytes());
     }
@@ -58,10 +59,6 @@ private void write(byte[] bytes) throws IOException {
         outputStream.write(bytes);
     }
 
-    private String contentLengthHeader(byte[] payload) {
-        return "Content-Length: " + payload.length + "\r\n";
-    }
-
     private String statusLine(int statusCode) {
         return ("HTTP/1.1 " + statusCode
                     + " " + statuses.get(statusCode)
diff --git a/src/main/java/httpserver/response/Response.java b/src/main/java/httpserver/response/Response.java
@@ -1,5 +1,6 @@
 package httpserver.response;
 
+import httpserver.ContentLengthHeader;
 import httpserver.Header;
 
 import java.util.ArrayList;
@@ -31,4 +32,8 @@ public Header[] getHeaders() {
     public void setHeader(Header header) {
         headers.add(header);
     }
+
+    public Header getContentLengthHeader() {
+        return new ContentLengthHeader(payload);
+    }
 }
diff --git a/src/test/java/httpserver/ContentLengthHeaderTest.java b/src/test/java/httpserver/ContentLengthHeaderTest.java
@@ -0,0 +1,16 @@
+package httpserver;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+public class ContentLengthHeaderTest {
+    @Test
+    public void setsContentLength() throws Exception {
+        byte[] payload = "test payload".getBytes();
+
+        ContentLengthHeader contentLengthHeader = new ContentLengthHeader(payload);
+
+        assertEquals(new Header("Content-Length", "12"), contentLengthHeader);
+    }
+}
diff --git a/src/test/java/httpserver/response/OkResponseTest.java b/src/test/java/httpserver/response/OkResponseTest.java
@@ -26,17 +26,25 @@ public void getsStatusCode() throws Exception {
     @Test
     public void getsPayload() throws Exception {
         byte[] payload = okResponse.getPayload();
+
         assertEquals("test payload", new String(payload));
     }
 
     @Test
     public void getsHeaders() throws Exception {
         Header[] expected = new Header[]{new Header("header1", "value"),
                 new Header("header2", "v")};
-        OkResponse okResponse = this.okResponse;
+
         assertTrue(Arrays.equals(expected, okResponse.getHeaders()));
     }
 
+    @Test
+    public void getsContentLengthHeader() throws Exception {
+        Header expected = new Header("Content-Length", "12");
+
+        assertEquals(expected, okResponse.getContentLengthHeader());
+    }
+
     @Test
     public void hasEmptyHeaderList() throws Exception {
         OkResponse okResponse = new OkResponse("test payload".getBytes());

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`package httpserver.response;`
`2`	`2`
	`3`	`+import httpserver.ContentLengthHeader;`
`3`	`4`	`import httpserver.Header;`
`4`	`5`
`5`	`6`	`import java.util.ArrayList;`
`@@ -31,4 +32,8 @@ public Header[] getHeaders() {`
`31`	`32`	`public void setHeader(Header header) {`
`32`	`33`	`headers.add(header);`
`33`	`34`	`}`
	`35`	`+`
	`36`	`+ public Header getContentLengthHeader() {`
	`37`	`+ return new ContentLengthHeader(payload);`
	`38`	`+ }`
`34`	`39`	`}`