refactor: Use XPathProcessor from eforms-core

Use XPathProcessor from eforms-core instead of our own XPath parser.

Also rename getXpathRelativeStepCount to getXpathRelativeElementCount to
make it clearer it only count XPath steps that are elements, and not
attributes.

(cherry picked from commit ad2136b)

Author: bertrand-lorentz

src/main/java/eu/europa/ted/eforms/sdk/analysis/fact/FieldFact.java

@@ -15,7 +15,8 @@
 import eu.europa.ted.eforms.sdk.analysis.domain.field.FieldPrivacy;
 import eu.europa.ted.eforms.sdk.analysis.domain.field.XmlElementPosition;
 import eu.europa.ted.eforms.sdk.analysis.domain.field.XmlStructureNode;
-import eu.europa.ted.eforms.sdk.analysis.util.XPathSplitter;
+import eu.europa.ted.eforms.xpath.XPathInfo;
+import eu.europa.ted.eforms.xpath.XPathProcessor;
 
 public class FieldFact implements SdkComponentFact<String> {
   private static final long serialVersionUID = -8325643682910825716L;
@@ -118,9 +119,14 @@ public String getXpathRelative() {
     return field.getXpathRelative();
   }
 
-  public int getXpathRelativeStepCount() {
+  public int getXpathRelativeElementCount() {
     if (stepCount == 0 && getXpathRelative() != null) {
-      stepCount = XPathSplitter.getStepElementNames(getXpathRelative()).size();
+      XPathInfo xpathInfo = XPathProcessor.parse(getXpathRelative());
+      stepCount = xpathInfo.getSteps().size();
+      if (xpathInfo.isAttribute()) {
+        // we don't want to count attributes
+        stepCount--;
+      }
     }
     return stepCount;
   }

src/main/java/eu/europa/ted/eforms/sdk/analysis/fact/NodeFact.java

@@ -5,7 +5,7 @@
 
 import eu.europa.ted.eforms.sdk.analysis.domain.field.XmlElementPosition;
 import eu.europa.ted.eforms.sdk.analysis.domain.field.XmlStructureNode;
-import eu.europa.ted.eforms.sdk.analysis.util.XPathSplitter;
+import eu.europa.ted.eforms.xpath.XPathProcessor;
 
 public class NodeFact implements SdkComponentFact<String> {
   private static final long serialVersionUID = -6237630016231337698L;
@@ -78,9 +78,9 @@ public String getXpathRelative() {
     return node.getXpathRelative();
   }
 
-  public int getXpathRelativeStepCount() {
+  public int getXpathRelativeElementCount() {
     if (stepCount == 0 && getXpathRelative() != null) {
-      stepCount = XPathSplitter.getStepElementNames(getXpathRelative()).size();
+      stepCount = XPathProcessor.parse(getXpathRelative()).getSteps().size();
     }
     return stepCount;
   }

src/main/java/eu/europa/ted/eforms/sdk/analysis/util/XPathSplitter.java

@@ -31,8 +31,9 @@
 import eu.europa.ted.eforms.sdk.analysis.enums.ValidationStatusEnum;
 import eu.europa.ted.eforms.sdk.analysis.fact.FieldFact;
 import eu.europa.ted.eforms.sdk.analysis.fact.NodeFact;
-import eu.europa.ted.eforms.sdk.analysis.util.XPathSplitter;
 import eu.europa.ted.eforms.sdk.analysis.vo.ValidationResult;
+import eu.europa.ted.eforms.xpath.XPathProcessor;
+import eu.europa.ted.eforms.xpath.XPathStep;
 
 /**
  * Validates the content of the XSD files in the SDK, and their consistency with other files.
@@ -161,17 +162,16 @@ private void checkNodeRepeatability(XmlStructureNode node) {
    * removing any predicate.
    */
   private String getFirstElementName(String xpath) {
-    List<String> names = XPathSplitter.getStepElementNames(xpath);
-    return names.get(0);
+    return XPathProcessor.parse(xpath).getSteps().get(0).getStepText();
   }
 
   /**
    * Return the name of the element that is the last step in the given XPath,
    * removing any predicate.
    */
   private String getLastElementName(String xpath) {
-    List<String> names = XPathSplitter.getStepElementNames(xpath);
-    return names.get(names.size() - 1);
+    List<XPathStep> steps = XPathProcessor.parse(xpath).getSteps();
+    return steps.get(steps.size() - 1).getStepText();
   }
 
   /**

src/main/java/eu/europa/ted/eforms/sdk/analysis/validator/XmlSchemaValidator.java

@@ -139,14 +139,14 @@ end
 
 rule "Every field has XSD sequence order consistent with relative xpath"
 when
-  /fields[ $f: this, xsdSequenceOrderCount != xpathRelativeStepCount ]
+  /fields[ $f: this, xsdSequenceOrderCount != xpathRelativeElementCount ]
 then
   results.add(new ValidationResult($f, "Field XSD sequence order is inconsistent with relative XPath.", ValidationStatusEnum.ERROR));
 end
 
 rule "Every non-root node has XSD sequence order consistent with relative xpath"
 when
-  /nodes[ $n: this, parentId != null, xsdSequenceOrderCount != xpathRelativeStepCount ]
+  /nodes[ $n: this, parentId != null, xsdSequenceOrderCount != xpathRelativeElementCount ]
 then
   results.add(new ValidationResult($n, "Node XSD sequence order is inconsistent with relative XPath.", ValidationStatusEnum.ERROR));
 end