Skip to content

Simplify PackageURL::validatePath(String, boolean) #173

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 2 commits into from
Mar 12, 2025
Merged

Simplify PackageURL::validatePath(String, boolean) #173

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c68a01
Simplify `PackageURL::validatePath(String, boolean)`
dwalluck Feb 27, 2025
275f100
Rename to `validateSubpath`
dwalluck Mar 11, 2025
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
6 changes: 3 additions & 3 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 @@ -100,7 +100,7 @@ public PackageURL(final String type, final String namespace, final String name,
this.name = validateName(name);
this.version = validateVersion(version);
this.qualifiers = parseQualifiers(qualifiers);
this.subpath = validatePath(subpath, true);
this.subpath = validateSubpath(subpath);
verifyTypeConstraints(this.type, this.namespace, this.name);
}

Expand Down Expand Up @@ -369,11 +369,11 @@ private void validateKey(final String value) throws MalformedPackageURLException
validateChars(value, PackageURL::isValidCharForKey, "qualifier key");
}

private String validatePath(final String value, final boolean isSubpath) throws MalformedPackageURLException {
private String validateSubpath(final String value) throws MalformedPackageURLException {
if (value == null || value.isEmpty()) {
return null;
}
return validatePath(value.split("/"), isSubpath);
return validatePath(value.split("/"), true);
}

private String validatePath(final String[] segments, final boolean isSubpath) throws MalformedPackageURLException {
Expand Down