Merge pull request #96 from SentryMan/nima-jsonb

(Nima) Avaje JsonB support

Author: rbygrave

.gitignore

@@ -9,3 +9,8 @@ http-generator-nima/.settings/org.eclipse.jdt.apt.core.prefs
 http-generator-nima/.settings/org.eclipse.core.resources.prefs
 http-generator-nima/.project
 http-generator-nima/.classpath
+*.prefs
+tests/test-nima/.classpath
+tests/test-nima/.factorypath
+tests/test-nima/.project
+*.class

README.md

@@ -6,78 +6,94 @@ Http server and client libraries and code generation.
 
 A jax-rs style controllers with annotations (`@Path`, `@Get` ...)
 that is lightweight by using source code generation (annotation processors)
-to generate adapter code for Javalin and Helidon SE.
+to generate adapter code for Javalin and Helidon SE/Nima.
 
 - Lightweight as in 65Kb library + generated source code
-- Full use of Javalin or Helidon SE as desired
+- Full use of Javalin or Helidon SE/Nima as desired
 
 
-## Define a Controller
+## Define a Controller (Note that these APT processors works with both Java and Kotlin.)
 ```java
-package org.example.hello
+package org.example.hello;
 
-import io.avaje.http.api.Controller
-import io.avaje.http.api.Get
-import io.avaje.http.api.Path
+import io.avaje.http.api.Controller;
+import io.avaje.http.api.Get;
+import io.avaje.http.api.Path;
+import java.util.List;
 
 @Path("/widgets")
 @Controller
-class WidgetController(private val hello: HelloComponent) {
+public class WidgetController {
+  private final HelloComponent hello;
+  public WidgetController(HelloComponent hello) {
+    this.hello = hello;
+  }
+  
+  @Get("/{id}")
+  Widget getById(int id) {
+    return new Widget(id, "you got it"+ hello.hello());
+  }
 
-  @Get("/:id")
-  fun getById(id : Int): Widget {
-    return Widget(id, "you got it${hello.hello()}")
+  @Get()
+  List<Widget> getAll() {
+    return List.of(new Widget(1, "Rob"), new Widget(2, "Fi"));
   }
 
-  @Get
-  fun getAll(): MutableList<Widget> {
+  record Widget(int id, String name){};
+}
+
+```
 
-    val list = mutableListOf<Widget>()
-    list.add(Widget(1, "Rob"))
-    list.add(Widget(2, "Fi"))
+## Usage with Javalin
 
-    return list
-  }
+The annotation processor will generate controller classes implementing the WebRoutes interface, which means we can
+get all the WebRoutes and register them with Javalin using:
 
-  data class Widget(var id: Int, var name: String)
-}
+```java
+var routes = BeanScope.builder().build().list(WebRoutes.class); 
 
+Javalin.create()
+        .routes(() -> routes.forEach(WebRoutes::registerRoutes))
+        .start();
 ```
 
-## Generated source
 
-The annotation processor will generate a `$Route` for the controller like below.
+## Usage with Helidon SE
 
-Note that this class implements the WebRoutes interface, which means we can
-get all the WebRoutes and register them with Javalin using.
+The annotation processor will generate controller classes implementing the Helidon Service interface, which we can use
+get all the Services and register them with Helidon `RoutingBuilder`.
 
 ```java
-fun main(args: Array<String>) {
-
-  // get all the webRoutes
-  val webRoutes = ApplicationScope.list(WebRoutes::class.java)
+var routes = BeanScope.builder().build().list(Service.class); 
+var routingBuilder = Routing.builder().register(routes.stream().toArray(Service[]::new));
+WebServer.builder()
+        .addMediaSupport(JacksonSupport.create())
+        .routing(routingBuilder)
+        .build()
+        .start();
+```
 
-  val javalin = Javalin.create()
+## Usage with Helidon Nima
 
-  javalin.routes {
-    // register all the routes with Javalin
-    webRoutes.forEach { it.registerRoutes() }
+The annotation processor will generate controller classes implementing the Helidon HttpService interface, which we can use
+get all the services and register them with the Helidon `HttpRouting`.
 
-    // other routes etc as desired
-    ApiBuilder.get("/foo") { ctx ->
-      ctx.html("bar")
-      ctx.status(200)
-    }
-    ...
-  }
+```java
+var routes = BeanScope.builder().build().list(HttpService.class); 
+final var builder = HttpRouting.builder();
 
-  javalin.start(7000)
+for (final HttpService httpService : routes) {
+   httpService.routing(builder);
 }
 
+WebServer.builder()
+         .addRouting(builder.build())
+         .build()
+         .start();
 ```
+## Generated sources
 
-### The generated WidgetController$Route.java is:
-
+### (Javalin) The generated WidgetController$Route.java is:
 
 ```java
 package org.example.hello;
@@ -102,7 +118,7 @@ public class WidgetController$Route implements WebRoutes {
   @Override
   public void registerRoutes() {
 
-    ApiBuilder.get("/widgets/:id", ctx -> {
+    ApiBuilder.get("/widgets/{id}", ctx -> {
       int id = asInt(ctx.pathParam("id"));
       ctx.json(controller.getById(id));
       ctx.status(200);
@@ -117,6 +133,149 @@ public class WidgetController$Route implements WebRoutes {
 }
 ```
 
-Note that this APT processor works with both Java and Kotlin.
+### (Helidon SE) The generated WidgetController$Route.java is:
+```java
+package org.example.hello;
+
+import static io.avaje.http.api.PathTypeConversion.*;
+
+import io.avaje.http.api.*;
+import io.helidon.common.http.FormParams;
+import io.helidon.webserver.Handler;
+import io.helidon.webserver.Routing;
+import io.helidon.webserver.ServerRequest;
+import io.helidon.webserver.ServerResponse;
+import io.helidon.webserver.Service;
+import jakarta.inject.Singleton;
+import org.example.hello.WidgetController;
+
+@Generated("io.dinject.helidon-generator")
+@Singleton
+public class WidgetController$Route implements Service {
+
+  private final WidgetController controller;
+
+  public WidgetController$Route(WidgetController controller) {
+    this.controller = controller;
+  }
+
+  @Override
+  public void update(Routing.Rules rules) {
+
+    rules.get("/widgets/{id}", this::_getById);
+    rules.post("/widgets", this::_getAll);
+  }
+
+  private void _getById(ServerRequest req, ServerResponse res) {
+    int id = asInt(req.path().param("id"));
+    res.send(controller.getById(id));
+  }
+
+  private void _getAll(ServerRequest req, ServerResponse res) {
+    res.send(controller.getAll());
+  }
+
+}
+```
+
+### (Helidon Nima) The generated WidgetController$Route.java is:
+
+```java
+package org.example.hello;
+
+import static io.avaje.http.api.PathTypeConversion.*;
+
+import io.avaje.http.api.*;
+import io.avaje.inject.Component;
+import io.helidon.nima.webserver.http.HttpRouting;
+import io.helidon.nima.webserver.http.HttpRules;
+import io.helidon.nima.webserver.http.HttpService;
+import io.helidon.nima.webserver.http.ServerRequest;
+import io.helidon.nima.webserver.http.ServerResponse;
+import org.example.hello.WidgetController;
+
+@Generated("avaje-helidon-nima-generator")
+@Component
+public class WidgetController$Route implements HttpService {
+
+  private final WidgetController controller;
+  public WidgetController$Route(WidgetController controller) {
+    this.controller = controller;
+  }
+
+  @Override
+  public void routing(HttpRules rules) {
+    rules.get("/widgets/{id}", this::_getById);
+    rules.get("/widgets", this::_getAll);
+  }
+
+  private void _getById(ServerRequest req, ServerResponse res) {
+    var pathParams = req.path().pathParameters();
+    int id = asInt(pathParams.first("id").get());
+    var result = controller.getById(id);
+    res.send(result);
+  }
+
+  private void _getAll(ServerRequest req, ServerResponse res) {
+    var pathParams = req.path().pathParameters();
+    var result = controller.getAll();
+    res.send(result);
+  }
+
+}
+```
+
+### (Helidon Nima with Avaje-Jsonb) The generated WidgetController$Route.java is:
 
+```java
+package org.example.hello;
+
+import static io.avaje.http.api.PathTypeConversion.*;
+
+import io.avaje.http.api.*;
+import io.avaje.inject.Component;
+import io.helidon.nima.webserver.http.HttpRouting;
+import io.helidon.nima.webserver.http.HttpRules;
+import io.helidon.nima.webserver.http.HttpService;
+import io.helidon.nima.webserver.http.ServerRequest;
+import io.helidon.nima.webserver.http.ServerResponse;
+import org.example.hello.WidgetController;
+
+@Generated("avaje-helidon-nima-generator")
+@Component
+public class WidgetController$Route implements HttpService {
+
+
+  private final WidgetController controller;
+  private final JsonType<org.example.hello.WidgetController.Widget> getByIdReturnedJsonType;
+  private final JsonType<java.util.List<org.example.hello.WidgetController.Widget>> getAllReturnedJsonType;
+
+  public WidgetController$Route(WidgetController controller, Jsonb jsonB) {
+    this.controller = controller;
+    this.getByIdReturnedJsonType = jsonB.type(org.example.hello.WidgetController.Widget.class);
+    this.getAllReturnedJsonType = jsonB.type(org.example.hello.WidgetController.Widget.class).list();
+  }
 
+  @Override
+  public void routing(HttpRules rules) {
+    rules.get("/widgets/{id}", this::_getById);
+    rules.get("/widgets", this::_getAll);
+  }
+
+  private void _getById(ServerRequest req, ServerResponse res) {
+    var pathParams = req.path().pathParameters();
+    int id = asInt(pathParams.first("id").get());
+    var result = controller.getById(id);
+    res.headers().contentType(io.helidon.common.http.HttpMediaType.APPLICATION_JSON);
+    getByIdReturnedJsonType.toJson(result, res.outputStream());
+  }
+
+  private void _getAll(ServerRequest req, ServerResponse res) {
+    var pathParams = req.path().pathParameters();
+    var result = controller.getAll();
+    res.headers().contentType(io.helidon.common.http.HttpMediaType.APPLICATION_JSON);
+    getAllReturnedJsonType.toJson(result, res.outputStream());
+  }
+
+}
+```

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

@@ -35,7 +35,6 @@ public interface MediaType {
    */
   String APPLICATION_FORM_URLENCODED = "application/x-www-form-urlencoded";
 
-
   /**
    * A {@code String} constant representing {@value #MULTIPART_FORM_DATA} media type.
    */
@@ -51,7 +50,6 @@ public interface MediaType {
    */
   String TEXT_PLAIN = "text/plain";
 
-
   /**
    * A {@code String} constant representing {@value #TEXT_XML} media type.
    */
@@ -71,5 +69,35 @@ public interface MediaType {
    * {@link String} representation of {@value #APPLICATION_JSON_PATCH_JSON} media type..
    */
   String APPLICATION_JSON_PATCH_JSON = "application/json-patch+json";
-
+  
+	/**
+	 * {@link String} representation of {@value #APPLICATION_PDF} media type.
+	 */
+	String APPLICATION_PDF = "application/pdf";
+
+	/**
+	 * {@link String} representation of {@value #IMAGE_GIF} media type.
+	 */
+	String IMAGE_GIF = "image/gif";
+
+	/**
+	 * {@link String} representation of {@value #IMAGE_JPEG} media type.
+	 */
+	String IMAGE_JPEG = "image/jpeg";
+
+	/**
+	 * {@link String} representation of {@value #IMAGE_PNG} media type.
+	 */
+	String IMAGE_PNG = "image/png";
+
+	/**
+	 * {@link String} representation of {@value #MULTIPART_MIXED} media type.
+	 */
+	String MULTIPART_MIXED = "multipart/mixed";
+
+	/**
+	 * {@link String} representation of {@value #MULTIPART_RELATED} media type.
+	 */
+	String MULTIPART_RELATED = "multipart/related";
+  
 }

http-generator-core/src/main/java/io/avaje/http/generator/core/openapi/SchemaDocBuilder.java

@@ -177,7 +177,7 @@ private Schema<?> buildIterableSchema(TypeMirror type) {
 
   private Schema<?> buildArraySchema(TypeMirror type) {
 
-    ArrayType arrayType = types.getArrayType(type);
+    ArrayType arrayType = (ArrayType) type;
     Schema<?> itemSchema = toSchema(arrayType.getComponentType());
 
     ArraySchema arraySchema = new ArraySchema();