#55 - Support client generation with @client and @Client.Import

Tidy imports

Author: rbygrave

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

@@ -64,7 +64,7 @@ public static long asLong(String value) {
   public static double asDouble(String value) {
     checkNull(value);
     try {
-      return Double.valueOf(value);
+      return Double.parseDouble(value);
     } catch (RuntimeException e) {
       throw new InvalidPathArgumentException(e);
     }
@@ -76,7 +76,7 @@ public static double asDouble(String value) {
   public static float asFloat(String value) {
     checkNull(value);
     try {
-      return Float.valueOf(value);
+      return Float.parseFloat(value);
     } catch (RuntimeException e) {
       throw new InvalidPathArgumentException(e);
     }

http-api/src/test/java/io/avaje/http/api/PathTypeConversionTest.java

@@ -42,7 +42,7 @@ public void asInt_when_invalid() {
 
   @Test
   public void asLong() {
-    assertEquals(42L, PathTypeConversion.asInt("42"));
+    assertEquals(42L, PathTypeConversion.asLong("42"));
   }
 
   @Test

http-generator-client/src/main/java/io/avaje/http/generator/client/ClientMethodWriter.java

@@ -60,10 +60,10 @@ void write() {
     PathSegments pathSegments = method.getPathSegments();
     Set<PathSegments.Segment> segments = pathSegments.getSegments();
 
+    writeHeaders();
     writePaths(segments);
     writeQueryParams(pathSegments);
     writeFormParams();
-    writeHeaders();
     writeBody();
 
     WebMethod webMethod = method.getWebMethod();

http-generator-client/src/main/java/io/avaje/http/generator/client/ClientWriter.java

@@ -14,7 +14,6 @@
  */
 class ClientWriter extends BaseControllerWriter {
 
-  private static final String PATH_CONVERSION = "io.avaje.http.client.PathConversion.toPath";
   private static final String HTTP_CLIENT_CONTEXT = "io.avaje.http.client.HttpClientContext";
   private static final String AT_GENERATED = "@Generated(\"avaje-http-client-generator\")";
 
@@ -23,7 +22,6 @@ class ClientWriter extends BaseControllerWriter {
   ClientWriter(ControllerReader reader, ProcessingContext ctx) throws IOException {
     super(reader, ctx, "$httpclient");
     reader.addImportType(HTTP_CLIENT_CONTEXT);
-    reader.addStaticImportType(PATH_CONVERSION);
     readMethods();
   }
 

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

@@ -5,11 +5,10 @@ class Constants {
   static final String OPENAPIDEFINITION = "io.swagger.v3.oas.annotations.OpenAPIDefinition";
 
   static final String SINGLETON = "jakarta.inject.Singleton";
-  static final String GENERATED = "io.avaje.http.api.Generated";
 
   static final String IMPORT_PATH_TYPE_CONVERT = "import static io.avaje.http.api.PathTypeConversion.*;";
 
-  static final String IMPORT_CONTROLLER = "io.avaje.http.api.*";
+  static final String IMPORT_HTTP_API = "io.avaje.http.api.*";
   static final String VALIDATOR = "io.avaje.http.api.Validator";
 
 }

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

@@ -61,13 +61,12 @@ public ControllerReader(TypeElement beanType, ProcessingContext ctx) {
     this.interfaces = initInterfaces();
     this.interfaceMethods = initInterfaceMethods();
     this.roles = Util.findRoles(beanType);
-    importTypes.add(Constants.GENERATED);
     if (ctx.isOpenApiAvailable()) {
       docHidden = initDocHidden();
     }
     includeValidator = initIncludeValidator();
     importTypes.add(Constants.SINGLETON);
-    importTypes.add(Constants.IMPORT_CONTROLLER);
+    importTypes.add(Constants.IMPORT_HTTP_API);
     importTypes.add(beanType.getQualifiedName().toString());
     if (includeValidator) {
       importTypes.add(Constants.VALIDATOR);

tests/test-client/src/main/java/org/example/Simple.java

@@ -3,32 +3,39 @@
 
 import io.avaje.http.api.*;
 
+import javax.validation.Valid;
+import java.net.URL;
 import java.net.http.HttpResponse;
 import java.time.LocalDate;
-import java.time.LocalTime;
 import java.util.List;
 
 @Client
+@Path("moo")
 public interface Simple {
 
   // UUID goo, Boolean option,
-  @Get("{uid}")
-  HttpResponse<String> byId(long uid, LocalTime forT, @QueryParam("my-dat") LocalDate dt);
+  @Get("{uid}/{date}")
+  HttpResponse<String> byIdg(long uid, LocalDate date, @Header URL access, @QueryParam("my-dat") LocalDate dt);
 
   @Get("users/{user}/repos")
   List<Repo> listRepos(String user, String other);
 
   @Post
-  void save(Repo bean);
+  Id save(Repo bean);
 
-  @Post
+  @Post("/register")
   @Form
   void register(MyForm myForm);
 
   @Post("other")
   @Form
   void registerOther(String myName, String email);
 
+  class Id {
+    public long id;
+  }
+
+  @Valid
   class MyForm {
 
     String name;