Merge pull request #89 from evolvedbinary/6.x.x/hotfix/node-path-to-string

[6.x.x] Fix an issue in NodePath#toString()

Author: adamretter

exist-core/pom.xml

@@ -898,6 +898,8 @@
                                 <include>src/main/java/org/exist/storage/IndexSpec.java</include>
                                 <include>src/main/java/org/exist/storage/NativeBroker.java</include>
                                 <include>src/main/java/org/exist/storage/NativeValueIndex.java</include>
+                                <include>src/main/java/org/exist/storage/NodePath.java</include>
+                                <include>src/test/java/org/exist/storage/NodePathTest.java</include>
                                 <include>src/main/java/org/exist/storage/ProcessMonitor.java</include>
                                 <include>src/test/java/org/exist/storage/RecoveryTest.java</include>
                                 <include>src/test/java/org/exist/storage/RecoveryTest2.java</include>
@@ -1342,6 +1344,8 @@
                                 <exclude>src/test/java/org/exist/storage/MoveCollectionTest.java</exclude>
                                 <exclude>src/main/java/org/exist/storage/NativeBroker.java</exclude>
                                 <exclude>src/main/java/org/exist/storage/NativeValueIndex.java</exclude>
+                                <exclude>src/main/java/org/exist/storage/NodePath.java</exclude>
+                                <exclude>src/test/java/org/exist/storage/NodePathTest.java</exclude>
                                 <exclude>src/main/java/org/exist/storage/ProcessMonitor.java</exclude>
                                 <exclude>src/test/java/org/exist/storage/RecoverBinaryTest.java</exclude>
                                 <exclude>src/test/java/org/exist/storage/RecoverXmlTest.java</exclude>

exist-core/src/main/java/org/exist/storage/NodePath.java

@@ -1,4 +1,28 @@
 /*
+ * Elemental
+ * Copyright (C) 2024, Evolved Binary Ltd
+ *
+ * [email protected]
+ * https://www.evolvedbinary.com | https://www.elemental.xyz
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; version 2.1.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * NOTE: Parts of this file contain code from 'The eXist-db Authors'.
+ *       The original license header is included below.
+ *
+ * =====================================================================
+ *
  * eXist-db Open Source Native XML Database
  * Copyright (C) 2001 The eXist-db Authors
  *
@@ -242,12 +266,21 @@ public final boolean match(final NodePath other, int j) {
     @Override
     public String toString() {
         final StringBuilder buf = new StringBuilder();
+        boolean prevSkip = false;
         for (int i = 0; i < pos; i++) {
-        	buf.append("/");
-            if (components[i].getNameType() == ElementValue.ATTRIBUTE) {
+            final QName component = components[i];
+            if (component != NodePath.SKIP && !component.equals(NodePath.SKIP)) {
+                if (!prevSkip) {
+                    buf.append("/");
+                }
+                prevSkip = false;
+            } else {
+                prevSkip = true;
+            }
+            if (component.getNameType() == ElementValue.ATTRIBUTE) {
                 buf.append("@");
             }
-            buf.append(components[i]);
+            buf.append(component);
         }
         return buf.toString();
     }

exist-core/src/test/java/org/exist/storage/NodePathTest.java

@@ -1,4 +1,28 @@
 /*
+ * Elemental
+ * Copyright (C) 2024, Evolved Binary Ltd
+ *
+ * [email protected]
+ * https://www.evolvedbinary.com | https://www.elemental.xyz
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; version 2.1.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * NOTE: Parts of this file contain code from 'The eXist-db Authors'.
+ *       The original license header is included below.
+ *
+ * =====================================================================
+ *
  * eXist-db Open Source Native XML Database
  * Copyright (C) 2001 The eXist-db Authors
  *
@@ -90,6 +114,12 @@ public void appendFromEmpty() {
         assertEquals("/a/b/c/d", path.toString());
         path.append(new NodePath(null, "/1/2/3"));
         assertEquals("/a/b/c/d/1/2/3", path.toString());
+
+        path = new NodePath();
+        path.addComponent(NodePath.SKIP);
+        path.addComponent(new QName("lemma", "", "", ElementValue.ATTRIBUTE));
+        assertEquals("//@lemma", path.toString());
+
     }
 
     @Test
@@ -108,6 +138,10 @@ public void appendFromNonEmpty() {
         assertEquals("/a/b/c/d", path.toString());
         path.append(new NodePath(null, "/1/2/3"));
         assertEquals("/a/b/c/d/1/2/3", path.toString());
+
+        path = new NodePath(NodePath.SKIP);
+        path.addComponent(new QName("lemma", "", "", ElementValue.ATTRIBUTE));
+        assertEquals("//@lemma", path.toString());
     }
 
     @Test