Skip to content

feat: improve toString() #208

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 19, 2025
Merged

feat: improve toString() #208

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
32 changes: 19 additions & 13 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,6 +32,7 @@
import java.util.Collections;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
import java.util.function.IntPredicate;
import java.util.stream.Collectors;
Expand Down Expand Up @@ -470,28 +471,33 @@ public String canonicalize() {
*/
private String canonicalize(boolean coordinatesOnly) {
final StringBuilder purl = new StringBuilder();
purl.append(SCHEME_PART).append(type).append("/");
purl.append(SCHEME_PART).append(type).append('/');
if (namespace != null) {
purl.append(encodePath(namespace));
purl.append("/");
purl.append('/');
}
purl.append(percentEncode(name));
if (version != null) {
purl.append("@").append(percentEncode(version));
purl.append('@').append(percentEncode(version));
}
if (! coordinatesOnly) {

if (!coordinatesOnly) {
if (qualifiers != null) {
purl.append("?");
qualifiers.forEach((key, value) -> {
purl.append(toLowerCase(key));
purl.append("=");
purl.append(percentEncode(value));
purl.append("&");
});
purl.setLength(purl.length() - 1);
purl.append('?');
Set<Map.Entry<String, String>> entries = qualifiers.entrySet();
boolean separator = false;
for (Map.Entry<String, String> entry : entries) {
if (separator) {
purl.append('&');
}
purl.append(entry.getKey());
purl.append('=');
purl.append(percentEncode(entry.getValue()));
separator = true;
}
}
if (subpath != null) {
purl.append("#").append(encodePath(subpath));
purl.append('#').append(encodePath(subpath));
}
}
return purl.toString();
Expand Down