open-api: javadoc

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();
+    return getRouter().getOutputFactory().getContextOutputFactory();
   }
 }

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

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

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

@@ -7,18 +7,25 @@
 
 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 ByteBufferWrappedOutput implements Output {
+public class ByteBufferOutputStatic implements Output {
 
-  private final ByteBuffer buffer;
+  private final int size;
+  private final Supplier<ByteBuffer> provider;
 
-  public ByteBufferWrappedOutput(ByteBuffer buffer) {
-    this.buffer = buffer;
+  public ByteBufferOutputStatic(int size, Supplier<ByteBuffer> provider) {
+    this.size = size;
+    this.provider = provider;
+  }
+
+  public ByteBufferOutputStatic(ByteBuffer byteBuffer) {
+    this(byteBuffer.remaining(), () -> byteBuffer);
   }
 
   @Override
@@ -38,23 +45,22 @@ public Output write(byte[] source, int offset, int length) {
 
   @Override
   public Output clear() {
-    buffer.clear();
     return this;
   }
 
   @Override
   public int size() {
-    return buffer.remaining();
+    return size;
   }
 
   @Override
   public void transferTo(@NonNull SneakyThrows.Consumer<ByteBuffer> consumer) {
-    consumer.accept(buffer);
+    consumer.accept(asByteBuffer());
   }
 
   @Override
   public ByteBuffer asByteBuffer() {
-    return buffer.duplicate();
+    return provider.get();
   }
 
   @Override
@@ -69,6 +75,6 @@ public String toString() {
 
   @Override
   public void send(Context ctx) {
-    ctx.send(buffer);
+    ctx.send(asByteBuffer());
   }
 }

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

@@ -86,7 +86,6 @@ public void send(Context ctx) {
 
   private void addChunk(ByteBuffer chunk) {
     chunks.add(chunk);
-    int length = chunk.remaining();
-    size += length;
+    size += chunk.remaining();
   }
 }

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

@@ -108,6 +108,8 @@ public Output write(@NonNull ByteBuffer source) {
 
   @Override
   public Output clear() {
+    this.writePosition = 0;
+    this.readPosition = 0;
     this.buffer.clear();
     return this;
   }

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

@@ -6,9 +6,10 @@
 package io.jooby.output;
 
 import java.nio.ByteBuffer;
+import java.nio.charset.Charset;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
-import io.jooby.internal.output.ByteBufferWrappedOutput;
+import io.jooby.internal.output.ByteBufferOutputStatic;
 import io.jooby.internal.output.CompsiteByteBufferOutput;
 
 /**
@@ -45,18 +46,24 @@ public Output newCompositeOutput() {
     return new CompsiteByteBufferOutput();
   }
 
+  @Override
+  public Output wrap(@NonNull String value, @NonNull Charset charset) {
+    return new ByteBufferOutputStatic(ByteBuffer.wrap(value.getBytes(charset)));
+  }
+
   @Override
   public Output wrap(@NonNull ByteBuffer buffer) {
-    return new ByteBufferWrappedOutput(buffer);
+    return new ByteBufferOutputStatic(buffer.remaining(), () -> buffer);
   }
 
   @Override
   public Output wrap(@NonNull byte[] bytes) {
-    return new ByteBufferWrappedOutput(ByteBuffer.wrap(bytes));
+    return new ByteBufferOutputStatic(bytes.length, () -> ByteBuffer.wrap(bytes));
   }
 
   @Override
   public Output wrap(@NonNull byte[] bytes, int offset, int length) {
-    return new ByteBufferWrappedOutput(ByteBuffer.wrap(bytes, offset, length));
+    return new ByteBufferOutputStatic(
+        length - offset, () -> ByteBuffer.wrap(bytes, offset, length));
   }
 }

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

@@ -5,8 +5,6 @@
  */
 package io.jooby.output;
 
-import static java.lang.ThreadLocal.withInitial;
-
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
@@ -21,34 +19,6 @@
  */
 public interface OutputFactory {
 
-  /**
-   * Thread local for output buffer. Please note only store calls to {@link #newOutput()}, {@link
-   * #newCompositeOutput()} are not saved into thread local.
-   *
-   * @param factory Factory.
-   * @return Thread local factory.
-   */
-  static OutputFactory threadLocal(OutputFactory factory) {
-    return new ForwardingOutputFactory(factory) {
-      private final ThreadLocal<Output> threadLocal = withInitial(factory::newOutput);
-
-      @Override
-      public Output newOutput(boolean direct, int size) {
-        return threadLocal.get().clear();
-      }
-
-      @Override
-      public Output newOutput(int size) {
-        return threadLocal.get().clear();
-      }
-
-      @Override
-      public Output newOutput() {
-        return threadLocal.get().clear();
-      }
-    };
-  }
-
   /**
    * Default output factory, backed by {@link ByteBuffer}.
    *
@@ -148,4 +118,13 @@ default Output wrap(@NonNull String value, @NonNull Charset charset) {
    * @return Readonly buffer.
    */
   Output wrap(@NonNull byte[] bytes, int offset, int length);
+
+  /**
+   * Special implementation when output factory is requested from {@link io.jooby.Context}.
+   *
+   * @return Same or custom implementation.
+   */
+  default OutputFactory getContextOutputFactory() {
+    return this;
+  }
 }

jooby/src/test/java/io/jooby/output/OutputTest.java

@@ -15,7 +15,7 @@
 import org.junit.jupiter.api.Test;
 
 import io.jooby.SneakyThrows;
-import io.jooby.internal.output.ByteBufferWrappedOutput;
+import io.jooby.internal.output.ByteBufferOutputStatic;
 import io.jooby.internal.output.CompsiteByteBufferOutput;
 
 public class OutputTest {
@@ -104,7 +104,7 @@ public void chunkedOutput() {
   @Test
   public void wrapOutput() throws IOException {
     var bytes = "xxHello World!xx".getBytes(StandardCharsets.UTF_8);
-    var output = new ByteBufferWrappedOutput(ByteBuffer.wrap(bytes, 2, bytes.length - 4));
+    var output = new ByteBufferOutputStatic(ByteBuffer.wrap(bytes, 2, bytes.length - 4));
     assertEquals("Hello World!", output.asString(StandardCharsets.UTF_8));
     assertEquals(12, output.size());
   }

modules/jooby-avaje-jsonb/src/test/java/io/jooby/avaje/jsonb/AvajeJsonbEncoderBench.java

@@ -43,18 +43,24 @@ public void setup() {
 
   @Benchmark
   public void withJsonBuffer() {
-    jsonb.toJsonBytes(message);
+    factory.wrap(jsonb.toJsonBytes(message));
   }
 
   @Benchmark
-  public void witCachedBufferedOutput() {
+  public void withCachedBufferedOutput() {
     var buffer = cache.get().clear();
     jsonb.toJson(message, jsonb.writer(new BufferedJsonOutput(buffer)));
   }
 
   @Benchmark
-  public void witBufferedOutput() {
+  public void withBufferedOutput() {
     var buffer = factory.newOutput(1024);
     jsonb.toJson(message, jsonb.writer(new BufferedJsonOutput(buffer)));
   }
+
+  @Benchmark
+  public void withCompositeOutput() {
+    var buffer = factory.newCompositeOutput();
+    jsonb.toJson(message, jsonb.writer(new BufferedJsonOutput(buffer)));
+  }
 }

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

@@ -91,6 +91,11 @@ public OutputFactory getOutputFactory() {
     return outputFactory;
   }
 
+  public JettyServer setOutputFactory(OutputFactory outputFactory) {
+    this.outputFactory = outputFactory;
+    return this;
+  }
+
   @NonNull @Override
   public String getName() {
     return NAME;