Skip to content

Fix fullUrl on jetty #235

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 4 commits into from
Mar 24, 2025
Merged

Fix fullUrl on jetty #235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
18bfff2
fix fullUrl on jetty
SentryMan Mar 22, 2025
74ece82
Merge branch 'master' into jetty-fullurl
SentryMan Mar 24, 2025
15acfef
Format only
rbygrave Mar 24, 2025
e1310ff
Merge branch 'jetty-fullurl' of github.com:SentryMan/avaje-jex into j…
rbygrave Mar 24, 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
3 changes: 2 additions & 1 deletion avaje-jex/src/main/java/io/avaje/jex/http/Context.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,8 @@ default List<String> formParams(String key) {

/** Return the full request url, including query string (if present) */
default String fullUrl() {
return scheme() + "://" + host() + uri().toString();
var uri = uri().toString();
return !uri.startsWith("/") ? uri : scheme() + "://" + host() + uri;
}

/**
Expand Down
11 changes: 6 additions & 5 deletions avaje-jex/src/test/java/io/avaje/jex/core/ContextLengthTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
package io.avaje.jex.core;

import io.avaje.jex.Jex;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;

import java.net.http.HttpResponse;

import static org.assertj.core.api.Assertions.assertThat;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Test;

import io.avaje.jex.Jex;

class ContextLengthTest {

Expand Down Expand Up @@ -59,7 +60,7 @@ void uri() {
.GET().asString();

assertThat(res.statusCode()).isEqualTo(200);
assertThat(res.body()).isEqualTo("uri:/uri/uriTest?a=av");
assertThat(res.body()).contains("/uri/uriTest?a=av");
}

@Test
Expand Down