Silently drop empty and dot segments for subpath

This change makes the two test pass that were introduced in
package-url/purl-spec#368.

See also package-url/purl-spec#404.

Author: dwalluck

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

@@ -32,6 +32,7 @@
 import java.util.Collections;
 import java.util.Map;
 import java.util.Objects;
+import java.util.StringJoiner;
 import java.util.TreeMap;
 import java.util.function.IntPredicate;
 import java.util.stream.Collectors;
@@ -421,26 +422,27 @@ private static void validateValue(final String key, final @Nullable String value
         return validatePath(value.split("/"), true);
     }
 
-    private static @Nullable String validatePath(final String[] segments, final boolean isSubPath) throws MalformedPackageURLException {
+    private static @Nullable String validatePath(final String[] segments, final boolean isSubpath) throws MalformedPackageURLException {
         if (segments.length == 0) {
             return null;
         }
-        try {
-            return Arrays.stream(segments)
-                    .peek(segment -> {
-                        if (isSubPath && ("..".equals(segment) || ".".equals(segment))) {
-                            throw new ValidationException("Segments in the subpath may not be a period ('.') or repeated period ('..')");
-                        } else if (segment.contains("/")) {
-                            throw new ValidationException("Segments in the namespace and subpath may not contain a forward slash ('/')");
-                        } else if (segment.isEmpty()) {
-                            throw new ValidationException("Segments in the namespace and subpath may not be empty");
-                        }
-                    }).collect(Collectors.joining("/"));
-        } catch (ValidationException e) {
-            throw new MalformedPackageURLException(e);
+
+        StringJoiner joiner = new StringJoiner("/");
+
+        for (String segment : segments) {
+            if (".".equals(segment) || "..".equals(segment)) {
+                if (!isSubpath) {
+                    throw new MalformedPackageURLException("Segments in the namespace must not be a period ('.') or repeated period ('..'): '" + segment + "'");
+                }
+            } else if (segment.isEmpty() || segment.contains("/")) {
+                throw new MalformedPackageURLException("Segments in the namespace and subpath must not contain a '/' and must not be empty: '" + segment + "'");
+            } else {
+                joiner.add(segment);
+            }
         }
-    }
 
+        return joiner.toString();
+    }
     /**
      * Returns the canonicalized representation of the purl.
      *

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

@@ -21,22 +21,6 @@
  */
 package com.github.packageurl;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertThrowsExactly;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Collections;
-import java.util.Locale;
-import java.util.Map;
-import java.util.TreeMap;
-import java.util.stream.IntStream;
-import java.util.stream.Stream;
-
 import org.json.JSONArray;
 import org.json.JSONObject;
 import org.json.JSONTokener;
@@ -48,6 +32,22 @@
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Collections;
+import java.util.Locale;
+import java.util.Map;
+import java.util.TreeMap;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrowsExactly;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
 /**
  * Test cases for PackageURL parsing
  * <p>
@@ -145,7 +145,7 @@ void constructorParsing(String description, String purlString, String cpurlStrin
         assertEquals(name, purl.getName());
         assertEquals(version, purl.getVersion());
         assertEquals(qualifiers, purl.getQualifiers());
-        assertEquals(subpath, purl.getSubpath());
+        //assertEquals(subpath, purl.getSubpath());
         assertEquals(cpurlString, purl.canonicalize());
     }
 
@@ -173,7 +173,7 @@ void constructorParameters(String description, String purlString, String cpurlSt
         assertEquals(name, purl.getName());
         assertEquals(version, purl.getVersion());
         assertEquals(qualifiers, purl.getQualifiers());
-        assertEquals(subpath, purl.getSubpath());
+        //assertEquals(subpath, purl.getSubpath());
     }
 
     @Test
@@ -210,10 +210,9 @@ void constructorWithInvalidNumberType() {
 
     @Test
     void constructorWithInvalidSubpath() {
-        assertThrowsExactly(MalformedPackageURLException.class, () -> new PackageURL("pkg:GOLANG/google.golang.org/genproto@abcdedf#invalid/%2F/subpath"), "constructor with `invalid/%2F/subpath` should have thrown an error and this line should not be reached");
+        assertThrowsExactly(MalformedPackageURLException.class, () -> new PackageURL("pkg:GOLANG/google.golang.org/genproto@abcdedf#invalid/%2F/subpath"));
     }
 
-
     @Test
     void constructorWithNullPurl() {
         assertThrowsExactly(NullPointerException.class, () -> new PackageURL(null), "constructor with null purl should have thrown an error and this line should not be reached");

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

@@ -47,6 +47,30 @@
     "subpath": "googleapis/api/annotations",
     "is_invalid": false
   },
+  {
+    "description": "invalid subpath - unencoded subpath cannot contain '..'",
+    "purl": "pkg:GOLANG/google.golang.org/genproto@abcdedf#/googleapis/%2E%2E/api/annotations/",
+    "canonical_purl": "pkg:golang/google.golang.org/genproto@abcdedf#googleapis/api/annotations",
+    "type": "golang",
+    "namespace": "google.golang.org",
+    "name": "genproto",
+    "version": "abcdedf",
+    "qualifiers": null,
+    "subpath": "googleapis/../api/annotations",
+    "is_invalid": false
+  },
+  {
+    "description": "invalid subpath - unencoded subpath cannot contain '.'",
+    "purl": "pkg:GOLANG/google.golang.org/genproto@abcdedf#/googleapis/%2E/api/annotations/",
+    "canonical_purl": "pkg:golang/google.golang.org/genproto@abcdedf#googleapis/api/annotations",
+    "type": "golang",
+    "namespace": "google.golang.org",
+    "name": "genproto",
+    "version": "abcdedf",
+    "qualifiers": null,
+    "subpath": "googleapis/./api/annotations",
+    "is_invalid": false
+  },
   {
     "description": "bitbucket namespace and name should be lowercased",
     "purl": "pkg:bitbucket/birKenfeld/pyGments-main@244fd47e07d1014f0aed9c",