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

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
revert path generation
  • Loading branch information
@SentryMan
SentryMan committed Oct 19, 2023
commit ba690bd5b40c868f21b9c0f15368b45e591a6e31
33 changes: 5 additions & 28 deletions 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 @@ -9,7 +9,6 @@

import static java.util.stream.Collectors.toMap;

import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Optional;
Expand Down Expand Up @@ -367,36 +366,14 @@ private void writePaths(Set<PathSegments.Segment> segments) {
if (!segments.isEmpty()) {
writer.append(" ");
}
boolean first = true;
Iterator<Segment> iterator = segments.iterator();
boolean sentinel = true;
boolean noSlash = false;
var size = segments.size();
while (sentinel) {
PathSegments.Segment segment = iterator.hasNext() ? iterator.next() : null;
if (segment == null) {
sentinel = false;
if (size != 0) {
writer.append("\")");
}
continue;
}
if (first) {
writer.append(".path(\"");
first = false;
}
if (noSlash) {
writer.append("/");
}
noSlash = true;
for (PathSegments.Segment segment : segments) {
if (segment.isLiteral()) {
writer.append(segment.literalSection());
writer.append(".path(\"").append(segment.literalSection()).append("\")");
} else if (segment.isProperty()) {

writer.append("\" + %s + \"", segmentPropertyMap.get(segment.name()));

writer.append(".path(").append(segmentPropertyMap.get(segment.name())).append(")");
} else {
writer.append("\" + %s + \"", segment.name());
writer.append(".path(").append(segment.name()).append(")");
// TODO: matrix params
}
}
if (!segments.isEmpty()) {
Expand Down