Merge pull request #39 from OP-TED/release/1.5.0

Prepare release of version 1.5.0

Author: bertrand-lorentz

.github/workflows/publish.yml

@@ -29,7 +29,7 @@ jobs:
         with:
           java-version: '11'
           distribution: 'adopt'
-          server-id: ossrh
+          server-id: central
           server-username: MAVEN_USERNAME
           server-password: MAVEN_PASSWORD
       - name: Publish to the Maven Central Repository

CHANGELOG.md

@@ -1,12 +1,12 @@
-# eForms Core Library 1.4.0 Release Notes
+# eForms Core Library 1.5.0 Release Notes
 
 The eForms Core Library is a collection of utilities that are used by our sample applications as well as the EFX Toolkit for Java Developers.
 
 ## In this release
 
-This release adds the option to indicate a qualifier for SDK components. If there are 2 or more classes that have an @SdkComponent annotation with the same version and component type, this allows you to differentiate them and load the component with the matching qualifier.
+This release fixes an issue in the XPathProcessor that could cause a redundant predicate production when contextualising XPaths with multiple predicates.
 
-The versions of various dependencies was updated: ANTLR 4.13.1, JAXB 4.0.4, logback 1.5.3, ph-genericode 7.1.1.
+The versions of various dependencies was updated: Apache Commons IO 2.19.0, Apache Commons Lang 3.18.0, Jackson 2.18.3, logback 1.5.18.
 
 ## Download
 

pom.xml

@@ -3,7 +3,7 @@
 
   <groupId>eu.europa.ted.eforms</groupId>
   <artifactId>eforms-core-java</artifactId>
-  <version>1.4.0</version>
+  <version>1.5.0</version>
 
   <name>eForms Core Library</name>
   <description>API and tools for eForms applications.</description>
@@ -32,23 +32,10 @@
     <url>https://github.com/OP-TED/eforms-core-java.git</url>
   </scm>
 
-  <distributionManagement>
-    <snapshotRepository>
-      <id>ossrh</id>
-      <url>https://${sonatype.server.url}/content/repositories/snapshots</url>
-    </snapshotRepository>
-    <repository>
-      <id>ossrh</id>
-      <url>https://${sonatype.server.url}/service/local/staging/deploy/maven2/</url>
-    </repository>
-  </distributionManagement>
-
   <properties>
-    <project.build.outputTimestamp>2024-08-02T09:11:15Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2024-08-02T09:50:45Z</project.build.outputTimestamp>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-    <sonatype.server.url>s01.oss.sonatype.org</sonatype.server.url>
-
     <!-- Java compiler -->
     <java.version>11</java.version>
     <maven.compiler.source>${java.version}</maven.compiler.source>
@@ -57,13 +44,13 @@
     <!-- Versions - Third-party libraries -->
     <version.antlr4>4.13.1</version.antlr4>
     <version.commons-collections>3.2.2</version.commons-collections>
-    <version.commons-io>2.11.0</version.commons-io>
-    <version.commons-lang3>3.12.0</version.commons-lang3>
-    <version.jackson>2.15.1</version.jackson>
+    <version.commons-io>2.19.0</version.commons-io>
+    <version.commons-lang3>3.18.0</version.commons-lang3>
+    <version.jackson>2.18.3</version.jackson>
     <version.jaxb-impl>4.0.4</version.jaxb-impl>
     <version.jool>0.9.15</version.jool>
     <version.junit>5.7.2</version.junit>
-    <version.logback>1.5.3</version.logback>
+    <version.logback>1.5.18</version.logback>
     <version.maven>3.8.6</version.maven>
     <version.ph-jaxb>11.1.3</version.ph-jaxb>
     <version.ph-genericode>7.1.1</version.ph-genericode>
@@ -83,7 +70,7 @@
     <version.source.plugin>3.2.1</version.source.plugin>
     <version.jar.plugin>3.3.0</version.jar.plugin>
     <version.surefire.plugin>3.2.5</version.surefire.plugin>
-    <version.nexus-staging.plugin>1.6.7</version.nexus-staging.plugin>
+    <version.central-publishing.plugin>0.8.0</version.central-publishing.plugin>
   </properties>
 
   <dependencyManagement>
@@ -421,9 +408,9 @@
           <version>${version.japicmp.plugin}</version>
         </plugin>
         <plugin>
-          <groupId>org.sonatype.plugins</groupId>
-          <artifactId>nexus-staging-maven-plugin</artifactId>
-          <version>${version.nexus-staging.plugin}</version>
+          <groupId>org.sonatype.central</groupId>
+          <artifactId>central-publishing-maven-plugin</artifactId>
+          <version>${version.central-publishing.plugin}</version>
         </plugin>
       </plugins>
     </pluginManagement>
@@ -561,13 +548,12 @@
             </configuration>
           </plugin>
            <plugin>
-              <groupId>org.sonatype.plugins</groupId>
-              <artifactId>nexus-staging-maven-plugin</artifactId>
+              <groupId>org.sonatype.central</groupId>
+              <artifactId>central-publishing-maven-plugin</artifactId>
               <extensions>true</extensions>
               <configuration>
-                <serverId>ossrh</serverId>
-                <nexusUrl>https://${sonatype.server.url}/</nexusUrl>
-                <autoReleaseAfterClose>true</autoReleaseAfterClose>
+                <publishingServerId>central</publishingServerId>
+                <autoPublish>true</autoPublish>
               </configuration>
            </plugin>
         </plugins>

src/main/java/eu/europa/ted/eforms/xpath/XPathProcessor.java

@@ -76,17 +76,20 @@ private static String getContextualizedXpath(Queue<XPathStep> contextQueue,
       // we want to use a dot step with the predicate of the path.
       if (!contextQueue.isEmpty() && !pathQueue.isEmpty()
           && pathQueue.peek().isSameAsOrNarrowerThan(contextQueue.peek())) {
-        contextQueue.poll();  // consume the same step from the contextQueue
+        // Consume the same step from the contextQueue and get its predicates
+        List<String> contextPredicates = contextQueue.poll().getPredicates(); 
+        // Keep only the predicates that are not in the context.
+        String pathPredicates = pathQueue.poll().getPredicates().stream().filter(p -> !contextPredicates.contains(p)).collect(Collectors.joining(""));
         if (contextQueue.isEmpty()) {
           // Since there are no more steps in the contextQueue, the relative xpath should 
           // start with a dot step to provide a context for the predicate.
-          relativeXpath += "." + pathQueue.poll().getPredicateText();
+          relativeXpath += "." + pathPredicates;
         } else {
           // Since there are more steps in the contextQueue which we will need to navigate back to,
-          // using back-steps, we will use a back-step to provide context of the predicate.
+          // using back-steps, we will use a back-step to provide context for the predicate.
           // This avoids an output that looks like ../.[predicate] which is valid but silly.  
           contextQueue.poll();  // consume the step from the contextQueue
-          relativeXpath += ".." + pathQueue.poll().getPredicateText();
+          relativeXpath += ".." + pathPredicates;
         }
       }
 

src/test/java/eu/europa/ted/eforms/xpath/XPathProcessorTest.java

@@ -65,7 +65,7 @@ void testIdentical() {
 
   @Test
   void testIdentical_WithPredicates() {
-    assertEquals(".[d = e][f = g]", contextualize("/a/b/c[d = e]", "/a/b/c[d = e][f = g]"));
+    assertEquals(".[f = g]", contextualize("/a/b/c[d = e]", "/a/b/c[d = e][f = g]"));
   }
 
   @Test
@@ -181,7 +181,7 @@ void testPredicateDifferent() {
 
   @Test
   void testPredicateMoreInXpath() {
-    assertEquals("..[e][f]/c/d", contextualize("/a/b[e]/c", "/a/b[e][f]/c/d"));
+    assertEquals("..[f]/c/d", contextualize("/a/b[e]/c", "/a/b[e][f]/c/d"));
   }
 
   @Test