Context API: Add ctx.send(byte[]...) and ctx.send(ByteBuffer[])

jknack · jknack · commit 901bbcbb5815 · 2019-10-02T14:40:37.000-03:00
diff --git a/jooby/src/main/java/io/jooby/Context.java b/jooby/src/main/java/io/jooby/Context.java
@@ -985,6 +985,10 @@ public interface Context extends Registry {
    */
   @Nonnull Context send(@Nonnull ByteBuffer data);
 
+  @Nonnull Context send(@Nonnull byte[]... data);
+
+  @Nonnull Context send(@Nonnull ByteBuffer[] data);
+
   /**
    * Send response data.
    *
diff --git a/jooby/src/main/java/io/jooby/DefaultContext.java b/jooby/src/main/java/io/jooby/DefaultContext.java
@@ -19,6 +19,7 @@
 import java.io.OutputStream;
 import java.io.PrintWriter;
 import java.lang.reflect.Type;
+import java.nio.ByteBuffer;
 import java.nio.channels.FileChannel;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
@@ -401,6 +402,14 @@ default Context setResponseHeader(@Nonnull String name, @Nonnull Object value) {
     return send(redirect);
   }
 
+  @Override default @Nonnull Context send(@Nonnull byte[]... data) {
+    ByteBuffer[] buffer = new ByteBuffer[data.length];
+    for (int i = 0; i < data.length; i++) {
+      buffer[i] = ByteBuffer.wrap(data[i]);
+    }
+    return send(buffer);
+  }
+
   @Override default @Nonnull Context send(@Nonnull String data) {
     return send(data, StandardCharsets.UTF_8);
   }
diff --git a/jooby/src/main/java/io/jooby/ForwardingContext.java b/jooby/src/main/java/io/jooby/ForwardingContext.java
@@ -471,6 +471,16 @@ public Context sendRedirect(@Nonnull StatusCode redirect, @Nonnull String locati
     return this;
   }
 
+  @Nonnull @Override public Context send(@Nonnull byte[]... data) {
+    ctx.send(data);
+    return this;
+  }
+
+  @Nonnull @Override public Context send(@Nonnull ByteBuffer[] data) {
+    ctx.send(data);
+    return this;
+  }
+
   @Override @Nonnull public Context send(@Nonnull ReadableByteChannel channel) {
     ctx.send(channel);
     return this;
diff --git a/modules/jooby-jetty/src/main/java/io/jooby/internal/jetty/JettyContext.java b/modules/jooby-jetty/src/main/java/io/jooby/internal/jetty/JettyContext.java
@@ -26,6 +26,7 @@
 import io.jooby.Value;
 import io.jooby.ValueNode;
 import io.jooby.WebSocket;
+import org.eclipse.jetty.http.HttpContent;
 import org.eclipse.jetty.http.HttpFields;
 import org.eclipse.jetty.http.HttpHeader;
 import org.eclipse.jetty.http.HttpHeaderValue;
@@ -34,6 +35,7 @@
 import org.eclipse.jetty.server.HttpOutput;
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.Response;
+import org.eclipse.jetty.util.BufferUtil;
 import org.eclipse.jetty.util.Callback;
 import org.eclipse.jetty.util.MultiMap;
 import org.eclipse.jetty.websocket.api.WebSocketBehavior;
@@ -43,8 +45,11 @@
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
+import javax.servlet.AsyncContext;
 import javax.servlet.MultipartConfigElement;
 import javax.servlet.ServletException;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.WriteListener;
 import javax.servlet.http.Part;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -65,6 +70,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.Executor;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 import static org.eclipse.jetty.http.HttpHeader.CONTENT_TYPE;
 import static org.eclipse.jetty.http.HttpHeader.SET_COOKIE;
@@ -380,6 +386,17 @@ public Context setResponseType(@Nonnull MediaType contentType, @Nullable Charset
     return this;
   }
 
+  @Nonnull @Override public Context send(@Nonnull ByteBuffer[] data) {
+    if (response.getContentLength() <= 0) {
+      setResponseLength(BufferUtil.remaining(data));
+    }
+    ifStartAsync();
+    HttpOutput out = response.getHttpOutput();
+    out.setWriteListener(writeListener(request.getAsyncContext(), out, data));
+    responseStarted = true;
+    return this;
+  }
+
   @Nonnull @Override public Context send(@Nonnull byte[] data) {
     return send(ByteBuffer.wrap(data));
   }
@@ -554,4 +571,25 @@ private static void formParam(Request request, Formdata form) {
     }
   }
 
+  private static WriteListener writeListener(AsyncContext async, HttpOutput out,
+      ByteBuffer[] data) {
+    return new WriteListener() {
+      int i = 0;
+
+      @Override public void onWritePossible() throws IOException {
+        while (out.isReady()) {
+          if (i < data.length) {
+            out.write(data[i++]);
+          } else {
+            async.complete();
+            return;
+          }
+        }
+      }
+
+      @Override public void onError(Throwable x) {
+        async.complete();
+      }
+    };
+  }
 }
diff --git a/modules/jooby-netty/src/main/java/io/jooby/internal/netty/NettyContext.java b/modules/jooby-netty/src/main/java/io/jooby/internal/netty/NettyContext.java
@@ -401,6 +401,14 @@ public NettyContext(ChannelHandlerContext ctx, HttpRequest req, Router router, S
     return send(wrappedBuffer(data));
   }
 
+  @Nonnull @Override public Context send(@Nonnull byte[]... data) {
+    return send(Unpooled.wrappedBuffer(data));
+  }
+
+  @Nonnull @Override public Context send(@Nonnull ByteBuffer[] data) {
+    return send(Unpooled.wrappedBuffer(data));
+  }
+
   @Override public final Context send(ByteBuffer data) {
     return send(wrappedBuffer(data));
   }
diff --git a/modules/jooby-test/src/main/java/io/jooby/MockContext.java b/modules/jooby-test/src/main/java/io/jooby/MockContext.java
@@ -28,6 +28,7 @@
 import java.util.Map;
 import java.util.concurrent.Executor;
 import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 
 /**
  * Unit test friendly context implementation. Allows to set context properties.
@@ -478,13 +479,27 @@ public MockContext setResponseType(@Nonnull MediaType contentType, @Nullable Cha
     return this;
   }
 
+  @Nonnull @Override public MockContext send(@Nonnull byte[]... data) {
+    responseStarted = true;
+    this.response.setResult(data)
+        .setContentLength(IntStream.range(0, data.length).map(i -> data[i].length).sum());
+    return this;
+  }
+
   @Nonnull @Override public MockContext send(@Nonnull ByteBuffer data) {
     responseStarted = true;
     this.response.setResult(data)
         .setContentLength(data.remaining());
     return this;
   }
 
+  @Nonnull @Override public Context send(@Nonnull ByteBuffer[] data) {
+    responseStarted = true;
+    this.response.setResult(data)
+        .setContentLength(IntStream.range(0, data.length).map(i -> data[i].remaining()).sum());
+    return this;
+  }
+
   @Nonnull @Override public MockContext send(InputStream input) {
     responseStarted = true;
     this.response.setResult(input);
diff --git a/modules/jooby-utow/src/main/java/io/jooby/internal/utow/UtowContext.java b/modules/jooby-utow/src/main/java/io/jooby/internal/utow/UtowContext.java
@@ -25,9 +25,11 @@
 import io.jooby.ValueNode;
 import io.jooby.WebSocket;
 import io.undertow.Handlers;
+import io.undertow.connector.PooledByteBuffer;
 import io.undertow.io.IoCallback;
 import io.undertow.io.Sender;
 import io.undertow.server.HttpServerExchange;
+import io.undertow.server.ServerConnection;
 import io.undertow.server.handlers.form.FormData;
 import io.undertow.util.HeaderMap;
 import io.undertow.util.HeaderValues;
@@ -347,6 +349,20 @@ public Context setResponseType(@Nonnull MediaType contentType, @Nullable Charset
     return send(ByteBuffer.wrap(data.getBytes(charset)));
   }
 
+  @Nonnull @Override public Context send(@Nonnull ByteBuffer[] data) {
+    HeaderMap headers = exchange.getResponseHeaders();
+    if (!headers.contains(CONTENT_LENGTH)) {
+      long len = 0;
+      for (ByteBuffer b : data) {
+        len += b.remaining();
+      }
+      exchange.getResponseHeaders().put(Headers.CONTENT_LENGTH, Long.toString(len));
+    }
+
+    exchange.getResponseSender().send(data,this);
+    return this;
+  }
+
   @Nonnull @Override public Context send(@Nonnull ByteBuffer data) {
     exchange.getResponseHeaders().put(Headers.CONTENT_LENGTH, Long.toString(data.remaining()));
     exchange.getResponseSender().send(data, this);
diff --git a/tests/src/test/java/io/jooby/FeaturedTest.java b/tests/src/test/java/io/jooby/FeaturedTest.java
@@ -39,6 +39,7 @@
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoUnit;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -2885,6 +2886,32 @@ public void beanConverter() {
     });
   }
 
+  @Test
+  public void byteArrayResponse() {
+    new JoobyRunner(app -> {
+      app.get("/bytearray", ctx -> {
+        return ctx.send(partition(_19kb.getBytes(StandardCharsets.UTF_8), 1536));
+      });
+    }).ready(client -> {
+      client.get("/bytearray", rsp -> {
+        assertEquals(_19kb, rsp.body().string());
+      });
+    });
+  }
+
+  private byte[][] partition(byte[] bytes, int size) {
+    List<byte[]> result = new ArrayList<>();
+    int offset = 0;
+    while (offset < bytes.length) {
+      int len = Math.min(size,bytes.length - offset);
+      byte[] b = new byte[len];
+      System.arraycopy(bytes, offset, b, 0, len);
+      result.add(b);
+      offset += size;
+    }
+    return result.toArray(new byte[0][0]);
+  }
+
   private static String readText(Path file) {
     try {
       return new String(Files.readAllBytes(file), StandardCharsets.UTF_8);

Original file line number	Diff line number	Diff line change
`@@ -401,6 +401,14 @@ public NettyContext(ChannelHandlerContext ctx, HttpRequest req, Router router, S`
`401`	`401`	`return send(wrappedBuffer(data));`
`402`	`402`	`}`
`403`	`403`
	`404`	`+ @Nonnull @Override public Context send(@Nonnull byte[]... data) {`
	`405`	`+ return send(Unpooled.wrappedBuffer(data));`
	`406`	`+ }`
	`407`	`+`
	`408`	`+ @Nonnull @Override public Context send(@Nonnull ByteBuffer[] data) {`
	`409`	`+ return send(Unpooled.wrappedBuffer(data));`
	`410`	`+ }`
	`411`	`+`
`404`	`412`	`@Override public final Context send(ByteBuffer data) {`
`405`	`413`	`return send(wrappedBuffer(data));`
`406`	`414`	`}`