more refactor on byterange

jknack · jknack · commit 3c0953128ce8 · 2019-04-12T16:51:51.000-03:00
diff --git a/jooby/src/main/java/io/jooby/ByteRange.java b/jooby/src/main/java/io/jooby/ByteRange.java
@@ -1,5 +1,10 @@
 package io.jooby;
 
+import org.apache.commons.io.input.BoundedInputStream;
+
+import java.io.IOException;
+import java.io.InputStream;
+
 public class ByteRange {
   private static final String BYTES_EQ = "bytes=";
 
@@ -62,6 +67,17 @@ public ByteRange apply(Context ctx) {
     return this;
   }
 
+  public InputStream apply(InputStream input) throws IOException  {
+    if (statusCode == StatusCode.OK) {
+      return input;
+    }
+    if (statusCode == StatusCode.PARTIAL_CONTENT) {
+      input.skip(start);
+      return new BoundedInputStream(input, end);
+    }
+    throw new Err(statusCode, value);
+  }
+
   @Override public String toString() {
     return value;
   }
diff --git a/modules/server/jooby-jetty/src/main/java/io/jooby/internal/jetty/ByteRangeInputStream.java b/modules/server/jooby-jetty/src/main/java/io/jooby/internal/jetty/ByteRangeInputStream.java
diff --git a/modules/server/jooby-jetty/src/main/java/io/jooby/internal/jetty/JettyContext.java b/modules/server/jooby-jetty/src/main/java/io/jooby/internal/jetty/JettyContext.java
@@ -336,9 +336,9 @@ private Context sendStreamInternal(@Nonnull InputStream in) {
       long len = response.getContentLength();
       InputStream stream;
       if (len > 0) {
-        ByteRange range = ByteRange.parse(request.getHeader(HttpHeader.RANGE.asString()), len)
-            .apply(this);
-        stream = new ByteRangeInputStream(in, range);
+        stream = ByteRange.parse(request.getHeader(HttpHeader.RANGE.asString()), len)
+            .apply(this)
+            .apply(in);
       } else {
         response.setHeader(HttpHeader.TRANSFER_ENCODING, HttpHeaderValue.CHUNKED.asString());
         stream = in;
diff --git a/modules/server/jooby-netty/src/main/java/io/jooby/internal/netty/NettyContext.java b/modules/server/jooby-netty/src/main/java/io/jooby/internal/netty/NettyContext.java
@@ -332,16 +332,9 @@ public NettyContext(ChannelHandlerContext ctx, HttpRequest req, Router router, S
     try {
       prepareChunked();
       long len = responseLength();
-      ChunkedInput chunkedStream;
       ByteRange range = ByteRange.parse(req.headers().get(RANGE), len)
           .apply(this);
-      if (range.isPartial()) {
-        range.apply(this);
-        in.skip(range.getStart());
-        chunkedStream = new ChunkedLimitedStream(in, bufferSize, range.getEnd());
-      } else {
-        chunkedStream = new ChunkedStream(in, bufferSize);
-      }
+      ChunkedStream chunkedStream = new ChunkedStream(range.apply(in), bufferSize);
 
       DefaultHttpResponse rsp = new DefaultHttpResponse(HttpVersion.HTTP_1_1, status, setHeaders);
       responseStarted = true;
diff --git a/modules/server/jooby-utow/src/main/java/io/jooby/internal/utow/UtowContext.java b/modules/server/jooby-utow/src/main/java/io/jooby/internal/utow/UtowContext.java
@@ -274,15 +274,9 @@ public Context setContentType(@Nonnull MediaType contentType, @Nullable Charset
     try {
       ifSetChunked();
       long len = exchange.getResponseContentLength();
-      if (len > 0) {
-        ByteRange range = ByteRange.parse(exchange.getRequestHeaders().getFirst(RANGE), len)
-            .apply(this);
-        in.skip(range.getStart());
-        len = range.getEnd();
-      } else {
-        len = -1;
-      }
-      new UtowChunkedStream(len).send(Channels.newChannel(in), exchange, this);
+      ByteRange range = ByteRange.parse(exchange.getRequestHeaders().getFirst(RANGE), len)
+          .apply(this);
+      new UtowChunkedStream(len).send(Channels.newChannel(range.apply(in)), exchange, this);
       return this;
     } catch (IOException x) {
       throw Throwing.sneakyThrow(x);
