From: Priyank Maheshwari <priyank.maheshwari@est.tech>
Date: Wed, 4 Sep 2024 16:18:43 +0000 (+0000)
Subject: Merge "[Cps Path Parser] Refactoring leaf conditions"
X-Git-Tag: 3.5.3~36
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=66f6c6d2634d83d972e8f226156359b72a1f6841;p=cps.git

Merge "[Cps Path Parser] Refactoring leaf conditions"
---

66f6c6d2634d83d972e8f226156359b72a1f6841
diff --cc cps-path-parser/src/main/java/org/onap/cps/cpspath/parser/CpsPathBuilder.java
index 66964bbc47,1993e17c41..0325bdcacb
--- a/cps-path-parser/src/main/java/org/onap/cps/cpspath/parser/CpsPathBuilder.java
+++ b/cps-path-parser/src/main/java/org/onap/cps/cpspath/parser/CpsPathBuilder.java
@@@ -54,8 -55,11 +54,6 @@@ public class CpsPathBuilder extends Cps
  
      private final List<String> booleanOperators = new ArrayList<>();
  
-     private final List<String> comparativeOperators = new ArrayList<>();
 -    @Override
 -    public void exitInvalidPostFix(final CpsPathParser.InvalidPostFixContext ctx) {
 -        throw new PathParsingException(ctx.getText());
 -    }
--
      @Override
      public void exitPrefix(final PrefixContext ctx) {
          cpsPathQuery.setXpathPrefix(normalizedXpathBuilder.toString());
@@@ -66,8 -70,15 +64,10 @@@
          cpsPathQuery.setNormalizedParentPath(normalizedXpathBuilder.toString());
      }
  
 -    @Override
 -    public void exitIncorrectPrefix(final IncorrectPrefixContext ctx) {
 -        throw new PathParsingException("CPS path can only start with one or two slashes (/)");
 -    }
 -
      @Override
      public void exitLeafCondition(final LeafConditionContext ctx) {
+         final String leafName = ctx.leafName().getText();
+         final String operator = ctx.comparativeOperators().getText();
          final Object comparisonValue;
          if (ctx.IntegerLiteral() != null) {
              comparisonValue = Integer.valueOf(ctx.IntegerLiteral().getText());