Skip to content

[http-client] Reset base if an http scheme is detected #324

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 8 commits into from
Oct 19, 2023
Merged

[http-client] Reset base if an http scheme is detected #324

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
cf6ce02
reset path if an http scheme is detected
SentryMan Oct 18, 2023
7ac946f
remove extra path calls
SentryMan Oct 19, 2023
25740de
Merge branch 'master' into path
SentryMan Oct 19, 2023
a81fca6
Update ClientMethodWriter.java
SentryMan Oct 19, 2023
6e6bba8
url instead of path
SentryMan Oct 19, 2023
1c0c774
back to path
SentryMan Oct 19, 2023
ba690bd
revert path generation
SentryMan Oct 19, 2023
c87cddb
Update DUrlBuilder.java
SentryMan Oct 19, 2023
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
Prev Previous commit
Next Next commit
url instead of path
  • Loading branch information
@SentryMan
SentryMan committed Oct 19, 2023
commit 6e6bba87acc460bf8efecb16ec9e77c5b511cc4c
9 changes: 5 additions & 4 deletions http-client/src/main/java/io/avaje/http/client/DUrlBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,17 @@ final class DUrlBuilder implements UrlBuilder {

@Override
public UrlBuilder url(String url) {
buffer.delete(0, buffer.length());

if (url.startsWith("http") && url.contains("://")) {
buffer.setLength(0);
}

buffer.append(url);
return this;
}

@Override
public UrlBuilder path(String path) {
if (path.startsWith("http") && path.contains("://")) {
return url(path);
}
buffer.append("/").append(path);
return this;
}
Expand Down
2 changes: 1 addition & 1 deletion http-generator-client/src/main/java/io/avaje/http/generator/client/ClientMethodWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@ private void writePaths(Set<PathSegments.Segment> segments) {
continue;
}
if (first) {
writer.append(".path(\"");
writer.append(".url(\"");
first = false;
}
if (noSlash) {
Expand Down