From 99cfc51a4f999ec66619860ff36de810bd87a661 Mon Sep 17 00:00:00 2001 From: Josiah Noel <32279667+SentryMan@users.noreply.github.com> Date: Sun, 9 Feb 2025 20:45:39 -0500 Subject: [PATCH 1/2] update jex context package --- .../java/io/avaje/http/generator/jex/ControllerWriter.java | 4 ++-- tests/pom.xml | 2 +- .../src/main/java/org/example/web/TestController.java | 4 ++-- .../src/main/java/org/example/web/myapp/WebController.java | 4 +--- 4 files changed, 6 insertions(+), 8 deletions(-) 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 index 410bb0578..da470c8b4 100644 --- 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 @@ -13,7 +13,7 @@ class ControllerWriter extends BaseControllerWriter { private static final String AT_GENERATED = "@Generated(\"avaje-jex-generator\")"; - private static final String API_CONTEXT = "io.avaje.jex.Context"; + private static final String API_CONTEXT = "io.avaje.jex.http.Context"; private static final String API_ROUTING = "io.avaje.jex.Routing"; private final boolean useJsonB; private final Map jsonTypes; @@ -27,7 +27,7 @@ class ControllerWriter extends BaseControllerWriter { if (reader.methods().stream() .map(MethodReader::webMethod) .anyMatch(w -> CoreWebMethod.FILTER == w)) { - reader.addImportType("io.avaje.jex.HttpFilter.FilterChain"); + reader.addImportType("io.avaje.jex.http.HttpFilter.FilterChain"); } if (reader.methods().stream() .map(MethodReader::hxRequest) diff --git a/tests/pom.xml b/tests/pom.xml index 134c0f3c6..09702382a 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -15,7 +15,7 @@ 5.11.4 3.27.3 2.18.2 - 3.0-RC16 + 3.0-RC18 11.2 4.1.6 6.4.0 diff --git a/tests/test-jex/src/main/java/org/example/web/TestController.java b/tests/test-jex/src/main/java/org/example/web/TestController.java index 0c447d05c..9b61882e6 100644 --- a/tests/test-jex/src/main/java/org/example/web/TestController.java +++ b/tests/test-jex/src/main/java/org/example/web/TestController.java @@ -13,8 +13,8 @@ import io.avaje.http.api.Post; import io.avaje.http.api.Produces; import io.avaje.http.api.QueryParam; -import io.avaje.jex.Context; -import io.avaje.jex.HttpFilter.FilterChain; +import io.avaje.jex.http.Context; +import io.avaje.jex.http.HttpFilter.FilterChain; @Path("test/") @Controller diff --git a/tests/test-jex/src/main/java/org/example/web/myapp/WebController.java b/tests/test-jex/src/main/java/org/example/web/myapp/WebController.java index ca73d0542..47ff90274 100644 --- a/tests/test-jex/src/main/java/org/example/web/myapp/WebController.java +++ b/tests/test-jex/src/main/java/org/example/web/myapp/WebController.java @@ -6,8 +6,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Optional; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.Executors; import org.example.web.AppRoles; import org.example.web.myapp.other.Foo; @@ -25,7 +23,7 @@ import io.avaje.http.api.Produces; import io.avaje.http.api.QueryParam; import io.avaje.http.api.Valid; -import io.avaje.jex.Context; +import io.avaje.jex.http.Context; import io.swagger.v3.oas.annotations.Hidden; import jakarta.inject.Inject; From 186f0e17a0eadf9ff7faefcc907b26cbf7348356 Mon Sep 17 00:00:00 2001 From: Josiah Noel <32279667+SentryMan@users.noreply.github.com> Date: Sun, 9 Feb 2025 22:31:02 -0500 Subject: [PATCH 2/2] fix test --- .../main/java/io/avaje/http/generator/jex/JexAdapter.java | 2 +- .../src/main/java/org/example/web/HelloController.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/http-generator-jex/src/main/java/io/avaje/http/generator/jex/JexAdapter.java b/http-generator-jex/src/main/java/io/avaje/http/generator/jex/JexAdapter.java index 730fd52f6..100589c1f 100644 --- a/http-generator-jex/src/main/java/io/avaje/http/generator/jex/JexAdapter.java +++ b/http-generator-jex/src/main/java/io/avaje/http/generator/jex/JexAdapter.java @@ -12,7 +12,7 @@ class JexAdapter implements PlatformAdapter { - static final String JEX_CONTEXT = "io.avaje.jex.Context"; + static final String JEX_CONTEXT = "io.avaje.jex.http.Context"; @Override public boolean isContextType(String rawType) { diff --git a/tests/test-jex/src/main/java/org/example/web/HelloController.java b/tests/test-jex/src/main/java/org/example/web/HelloController.java index 899acb8f3..8f56f008f 100644 --- a/tests/test-jex/src/main/java/org/example/web/HelloController.java +++ b/tests/test-jex/src/main/java/org/example/web/HelloController.java @@ -1,5 +1,7 @@ package org.example.web; +import java.math.BigInteger; + import io.avaje.http.api.Controller; import io.avaje.http.api.Default; import io.avaje.http.api.Get; @@ -7,9 +9,7 @@ import io.avaje.http.api.Produces; import io.avaje.http.api.Put; import io.avaje.http.api.Valid; -import io.avaje.jex.Context; - -import java.math.BigInteger; +import io.avaje.jex.http.Context; // @Roles(AppRoles.BASIC_USER) @Controller