Start changing over to use streams instead of byte[]

onlyskin · onlyskin · commit 05ac1629bd1a · 2017-12-20T18:25:09.000+02:00
diff --git a/src/main/java/httpserver/response/PartialContentResponse.java b/src/main/java/httpserver/response/PartialContentResponse.java
@@ -2,12 +2,13 @@
 
 import httpserver.Range;
 
+import java.io.ByteArrayInputStream;
 import java.util.Arrays;
 
 public class PartialContentResponse extends Response {
     public PartialContentResponse(Range range, byte[] payload) {
         byte[] partialPayload = getPartialPayload(range, payload);
-        super.setPayload(partialPayload);
+        super.setPayloadStream(new ByteArrayInputStream(partialPayload));
     }
 
     private byte[] getPartialPayload(Range range, byte[] payload) {
diff --git a/src/main/java/httpserver/response/Response.java b/src/main/java/httpserver/response/Response.java
@@ -3,13 +3,16 @@
 import httpserver.header.ContentLengthHeader;
 import httpserver.header.Header;
 
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.List;
 
 public abstract class Response {
     private byte[] payload;
+    private InputStream payloadStream;
     private final List<Header> headers;
     private boolean isHead;
 
@@ -25,6 +28,14 @@ public void setPayload(byte[] newPayload) {
         payload = newPayload;
     }
 
+    public InputStream getPayloadStream() {
+        return payloadStream;
+    }
+
+    public void setPayloadStream(InputStream payloadStream) {
+        this.payloadStream = payloadStream;
+    }
+
     public Header[] getHeaders() {
         return headers.toArray(new Header[0]);
     }
@@ -34,6 +45,14 @@ public void setHeader(Header header) {
     }
 
     public Header getContentLengthHeader() {
+        if (payloadStream != null) {
+            int data = payloadStream.read();
+            while(data != -1){
+                System.out.print((char) data);
+                outputStream.write(data);
+                data = payloadStream.read();
+            }
+        }
         return new ContentLengthHeader(payload);
     }
 
@@ -47,4 +66,13 @@ public void writePayload(OutputStream outputStream) throws IOException {
         }
         outputStream.write(payload);
     }
+
+    public void writePayloadStream(OutputStream outputStream) throws IOException {
+        int data = payloadStream.read();
+        while(data != -1){
+            System.out.print((char) data);
+            outputStream.write(data);
+            data = payloadStream.read();
+        }
+    }
 }
diff --git a/src/main/java/httpserver/response/TeapotResponse.java b/src/main/java/httpserver/response/TeapotResponse.java
@@ -1,8 +1,12 @@
 package httpserver.response;
 
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+
 public class TeapotResponse extends Response {
     public TeapotResponse() {
-        super.setPayload("I'm a teapot".getBytes());
+        InputStream inputStream = new ByteArrayInputStream("I'm a teapot".getBytes());
+        super.setPayloadStream(inputStream);
     }
 
     public int getStatusCode() {
diff --git a/src/test/java/httpserver/response/PartialContentResponseTest.java b/src/test/java/httpserver/response/PartialContentResponseTest.java
@@ -17,6 +17,6 @@ public void partialRange() throws Exception {
         assertEquals(new Header("Content-Length", "6"), partialContentResponse.getContentLengthHeader());
         OutputStream outputStreamMock = mock(OutputStream.class);
         partialContentResponse.writePayload(outputStreamMock);
-        verify(outputStreamMock).write("ged te".getBytes());
+        verify(outputStreamMock, times(6)).write(anyInt());
     }
 }
diff --git a/src/test/java/httpserver/response/TeapotResponseTest.java b/src/test/java/httpserver/response/TeapotResponseTest.java
@@ -23,10 +23,10 @@ public void hasStatusCode405() throws Exception {
     }
 
     @Test
-    public void hasEmptyPayload() throws Exception {
+    public void hasCorrectPayload() throws Exception {
         OutputStream outputStreamMock = mock(OutputStream.class);
-        teapotResponse.writePayload(outputStreamMock);
-        verify(outputStreamMock).write("I'm a teapot".getBytes());
+        teapotResponse.writePayloadStream(outputStreamMock);
+        verify(outputStreamMock, times(12)).write(anyInt());
     }
 
     @Test

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,6 @@ public void partialRange() throws Exception {`
`17`	`17`	`assertEquals(new Header("Content-Length", "6"), partialContentResponse.getContentLengthHeader());`
`18`	`18`	`OutputStream outputStreamMock = mock(OutputStream.class);`
`19`	`19`	`partialContentResponse.writePayload(outputStreamMock);`
`20`		`- verify(outputStreamMock).write("ged te".getBytes());`
	`20`	`+ verify(outputStreamMock, times(6)).write(anyInt());`
`21`	`21`	`}`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,10 +23,10 @@ public void hasStatusCode405() throws Exception {`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`@Test`
`26`		`- public void hasEmptyPayload() throws Exception {`
	`26`	`+ public void hasCorrectPayload() throws Exception {`
`27`	`27`	`OutputStream outputStreamMock = mock(OutputStream.class);`
`28`		`- teapotResponse.writePayload(outputStreamMock);`
`29`		`- verify(outputStreamMock).write("I'm a teapot".getBytes());`
	`28`	`+ teapotResponse.writePayloadStream(outputStreamMock);`
	`29`	`+ verify(outputStreamMock, times(12)).write(anyInt());`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`@Test`