nima stream

Author: SentryMan

http-api/pom.xml

@@ -14,5 +14,15 @@
     <developerConnection>scm:git:[email protected]:avaje/avaje-http.git</developerConnection>
     <tag>avaje-http-parent-1.19</tag>
   </scm>
+  
+  <dependencies>
+		<dependency>
+			<groupId>io.helidon.nima.webserver</groupId>
+			<artifactId>helidon-nima-webserver</artifactId>
+			<version>4.0.0-ALPHA5</version>
+			<optional>true</optional>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
 
 </project>

http-api/src/main/java/io/avaje/http/api/NimaJsonbStream.java

@@ -0,0 +1,50 @@
+package io.avaje.http.api;
+
+import java.io.IOException;
+import java.io.OutputStream;
+
+import io.helidon.nima.webserver.http.ServerResponse;
+
+public class NimaJsonbStream extends OutputStream {
+
+  private final ServerResponse response;
+  private OutputStream outputStream;
+  private byte[] firstBuffer;
+  private int firstOff;
+  private int firstLen;
+  private boolean chunked;
+
+  public NimaJsonbStream(ServerResponse response) {
+    this.response = response;
+  }
+
+  @Override
+  public void write(int b) throws IOException {}
+
+  @Override
+  public void write(byte[] b, int off, int len) throws IOException {
+    if (chunked) {
+      outputStream.write(b, off, len);
+    } else if (firstBuffer == null) {
+      firstBuffer = b;
+      firstOff = off;
+      firstLen = len;
+    } else {
+      chunked = true;
+      outputStream = response.outputStream();
+      outputStream.write(firstBuffer, firstOff, firstLen);
+      outputStream.write(b, off, len);
+      firstBuffer = null;
+    }
+  }
+
+  @Override
+  public void flush() throws IOException {
+    if (!chunked) {
+      response.contentLength(firstLen);
+      outputStream = response.outputStream();
+      outputStream.write(firstBuffer, firstOff, firstLen);
+    }
+    outputStream.flush();
+  }
+}

http-api/src/main/java/module-info.java

@@ -1,5 +1,6 @@
 module io.avaje.http.api {
 
   exports io.avaje.http.api;
+  requires static io.helidon.nima.webserver;
 
 }

http-generator-nima/src/main/java/io/avaje/http/generator/helidon/nima/ControllerMethodWriter.java

@@ -42,7 +42,7 @@ void writeHandler(boolean requestScoped) {
     final var bodyType = method.bodyType();
     if (bodyType != null) {
 
-      if (bodyType.equals("InputStream")) {
+      if ("InputStream".equals(bodyType)) {
         writer.append("    var %s = req.content().inputStream();", method.bodyName()).eol();
       } else if (useJsonB) {
         final var fieldName =
@@ -118,7 +118,7 @@ void writeHandler(boolean requestScoped) {
       writeContextReturn();
       if (producesJson()) {
         final var uType = UType.parse(method.returnType());
-        writer.append("    %sJsonType.toJson(result, res.outputStream());", uType.shortName()).eol();
+        writer.append("    %sJsonType.toJson(result, new NimaJsonbStream(res));", uType.shortName()).eol();
       } else {
         writer.append("    res.send(result);").eol();
       }

tests/test-nima-jsonb/pom.xml

@@ -36,29 +36,19 @@
 		<dependency>
 			<groupId>io.helidon.nima.webserver</groupId>
 			<artifactId>helidon-nima-webserver</artifactId>
-			<version>4.0.0-ALPHA4</version>
+			<version>4.0.0-ALPHA5</version>
 		</dependency>
 		<dependency>
 			<groupId>io.helidon.nima.http.media</groupId>
 			<artifactId>helidon-nima-http-media-jsonb</artifactId>
-			<version>4.0.0-ALPHA4</version>
+			<version>4.0.0-ALPHA5</version>
 		</dependency>
 		<dependency>
 			<groupId>io.avaje</groupId>
 			<artifactId>avaje-http-nima-generator</artifactId>
 			<version>${project.version}</version>
 			<scope>test</scope>
 		</dependency>
-		<!--    <dependency>-->
-		<!--      <groupId>io.helidon.nima.http2</groupId>-->
-		<!--      <artifactId>helidon-nima-http2-webserver</artifactId>-->
-		<!--      <version>4.0.0-SNAPSHOT</version>-->
-		<!--    </dependency>-->
-		<!--    <dependency>-->
-		<!--      <groupId>io.helidon.nima.websocket</groupId>-->
-		<!--      <artifactId>helidon-nima-websocket-webserver</artifactId>-->
-		<!--      <version>4.0.0-SNAPSHOT</version>-->
-		<!--    </dependency>-->
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>junit</artifactId>