Merge pull request #102 from package-url/fix-issue-89

Removed unnecessary cache of canonicalized form

Author: stevespringett

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

@@ -146,11 +146,6 @@ public PackageURL(final String type, final String namespace, final String name,
      */
     private String subpath;
 
-    /**
-     * The cached version of the canonical form.
-     */
-    private String canonicalizedForm = null;
-
     /**
      * Returns the package url scheme.
      *
@@ -384,9 +379,6 @@ public String canonicalize() {
      * @since 1.3.2
      */
     private String canonicalize(boolean coordinatesOnly) {
-        if (canonicalizedForm != null) {
-            return canonicalizedForm;
-        }
         final StringBuilder purl = new StringBuilder();
         purl.append(scheme).append(":");
         if (type != null) {
@@ -418,8 +410,7 @@ private String canonicalize(boolean coordinatesOnly) {
                 purl.append("#").append(encodePath(subpath));
             }
         }
-        canonicalizedForm = purl.toString();
-        return canonicalizedForm;
+        return purl.toString();
     }
 
     /**

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

@@ -306,6 +306,13 @@ public void testGetCoordinates() throws Exception {
         Assert.assertEquals("pkg:generic/acme/example-component@1.0.0", purl.getCoordinates());
     }
 
+    @Test
+    public void testGetCoordinatesNoCacheIssue89() throws Exception {
+        PackageURL purl = new PackageURL("pkg:generic/acme/example-component@1.0.0?key1=value1&key2=value2");
+        purl.canonicalize();
+        Assert.assertEquals("pkg:generic/acme/example-component@1.0.0", purl.getCoordinates());
+    }
+
     @Test
     public void testNpmCaseSensitive() throws Exception {
         // e.g. https://www.npmjs.com/package/base64/v/1.0.0