Skip to content

Commit bdf0037

Browse files
Fix Jex Request-Scoped Context (#789)
* Bump the dependencies group with 3 updates Bumps the dependencies group with 3 updates: io.avaje:avaje-http-api, [io.avaje:avaje-http-client](https://github.com/avaje/avaje-http-client) and [io.avaje:avaje-jex](https://github.com/avaje/avaje-jex). Updates `io.avaje:avaje-http-api` from 3.1 to 3.2 Updates `io.avaje:avaje-http-client` from 3.1 to 3.2 - [Release notes](https://github.com/avaje/avaje-http-client/releases) - [Commits](https://github.com/avaje/avaje-http-client/commits) Updates `io.avaje:avaje-jex` from 2.5 to 3.0 - [Release notes](https://github.com/avaje/avaje-jex/releases) - [Commits](avaje/avaje-jex@avaje-jex-parent-2.5...3.0) --- updated-dependencies: - dependency-name: io.avaje:avaje-http-api dependency-type: direct:development update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: io.avaje:avaje-http-client dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: io.avaje:avaje-jex dependency-type: direct:development update-type: version-update:semver-major dependency-group: dependencies ... Signed-off-by: dependabot[bot] <[email protected]> * fix jex http context * Update pom.xml * Update CustomScopeTest.java * Update build.yml --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 parent f650539 commit bdf0037

File tree

7 files changed

+25
-18
lines changed

7 files changed

+25
-18
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
strategy:
1313
fail-fast: false
1414
matrix:
15-
java_version: [11,17,21]
15+
java_version: [21]
1616
os: [ubuntu-latest]
1717

1818
steps:

inject-generator/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<dependency>
4444
<groupId>io.avaje</groupId>
4545
<artifactId>avaje-http-api</artifactId>
46-
<version>3.1</version>
46+
<version>3.2</version>
4747
<optional>true</optional>
4848
<scope>provided</scope>
4949
</dependency>
@@ -59,7 +59,7 @@
5959
<dependency>
6060
<groupId>io.avaje</groupId>
6161
<artifactId>avaje-http-client</artifactId>
62-
<version>3.1</version>
62+
<version>3.2</version>
6363
<scope>test</scope>
6464
</dependency>
6565

inject-generator/src/main/java/io/avaje/inject/generator/RequestScope.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*/
99
final class RequestScope {
1010

11-
private static final String JEX_CONTEXT = "io.avaje.jex.Context";
11+
private static final String JEX_CONTEXT = "io.avaje.jex.http.Context";
1212
private static final String JAVALIN_CONTEXT = "io.javalin.http.Context";
1313
private static final String HELIDON_REQ = "io.helidon.webserver.ServerRequest";
1414
private static final String HELIDON_RES = "io.helidon.webserver.ServerResponse";

inject-test/pom.xml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,21 +77,28 @@
7777
<dependency>
7878
<groupId>io.avaje</groupId>
7979
<artifactId>avaje-http-api</artifactId>
80-
<version>3.1</version>
80+
<version>3.2</version>
8181
<scope>test</scope>
8282
</dependency>
8383

8484
<dependency>
8585
<groupId>io.avaje</groupId>
8686
<artifactId>avaje-http-client</artifactId>
87-
<version>3.1</version>
87+
<version>3.2</version>
8888
<scope>test</scope>
8989
</dependency>
9090

9191
<dependency>
9292
<groupId>io.avaje</groupId>
9393
<artifactId>avaje-jex</artifactId>
94-
<version>2.5</version>
94+
<version>3.0</version>
95+
<scope>test</scope>
96+
</dependency>
97+
98+
<dependency>
99+
<groupId>io.avaje</groupId>
100+
<artifactId>avaje-jsonb</artifactId>
101+
<version>3.2</version>
95102
<scope>test</scope>
96103
</dependency>
97104

inject-test/src/test/java/org/example/custom/CustomScopeTest.java

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
package org.example.custom;
22

3-
import io.avaje.inject.BeanEntry;
4-
import io.avaje.inject.BeanScope;
3+
import static java.util.stream.Collectors.toList;
4+
import static org.assertj.core.api.Assertions.assertThat;
5+
6+
import java.util.List;
7+
import java.util.Optional;
8+
59
import org.example.MyCustomScope;
610
import org.example.coffee.CoffeeMaker;
711
import org.example.custom.loc.LocalExternal;
812
import org.junit.jupiter.api.Test;
913
import org.mockito.Mockito;
1014

11-
import java.util.List;
12-
import java.util.Optional;
13-
14-
import static java.util.stream.Collectors.toList;
15-
import static org.assertj.core.api.Assertions.assertThat;
15+
import io.avaje.inject.BeanEntry;
16+
import io.avaje.inject.BeanScope;
1617

1718
class CustomScopeTest {
1819

@@ -80,7 +81,7 @@ void customScopeAll() {
8081

8182
// includes the 2 supplied beans
8283
final List<BeanEntry> all = beanScope.all();
83-
assertThat(all).hasSize(7);
84+
assertThat(all).hasSize(8);
8485

8586
final CustomBean customBean = beanScope.get(CustomBean.class);
8687

inject-test/src/test/java/org/example/request/JexController.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22

33

44
import io.avaje.http.api.Controller;
5-
import io.avaje.jex.Context;
6-
5+
import io.avaje.jex.http.Context;
76
import jakarta.inject.Inject;
87

98
@Controller

inject-test/src/test/java/org/example/request/JexControllerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.example.request;
22

33
import io.avaje.inject.xtra.ApplicationScope;
4-
import io.avaje.jex.Context;
4+
import io.avaje.jex.http.Context;
55
import org.junit.jupiter.api.Test;
66
import org.mockito.Mockito;
77

0 commit comments

Comments
 (0)