Skip to content

Code cleanup and optimization #355

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
ok2c merged 5 commits into from
Jul 2, 2022
Merged

Code cleanup and optimization #355

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d6c10f0
Make MIN_VALUE and MAX_VALUE final
Jul 1, 2022
5e6b6bc
Remove unused private static final field
Jul 1, 2022
35e6031
Replace Stack with LinkedList
Jul 1, 2022
ff424c6
Revert "Remove unused private static final field"
Jul 1, 2022
fc54181
Revert "Make MIN_VALUE and MAX_VALUE final"
Jul 1, 2022
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
10 changes: 5 additions & 5 deletions httpcore5/src/main/java/org/apache/hc/core5/net/URIBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
import java.util.Arrays;
import java.util.BitSet;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
import java.util.Stack;

import org.apache.hc.core5.http.HttpHost;
import org.apache.hc.core5.http.NameValuePair;
Expand Down Expand Up @@ -1033,22 +1033,22 @@ public URIBuilder normalizeSyntax() {
if (this.pathSegments != null) {
final List<String> inputSegments = this.pathSegments;
if (!inputSegments.isEmpty()) {
final Stack<String> outputSegments = new Stack<>();
final LinkedList<String> outputSegments = new LinkedList<>();
Comment thread
michael-o marked this conversation as resolved.
for (final String inputSegment : inputSegments) {
if (!inputSegment.isEmpty() && !".".equals(inputSegment)) {
if ("..".equals(inputSegment)) {
if (!outputSegments.isEmpty()) {
outputSegments.pop();
outputSegments.removeLast();
}
} else {
outputSegments.push(inputSegment);
outputSegments.addLast(inputSegment);
}
}
}
if (!inputSegments.isEmpty()) {
final String lastSegment = inputSegments.get(inputSegments.size() - 1);
if (lastSegment.isEmpty()) {
outputSegments.push("");
outputSegments.addLast("");
}
}
this.pathSegments = outputSegments;
Expand Down