Merge "[Cps Path Parser] Refactoring leaf conditions"

diff --cc cps-path-parser/src/main/java/org/onap/cps/cpspath/parser/CpsPathBuilder.java
index 66964bb,1993e17..0325bdc
--- 1/cps-path-parser/src/main/java/org/onap/cps/cpspath/parser/CpsPathBuilder.java
--- 2/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());