Fix percent encoding and pass original tests

Author: dwalluck

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

@@ -471,11 +471,11 @@ private String canonicalize(boolean coordinatesOnly) {
         }
         purl.append("/");
         if (namespace != null) {
-            purl.append(encodePath(namespace));
+            purl.append(encodePath(namespace, ":"));
             purl.append("/");
         }
         if (name != null) {
-            purl.append(percentEncode(name));
+            purl.append(percentEncode(name, ":"));
         }
         if (version != null) {
             purl.append("@").append(percentEncode(version));
@@ -486,36 +486,44 @@ private String canonicalize(boolean coordinatesOnly) {
                 qualifiers.entrySet().stream().forEachOrdered(entry -> {
                     purl.append(toLowerCase(entry.getKey()));
                     purl.append("=");
-                    purl.append(percentEncode(entry.getValue()));
+                    purl.append(percentEncode(entry.getValue(), ":/"));
                     purl.append("&");
                 });
                 purl.setLength(purl.length() - 1);
             }
             if (subpath != null) {
-                purl.append("#").append(encodePath(subpath));
+                purl.append("#").append(encodePath(subpath, "?#+&="));
             }
         }
         return purl.toString();
     }
 
+    private String percentEncode(final String input, final Charset charset, final String charsToExclude) {
+        return uriEncode(input, charset, charsToExclude);
+    }
+
+    private String percentEncode(final String input, final String charsToExclude) {
+        return percentEncode(input, StandardCharsets.UTF_8, charsToExclude);
+    }
+
     /**
      * Encodes the input in conformance with RFC 3986.
      *
      * @param input the String to encode
      * @return an encoded String
      */
     private String percentEncode(final String input) {
-        return uriEncode(input, StandardCharsets.UTF_8);
+        return percentEncode(input, StandardCharsets.UTF_8, null);
     }
 
-    private static String uriEncode(String source, Charset charset) {
-        if (source == null || source.isEmpty()) {
+    private static String uriEncode(String source, Charset charset, String chars) {
+        if (source == null || source.length() == 0) {
             return source;
         }
 
         StringBuilder builder = new StringBuilder();
         for (byte b : source.getBytes(charset)) {
-            if (isUnreserved(b)) {
+            if (isUnreserved(b) || chars != null && chars.indexOf(b) != -1) {
                 builder.append((char) b);
             }
             else {

src/test/resources/test-suite-data.json

@@ -85,8 +85,8 @@
   },
   {
     "description": "docker uses qualifiers and hash image id as versions",
-    "purl": "pkg:docker/customer/dockerimage@sha256:244fd47e07d1004f0aed9c?repository_url=gcr.io",
-    "canonical_purl": "pkg:docker/customer/dockerimage@sha256:244fd47e07d1004f0aed9c?repository_url=gcr.io",
+    "purl": "pkg:docker/customer/dockerimage@sha256%3A244fd47e07d1004f0aed9c?repository_url=gcr.io",
+    "canonical_purl": "pkg:docker/customer/dockerimage@sha256%3A244fd47e07d1004f0aed9c?repository_url=gcr.io",
     "type": "docker",
     "namespace": "customer",
     "name": "dockerimage",