output-api: refactor API

- Make Output more simply, so it allows reuse and sharing
- Added BufferedOutput for buffers

Author: jknack

jooby/src/main/java/io/jooby/DefaultContext.java

@@ -693,6 +693,6 @@ default Context sendError(@NonNull Throwable cause, @NonNull StatusCode code) {
 
   @Override
   default OutputFactory getOutputFactory() {
-    return getRouter().getOutputFactory().getContextOutputFactory();
+    return getRouter().getOutputFactory().getContextFactory();
   }
 }

jooby/src/main/java/io/jooby/ForwardingContext.java

@@ -672,7 +672,7 @@ public Router getRouter() {
 
   @Override
   public OutputFactory getOutputFactory() {
-    return ctx.getOutputFactory().getContextOutputFactory();
+    return ctx.getOutputFactory().getContextFactory();
   }
 
   @Override

jooby/src/main/java/io/jooby/ServerSentMessage.java

@@ -137,7 +137,7 @@ public ServerSentMessage(@NonNull Object data) {
       var route = ctx.getRoute();
       var encoder = route.getEncoder();
       var bufferFactory = ctx.getOutputFactory();
-      var buffer = bufferFactory.newOutput();
+      var buffer = bufferFactory.allocate();
 
       if (id != null) {
         buffer.write(ID);

jooby/src/main/java/io/jooby/internal/handler/ChunkedSubscriber.java

@@ -117,7 +117,7 @@ public void onComplete() {
   }
 
   private static Output prepend(Context ctx, Output data, byte c) {
-    var buffer = ctx.getOutputFactory().newCompositeOutput();
+    var buffer = ctx.getOutputFactory().newComposite();
     buffer.write(c);
     data.transferTo(buffer::write);
     return buffer;

…nal/output/CompsiteByteBufferOutput.java …oby/internal/output/CompositeOutput.javajooby/src/main/java/io/jooby/internal/output/CompsiteByteBufferOutput.java renamed to jooby/src/main/java/io/jooby/internal/output/CompositeOutput.java jooby/src/main/java/io/jooby/internal/output/CompsiteByteBufferOutput.java renamed to jooby/src/main/java/io/jooby/internal/output/CompositeOutput.java

@@ -6,16 +6,21 @@
 package io.jooby.internal.output;
 
 import java.nio.ByteBuffer;
-import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.List;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import io.jooby.Context;
 import io.jooby.SneakyThrows;
-import io.jooby.output.Output;
+import io.jooby.output.BufferedOutput;
 
-public class CompsiteByteBufferOutput implements Output {
+/**
+ * Merge buffers into one.
+ *
+ * @author edgar
+ * @since 4.0.0
+ */
+public class CompositeOutput implements BufferedOutput {
   private final List<ByteBuffer> chunks = new ArrayList<>();
   private int size = 0;
 
@@ -25,25 +30,25 @@ public int size() {
   }
 
   @Override
-  public Output write(byte b) {
+  public BufferedOutput write(byte b) {
     addChunk(ByteBuffer.wrap(new byte[] {b}));
     return this;
   }
 
   @Override
-  public Output write(byte[] source) {
+  public BufferedOutput write(byte[] source) {
     addChunk(ByteBuffer.wrap(source));
     return this;
   }
 
   @Override
-  public Output write(byte[] source, int offset, int length) {
+  public BufferedOutput write(byte[] source, int offset, int length) {
     addChunk(ByteBuffer.wrap(source, offset, length));
     return this;
   }
 
   @Override
-  public Output clear() {
+  public BufferedOutput clear() {
     chunks.forEach(ByteBuffer::clear);
     chunks.clear();
     return this;
@@ -57,18 +62,13 @@ public Output clear() {
   @Override
   public ByteBuffer asByteBuffer() {
     var buf = ByteBuffer.allocate(size);
-    chunks.forEach(buf::put);
+    for (ByteBuffer chunk : chunks) {
+      buf.put(chunk.duplicate());
+    }
     buf.flip();
     return buf;
   }
 
-  @Override
-  public String asString(@NonNull Charset charset) {
-    var sb = new StringBuilder();
-    chunks.forEach(bytes -> sb.append(charset.decode(bytes)));
-    return sb.toString();
-  }
-
   @Override
   public void transferTo(@NonNull SneakyThrows.Consumer<ByteBuffer> consumer) {
     chunks.forEach(consumer);

jooby/src/main/java/io/jooby/internal/output/ContextOutputFactory.java

@@ -0,0 +1,40 @@
+/*
+ * Jooby https://jooby.io
+ * Apache License Version 2.0 https://jooby.io/LICENSE.txt
+ * Copyright 2014 Edgar Espina
+ */
+package io.jooby.internal.output;
+
+import java.nio.ByteBuffer;
+import java.nio.charset.Charset;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+import io.jooby.output.ByteBufferedOutputFactory;
+import io.jooby.output.Output;
+import io.jooby.output.OutputOptions;
+
+public class ContextOutputFactory extends ByteBufferedOutputFactory {
+  public ContextOutputFactory(OutputOptions options) {
+    super(options);
+  }
+
+  @Override
+  public Output wrap(@NonNull ByteBuffer buffer) {
+    return new WrappedOutput(buffer);
+  }
+
+  @Override
+  public Output wrap(@NonNull String value, @NonNull Charset charset) {
+    return new WrappedOutput(charset.encode(value));
+  }
+
+  @Override
+  public Output wrap(@NonNull byte[] bytes) {
+    return new WrappedOutput(ByteBuffer.wrap(bytes));
+  }
+
+  @Override
+  public Output wrap(@NonNull byte[] bytes, int offset, int length) {
+    return new WrappedOutput(ByteBuffer.wrap(bytes, offset, length));
+  }
+}

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

@@ -9,20 +9,21 @@
 import java.io.OutputStream;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
+import io.jooby.output.BufferedOutput;
 import io.jooby.output.Output;
 
 /**
  * An {@link OutputStream} that writes to a {@link Output}.
  *
- * @see Output#asOutputStream()
+ * @see BufferedOutput#asOutputStream()
  */
 public class OutputOutputStream extends OutputStream {
 
-  private final Output output;
+  private final BufferedOutput output;
 
   private boolean closed;
 
-  public OutputOutputStream(@NonNull Output output) {
+  public OutputOutputStream(@NonNull BufferedOutput output) {
     this.output = output;
   }
 
@@ -46,7 +47,6 @@ public void close() throws IOException {
       return;
     }
     this.closed = true;
-    output.clear();
   }
 
   private void checkClosed() throws IOException {

jooby/src/main/java/io/jooby/internal/output/OutputWriter.java

@@ -11,14 +11,14 @@
 import java.nio.charset.Charset;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
-import io.jooby.output.Output;
+import io.jooby.output.BufferedOutput;
 
 public class OutputWriter extends Writer {
-  private final Output output;
+  private final BufferedOutput output;
   private final Charset charset;
   private boolean closed;
 
-  public OutputWriter(@NonNull Output output, @NonNull Charset charset) {
+  public OutputWriter(@NonNull BufferedOutput output, @NonNull Charset charset) {
     this.output = output;
     this.charset = charset;
   }
@@ -61,7 +61,6 @@ public void close() throws IOException {
       return;
     }
     this.closed = true;
-    output.clear();
   }
 
   private void checkClosed() throws IOException {

…ernal/output/ByteBufferOutputStatic.java …/jooby/internal/output/StaticOutput.javajooby/src/main/java/io/jooby/internal/output/ByteBufferOutputStatic.java renamed to jooby/src/main/java/io/jooby/internal/output/StaticOutput.java jooby/src/main/java/io/jooby/internal/output/ByteBufferOutputStatic.java renamed to jooby/src/main/java/io/jooby/internal/output/StaticOutput.java

@@ -6,48 +6,27 @@
 package io.jooby.internal.output;
 
 import java.nio.ByteBuffer;
-import java.nio.charset.Charset;
 import java.util.function.Supplier;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import io.jooby.Context;
 import io.jooby.SneakyThrows;
 import io.jooby.output.Output;
 
-public class ByteBufferOutputStatic implements Output {
+public class StaticOutput implements Output {
 
   private final int size;
   private final Supplier<ByteBuffer> provider;
 
-  public ByteBufferOutputStatic(int size, Supplier<ByteBuffer> provider) {
+  public StaticOutput(int size, Supplier<ByteBuffer> provider) {
     this.size = size;
     this.provider = provider;
   }
 
-  public ByteBufferOutputStatic(ByteBuffer byteBuffer) {
+  public StaticOutput(ByteBuffer byteBuffer) {
     this(byteBuffer.remaining(), () -> byteBuffer);
   }
 
-  @Override
-  public Output write(byte b) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public Output write(byte[] source) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public Output write(byte[] source, int offset, int length) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public Output clear() {
-    return this;
-  }
-
   @Override
   public int size() {
     return size;
@@ -60,12 +39,8 @@ public void transferTo(@NonNull SneakyThrows.Consumer<ByteBuffer> consumer) {
 
   @Override
   public ByteBuffer asByteBuffer() {
-    return provider.get();
-  }
-
-  @Override
-  public String asString(@NonNull Charset charset) {
-    return charset.decode(asByteBuffer()).toString();
+    var buffer = provider.get();
+    return buffer.slice().asReadOnlyBuffer();
   }
 
   @Override
@@ -75,6 +50,6 @@ public String toString() {
 
   @Override
   public void send(Context ctx) {
-    ctx.send(asByteBuffer());
+    ctx.send(provider.get());
   }
 }

jooby/src/main/java/io/jooby/internal/output/WrappedOutput.java

@@ -0,0 +1,49 @@
+/*
+ * Jooby https://jooby.io
+ * Apache License Version 2.0 https://jooby.io/LICENSE.txt
+ * Copyright 2014 Edgar Espina
+ */
+package io.jooby.internal.output;
+
+import java.nio.ByteBuffer;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+import io.jooby.Context;
+import io.jooby.SneakyThrows;
+import io.jooby.output.Output;
+import io.jooby.output.OutputFactory;
+
+/** This is part of {@link OutputFactory#getContextFactory()}. */
+public class WrappedOutput implements Output {
+
+  private final ByteBuffer buffer;
+
+  public WrappedOutput(ByteBuffer buffer) {
+    this.buffer = buffer;
+  }
+
+  @Override
+  public int size() {
+    return buffer.remaining();
+  }
+
+  @Override
+  public void transferTo(@NonNull SneakyThrows.Consumer<ByteBuffer> consumer) {
+    consumer.accept(asByteBuffer());
+  }
+
+  @Override
+  public ByteBuffer asByteBuffer() {
+    return buffer.slice().asReadOnlyBuffer();
+  }
+
+  @Override
+  public String toString() {
+    return "size=" + size();
+  }
+
+  @Override
+  public void send(Context ctx) {
+    ctx.send(buffer);
+  }
+}