Skip to content

Commit ba690bd

Browse files
committed
revert path generation
1 parent 1c0c774 commit ba690bd

File tree

1 file changed

+5
-28
lines changed

1 file changed

+5
-28
lines changed

http-generator-client/src/main/java/io/avaje/http/generator/client/ClientMethodWriter.java

Lines changed: 5 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

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

12-
import java.util.Iterator;
1312
import java.util.List;
1413
import java.util.Map;
1514
import java.util.Optional;
@@ -367,36 +366,14 @@ private void writePaths(Set<PathSegments.Segment> segments) {
367366
if (!segments.isEmpty()) {
368367
writer.append(" ");
369368
}
370-
boolean first = true;
371-
Iterator<Segment> iterator = segments.iterator();
372-
boolean sentinel = true;
373-
boolean noSlash = false;
374-
var size = segments.size();
375-
while (sentinel) {
376-
PathSegments.Segment segment = iterator.hasNext() ? iterator.next() : null;
377-
if (segment == null) {
378-
sentinel = false;
379-
if (size != 0) {
380-
writer.append("\")");
381-
}
382-
continue;
383-
}
384-
if (first) {
385-
writer.append(".path(\"");
386-
first = false;
387-
}
388-
if (noSlash) {
389-
writer.append("/");
390-
}
391-
noSlash = true;
369+
for (PathSegments.Segment segment : segments) {
392370
if (segment.isLiteral()) {
393-
writer.append(segment.literalSection());
371+
writer.append(".path(\"").append(segment.literalSection()).append("\")");
394372
} else if (segment.isProperty()) {
395-
396-
writer.append("\" + %s + \"", segmentPropertyMap.get(segment.name()));
397-
373+
writer.append(".path(").append(segmentPropertyMap.get(segment.name())).append(")");
398374
} else {
399-
writer.append("\" + %s + \"", segment.name());
375+
writer.append(".path(").append(segment.name()).append(")");
376+
// TODO: matrix params
400377
}
401378
}
402379
if (!segments.isEmpty()) {

0 commit comments

Comments
 (0)