Merge branch 'feature/bump-2.x'

rbygrave · rbygrave · commit aff99356f2ba · 2021-06-02T15:00:46.000+12:00
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
@@ -1,6 +1,12 @@
 package io.avaje.http.generator.core;
 
-class Constants {
+public class Constants {
+
+  /**
+   * The suffix used by avaje-inject for generated factories.
+   * A factory is generated automatically for request scoped controllers.
+   */
+  public static final String FACTORY_SUFFIX = "$Factory";
 
   static final String OPENAPIDEFINITION = "io.swagger.v3.oas.annotations.OpenAPIDefinition";
 
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
@@ -1,9 +1,6 @@
 package io.avaje.http.generator.helidon;
 
-import io.avaje.http.generator.core.BaseControllerWriter;
-import io.avaje.http.generator.core.ControllerReader;
-import io.avaje.http.generator.core.MethodReader;
-import io.avaje.http.generator.core.ProcessingContext;
+import io.avaje.http.generator.core.*;
 
 import java.io.IOException;
 import java.util.List;
@@ -70,7 +67,7 @@ private void writeClassStart() {
     String controllerType = shortName;
     if (isRequestScoped()) {
       controllerName = "factory";
-      controllerType += "$factory";
+      controllerType += Constants.FACTORY_SUFFIX;
     }
     writer.append("  private final %s %s;", controllerType, controllerName).eol();
     if (reader.isIncludeValidator()) {
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
@@ -1,9 +1,6 @@
 package io.avaje.http.generator.javalin;
 
-import io.avaje.http.generator.core.BaseControllerWriter;
-import io.avaje.http.generator.core.ControllerReader;
-import io.avaje.http.generator.core.MethodReader;
-import io.avaje.http.generator.core.ProcessingContext;
+import io.avaje.http.generator.core.*;
 
 import java.io.IOException;
 
@@ -55,7 +52,7 @@ private void writeClassStart() {
     String controllerType = shortName;
     if (isRequestScoped()) {
       controllerName = "factory";
-      controllerType += "$factory";
+      controllerType += Constants.FACTORY_SUFFIX;
     }
     writer.append("  private final %s %s;", controllerType, controllerName).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
@@ -1,9 +1,6 @@
 package io.avaje.http.generator.jex;
 
-import io.avaje.http.generator.core.BaseControllerWriter;
-import io.avaje.http.generator.core.ControllerReader;
-import io.avaje.http.generator.core.MethodReader;
-import io.avaje.http.generator.core.ProcessingContext;
+import io.avaje.http.generator.core.*;
 
 import java.io.IOException;
 
@@ -57,7 +54,7 @@ private void writeClassStart() {
     String controllerType = shortName;
     if (isRequestScoped()) {
       controllerName = "factory";
-      controllerType += "$factory";
+      controllerType += Constants.FACTORY_SUFFIX;
     }
     writer.append("  private final %s %s;", controllerType, controllerName).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
@@ -55,7 +55,7 @@ private void writeClassStart() {
     String controllerType = shortName;
     if (isRequestScoped()) {
       controllerName = "factory";
-      controllerType += "$factory";
+      controllerType += Constants.FACTORY_SUFFIX;
     }
     writer.append("  private final %s %s;", controllerType, controllerName).eol();
 
diff --git a/pom.xml b/pom.xml
@@ -39,7 +39,7 @@
     <module>http-generator-jex</module>
     <module>http-generator-helidon</module>
     <module>http-generator-client</module>
-<!--    <module>tests</module>-->
+    <module>tests</module>
   </modules>
 
 </project>
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.2</version>
+      <version>${avaje-http-version}</version>
     </dependency>
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-inject</artifactId>
-      <version>4.1</version>
+      <version>6.0.RC4</version>
     </dependency>
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-inject-generator</artifactId>
-      <version>4.1</version>
+      <version>6.0.RC4</version>
       <scope>provided</scope>
     </dependency>
 
@@ -134,7 +134,7 @@
       <plugin>
         <groupId>io.repaint.maven</groupId>
         <artifactId>tiles-maven-plugin</artifactId>
-        <version>2.17</version>
+        <version>2.22</version>
         <extensions>true</extensions>
         <configuration>
           <tiles>
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>4.1</version>
+      <version>6.0.RC4</version>
     </dependency>
 
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-http-api</artifactId>
-      <version>1.2</version>
+      <version>${avaje-http-version}</version>
     </dependency>
 
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-http-hibernate-validator</artifactId>
-      <version>2.0</version>
+      <version>2.5</version>
     </dependency>
 
     <dependency>
@@ -78,7 +78,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-inject-generator</artifactId>
-      <version>4.1</version>
+      <version>6.0.RC4</version>
       <scope>provided</scope>
     </dependency>
 
@@ -136,7 +136,7 @@
       <plugin>
         <groupId>io.repaint.maven</groupId>
         <artifactId>tiles-maven-plugin</artifactId>
-        <version>2.17</version>
+        <version>2.22</version>
         <extensions>true</extensions>
         <configuration>
           <tiles>
diff --git a/tests/test-jex/pom.xml b/tests/test-jex/pom.xml
@@ -19,7 +19,7 @@
     <jex.version>1.5</jex.version>
     <swagger.version>2.0.8</swagger.version>
     <jackson.version>2.12.3</jackson.version>
-    <avaje-inject.version>6.0.RC3</avaje-inject.version>
+    <avaje-inject.version>6.0.RC4</avaje-inject.version>
     <avaje-http.version>1.5-SNAPSHOT</avaje-http.version>
   </properties>
 
@@ -58,7 +58,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-http-hibernate-validator</artifactId>
-      <version>2.0</version>
+      <version>2.5</version>
     </dependency>
 
     <dependency>
diff --git a/tests/test-spark/pom.xml b/tests/test-spark/pom.xml
@@ -43,19 +43,19 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-inject</artifactId>
-      <version>4.1</version>
+      <version>6.0.RC4</version>
     </dependency>
 
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-http-api</artifactId>
-      <version>1.2</version>
+      <version>${avaje-http-version}</version>
     </dependency>
 
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-http-hibernate-validator</artifactId>
-      <version>2.0</version>
+      <version>2.5</version>
     </dependency>
 
     <dependency>
@@ -69,7 +69,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-inject-generator</artifactId>
-      <version>4.1</version>
+      <version>6.0.RC4</version>
       <scope>provided</scope>
     </dependency>
 

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ private void writeClassStart() {`
`55`	`55`	`String controllerType = shortName;`
`56`	`56`	`if (isRequestScoped()) {`
`57`	`57`	`controllerName = "factory";`
`58`		`- controllerType += "$factory";`
	`58`	`+ controllerType += Constants.FACTORY_SUFFIX;`
`59`	`59`	`}`
`60`	`60`	`writer.append(" private final %s %s;", controllerType, controllerName).eol();`
`61`	`61`