Nima - Tests for when returning JSON as String assume the string is raw json

Author: rbygrave

tests/test-nima-jsonb/pom.xml

@@ -14,6 +14,7 @@
     <maven.compiler.source>20</maven.compiler.source>
     <maven.compiler.target>20</maven.compiler.target>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <surefire.useModulePath>false</surefire.useModulePath>
   </properties>
 
 
@@ -31,7 +32,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-jsonb</artifactId>
-      <version>1.4</version>
+      <version>1.6-RC6</version>
     </dependency>
     <dependency>
       <groupId>io.avaje</groupId>
@@ -48,6 +49,11 @@
       <artifactId>helidon-nima-http-media-jsonb</artifactId>
       <version>${nima.version}</version>
     </dependency>
+    <dependency>
+      <groupId>io.avaje</groupId>
+      <artifactId>avaje-http-client</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-http-nima-generator</artifactId>
@@ -69,6 +75,7 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.10.1</version>
         <configuration>
+          <enablePreview>true</enablePreview>
           <release>20</release>
           <annotationProcessorPaths>
             <path>
@@ -84,17 +91,25 @@
             <path>
               <groupId>io.avaje</groupId>
               <artifactId>avaje-jsonb-generator</artifactId>
-              <version>1.4</version>
+              <version>1.6-RC6</version>
             </path>
           </annotationProcessorPaths>
             <source>19</source>
             <target>19</target>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>3.0.0</version>
+        <configuration>
+          <argLine>--enable-preview</argLine>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>io.repaint.maven</groupId>
         <artifactId>tiles-maven-plugin</artifactId>
-        <version>2.22</version>
+        <version>2.34</version>
         <extensions>true</extensions>
         <configuration>
           <tiles>

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

@@ -4,21 +4,18 @@
 import java.util.List;
 import java.util.Set;
 
-import io.avaje.http.api.BodyString;
-import io.avaje.http.api.Controller;
-import io.avaje.http.api.Default;
-import io.avaje.http.api.Form;
-import io.avaje.http.api.FormParam;
-import io.avaje.http.api.Get;
-import io.avaje.http.api.InstrumentServerContext;
-import io.avaje.http.api.Path;
-import io.avaje.http.api.Post;
-import io.avaje.http.api.QueryParam;
+import io.avaje.http.api.*;
 
-@Path("test/")
+@Path("test")
 @Controller
 public class TestController {
 
+  @Produces("text/plain")
+  @Get
+  String hello() {
+    return "hi";
+  }
+
   @Get("/paramMulti")
   String paramMulti(Set<String> strings) {
     return strings.toString();

tests/test-nima-jsonb/src/test/java/org/example/TestControllerTest.java

@@ -0,0 +1,45 @@
+package org.example;
+
+import io.avaje.http.client.HttpClient;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+
+import java.net.http.HttpResponse;
+
+import static org.assertj.core.api.Assertions.as;
+import static org.assertj.core.api.Assertions.assertThat;
+
+class TestControllerTest {
+
+  private static TestPair pair = new TestPair();
+  private static HttpClient client = pair.client();
+
+  @AfterAll
+  static void end() {
+    pair.stop();
+  }
+
+  @Test
+  void hello() {
+    HttpResponse<String> res = client.request()
+      .GET()
+      .asString();
+
+    assertThat(res.statusCode()).isEqualTo(200);
+    assertThat(res.body()).isEqualTo("Hello world - index");
+  }
+
+  @Test
+  void strBody() {
+    HttpResponse<String> res = client.request()
+      .path("test/strBody")
+      .body("{\"key\":42}")
+      .POST()
+      .asString();
+
+    assertThat(res.statusCode()).isEqualTo(200);
+    assertThat(res.body()).isEqualTo("{\"key\":42}");
+    assertThat(res.headers().firstValue("Content-Type")).isPresent().get().isEqualTo("application/json");
+    assertThat(res.headers().firstValue("Content-Length")).isPresent();
+  }
+}

tests/test-nima-jsonb/src/test/java/org/example/TestPair.java

@@ -0,0 +1,53 @@
+package org.example;
+
+import io.avaje.http.api.context.ThreadLocalRequestContextResolver;
+import io.avaje.http.client.HttpClient;
+import io.avaje.http.hibernate.validator.BeanValidator;
+import io.avaje.jsonb.Jsonb;
+import io.helidon.nima.webserver.WebServer;
+import io.helidon.nima.webserver.http.HttpRouting;
+
+public class TestPair {
+
+  WebServer webServer;
+  HttpClient httpClient;
+  int port;
+
+  public TestPair() {
+    this.webServer = WebServer.builder()
+      .routing(routing().build())
+      .build();
+
+    webServer.start();
+    this.port = webServer.port();
+
+    this.httpClient = HttpClient.builder()
+      .baseUrl("http://localhost:" + port)
+      .build();
+  }
+
+  public HttpClient client() {
+    return httpClient;
+  }
+
+  void stop() {
+    webServer.stop();
+  }
+
+  private static HttpRouting.Builder routing() {
+    HttpRouting.Builder routing = HttpRouting.builder();
+
+    var beanValidator = new BeanValidator();
+    Jsonb jsonb = Jsonb.builder().build();
+
+    var hc = new HelloController();
+    var hello = new HelloController$Route(hc, beanValidator, jsonb);
+    hello.routing(routing);
+
+    var cr = new ThreadLocalRequestContextResolver();
+    var tc = new TestController();
+    TestController$Route tcr = new TestController$Route(tc, jsonb, cr);
+    tcr.routing(routing);
+    return routing;
+  }
+}