Fix matrix TCKs

Signed-off-by: Jorge Bescos Gascon <[email protected]>
helidon-io · Oct 24, 2023 · bba4aa7 · bba4aa7
1 parent 7bfe1e7
commit bba4aa7
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 0 deletions.
diff --git a/common/uri/src/main/java/io/helidon/common/uri/UriPath.java b/common/uri/src/main/java/io/helidon/common/uri/UriPath.java
@@ -34,6 +34,12 @@ public interface UriPath {
      * @return a new path representing the new relative path
      */
     static UriPath createRelative(UriPath uriPath, String relativePath) {
+        if (uriPath instanceof UriPathMatrix) {
+            String rawPath = uriPath.rawPath();
+            int idx = rawPath.indexOf(relativePath);
+            rawPath = rawPath.substring(idx);
+            return new UriPathMatrix(rawPath, relativePath);
+        }
         return new UriPathNoParam(uriPath.absolute(), relativePath);
     }
 

diff --git a/common/uri/src/main/java/io/helidon/common/uri/UriPathMatrix.java b/common/uri/src/main/java/io/helidon/common/uri/UriPathMatrix.java
@@ -30,6 +30,11 @@ class UriPathMatrix extends UriPathNoParam {
         this.rawPath = rawPath;
     }
 
+    UriPathMatrix(String rawPath, String noParamPath, UriPath absolute) {
+        super(noParamPath, absolute);
+        this.rawPath = rawPath;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) {

diff --git a/common/uri/src/main/java/io/helidon/common/uri/UriPathNoParam.java b/common/uri/src/main/java/io/helidon/common/uri/UriPathNoParam.java
@@ -35,6 +35,11 @@ class UriPathNoParam implements UriPath {
         this.absolute = this;
     }
 
+    UriPathNoParam(String rawPath, UriPath absolute) {
+        this.rawPath = rawPath;
+        this.absolute = absolute;
+    }
+
     UriPathNoParam(UriPath absolute, String relativePath) {
         this.rawPath = relativePath;
         this.decodedPath = relativePath;

diff --git a/common/uri/src/test/java/io/helidon/common/uri/UriPathTest.java b/common/uri/src/test/java/io/helidon/common/uri/UriPathTest.java
@@ -51,4 +51,11 @@ void testDoubleSlash(String rawPath) {
         UriPath path = UriPath.create(rawPath);
         assertThat(path.path(), is("/foo/bar"));
     }
+
+    @Test
+    void testMatrix() {
+        UriPath raw = UriPath.create("/jaxrs_spec/resource/entitymatrix;param=ASDFGHJKLQWERTYUIOPPPPPPP");
+        UriPath relative = (UriPathMatrix) UriPath.createRelative(raw, "/resource/entitymatrix");
+        assertThat(relative.rawPath(), is("/resource/entitymatrix;param=ASDFGHJKLQWERTYUIOPPPPPPP"));
+    }
 }