Add withoutQualifiers(Set) and withoutQualifiers()

Author: dwalluck

src/main/java/com/github/packageurl/PackageURLBuilder.java

@@ -22,6 +22,7 @@
 package com.github.packageurl;
 
 import java.util.Map;
+import java.util.Set;
 import java.util.TreeMap;
 
 /**
@@ -36,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
     }
 
     /**
@@ -126,7 +127,7 @@ public PackageURLBuilder withQualifier(final String key, final String value) {
     }
 
     /**
-     * Adds the package qualifiers .
+     * Adds the package qualifiers.
      *
      * @param qualifiers the package qualifiers
      * @return a reference to the builder
@@ -158,6 +159,29 @@ public PackageURLBuilder withoutQualifier(final String key) {
         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.

src/test/java/com/github/packageurl/PackageURLBuilderTest.java

@@ -26,6 +26,7 @@
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -211,9 +212,10 @@ public void testQualifiers() throws MalformedPackageURLException {
                 .withQualifier("key4", "value4")
                 .withQualifiers(qualifiers2)
                 .withSubpath("")
+                .withoutQualifiers(Collections.singleton("key4"))
                 .build();
 
-        assertEquals("pkg:generic/name@version?key=value&key2=value2&key3=value3&key4=value4&next=value", purl.toString());
+        assertEquals("pkg:generic/name@version?key=value&key2=value2&key3=value3&next=value", purl.toString());
     }
 
     private void assertBuilderMatch(PackageURL expected, PackageURLBuilder actual) throws MalformedPackageURLException {