Skip to content

Simplify parsePath #182

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
jeremylong merged 1 commit into from
Mar 12, 2025
Merged

Simplify parsePath #182

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 4 additions & 10 deletions src/main/java/com/github/packageurl/PackageURL.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
import java.util.Objects;
import java.util.TreeMap;
import java.util.function.IntPredicate;
import java.util.regex.Pattern;
import java.util.stream.Collectors;

/**
Expand All @@ -54,7 +53,6 @@
public final class PackageURL implements Serializable {

private static final long serialVersionUID = 3243226021636427586L;
private static final Pattern PATH_SPLITTER = Pattern.compile("/");

/**
* Constructs a new PackageURL object by parsing the specified string.
Expand Down Expand Up @@ -724,19 +722,15 @@ private Map<String, String> parseQualifiers(final String encodedString) throws M
}
}

@SuppressWarnings("StringSplitter")//reason: surprising behavior is okay in this case
private String[] parsePath(final String value, final boolean isSubpath) {
if (value == null || value.isEmpty()) {
return null;
}
return PATH_SPLITTER.splitAsStream(value)
private String[] parsePath(final String path, final boolean isSubpath) {
return Arrays.stream(path.split("/"))
.filter(segment -> !segment.isEmpty() && !(isSubpath && (".".equals(segment) || "..".equals(segment))))
.map(segment -> percentDecode(segment))
.map(this::percentDecode)
.toArray(String[]::new);
}

private String encodePath(final String path) {
return Arrays.stream(path.split("/")).map(segment -> percentEncode(segment)).collect(Collectors.joining("/"));
return Arrays.stream(path.split("/")).map(this::percentEncode).collect(Collectors.joining("/"));
}

/**
Expand Down