buffer: move actual send to the buffer implementation

- remove the need of creating a buffer iterator for jetty and undertow
- ref #3604

Author: jknack

jooby/src/main/java/io/jooby/buffer/DataBuffer.java

@@ -16,6 +16,7 @@
 import java.util.function.IntPredicate;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
+import io.jooby.Context;
 
 /**
  * Basic abstraction over byte buffers.
@@ -447,6 +448,14 @@ default String toString(Charset charset) {
    */
   DataBuffer clear();
 
+  /**
+   * Send the buffer data to the client.
+   *
+   * @param ctx HTTP context.
+   * @return HTTP context.
+   */
+  Context send(Context ctx);
+
   /**
    * A dedicated iterator type that ensures the lifecycle of iterated {@link ByteBuffer} elements.
    * This iterator must be used in a try-with-resources clause or explicitly {@linkplain #close()

jooby/src/main/java/io/jooby/buffer/DataBufferWrapper.java

@@ -11,6 +11,8 @@
 import java.nio.charset.Charset;
 import java.util.function.IntPredicate;
 
+import io.jooby.Context;
+
 /**
  * Provides a convenient implementation of the {@link DataBuffer} interface that can be overridden
  * to adapt the delegate.
@@ -208,10 +210,16 @@ public String toString(Charset charset) {
 
   @Override
   public DataBuffer clear() {
-    this.clear();
+    delegate.clear();
     return this;
   }
 
+  @Override
+  public Context send(Context ctx) {
+    this.delegate.send(ctx);
+    return ctx;
+  }
+
   @Override
   public String toString(int index, int length, Charset charset) {
     return this.delegate.toString(index, length, charset);

jooby/src/main/java/io/jooby/buffer/DefaultDataBuffer.java

@@ -11,6 +11,8 @@
 import java.util.NoSuchElementException;
 import java.util.function.IntPredicate;
 
+import io.jooby.Context;
+
 /**
  * Default implementation of the {@link DataBuffer} interface that uses a {@link ByteBuffer}
  * internally. with separate read and write positions. Constructed using the {@link
@@ -474,6 +476,12 @@ public DataBuffer clear() {
     return this;
   }
 
+  @Override
+  public Context send(Context ctx) {
+    ctx.send(this.byteBuffer.slice(this.readPosition, readableByteCount()));
+    return ctx;
+  }
+
   private static final class ByteBufferIterator implements DataBuffer.ByteBufferIterator {
 
     private final ByteBuffer buffer;

modules/jooby-jetty/src/main/java/io/jooby/internal/jetty/JettyContext.java

@@ -6,7 +6,6 @@
 package io.jooby.internal.jetty;
 
 import static io.jooby.internal.jetty.JettyCallbacks.fromByteBufferArray;
-import static io.jooby.internal.jetty.JettyCallbacks.fromDataBuffer;
 import static org.eclipse.jetty.http.HttpHeader.*;
 import static org.eclipse.jetty.http.HttpHeader.CONTENT_TYPE;
 import static org.eclipse.jetty.http.HttpHeader.SET_COOKIE;
@@ -520,12 +519,7 @@ public Context send(@NonNull String data, @NonNull Charset charset) {
 
   @NonNull @Override
   public Context send(@NonNull DataBuffer data) {
-    var length = response.getHeaders().getLongField(CONTENT_LENGTH);
-    if (length <= 0) {
-      setResponseLength(data.readableByteCount());
-    }
-    responseStarted = true;
-    fromDataBuffer(response, this, data).send(true);
+    data.send(this);
     return this;
   }
 

modules/jooby-netty/src/main/java/io/jooby/internal/netty/NettyContext.java

@@ -71,7 +71,6 @@
 import io.jooby.ValueNode;
 import io.jooby.WebSocket;
 import io.jooby.buffer.DataBuffer;
-import io.jooby.netty.buffer.NettyDataBuffer;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.ChannelFuture;
@@ -597,10 +596,11 @@ public final Context send(ByteBuffer data) {
 
   @NonNull @Override
   public Context send(@NonNull DataBuffer data) {
-    return send(((NettyDataBuffer) data).getNativeBuffer());
+    data.send(this);
+    return this;
   }
 
-  private Context send(@NonNull ByteBuf data) {
+  public Context send(@NonNull ByteBuf data) {
     try {
       responseStarted = true;
       setHeaders.set(CONTENT_LENGTH, Integer.toString(data.readableBytes()));

modules/jooby-netty/src/main/java/io/jooby/netty/buffer/NettyDataBuffer.java

@@ -12,8 +12,10 @@
 import java.util.Objects;
 import java.util.function.IntPredicate;
 
+import io.jooby.Context;
 import io.jooby.buffer.DataBuffer;
 import io.jooby.buffer.PooledDataBuffer;
+import io.jooby.internal.netty.NettyContext;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufUtil;
 
@@ -287,6 +289,12 @@ public DataBuffer clear() {
     return this;
   }
 
+  @Override
+  public Context send(Context ctx) {
+    ((NettyContext) ctx).send(this.byteBuf);
+    return ctx;
+  }
+
   @Override
   public boolean isAllocated() {
     return this.byteBuf.refCnt() > 0;

modules/jooby-undertow/src/main/java/io/jooby/internal/undertow/UndertowContext.java

@@ -500,10 +500,7 @@ public Context send(@NonNull ByteBuffer data) {
 
   @NonNull @Override
   public Context send(@NonNull DataBuffer data) {
-    exchange
-        .getResponseHeaders()
-        .put(Headers.CONTENT_LENGTH, Long.toString(data.readableByteCount()));
-    new UndertowDataBufferCallback(data, this).send(exchange);
+    data.send(this);
     return this;
   }
 

tests/src/test/java/io/jooby/junit/ServerTestRunner.java

@@ -28,7 +28,9 @@
 import io.jooby.SneakyThrows;
 import io.jooby.StartupSummary;
 import io.jooby.StatusCode;
+import io.jooby.buffer.DefaultDataBufferFactory;
 import io.jooby.internal.MutedServer;
+import io.jooby.netty.NettyServer;
 import io.jooby.test.WebClient;
 
 public class ServerTestRunner {
@@ -89,6 +91,9 @@ public void ready(SneakyThrows.Consumer2<WebClient, WebClient> onReady) {
       System.setProperty("___app_name__", testName);
       System.setProperty("___server_name__", server.getName());
       Jooby app = provider.get();
+      if (!(server instanceof NettyServer)) {
+        app.setBufferFactory(new DefaultDataBufferFactory());
+      }
       Optional.ofNullable(executionMode).ifPresent(app::setExecutionMode);
       // Reduce log from maven build:
       var mavenBuild = System.getProperty("surefire.real.class.path", "").length() > 0;