Skip to content

Commit 689c310

Browse files
rbygraverbygrave
committed
Bump to avaje-inject 6.x with $Factory for request scoped controllers
- Bumps to avaje-inject 6.x and $Factory - Bumps avaje-http-hibernate-validator to 2.5 - Bumps http client used in tests
1 parent dd5900c commit 689c310

File tree

14 files changed

+43
-46
lines changed

14 files changed

+43
-46
lines changed

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
package io.avaje.http.generator.core;
22

3-
class Constants {
3+
public class Constants {
4+
5+
/**
6+
* The suffix used by avaje-inject for generated factories.
7+
* A factory is generated automatically for request scoped controllers.
8+
*/
9+
public static final String FACTORY_SUFFIX = "$Factory";
410

511
static final String OPENAPIDEFINITION = "io.swagger.v3.oas.annotations.OpenAPIDefinition";
612

‎http-generator-helidon/src/main/java/io/avaje/http/generator/helidon/ControllerWriter.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
package io.avaje.http.generator.helidon;
22

3-
import io.avaje.http.generator.core.BaseControllerWriter;
4-
import io.avaje.http.generator.core.ControllerReader;
5-
import io.avaje.http.generator.core.MethodReader;
6-
import io.avaje.http.generator.core.ProcessingContext;
3+
import io.avaje.http.generator.core.*;
74

85
import java.io.IOException;
96
import java.util.List;
@@ -70,7 +67,7 @@ private void writeClassStart() {
7067
String controllerType = shortName;
7168
if (isRequestScoped()) {
7269
controllerName = "factory";
73-
controllerType += "$factory";
70+
controllerType += Constants.FACTORY_SUFFIX;
7471
}
7572
writer.append(" private final %s %s;", controllerType, controllerName).eol();
7673
if (reader.isIncludeValidator()) {

‎http-generator-javalin/src/main/java/io/avaje/http/generator/javalin/ControllerWriter.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
package io.avaje.http.generator.javalin;
22

3-
import io.avaje.http.generator.core.BaseControllerWriter;
4-
import io.avaje.http.generator.core.ControllerReader;
5-
import io.avaje.http.generator.core.MethodReader;
6-
import io.avaje.http.generator.core.ProcessingContext;
3+
import io.avaje.http.generator.core.*;
74

85
import java.io.IOException;
96

@@ -55,7 +52,7 @@ private void writeClassStart() {
5552
String controllerType = shortName;
5653
if (isRequestScoped()) {
5754
controllerName = "factory";
58-
controllerType += "$factory";
55+
controllerType += Constants.FACTORY_SUFFIX;
5956
}
6057
writer.append(" private final %s %s;", controllerType, controllerName).eol();
6158

‎http-generator-jex/src/main/java/io/avaje/http/generator/jex/ControllerWriter.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
package io.avaje.http.generator.jex;
22

3-
import io.avaje.http.generator.core.BaseControllerWriter;
4-
import io.avaje.http.generator.core.ControllerReader;
5-
import io.avaje.http.generator.core.MethodReader;
6-
import io.avaje.http.generator.core.ProcessingContext;
3+
import io.avaje.http.generator.core.*;
74

85
import java.io.IOException;
96

@@ -57,7 +54,7 @@ private void writeClassStart() {
5754
String controllerType = shortName;
5855
if (isRequestScoped()) {
5956
controllerName = "factory";
60-
controllerType += "$factory";
57+
controllerType += Constants.FACTORY_SUFFIX;
6158
}
6259
writer.append(" private final %s %s;", controllerType, controllerName).eol();
6360

‎http-generator-spark/src/main/java/io/avaje/http/generator/spark/ControllerWriter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ private void writeClassStart() {
5555
String controllerType = shortName;
5656
if (isRequestScoped()) {
5757
controllerName = "factory";
58-
controllerType += "$factory";
58+
controllerType += Constants.FACTORY_SUFFIX;
5959
}
6060
writer.append(" private final %s %s;", controllerType, controllerName).eol();
6161

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<module>http-generator-jex</module>
4040
<module>http-generator-helidon</module>
4141
<module>http-generator-client</module>
42-
<!-- <module>tests</module>-->
42+
<module>tests</module>
4343
</modules>
4444

4545
</project>

‎tests/test-client/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<!-- <dependency>-->
2020
<!-- <groupId>io.avaje</groupId>-->
2121
<!-- <artifactId>avaje-http-generator-client</artifactId>-->
22-
<!-- <version>1.4-SNAPSHOT</version>-->
22+
<!-- <version>1.5-SNAPSHOT</version>-->
2323
<!-- <scope>provided</scope>-->
2424
<!-- </dependency>-->
2525

@@ -32,7 +32,7 @@
3232
<dependency>
3333
<groupId>io.avaje</groupId>
3434
<artifactId>avaje-http-client</artifactId>
35-
<version>1.4-SNAPSHOT</version>
35+
<version>1.4</version>
3636
</dependency>
3737

3838
<dependency>
@@ -44,7 +44,7 @@
4444
<dependency>
4545
<groupId>io.avaje</groupId>
4646
<artifactId>avaje-http-api</artifactId>
47-
<version>1.4-SNAPSHOT</version>
47+
<version>1.5-SNAPSHOT</version>
4848
</dependency>
4949

5050
<dependency>
@@ -100,7 +100,7 @@
100100
<path>
101101
<groupId>io.avaje</groupId>
102102
<artifactId>avaje-http-generator-client</artifactId>
103-
<version>1.4-SNAPSHOT</version>
103+
<version>1.5-SNAPSHOT</version>
104104
</path>
105105
</annotationProcessorPaths>
106106
</configuration>

‎tests/test-helidon/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<properties>
1818
<mainClass>org.example.Main</mainClass>
1919
<helidon-version>2.2.2</helidon-version>
20-
<avaje-http-version>1.4-SNAPSHOT</avaje-http-version>
20+
<avaje-http-version>1.5-SNAPSHOT</avaje-http-version>
2121
</properties>
2222

2323
<dependencies>
@@ -36,17 +36,17 @@
3636
<dependency>
3737
<groupId>io.avaje</groupId>
3838
<artifactId>avaje-http-api</artifactId>
39-
<version>1.2</version>
39+
<version>1.4</version>
4040
</dependency>
4141
<dependency>
4242
<groupId>io.avaje</groupId>
4343
<artifactId>avaje-inject</artifactId>
44-
<version>4.1</version>
44+
<version>6.0.RC4</version>
4545
</dependency>
4646
<dependency>
4747
<groupId>io.avaje</groupId>
4848
<artifactId>avaje-inject-generator</artifactId>
49-
<version>4.1</version>
49+
<version>6.0.RC4</version>
5050
<scope>provided</scope>
5151
</dependency>
5252

@@ -115,7 +115,7 @@
115115
<dependency>
116116
<groupId>io.avaje</groupId>
117117
<artifactId>avaje-http-client</artifactId>
118-
<version>1.0</version>
118+
<version>1.4</version>
119119
<scope>test</scope>
120120
</dependency>
121121

‎tests/test-helidon/src/test/java/org/example/BaseWebTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public static void shutdown() {
2828
public static HttpClientContext client() {
2929
return HttpClientContext.newBuilder()
3030
.withBaseUrl(baseUrl)
31-
.withResponseListener(new RequestLogger())
31+
.withRequestListener(new RequestLogger())
3232
.withBodyAdapter(new JacksonBodyAdapter(new ObjectMapper()))
3333
//.with(httpClient)
3434
.build();

‎tests/test-javalin/pom.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<swagger.version>2.0.8</swagger.version>
2121
<kotlin.version>1.3.71</kotlin.version>
2222
<jackson.version>2.12.3</jackson.version>
23-
<avaje-http-version>1.4-SNAPSHOT</avaje-http-version>
23+
<avaje-http-version>1.5-SNAPSHOT</avaje-http-version>
2424
</properties>
2525

2626
<dependencies>
@@ -52,19 +52,19 @@
5252
<dependency>
5353
<groupId>io.avaje</groupId>
5454
<artifactId>avaje-inject</artifactId>
55-
<version>4.1</version>
55+
<version>6.0.RC4</version>
5656
</dependency>
5757

5858
<dependency>
5959
<groupId>io.avaje</groupId>
6060
<artifactId>avaje-http-api</artifactId>
61-
<version>1.2</version>
61+
<version>1.4</version>
6262
</dependency>
6363

6464
<dependency>
6565
<groupId>io.avaje</groupId>
6666
<artifactId>avaje-http-hibernate-validator</artifactId>
67-
<version>2.0</version>
67+
<version>2.5</version>
6868
</dependency>
6969

7070
<dependency>
@@ -78,7 +78,7 @@
7878
<dependency>
7979
<groupId>io.avaje</groupId>
8080
<artifactId>avaje-inject-generator</artifactId>
81-
<version>4.1</version>
81+
<version>6.0.RC4</version>
8282
<scope>provided</scope>
8383
</dependency>
8484

@@ -108,7 +108,7 @@
108108
<dependency>
109109
<groupId>io.avaje</groupId>
110110
<artifactId>avaje-http-client</artifactId>
111-
<version>1.0</version>
111+
<version>1.4</version>
112112
<scope>test</scope>
113113
</dependency>
114114

0 commit comments

Comments
 (0)