Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
61 changes: 57 additions & 4 deletions src/main/java/com/github/packageurl/PackageURLBuilder.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
*/
package com.github.packageurl;

import java.util.Map;
import java.util.Set;
import java.util.TreeMap;

/**
Expand All @@ -35,7 +37,7 @@ public final class PackageURLBuilder {
private TreeMap<String, String> qualifiers = null;

private PackageURLBuilder() {
//empty constructor for utility class
// empty constructor for utility class
}

/**
Expand Down Expand Up @@ -124,6 +126,26 @@ public PackageURLBuilder withQualifier(final String key, final String value) {
return this;
}

/**
* Adds the package qualifiers.
*
* @param qualifiers the package qualifiers
* @return a reference to the builder
* @see PackageURL#getQualifiers()
*/
public PackageURLBuilder withQualifiers(final Map<String, String> qualifiers) {
if (qualifiers == null) {
this.qualifiers = null;
} else {
if (this.qualifiers == null) {
this.qualifiers = new TreeMap<>(qualifiers);
} else {
this.qualifiers.putAll(qualifiers);
}
}
return this;
}

/**
* Removes a package qualifier. This is a no-op if the qualifier is not present.
* @param key the package qualifier key to remove
Expand All @@ -132,11 +154,38 @@ 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;
}

/**
* Removes a package qualifier. This is a no-op if the qualifier is not present.
* @param keys the package qualifier keys to remove
* @return a reference to the builder
*/
public PackageURLBuilder withoutQualifiers(final Set<String> keys) {
if (this.qualifiers != null) {
keys.forEach(k -> this.qualifiers.remove(k));
if (this.qualifiers.isEmpty()) {
this.qualifiers = null;
}
}
return this;
}


/**
* Removes all qualifiers, if any.
* @return a reference to this builder.
*/
public PackageURLBuilder withoutQualifiers() {
qualifiers = null;
return this;
}

/**
* Removes all qualifiers, if any.
* @return a reference to this builder.
Expand Down Expand Up @@ -192,7 +241,9 @@ public String getSubpath() {
* @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<>(); }
if (qualifiers == null) {
return new TreeMap<>();
}
return new TreeMap<>(qualifiers);
}

Expand All @@ -202,7 +253,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
27 changes: 26 additions & 1 deletion src/test/java/com/github/packageurl/PackageURLBuilderTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
import org.junit.Test;
import org.junit.rules.ExpectedException;

import java.util.Collections;
import java.util.HashMap;
import java.util.Map;

import static org.junit.Assert.*;
Expand Down Expand Up @@ -193,6 +195,29 @@ public void testEditBuilder1() throws MalformedPackageURLException {

}

@Test
public void testQualifiers() throws MalformedPackageURLException {
Map<String, String> qualifiers = new HashMap<>();
qualifiers.put("key2", "value2");
Map<String, String> qualifiers2 = new HashMap<>();
qualifiers.put("key3", "value3");
PackageURL purl = PackageURLBuilder.aPackageURL()
.withType(PackageURL.StandardTypes.GENERIC)
.withNamespace("")
.withName("name")
.withVersion("version")
.withQualifier("key", "value")
.withQualifier("next", "value")
.withQualifiers(qualifiers)
.withQualifier("key4", "value4")
.withQualifiers(qualifiers2)
.withSubpath("")
.withoutQualifiers(Collections.singleton("key4"))
.build();

assertEquals("pkg:generic/name@version?key=value&key2=value2&key3=value3&next=value", purl.toString());
}

private void assertBuilderMatch(PackageURL expected, PackageURLBuilder actual) throws MalformedPackageURLException {

Assert.assertEquals(expected.toString(), actual.build().toString());
Expand All @@ -216,4 +241,4 @@ private void assertBuilderMatch(PackageURL expected, PackageURLBuilder actual) t

}

}
}