output api: code clean up + refactor

Author: jknack

jooby/src/main/java/io/jooby/output/ByteBufferOut.java

@@ -7,6 +7,8 @@
 
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
+import java.util.Iterator;
+import java.util.List;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import io.jooby.Context;
@@ -59,6 +61,11 @@ public void accept(SneakyThrows.Consumer<ByteBuffer> consumer) {
     consumer.accept(asByteBuffer());
   }
 
+  @Override
+  public Iterator<ByteBuffer> iterator() {
+    return List.of(asByteBuffer()).iterator();
+  }
+
   private int writableByteCount() {
     return this.capacity - this.writePosition;
   }

jooby/src/main/java/io/jooby/output/Output.java

@@ -42,6 +42,21 @@ default void toByteBuffer(ByteBuffer dest) {
     toByteBuffer(0, dest, dest.position(), size());
   }
 
+  /**
+   * Copies the given length from this data buffer into the given destination {@code ByteBuffer},
+   * beginning at the given source position, and the given destination position in the destination
+   * byte buffer.
+   *
+   * @param srcPos the position of this data buffer from where copying should start
+   * @param dest the destination byte buffer
+   * @param destPos the position in {@code dest} to where copying should start
+   * @param length the amount of data to copy
+   */
+  default void toByteBuffer(int srcPos, ByteBuffer dest, int destPos, int length) {
+    dest = dest.duplicate().clear();
+    dest.put(destPos, asByteBuffer(), srcPos, length);
+  }
+
   default Iterator<ByteBuffer> split(IntPredicate predicate) {
     // TODO: fix me for chunks
     var buffer = asByteBuffer();
@@ -60,21 +75,6 @@ default Iterator<ByteBuffer> split(IntPredicate predicate) {
     return chunks.iterator();
   }
 
-  /**
-   * Copies the given length from this data buffer into the given destination {@code ByteBuffer},
-   * beginning at the given source position, and the given destination position in the destination
-   * byte buffer.
-   *
-   * @param srcPos the position of this data buffer from where copying should start
-   * @param dest the destination byte buffer
-   * @param destPos the position in {@code dest} to where copying should start
-   * @param length the amount of data to copy
-   */
-  default void toByteBuffer(int srcPos, ByteBuffer dest, int destPos, int length) {
-    dest = dest.duplicate().clear();
-    dest.put(destPos, asByteBuffer(), srcPos, length);
-  }
-
   void accept(SneakyThrows.Consumer<ByteBuffer> consumer);
 
   default Iterator<ByteBuffer> iterator() {

jooby/src/main/java/io/jooby/output/OutputOutputStream.java

@@ -21,8 +21,8 @@ final class OutputOutputStream extends OutputStream {
 
   private boolean closed;
 
-  public OutputOutputStream(@NonNull Output dataBuffer) {
-    this.output = dataBuffer;
+  public OutputOutputStream(@NonNull Output output) {
+    this.output = output;
   }
 
   @Override

modules/jooby-avaje-jsonb/src/main/java/io/jooby/avaje/jsonb/AvajeJsonbModule.java

@@ -18,7 +18,7 @@
 import io.jooby.MessageDecoder;
 import io.jooby.MessageEncoder;
 import io.jooby.ServiceRegistry;
-import io.jooby.internal.avaje.jsonb.DataBufferJsonOutput;
+import io.jooby.internal.avaje.jsonb.BufferedJsonOutput;
 import io.jooby.output.Output;
 
 /**
@@ -109,7 +109,7 @@ public Output encode(@NonNull Context ctx, @NonNull Object value) {
     ctx.setDefaultResponseType(MediaType.json);
     var factory = ctx.getOutputFactory();
     var buffer = factory.newBufferedOutput();
-    try (var writer = jsonb.writer(new DataBufferJsonOutput(buffer))) {
+    try (var writer = jsonb.writer(new BufferedJsonOutput(buffer))) {
       jsonb.toJson(value, writer);
       return buffer;
     }

…al/avaje/jsonb/DataBufferJsonOutput.java …rnal/avaje/jsonb/BufferedJsonOutput.javamodules/jooby-avaje-jsonb/src/main/java/io/jooby/internal/avaje/jsonb/DataBufferJsonOutput.java renamed to modules/jooby-avaje-jsonb/src/main/java/io/jooby/internal/avaje/jsonb/BufferedJsonOutput.java modules/jooby-avaje-jsonb/src/main/java/io/jooby/internal/avaje/jsonb/DataBufferJsonOutput.java renamed to modules/jooby-avaje-jsonb/src/main/java/io/jooby/internal/avaje/jsonb/BufferedJsonOutput.java

@@ -11,10 +11,10 @@
 import io.avaje.json.stream.JsonOutput;
 import io.jooby.output.Output;
 
-public class DataBufferJsonOutput implements JsonOutput {
+public class BufferedJsonOutput implements JsonOutput {
   private final Output output;
 
-  public DataBufferJsonOutput(Output output) {
+  public BufferedJsonOutput(Output output) {
     this.output = output;
   }
 

modules/jooby-jetty/src/main/java/io/jooby/jetty/JettyServer.java

@@ -54,9 +54,6 @@ public class JettyServer extends io.jooby.Server.Base {
 
   private Consumer<HttpConfiguration> httpConfigurer;
 
-  // TODO: integrate buffer factory with Jetty.
-  // private DataBufferFactory bufferFactory;
-
   public JettyServer(@NonNull QueuedThreadPool threadPool) {
     this.threadPool = threadPool;
   }

…jooby/internal/jte/DataBufferOutput.java …internal/jte/BufferedTemplateOutput.javamodules/jooby-jte/src/main/java/io/jooby/internal/jte/DataBufferOutput.java renamed to modules/jooby-jte/src/main/java/io/jooby/internal/jte/BufferedTemplateOutput.java modules/jooby-jte/src/main/java/io/jooby/internal/jte/DataBufferOutput.java renamed to modules/jooby-jte/src/main/java/io/jooby/internal/jte/BufferedTemplateOutput.java

@@ -11,11 +11,11 @@
 import gg.jte.TemplateOutput;
 import io.jooby.output.Output;
 
-public class DataBufferOutput implements TemplateOutput {
+public class BufferedTemplateOutput implements TemplateOutput {
   private final Output buffer;
   private final Charset charset;
 
-  public DataBufferOutput(Output buffer, Charset charset) {
+  public BufferedTemplateOutput(Output buffer, Charset charset) {
     this.buffer = buffer;
     this.charset = charset;
   }

modules/jooby-jte/src/main/java/io/jooby/internal/jte/JteModelEncoder.java

@@ -18,8 +18,7 @@ public class JteModelEncoder implements io.jooby.MessageEncoder {
   public Output encode(@NonNull Context ctx, @NonNull Object value) throws Exception {
     if (value instanceof JteModel jte) {
       var buffer = ctx.getOutputFactory().newBufferedOutput();
-      var output = new DataBufferOutput(buffer, StandardCharsets.UTF_8);
-      jte.render(output);
+      jte.render(new BufferedTemplateOutput(buffer, StandardCharsets.UTF_8));
       return buffer;
     }
     return null;

modules/jooby-jte/src/main/java/io/jooby/jte/JteTemplateEngine.java

@@ -14,7 +14,7 @@
 import io.jooby.Context;
 import io.jooby.MapModelAndView;
 import io.jooby.ModelAndView;
-import io.jooby.internal.jte.DataBufferOutput;
+import io.jooby.internal.jte.BufferedTemplateOutput;
 import io.jooby.output.Output;
 
 class JteTemplateEngine implements io.jooby.TemplateEngine {
@@ -34,7 +34,7 @@ public List<String> extensions() {
   @Override
   public Output render(Context ctx, ModelAndView<?> modelAndView) {
     var buffer = ctx.getOutputFactory().newBufferedOutput();
-    var output = new DataBufferOutput(buffer, StandardCharsets.UTF_8);
+    var output = new BufferedTemplateOutput(buffer, StandardCharsets.UTF_8);
     var attributes = ctx.getAttributes();
     if (modelAndView instanceof MapModelAndView mapModelAndView) {
       var mapModel = new HashMap<String, Object>();

…y/internal/jte/DataBufferOutputTest.java …rnal/jte/BufferedTemplateOutputTest.javamodules/jooby-jte/src/test/java/io/jooby/internal/jte/DataBufferOutputTest.java renamed to modules/jooby-jte/src/test/java/io/jooby/internal/jte/BufferedTemplateOutputTest.java modules/jooby-jte/src/test/java/io/jooby/internal/jte/DataBufferOutputTest.java renamed to modules/jooby-jte/src/test/java/io/jooby/internal/jte/BufferedTemplateOutputTest.java

@@ -13,13 +13,13 @@
 
 import io.jooby.output.DefaultOutputFactory;
 
-public class DataBufferOutputTest {
+public class BufferedTemplateOutputTest {
 
   @Test
   public void checkWriteContent() {
     var factory = new DefaultOutputFactory();
     var buffer = factory.newBufferedOutput();
-    var output = new DataBufferOutput(buffer, StandardCharsets.UTF_8);
+    var output = new BufferedTemplateOutput(buffer, StandardCharsets.UTF_8);
     output.writeContent("Hello");
     assertEquals("Hello", buffer.asString(StandardCharsets.UTF_8));
   }
@@ -28,7 +28,7 @@ public void checkWriteContent() {
   public void checkWriteContentSubstring() {
     var factory = new DefaultOutputFactory();
     var buffer = factory.newBufferedOutput();
-    var output = new DataBufferOutput(buffer, StandardCharsets.UTF_8);
+    var output = new BufferedTemplateOutput(buffer, StandardCharsets.UTF_8);
     output.writeContent(" Hello World! ", 1, " Hello World! ".length() - 2);
     assertEquals("Hello World", buffer.asString(StandardCharsets.UTF_8));
   }
@@ -37,7 +37,7 @@ public void checkWriteContentSubstring() {
   public void checkWriteBinaryContent() {
     var factory = new DefaultOutputFactory();
     var buffer = factory.newBufferedOutput();
-    var output = new DataBufferOutput(buffer, StandardCharsets.UTF_8);
+    var output = new BufferedTemplateOutput(buffer, StandardCharsets.UTF_8);
     output.writeBinaryContent("Hello".getBytes(StandardCharsets.UTF_8));
     assertEquals("Hello", buffer.asString(StandardCharsets.UTF_8));
   }