Skip to content

fix: correct issues with PackageURL #159

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 11, 2025
+7 −10
Merged

fix: correct issues with PackageURL #159

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
17 changes: 7 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 @@ -223,7 +223,7 @@ public String getVersion() {
* @since 1.0.0
*/
public Map<String, String> getQualifiers() {
return (qualifiers != null)? Collections.unmodifiableMap(qualifiers) : null;
return (qualifiers != null) ? Collections.unmodifiableMap(qualifiers) : null;
}

/**
Expand Down Expand Up @@ -312,9 +312,6 @@ private String validateName(final String value) throws MalformedPackageURLExcept
}

private String validateVersion(final String value) {
if (value == null) {
return null;
}
return value;
}

Expand Down Expand Up @@ -416,9 +413,9 @@ private String canonicalize(boolean coordinatesOnly) {
purl.append("@").append(percentEncode(version));
}
if (! coordinatesOnly) {
if (qualifiers != null && qualifiers.size() > 0) {
if (qualifiers != null && !qualifiers.isEmpty()) {
purl.append("?");
qualifiers.entrySet().stream().forEachOrdered((entry) -> {
qualifiers.entrySet().stream().forEachOrdered(entry -> {
purl.append(toLowerCase(entry.getKey()));
purl.append("=");
purl.append(percentEncode(entry.getValue()));
Expand All @@ -444,7 +441,7 @@ private String percentEncode(final String input) {
}

private static String uriEncode(String source, Charset charset) {
if (source == null || source.length() == 0) {
if (source == null || source.isEmpty()) {
return source;
}

Expand Down Expand Up @@ -660,7 +657,7 @@ private void verifyTypeConstraints(String type, String namespace, String name) t
private Map<String, String> parseQualifiers(final String encodedString) throws MalformedPackageURLException {
try {
final TreeMap<String, String> results = Arrays.stream(encodedString.split("&"))
.collect(TreeMap<String, String>::new,
.collect(TreeMap::new,
(map, value) -> {
final String[] entry = value.split("=", 2);
if (entry.length == 2 && !entry[1].isEmpty()) {
Expand All @@ -670,15 +667,15 @@ private Map<String, String> parseQualifiers(final String encodedString) throws M
}
}
},
TreeMap<String, String>::putAll);
TreeMap::putAll);
return validateQualifiers(results);
} catch (ValidationException e) {
throw new MalformedPackageURLException(e);
}
}

@SuppressWarnings("StringSplitter")//reason: surprising behavior is okay in this case
private String[] parsePath(final String value, final boolean isSubpath) throws MalformedPackageURLException {
private String[] parsePath(final String value, final boolean isSubpath) {
if (value == null || value.isEmpty()) {
return null;
}
Expand Down