Refactor Response to be abstract class instead of interface

onlyskin · onlyskin · commit 4a18ff2e05f6 · 2017-12-12T13:36:01.000+02:00
diff --git a/src/main/java/httpserver/responder/GetResponder.java b/src/main/java/httpserver/responder/GetResponder.java
@@ -63,8 +63,9 @@ private String htmlLinksForContents(Path root, Path[] paths) {
 
     private Response responseForFile(Path path) {
         byte[] payload = pathExaminer.fileContents(path);
-        Header[] headers = new Header[]{new ContentTypeHeader(path)};
-        return new OkResponse(payload, headers);
+        OkResponse okResponse = new OkResponse(payload);
+        okResponse.setHeader(new ContentTypeHeader(path));
+        return okResponse;
     }
 
     private Map<String, Responder> getRouteMap() {
diff --git a/src/main/java/httpserver/responder/LogsResponder.java b/src/main/java/httpserver/responder/LogsResponder.java
@@ -2,7 +2,6 @@
 
 import httpserver.AppConfig;
 import httpserver.Authorizer;
-import httpserver.Header;
 import httpserver.Request;
 import httpserver.response.OkResponse;
 import httpserver.response.Response;
@@ -13,7 +12,7 @@ public class LogsResponder implements Responder {
     public Response respond(AppConfig appConfig, Request request) {
         if (new Authorizer().authorize(request)) {
             byte[] log = appConfig.getLogger().readLog();
-            return new OkResponse(log, new Header[0]);
+            return new OkResponse(log);
         } else {
             return new UnauthorizedResponse();
         }
diff --git a/src/main/java/httpserver/response/FourEighteenResponse.java b/src/main/java/httpserver/response/FourEighteenResponse.java
@@ -1,20 +1,11 @@
 package httpserver.response;
 
-import httpserver.Header;
+public class FourEighteenResponse extends Response {
+    public FourEighteenResponse() {
+        super.setPayload("I'm a teapot".getBytes());
+    }
 
-public class FourEighteenResponse implements Response {
-    @Override
     public int getStatusCode() {
         return 418;
     }
-
-    @Override
-    public byte[] getPayload() {
-        return "I'm a teapot".getBytes();
-    }
-
-    @Override
-    public Header[] getHeaders() {
-        return new Header[0];
-    }
 }
diff --git a/src/main/java/httpserver/response/MethodNotAllowedResponse.java b/src/main/java/httpserver/response/MethodNotAllowedResponse.java
@@ -1,20 +1,7 @@
 package httpserver.response;
 
-import httpserver.Header;
-
-public class MethodNotAllowedResponse implements Response {
-    @Override
+public class MethodNotAllowedResponse extends Response {
     public int getStatusCode() {
         return 405;
     }
-
-    @Override
-    public byte[] getPayload() {
-        return new byte[0];
-    }
-
-    @Override
-    public Header[] getHeaders() {
-        return new Header[0];
-    }
 }
diff --git a/src/main/java/httpserver/response/NotFoundResponse.java b/src/main/java/httpserver/response/NotFoundResponse.java
@@ -1,20 +1,7 @@
 package httpserver.response;
 
-import httpserver.Header;
-
-public class NotFoundResponse implements Response {
-    @Override
+public class NotFoundResponse extends Response {
     public int getStatusCode() {
         return 404;
     }
-
-    @Override
-    public byte[] getPayload() {
-        return new byte[0];
-    }
-
-    @Override
-    public Header[] getHeaders() {
-        return new Header[0];
-    }
 }
diff --git a/src/main/java/httpserver/response/OkResponse.java b/src/main/java/httpserver/response/OkResponse.java
@@ -1,32 +1,12 @@
 package httpserver.response;
 
-import httpserver.Header;
-
-public class OkResponse implements Response {
-    private final byte[] payload;
-    private final Header[] headers;
+public class OkResponse extends Response {
 
     public OkResponse(byte[] payload) {
-        this.payload = payload;
-        this.headers = new Header[0];
-    }
-
-    public OkResponse(byte[] payload, Header[] headers) {
-        this.payload = payload;
-        this.headers = headers;
+        super.setPayload(payload);
     }
 
-    @Override
     public int getStatusCode() {
         return 200;
     }
-
-    @Override
-    public byte[] getPayload() {
-        return payload;
-    }
-
-    public Header[] getHeaders() {
-        return this.headers;
-    }
 }
diff --git a/src/main/java/httpserver/response/Response.java b/src/main/java/httpserver/response/Response.java
@@ -2,10 +2,33 @@
 
 import httpserver.Header;
 
-public interface Response {
-    int getStatusCode();
+import java.util.ArrayList;
+import java.util.List;
 
-    byte[] getPayload();
+public abstract class Response {
+    private byte[] payload;
+    private final List<Header> headers;
 
-    Header[] getHeaders();
+    public Response() {
+        this.payload = new byte[0];
+        this.headers = new ArrayList<>();
+    }
+
+    public abstract int getStatusCode();
+
+    public byte[] getPayload() {
+        return payload;
+    }
+
+    public void setPayload(byte[] newPayload) {
+        payload = newPayload;
+    }
+
+    public Header[] getHeaders() {
+        return headers.toArray(new Header[0]);
+    }
+
+    public void setHeader(Header header) {
+        headers.add(header);
+    }
 }
diff --git a/src/main/java/httpserver/response/UnauthorizedResponse.java b/src/main/java/httpserver/response/UnauthorizedResponse.java
@@ -2,19 +2,12 @@
 
 import httpserver.Header;
 
-public class UnauthorizedResponse implements Response {
-    @Override
-    public int getStatusCode() {
-        return 401;
-    }
-
-    @Override
-    public byte[] getPayload() {
-        return new byte[0];
+public class UnauthorizedResponse extends Response {
+    public UnauthorizedResponse() {
+        super.setHeader(new Header("WWW-Authenticate", "Basic realm=\"\""));
     }
 
-    @Override
-    public Header[] getHeaders() {
-        return new Header[]{new Header("WWW-Authenticate", "Basic realm=\"\"")};
+    public int getStatusCode() {
+        return 401;
     }
 }
diff --git a/src/test/java/httpserver/ResponseWriterTest.java b/src/test/java/httpserver/ResponseWriterTest.java
@@ -36,8 +36,8 @@ public void writes200RequestWithPayload() throws Exception {
     public void writesResponseHeaders() throws Exception {
         Header headerMock = mock(Header.class);
         when(headerMock.toString()).thenReturn("example: header");
-        Header[] headers = new Header[]{headerMock};
-        Response response = new OkResponse("example".getBytes(), headers);
+        Response response = new OkResponse("example".getBytes());
+        response.setHeader(headerMock);
 
         String output = outputForResponse(response);
 
diff --git a/src/test/java/httpserver/response/OkResponseTest.java b/src/test/java/httpserver/response/OkResponseTest.java
@@ -13,8 +13,9 @@ public class OkResponseTest {
     public OkResponseTest() {
         Header header1 = new Header("header1", "value");
         Header header2 = new Header("header2", "v");
-        Header[] headers = new Header[]{header1, header2};
-        this.okResponse = new OkResponse("test payload".getBytes(), headers);
+        this.okResponse = new OkResponse("test payload".getBytes());
+        okResponse.setHeader(header1);
+        okResponse.setHeader(header2);
     }
 
     @Test
