Fix naming.

Author: dwalluck

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

@@ -436,18 +436,18 @@ private String canonicalize(boolean coordinatesOnly) {
             purl.append("/");
         }
         if (name != null) {
-            purl.append(percentEncode(name));
+            purl.append(uriEncode(name));
         }
         if (version != null) {
-            purl.append("@").append(percentEncode(version));
+            purl.append("@").append(uriEncode(version));
         }
         if (! coordinatesOnly) {
             if (qualifiers != null && !qualifiers.isEmpty()) {
                 purl.append("?");
                 qualifiers.entrySet().stream().forEachOrdered(entry -> {
                     purl.append(toLowerCase(entry.getKey()));
                     purl.append("=");
-                    purl.append(percentEncode(entry.getValue()));
+                    purl.append(uriEncode(entry.getValue()));
                     purl.append("&");
                 });
                 purl.setLength(purl.length() - 1);
@@ -459,7 +459,7 @@ private String canonicalize(boolean coordinatesOnly) {
         return purl.toString();
     }
 
-    private static String percentEncode(final String source) {
+    private static String uriEncode(final String source) {
         if (source == null || source.isEmpty()) {
             return source;
         }
@@ -560,7 +560,7 @@ private static String toLowerCase(String s) {
         return new String(chars);
     }
 
-    public static String percentDecode(final String source) {
+    public static String uriDecode(final String source) {
         if (source == null || source.isEmpty()) {
             return source;
         }
@@ -661,16 +661,16 @@ private void parse(final String purl) throws MalformedPackageURLException {
             // version is optional - check for existence
             index = remainder.lastIndexOf('@');
             if (index >= start) {
-                this.version = validateVersion(percentDecode(remainder.substring(index + 1)));
+                this.version = validateVersion(uriDecode(remainder.substring(index + 1)));
                 remainder = remainder.substring(0, index);
             }
 
             // The 'remainder' should now consist of an optional namespace and the name
             index = remainder.lastIndexOf('/');
             if (index <= start) {
-                this.name = validateName(percentDecode(remainder.substring(start)));
+                this.name = validateName(uriDecode(remainder.substring(start)));
             } else {
-                this.name = validateName(percentDecode(remainder.substring(index + 1)));
+                this.name = validateName(uriDecode(remainder.substring(index + 1)));
                 remainder = remainder.substring(0, index);
                 this.namespace = validateNamespace(parsePath(remainder.substring(start), false));
             }
@@ -721,7 +721,7 @@ private Map<String, String> parseQualifiers(final String encodedString) throws M
                                 final String[] entry = value.split("=", 2);
                                 if (entry.length == 2 && !entry[1].isEmpty()) {
                                     String key = toLowerCase(entry[0]);
-                                    if (map.put(key, percentDecode(entry[1])) != null) {
+                                    if (map.put(key, uriDecode(entry[1])) != null) {
                                         throw new ValidationException("Duplicate package qualifier encountered. More then one value was specified for " + key);
                                     }
                                 }
@@ -740,12 +740,12 @@ private String[] parsePath(final String value, final boolean isSubpath) {
         }
         return PATH_SPLITTER.splitAsStream(value)
                 .filter(segment -> !segment.isEmpty() && !(isSubpath && (".".equals(segment) || "..".equals(segment))))
-                .map(segment -> percentDecode(segment))
+                .map(segment -> uriDecode(segment))
                 .toArray(String[]::new);
     }
 
     private String encodePath(final String path) {
-        return Arrays.stream(path.split("/")).map(segment -> percentEncode(segment)).collect(Collectors.joining("/"));
+        return Arrays.stream(path.split("/")).map(segment -> uriEncode(segment)).collect(Collectors.joining("/"));
     }
 
     /**