Skip to content

Update jex context package #563

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 10, 2025
Merged

Update jex context package #563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
99cfc51
update jex context package
SentryMan Feb 10, 2025
186f0e1
fix test
SentryMan Feb 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions http-generator-jex/src/main/java/io/avaje/http/generator/jex/ControllerWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<String, UType> jsonTypes;
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion http-generator-jex/src/main/java/io/avaje/http/generator/jex/JexAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<junit.version>5.11.4</junit.version>
<assertj.version>3.27.3</assertj.version>
<jackson.version>2.18.2</jackson.version>
<jex.version>3.0-RC16</jex.version>
<jex.version>3.0-RC18</jex.version>
<avaje-inject.version>11.2</avaje-inject.version>
<nima.version>4.1.6</nima.version>
<javalin.version>6.4.0</javalin.version>
Expand Down
6 changes: 3 additions & 3 deletions tests/test-jex/src/main/java/org/example/web/HelloController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
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;
import io.avaje.http.api.Path;
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
Expand Down
4 changes: 2 additions & 2 deletions tests/test-jex/src/main/java/org/example/web/TestController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions tests/test-jex/src/main/java/org/example/web/myapp/WebController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;

Expand Down