From: danielhanrahan <daniel.hanrahan@est.tech>
Date: Sat, 31 Aug 2024 21:06:12 +0000 (+0100)
Subject: [Cps Path Parser] Remove unneeded validation in grammar
X-Git-Tag: 3.5.3~38
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=bbc81d85bda5e9c446e3218e30b1ba5bdf3dc3e0;p=cps.git

[Cps Path Parser] Remove unneeded validation in grammar

The invalid prefix/postfix is not needed; existing tests show
that PathParsingException is thrown in for invalid paths.

Issue-ID: CPS-2365
Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech>
Change-Id: I202f0ca0bc5eb768fc3af711180405882dafc22d
---

diff --git a/cps-path-parser/src/main/antlr4/org/onap/cps/cpspath/parser/antlr4/CpsPath.g4 b/cps-path-parser/src/main/antlr4/org/onap/cps/cpspath/parser/antlr4/CpsPath.g4
index 3aef120fed..be8d968fcb 100644
--- a/cps-path-parser/src/main/antlr4/org/onap/cps/cpspath/parser/antlr4/CpsPath.g4
+++ b/cps-path-parser/src/main/antlr4/org/onap/cps/cpspath/parser/antlr4/CpsPath.g4
@@ -1,6 +1,6 @@
 /*
  *  ============LICENSE_START=======================================================
- *  Copyright (C) 2021-2023 Nordix Foundation
+ *  Copyright (C) 2021-2024 Nordix Foundation
  *  Modifications Copyright (C) 2023 TechMahindra Ltd
  *  ================================================================================
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -27,7 +27,7 @@
 
 grammar CpsPath ;
 
-cpsPath : ( prefix | descendant | incorrectPrefix ) multipleLeafConditions? textFunctionCondition? containsFunctionCondition? ancestorAxis? invalidPostFix?;
+cpsPath : ( prefix | descendant ) multipleLeafConditions? textFunctionCondition? containsFunctionCondition? ancestorAxis? EOF ;
 
 ancestorAxis : SLASH KW_ANCESTOR COLONCOLON ancestorPath ;
 
@@ -43,8 +43,6 @@ prefix : parent SLASH containerName ;
 
 descendant : SLASH prefix ;
 
-incorrectPrefix : SLASH SLASH SLASH+ ;
-
 yangElement : containerName listElementRef? ;
 
 containerName : QName ;
@@ -61,8 +59,6 @@ booleanOperators : ( KW_AND | KW_OR ) ;
 
 comparativeOperators : ( EQ | GT | LT | GE | LE ) ;
 
-invalidPostFix : (AT | CB | COLONCOLON | comparativeOperators ).+ ;
-
 /*
  * Lexer Rules
  * Most of the lexer rules below are inspired by
diff --git 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
index 0bb09235ff..66964bbc47 100644
--- 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
@@ -29,7 +29,6 @@ import org.onap.cps.cpspath.parser.antlr4.CpsPathBaseListener;
 import org.onap.cps.cpspath.parser.antlr4.CpsPathParser;
 import org.onap.cps.cpspath.parser.antlr4.CpsPathParser.AncestorAxisContext;
 import org.onap.cps.cpspath.parser.antlr4.CpsPathParser.DescendantContext;
-import org.onap.cps.cpspath.parser.antlr4.CpsPathParser.IncorrectPrefixContext;
 import org.onap.cps.cpspath.parser.antlr4.CpsPathParser.LeafConditionContext;
 import org.onap.cps.cpspath.parser.antlr4.CpsPathParser.MultipleLeafConditionsContext;
 import org.onap.cps.cpspath.parser.antlr4.CpsPathParser.PrefixContext;
@@ -57,11 +56,6 @@ public class CpsPathBuilder extends CpsPathBaseListener {
 
     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());
@@ -72,11 +66,6 @@ public class CpsPathBuilder extends CpsPathBaseListener {
         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 Object comparisonValue;