Skip to content

Make PackageURLBuilder::getQualifiers return Map #157

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
Merged

Make PackageURLBuilder::getQualifiers return Map #157

Show file tree
Hide file tree
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
18 changes: 13 additions & 5 deletions src/main/java/com/github/packageurl/PackageURLBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
*/
package com.github.packageurl;

import java.util.Collections;
import java.util.Map;
import java.util.TreeMap;

/**
Expand Down Expand Up @@ -132,7 +134,9 @@ public PackageURLBuilder withQualifier(final String key, final String value) {
public PackageURLBuilder withoutQualifier(final String key) {
if (qualifiers != null) {
qualifiers.remove(key);
if (qualifiers.isEmpty()) { qualifiers = null; }
if (qualifiers.isEmpty()) {
qualifiers = null;
}
}
return this;
}
Expand Down Expand Up @@ -191,9 +195,11 @@ public String getSubpath() {
* An empty map is returned if no qualifiers is set.
* @return all qualifiers set in this builder, or an empty map if none are set.
*/
public TreeMap<String, String> getQualifiers() {
if (qualifiers == null) { return new TreeMap<>(); }
return new TreeMap<>(qualifiers);
public Map<String, String> getQualifiers() {
if (qualifiers == null) {
return null;
}
return Collections.unmodifiableMap(qualifiers);
}

/**
Expand All @@ -202,7 +208,9 @@ public TreeMap<String, String> getQualifiers() {
* @return qualifier value or {@code null} if one is not set.
*/
public String getQualifier(String key) {
if (qualifiers == null) { return null; }
if (qualifiers == null) {
return null;
}
return qualifiers.get(key);
}

Expand Down
12 changes: 5 additions & 7 deletions src/test/java/com/github/packageurl/PackageURLBuilderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,15 +205,13 @@ private void assertBuilderMatch(PackageURL expected, PackageURLBuilder actual) t
Map<String, String> eQualifiers = expected.getQualifiers();
Map<String, String> aQualifiers = actual.getQualifiers();

if (eQualifiers != null) {
eQualifiers.forEach((k,v)-> {
Assert.assertEquals(v, aQualifiers.remove(k));
assertEquals(eQualifiers, aQualifiers);

if (eQualifiers != null && aQualifiers != null) {
eQualifiers.forEach((k,v) -> {
Assert.assertEquals(v, actual.getQualifier(k));
});
}

Assert.assertTrue(aQualifiers.isEmpty());

}

}
}