Merge pull request #233 from SentryMan/nima-media

(nima-generator) Support `InputStream` Return Types

Author: rbygrave

http-generator-core/src/main/java/io/avaje/http/generator/core/ProcessingContext.java

@@ -3,7 +3,9 @@
 import java.io.IOException;
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import javax.annotation.processing.Filer;
 import javax.annotation.processing.Messager;
@@ -91,10 +93,6 @@ public static void init(ProcessingEnvironment env, PlatformAdapter adapter) {
     init(env, adapter, true);
   }
 
-  private static boolean isTypeAvailable(String canonicalName) {
-    return null != typeElement(canonicalName);
-  }
-
   public static TypeElement typeElement(String canonicalName) {
     return CTX.get().elementUtils.getTypeElement(canonicalName);
   }
@@ -198,4 +196,20 @@ public static boolean disabledDirectWrites() {
   public static Filer filer() {
     return CTX.get().filer;
   }
+
+  public static boolean isAssignable2Interface(String type, String superType) {
+    return type.equals(superType)
+        || Optional.ofNullable(typeElement(type)).stream()
+            .flatMap(ProcessingContext::superTypes)
+            .anyMatch(superType::equals);
+  }
+
+  static Stream<String> superTypes(Element element) {
+    final Types types = CTX.get().typeUtils;
+    return types.directSupertypes(element.asType()).stream()
+        .filter(type -> !type.toString().contains("java.lang.Object"))
+        .map(superType -> (TypeElement) types.asElement(superType))
+        .flatMap(e -> Stream.concat(superTypes(e), Stream.of(e)))
+        .map(Object::toString);
+  }
 }

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

@@ -1,6 +1,6 @@
 package io.avaje.http.generator.helidon.nima;
 
-import static io.avaje.http.generator.core.ProcessingContext.disabledDirectWrites;
+import static io.avaje.http.generator.core.ProcessingContext.*;
 import static io.avaje.http.generator.core.ProcessingContext.platform;
 
 import java.util.List;
@@ -41,7 +41,7 @@ void writeRule() {
   }
 
   void writeHandler(boolean requestScoped) {
-    writer.append("  private void _%s(ServerRequest req, ServerResponse res) {", method.simpleName()).eol();
+    writer.append("  private void _%s(ServerRequest req, ServerResponse res) throws Exception {", method.simpleName()).eol();
     final var bodyType = method.bodyType();
     if (bodyType != null) {
 
@@ -80,11 +80,11 @@ void writeHandler(boolean requestScoped) {
     }
 
     final var segments = method.pathSegments();
-    if (!segments.isEmpty()) {
+    if (segments.fullPath().contains("{")) {
       writer.append("    var pathParams = req.path().pathParameters();").eol();
     }
-    final var matrixSegments = segments.matrixSegments();
-    for (final PathSegments.Segment matrixSegment : matrixSegments) {
+
+    for (final PathSegments.Segment matrixSegment : segments.matrixSegments()) {
       matrixSegment.writeCreateSegment(writer, platform());
     }
 
@@ -127,9 +127,14 @@ void writeHandler(boolean requestScoped) {
       writer.append(")");
     }
     writer.append(");").eol();
+
     if (!method.isVoid()) {
       writeContextReturn();
-      if (producesJson()) {
+
+      if (isAssignable2Interface(method.returnType().toString(), "java.io.InputStream")) {
+        final var uType = UType.parse(method.returnType());
+        writer.append("    result.transferTo(res.outputStream());", uType.shortName()).eol();
+      } else if (producesJson()) {
         final var uType = UType.parse(method.returnType());
         writer.append("    %sJsonType.toJson(result, JsonOutput.of(res));", uType.shortName()).eol();
       } else {
@@ -166,7 +171,9 @@ private void writeContextReturn() {
       case APPLICATION_JSON -> writer.append(contentTypeString + "APPLICATION_JSON);").eol();
       case TEXT_HTML -> writer.append(contentTypeString + "TEXT_HTML);").eol();
       case TEXT_PLAIN -> writer.append(contentTypeString + "TEXT_PLAIN);").eol();
-      case UNKNOWN -> writer.append(contentTypeString + "create(\"%s\"));", produces).eol();
+      case UNKNOWN -> writer
+          .append(contentTypeString + "create(\"%s\"));", producesOp.orElse("UNKNOWN"))
+          .eol();
     }
   }
 

tests/test-nima-jsonb/src/main/java/org/example/TestController.java

@@ -57,8 +57,8 @@ String enumQueryImplied(String s, @QueryParam ServerType type) {
 
   @InstrumentServerContext
   @Get(value =  "/inputStream")
-  String stream(InputStream stream) {
-    return stream.toString();
+  InputStream stream(InputStream stream) throws Exception {
+    return stream;
   }