a test

Author: SentryMan

.gitignore

@@ -16,4 +16,6 @@ dependency-reduced-pom.xml
 *avaje-processors.txt
 *controllers.txt
 tests/test-sigma/io.avaje.jsonb.spi.JsonbExtension
+tests/test-sigma/*.txt
 tests/test-javalin-jsonb/*.txt
+tests/test-nima-jsonb/*.txt

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

@@ -189,7 +189,7 @@ private void writeClientAdapter(ControllerReader reader) {
       if (reader.beanType().getInterfaces().isEmpty()
           && "java.lang.Object".equals(reader.beanType().getSuperclass().toString())) {
         new TestClientWriter(reader).write();
-        clientFQNs.add(reader.beanType().getQualifiedName().toString() + "$TestAPI");
+        clientFQNs.add(reader.beanType().getQualifiedName().toString() + "TestAPI");
       }
     } catch (final IOException e) {
       logError(reader.beanType(), "Failed to write $Route class " + e);

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

@@ -46,7 +46,7 @@ public class TestClientWriter {
     writer =
         new Append(
             new FileWriter(
-                APContext.getBuildResource("testAPI/" + originName + "$TestAPI.txt").toFile()));
+                APContext.getBuildResource("testAPI/" + originName + "TestAPI.txt").toFile()));
   }
 
   protected String initPackageName(String originName) {
@@ -95,7 +95,7 @@ private void writeClassStart() {
     writer.append("@Client(\"%s\")", reader.path()).eol();
     writer
         .append(
-            "%sinterface %s$TestAPI {",
+            "%sinterface %sTestAPI {",
             reader.beanType().getModifiers().contains(Modifier.PUBLIC) ? "public " : "", shortName)
         .eol()
         .eol();
@@ -118,8 +118,7 @@ private void writeRoute(MethodReader method) {
 
     TypeMirror returnType = method.returnType();
     var isJstache = ProcessingContext.isJstacheTemplate(returnType);
-    writer.append("  ");
-    AnnotationCopier.copyAnnotations(writer, method.element(), true);
+    AnnotationCopier.copyAnnotations(writer, method.element(), "  ", true);
 
     var returnTypeStr = PrimitiveUtil.wrap(UType.parse(returnType).shortType());
 

tests/test-jex/pom.xml

@@ -96,6 +96,17 @@
       <scope>test</scope>
     </dependency>
 
+    <dependency>
+      <groupId>io.avaje</groupId>
+      <artifactId>avaje-http-jex-generator</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.avaje</groupId>
+      <artifactId>avaje-http-client-generator</artifactId>
+      <version>${project.version}</version>
+    </dependency>
   </dependencies>
 
   <build>
@@ -121,6 +132,11 @@
               <artifactId>avaje-http-jex-generator</artifactId>
               <version>${project.version}</version>
             </path>
+            <path>
+              <groupId>io.avaje</groupId>
+              <artifactId>avaje-http-client-generator</artifactId>
+              <version>${project.version}</version>
+            </path>
             <path>
               <groupId>io.avaje</groupId>
               <artifactId>avaje-jsonb-generator</artifactId>

tests/test-jex/src/test/java/org/example/web/HelloControllerTest.java

@@ -16,7 +16,7 @@
 @Import(Violation.class)
 class HelloControllerTest extends BaseWebTest {
 
-  final static HttpClient client = client();
+  static final HttpClient client = client();
 
   @Test
   void getHello() {
@@ -26,8 +26,24 @@ void getHello() {
     assertEquals("rob", hello.name);
   }
 
+  @Test
+  void getHelloClient() {
+    final HelloDto hello = client.create(HelloControllerTestAPI.class).getHello().body();
+
+    assertEquals(42, hello.id);
+    assertEquals("rob", hello.name);
+  }
+
   @Test
   void getPlain() {
+    final HttpResponse<String> res = client.create(HelloControllerTestAPI.class).getText();
+
+    assertEquals("something", res.body());
+    assertThat(res.headers().firstValue("content-type").orElseThrow()).startsWith("text/plain;");
+  }
+
+  @Test
+  void getPlainClient() {
     final HttpResponse<String> res = client.request().path("plain").GET().asString();
 
     assertEquals("something", res.body());

tests/test-nima/pom.xml

@@ -43,6 +43,11 @@
       <artifactId>helidon-http-media-jsonb</artifactId>
       <version>${helidon.version}</version>
     </dependency>
+    <dependency>
+      <groupId>io.avaje</groupId>
+      <artifactId>avaje-http-helidon-generator</artifactId>
+      <version>${project.version}</version>
+    </dependency>
   </dependencies>
 
   <build>