Merge pull request #258 from SentryMan/client-vararg

Sanitize Generated Imports

Author: rbygrave

README.md

@@ -45,7 +45,7 @@ Use source code generation to adapt annotated REST controllers `@Path, @Get, @Po
 </dependency>
 ```
 
-## Define a Controller (These APT processors work with both Java and Kotlin.)
+## Define a Controller (These APT processors work with Java and Kotlin.)
 ```java
 package org.example.hello;
 
@@ -74,7 +74,7 @@ public class WidgetController {
 }
 ```
 ## DI Usage
-The annotation processor will generate controller adapters that can register routes to Javalin/Helidon. The natural way to use the generated adapters is to get a DI library to find and wire them. This is what the below examples do and they use [Avaje-Inject](https://avaje.io/inject/) to do this. The AP will automatically detect the presence of avaje-inject and generate the class to use avaje-inject's `@Component` as the DI annotation.
+The annotation processor will generate controller adapters to register routes to Javalin/Helidon. The natural way to use the generated adapters is to get a DI library to find and wire them. This is what the examples below do; they use [Avaje-Inject](https://avaje.io/inject/) to do this. The AP will automatically detect the presence of avaje-inject and generate the class to use avaje-inject's `@Component` as the DI annotation.
 
 There isn't a hard requirement to use Avaje for dependency injection. In the absence of avaje-inject, the generated class will use `@jakarta.inject.Singleton` or `@javax.inject.Singleton` depending on what's on the classpath. Any DI library that can find and wire the generated @Singleton beans can be used. You can even use Dagger2 or Guice to wire the controllers if you so desire. 
 
@@ -93,15 +93,13 @@ To force the AP to generate with `@javax.inject.Singleton`(in the case where you
 
 ### Usage with Javalin
 
-The annotation processor will generate controller classes implementing the WebRoutes interface, which means we can
+The annotation processor will generate controller classes implementing the Javalin `Plugin` interface, which means we can
 get all the WebRoutes and register them with Javalin using:
 
 ```java
-List<WebRoutes> routes = BeanScope.builder().build().list(WebRoutes.class);
+List<Plugin> routes = BeanScope.builder().build().list(Plugin.class);
 
-Javalin.create()
-        .routes(() -> routes.forEach(WebRoutes::registerRoutes))
-        .start();
+Javalin.create(cfg -> routes.forEach(cfg.plugins::register));
 ```
 
 ### Usage with Helidon Nima
@@ -110,12 +108,10 @@ The annotation processor will generate controller classes implementing the Helid
 get all the services and register them with the Helidon `HttpRouting`.
 
 ```java
-List<HttpService> routes = BeanScope.builder().build().list(HttpService.class);
+List<HttpFeature> routes = BeanScope.builder().build().list(HttpFeature.class);
 final var builder = HttpRouting.builder();
 
-for (final HttpService httpService : routes) {
-   httpService.routing(builder);
-}
+routes.forEach(builder::register);
 
 WebServer.builder()
          .addRouting(builder.build())
@@ -129,7 +125,7 @@ WebServer.builder()
 ```java
 @Generated("avaje-javalin-generator")
 @Singleton
-public class WidgetController$Route implements WebRoutes {
+public class WidgetController$Route implements Plugin {
 
   private final WidgetController controller;
 
@@ -138,16 +134,16 @@ public class WidgetController$Route implements WebRoutes {
   }
 
   @Override
-  public void registerRoutes() {
+  public void apply(Javalin app) {
 
-    ApiBuilder.get("/widgets/{id}", ctx -> {
+    app.get("/widgets/{id}", ctx -> {
       ctx.status(200);
       var id = asInt(ctx.pathParam("id"));
       var result = controller.getById(id);
       ctx.json(result);
     });
 
-    ApiBuilder.get("/widgets", ctx -> {
+    app.get("/widgets", ctx -> {
       ctx.status(200);
       var result = controller.getAll();
       ctx.json(result);
@@ -162,17 +158,17 @@ public class WidgetController$Route implements WebRoutes {
 ```java
 @Generated("avaje-helidon-nima-generator")
 @Singleton
-public class WidgetController$Route implements HttpService {
+public class WidgetController$Route implements HttpFeature {
 
   private final WidgetController controller;
   public WidgetController$Route(WidgetController controller) {
     this.controller = controller;
   }
 
   @Override
-  public void routing(HttpRules rules) throws Exception {
-    rules.get("/widgets/{id}", this::_getById);
-    rules.get("/widgets", this::_getAll);
+  public void setup(HttpRouting.Builder routing) {
+    routing.get("/widgets/{id}", this::_getById);
+    routing.get("/widgets", this::_getAll);
   }
 
   private void _getById(ServerRequest req, ServerResponse res) throws Exception {
@@ -197,7 +193,7 @@ If [Avaje-Jsonb](https://github.com/avaje/avaje-jsonb) is detected, http generat
 ```java
 @Generated("avaje-javalin-generator")
 @Component
-public class WidgetController$Route implements WebRoutes {
+public class WidgetController$Route implements Plugin {
 
   private final WidgetController controller;
   private final JsonType<List<Widget>> listWidgetJsonType;
@@ -210,16 +206,16 @@ public class WidgetController$Route implements WebRoutes {
   }
 
   @Override
-  public void registerRoutes() {
+  public void apply(Javalin app) {
 
-    ApiBuilder.get("/widgets/{id}", ctx -> {
+    app.get("/widgets/{id}", ctx -> {
       ctx.status(200);
       var id = asInt(ctx.pathParam("id"));
       var result = controller.getById(id);
       widgetJsonType.toJson(result, ctx.contentType("application/json").outputStream());
     });
 
-    ApiBuilder.get("/widgets", ctx -> {
+    app.get("/widgets", ctx -> {
       ctx.status(200);
       var result = controller.getAll();
       listWidgetJsonType.toJson(result, ctx.contentType("application/json").outputStream());
@@ -234,8 +230,7 @@ public class WidgetController$Route implements WebRoutes {
 ```java
 @Generated("avaje-helidon-nima-generator")
 @Component
-public class WidgetController$Route implements HttpService {
-
+public class WidgetController$Route implements HttpFeature {
 
   private final WidgetController controller;
   private final JsonType<Widget> widgetJsonType;
@@ -248,9 +243,9 @@ public class WidgetController$Route implements HttpService {
   }
 
   @Override
-  public void routing(HttpRules rules) {
-    rules.get("/widgets/{id}", this::_getById);
-    rules.get("/widgets", this::_getAll);
+  public void setup(HttpRouting.Builder routing) {
+    routing.get("/widgets/{id}", this::_getById);
+    routing.get("/widgets", this::_getAll);
   }
 
   private void _getById(ServerRequest req, ServerResponse res) throws Exception {

http-generator-client/src/test/java/io/avaje/http/generator/client/ClientProcessorTest.java

@@ -18,7 +18,6 @@
 import javax.tools.JavaCompiler.CompilationTask;
 import javax.tools.JavaFileObject;
 import javax.tools.JavaFileObject.Kind;
-import javax.tools.StandardJavaFileManager;
 import javax.tools.StandardLocation;
 import javax.tools.ToolProvider;
 
@@ -38,6 +37,7 @@ void deleteGeneratedFiles() throws IOException {
           .sorted(Comparator.reverseOrder())
           .map(Path::toFile)
           .forEach(File::delete);
+
     } catch (final Exception e) {
     }
   }

http-generator-client/src/test/java/io/avaje/http/generator/client/clients/Body.java

@@ -0,0 +1,3 @@
+package io.avaje.http.generator.client.clients;
+
+public class Body {}

http-generator-client/src/test/java/io/avaje/http/generator/client/clients/UserClient.java

@@ -11,6 +11,9 @@ public interface UserClient {
   @Post("/users")
   String createUser(@BodyString String body);
 
+  @Post("/body")
+  String bodies(Body... bodies);
+
   @Get("/users/{userId}")
   String getUserById(String userId);
 }

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

@@ -328,7 +328,7 @@ public String path() {
 
   public void addImportType(String rawType) {
     if (rawType.indexOf('.') > 0) {
-      importTypes.add(rawType);
+      importTypes.add(sanitizeImports(rawType));
     }
   }
 
@@ -353,4 +353,17 @@ public Set<String> importTypes() {
   public boolean hasInstrument() {
     return hasInstrument;
   }
+
+  public static String sanitizeImports(String type) {
+    final int pos = type.indexOf("@");
+    if (pos == -1) {
+      return trimArrayBrackets(type);
+    }
+    final var start = pos == 0 ? type.substring(0, pos) : "";
+    return start + trimArrayBrackets(type.substring(type.lastIndexOf(' ') + 1));
+  }
+
+  private static String trimArrayBrackets(String type) {
+    return type.replaceAll("[^\\n\\r\\t $;\\w.]", "");
+  }
 }

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

@@ -3,7 +3,6 @@
 import static io.avaje.http.generator.core.ParamType.RESPONSE_HANDLER;
 import static io.avaje.http.generator.core.ProcessingContext.platform;
 import static io.avaje.http.generator.core.ProcessingContext.typeElement;
-import static java.util.function.Predicate.not;
 
 import java.util.ArrayList;
 import java.util.HashSet;

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

@@ -83,4 +83,9 @@ public UType utype() {
   public void setResponseHandler() {
     elementParam.setResponseHandler();
   }
+
+  @Override
+  public String toString() {
+    return elementParam.toString();
+  }
 }