#48 - Update to generate using "jakarta.inject" with avaje-inject version 4.1

rbygrave · rbygrave · commit 843665fbc54e · 2020-12-09T10:01:39.000+13:00
diff --git a/http-generator-core/pom.xml b/http-generator-core/pom.xml
@@ -19,9 +19,9 @@
   <dependencies>
 
     <dependency>
-      <groupId>javax.inject</groupId>
-      <artifactId>javax.inject</artifactId>
-      <version>1</version>
+      <groupId>jakarta.inject</groupId>
+      <artifactId>jakarta.inject-api</artifactId>
+      <version>2.0.0</version>
     </dependency>
 
     <dependency>
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-http-api</artifactId>
-      <version>0.1</version>
+      <version>1.1</version>
     </dependency>
 
     <dependency>
diff --git a/http-generator-core/src/main/java/io/avaje/http/generator/core/Constants.java b/http-generator-core/src/main/java/io/avaje/http/generator/core/Constants.java
@@ -4,9 +4,8 @@ class Constants {
 
   static final String OPENAPIDEFINITION = "io.swagger.v3.oas.annotations.OpenAPIDefinition";
 
-  static final String SINGLETON = "javax.inject.Singleton";
-  static final String GENERATED_9 = "javax.annotation.processing.Generated";
-  //static final String GENERATED_8 = "javax.annotation.Generated";
+  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.*;";
 
diff --git a/http-generator-core/src/main/java/io/avaje/http/generator/core/ControllerReader.java b/http-generator-core/src/main/java/io/avaje/http/generator/core/ControllerReader.java
@@ -61,10 +61,7 @@ public class ControllerReader {
     this.interfaces = initInterfaces();
     this.interfaceMethods = initInterfaceMethods();
     this.roles = Util.findRoles(beanType);
-    final String generated = ctx.getGeneratedAnnotation();
-    if (generated != null) {
-      importTypes.add(generated);
-    }
+    importTypes.add(Constants.GENERATED);
     if (ctx.isOpenApiAvailable()) {
       docHidden = initDocHidden();
     }
diff --git a/http-generator-core/src/main/java/io/avaje/http/generator/core/ProcessingContext.java b/http-generator-core/src/main/java/io/avaje/http/generator/core/ProcessingContext.java
@@ -23,7 +23,6 @@ public class ProcessingContext {
   private final Filer filer;
   private final Elements elements;
   private final Types types;
-  private final String generatedAnnotation;
   private final boolean openApiAvailable;
   private final DocContext docContext;
 
@@ -35,12 +34,6 @@ public class ProcessingContext {
     this.types = env.getTypeUtils();
     this.openApiAvailable = isTypeAvailable(Constants.OPENAPIDEFINITION);
     this.docContext = new DocContext(env, openApiAvailable);
-    boolean jdk8 = env.getSourceVersion().compareTo(SourceVersion.RELEASE_8) <= 0;
-    this.generatedAnnotation = generatedAnnotation(jdk8);
-  }
-
-  private String generatedAnnotation(boolean jdk8) {
-    return jdk8 ? null : isTypeAvailable(Constants.GENERATED_9) ? Constants.GENERATED_9 : null;
   }
 
   private boolean isTypeAvailable(String canonicalName) {
@@ -51,14 +44,6 @@ public TypeElement getTypeElement(String canonicalName) {
     return elements.getTypeElement(canonicalName);
   }
 
-  public boolean isGeneratedAvailable() {
-    return generatedAnnotation != null;
-  }
-
-  public String getGeneratedAnnotation() {
-    return generatedAnnotation;
-  }
-
   public boolean isOpenApiAvailable() {
     return openApiAvailable;
   }
@@ -67,10 +52,6 @@ public void logError(Element e, String msg, Object... args) {
     messager.printMessage(Diagnostic.Kind.ERROR, String.format(msg, args), e);
   }
 
-//  void logDebug(String msg, Object... args) {
-//    messager.printMessage(Diagnostic.Kind.NOTE, String.format(msg, args));
-//  }
-
   /**
    * Create a file writer for the given class name.
    */
diff --git a/http-generator-helidon/src/main/java/io/avaje/http/generator/helidon/ControllerWriter.java b/http-generator-helidon/src/main/java/io/avaje/http/generator/helidon/ControllerWriter.java
@@ -62,9 +62,7 @@ private void writeRoutes(List<ControllerMethodWriter> methods) {
   }
 
   private void writeClassStart() {
-    if (ctx.isGeneratedAvailable()) {
-      writer.append(AT_GENERATED).eol();
-    }
+    writer.append(AT_GENERATED).eol();
     writer.append("@Singleton").eol();
     writer.append("public class ").append(shortName).append("$route implements Service {").eol().eol();
 
diff --git a/http-generator-javalin/src/main/java/io/avaje/http/generator/javalin/ControllerWriter.java b/http-generator-javalin/src/main/java/io/avaje/http/generator/javalin/ControllerWriter.java
@@ -47,9 +47,7 @@ private void writeForMethod(MethodReader method) {
   }
 
   private void writeClassStart() {
-    if (ctx.isGeneratedAvailable()) {
-      writer.append(AT_GENERATED).eol();
-    }
+    writer.append(AT_GENERATED).eol();
     writer.append("@Singleton").eol();
     writer.append("public class ").append(shortName).append("$route implements WebRoutes {").eol().eol();
 
diff --git a/http-generator-jex/src/main/java/io/avaje/http/generator/jex/ControllerWriter.java b/http-generator-jex/src/main/java/io/avaje/http/generator/jex/ControllerWriter.java
@@ -49,9 +49,7 @@ private void writeForMethod(MethodReader method) {
   }
 
   private void writeClassStart() {
-    if (ctx.isGeneratedAvailable()) {
-      writer.append(AT_GENERATED).eol();
-    }
+    writer.append(AT_GENERATED).eol();
     writer.append("@Singleton").eol();
     writer.append("public class ").append(shortName).append("$route implements Routing.Service {").eol().eol();
 
diff --git a/http-generator-spark/src/main/java/io/avaje/http/generator/spark/ControllerWriter.java b/http-generator-spark/src/main/java/io/avaje/http/generator/spark/ControllerWriter.java
@@ -47,9 +47,7 @@ private void writeForMethod(MethodReader method) {
   }
 
   private void writeClassStart() {
-    if (ctx.isGeneratedAvailable()) {
-      writer.append(AT_GENERATED).eol();
-    }
+    writer.append(AT_GENERATED).eol();
     writer.append("@Singleton").eol();
     writer.append("public class ").append(shortName).append("$route implements WebRoutes {").eol().eol();
 
diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
   <parent>
     <groupId>org.avaje</groupId>
     <artifactId>java8-oss</artifactId>
-    <version>2.2</version>
+    <version>2.3</version>
   </parent>
 
   <scm>
@@ -34,7 +34,7 @@
     <module>http-generator-javalin</module>
     <module>http-generator-jex</module>
     <module>http-generator-helidon</module>
-    <module>http-generator-spark</module>
+<!--    <module>http-generator-spark</module>-->
     <!--    <module>http-generator-client</module>-->
     <module>tests</module>
   </modules>
diff --git a/tests/test-client/pom.xml b/tests/test-client/pom.xml
@@ -25,7 +25,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-http-client</artifactId>
-      <version>0.1</version>
+      <version>0.10</version>
     </dependency>
 
     <dependency>
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-http-api</artifactId>
-      <version>0.1</version>
+      <version>1.1</version>
     </dependency>
 
     <dependency>
diff --git a/tests/test-client/src/main/java/org/example/Simple$httpclient.java b/tests/test-client/src/main/java/org/example/Simple$httpclient.java
@@ -18,7 +18,7 @@ public class Simple$httpclient implements Simple {
   @Override
   public List<Repo> listRepos(String user, @QueryParam("foo-too") String fooToo) {
     return clientContext.request()
-      .path("users").path(user).path("repos").param("foo-too", fooToo)
+      .path("users").path(user).path("repos").queryParam("foo-too", fooToo)
       .get()
       .list(Repo.class);
   }
diff --git a/tests/test-client/src/test/java/org/example/SimpleTest.java b/tests/test-client/src/test/java/org/example/SimpleTest.java
@@ -20,7 +20,7 @@ void listRepos() {
     final HttpClientContext clientContext =
       HttpClientContext.newBuilder()
         .withBaseUrl("https://api.github.com")
-        .withRequestListener(new RequestLogger())
+        .withResponseListener(new RequestLogger())
         .withBodyAdapter(new JacksonBodyAdapter(objectMapper))
         .build();
 
diff --git a/tests/test-helidon/pom.xml b/tests/test-helidon/pom.xml
@@ -36,17 +36,17 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-http-api</artifactId>
-      <version>1.0</version>
+      <version>1.1</version>
     </dependency>
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-inject</artifactId>
-      <version>1.0</version>
+      <version>4.1</version>
     </dependency>
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-inject-generator</artifactId>
-      <version>1.0</version>
+      <version>4.1</version>
       <scope>provided</scope>
     </dependency>
 
@@ -115,7 +115,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-http-client</artifactId>
-      <version>0.5</version>
+      <version>0.10</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/tests/test-helidon/src/main/java/org/example/ReqScopedController.java b/tests/test-helidon/src/main/java/org/example/ReqScopedController.java
@@ -7,7 +7,7 @@
 import io.helidon.webserver.ServerRequest;
 import io.helidon.webserver.ServerResponse;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 @Controller
 @Path("/req-scoped")
diff --git a/tests/test-helidon/src/test/java/org/example/FooControllerTest.java b/tests/test-helidon/src/test/java/org/example/FooControllerTest.java
@@ -57,7 +57,7 @@ void getWithMatrixParam() {
       .path("withMatrix")
       .path("2011").matrixParam("author", "rob").matrixParam("country", "nz")
       .path("foo")
-      .param("extra", "banana")
+      .queryParam("extra", "banana")
       .get()
       .asString();
 
diff --git a/tests/test-javalin/pom.xml b/tests/test-javalin/pom.xml
@@ -52,19 +52,19 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-inject</artifactId>
-      <version>1.0</version>
+      <version>4.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-http-api</artifactId>
-      <version>1.0</version>
+      <version>1.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-http-hibernate-validator</artifactId>
-      <version>1.0</version>
+      <version>2.0</version>
     </dependency>
 
     <dependency>
@@ -78,7 +78,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-inject-generator</artifactId>
-      <version>1.0</version>
+      <version>4.1</version>
       <scope>provided</scope>
     </dependency>
 
@@ -108,7 +108,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-http-client</artifactId>
-      <version>0.5</version>
+      <version>0.10</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/tests/test-javalin/src/main/java/org/example/myapp/service/BazRepo.java b/tests/test-javalin/src/main/java/org/example/myapp/service/BazRepo.java
@@ -3,7 +3,7 @@
 import org.example.myapp.web.Baz;
 import org.example.myapp.web.Repository;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/tests/test-javalin/src/main/java/org/example/myapp/service/MyDependency.java b/tests/test-javalin/src/main/java/org/example/myapp/service/MyDependency.java
@@ -1,6 +1,6 @@
 package org.example.myapp.service;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Singleton
 public class MyDependency {
diff --git a/tests/test-javalin/src/main/java/org/example/myapp/service/MyService.java b/tests/test-javalin/src/main/java/org/example/myapp/service/MyService.java
@@ -2,7 +2,7 @@
 
 import org.example.myapp.web.HelloDto;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/tests/test-javalin/src/main/java/org/example/myapp/web/HelloController.java b/tests/test-javalin/src/main/java/org/example/myapp/web/HelloController.java
@@ -14,7 +14,7 @@
 import io.swagger.v3.oas.annotations.Hidden;
 import org.example.myapp.service.MyService;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import javax.validation.Valid;
 import java.time.LocalDate;
 import java.util.ArrayList;
diff --git a/tests/test-javalin/src/main/java/org/example/myapp/web/ReqScopedController.java b/tests/test-javalin/src/main/java/org/example/myapp/web/ReqScopedController.java
@@ -6,7 +6,7 @@
 import io.avaje.http.api.Produces;
 import io.javalin.http.Context;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 @Controller
 @Path("/req-scoped")
diff --git a/tests/test-javalin/src/test/java/org/example/myapp/HelloControllerTest.java b/tests/test-javalin/src/test/java/org/example/myapp/HelloControllerTest.java
@@ -89,7 +89,7 @@ void getWithPathParamAndQueryParam() {
     assertThat(bean.otherParam).isEqualTo("other");
 
     final HelloDto dto = clientContext.request()
-      .path("hello/43/2020-03-05").param("otherParam", "other").param("foo", null)
+      .path("hello/43/2020-03-05").queryParam("otherParam", "other").queryParam("foo", null)
       .get().bean(HelloDto.class);
 
     assertThat(dto.id).isEqualTo(43L);
@@ -136,7 +136,7 @@ void postForm_controller_using_formbean() {
       .param("name", "Bazz")
       .param("email", "user@foo.com")
       .param("url", "http://foo.com")
-      .param("startDate", "2020-12-03")
+      .param("startDate", "2030-12-03")
       .header("Accept", ContentType.JSON.getAcceptHeader())
       .post(baseUrl + "/hello/saveform")
       .then()
@@ -160,11 +160,23 @@ void postForm2_controllerUsingParams() {
   @Test
   void postForm3_controllerFormBean_responseJsonDto() {
 
+    final HelloDto bean = clientContext.request()
+      .path("hello/saveform3")
+      .formParam("name", "Bax")
+      .formParam("email", "Bax@foo.com")
+      .formParam("url", "http://foo.com")
+      .formParam("startDate", "2030-12-03")
+      .post().bean(HelloDto.class);
+
+    assertThat(bean.name).isEqualTo("Bax");
+    assertThat(bean.otherParam).isEqualTo("Bax@foo.com");
+    assertThat(bean.id).isEqualTo(52);
+
     given().urlEncodingEnabled(true)
       .param("name", "Bax")
       .param("email", "Bax@foo.com")
       .param("url", "http://foo.com")
-      .param("startDate", "2020-12-03")
+      .param("startDate", "2030-12-03")
       .header("Accept", ContentType.JSON.getAcceptHeader())
       .post(baseUrl + "/hello/saveform3")
       .then()
@@ -262,7 +274,7 @@ void getWithMatrixParam() {
       .matrixParam("author", "rob")
       .matrixParam("country", "nz")
       .path("foo")
-      .param("extra", "banana")
+      .queryParam("extra", "banana")
 
       .get().asString();
 
diff --git a/tests/test-jex/pom.xml b/tests/test-jex/pom.xml
diff --git a/tests/test-jex/src/main/resources/public/openapi.json b/tests/test-jex/src/main/resources/public/openapi.json
diff --git a/tests/test-spark/pom.xml b/tests/test-spark/pom.xml

Original file line number	Diff line number	Diff line change
`@@ -62,9 +62,7 @@ private void writeRoutes(List<ControllerMethodWriter> methods) {`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`private void writeClassStart() {`
`65`		`- if (ctx.isGeneratedAvailable()) {`
`66`		`- writer.append(AT_GENERATED).eol();`
`67`		`- }`
	`65`	`+ writer.append(AT_GENERATED).eol();`
`68`	`66`	`writer.append("@Singleton").eol();`
`69`	`67`	`writer.append("public class ").append(shortName).append("$route implements Service {").eol().eol();`
`70`	`68`
Original file line number	Diff line number	Diff line change
`@@ -47,9 +47,7 @@ private void writeForMethod(MethodReader method) {`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`private void writeClassStart() {`
`50`		`- if (ctx.isGeneratedAvailable()) {`
`51`		`- writer.append(AT_GENERATED).eol();`
`52`		`- }`
	`50`	`+ writer.append(AT_GENERATED).eol();`
`53`	`51`	`writer.append("@Singleton").eol();`
`54`	`52`	`writer.append("public class ").append(shortName).append("$route implements WebRoutes {").eol().eol();`
`55`	`53`
Original file line number	Diff line number	Diff line change
`@@ -49,9 +49,7 @@ private void writeForMethod(MethodReader method) {`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`private void writeClassStart() {`
`52`		`- if (ctx.isGeneratedAvailable()) {`
`53`		`- writer.append(AT_GENERATED).eol();`
`54`		`- }`
	`52`	`+ writer.append(AT_GENERATED).eol();`
`55`	`53`	`writer.append("@Singleton").eol();`
`56`	`54`	`writer.append("public class ").append(shortName).append("$route implements Routing.Service {").eol().eol();`
`57`	`55`