From c37678a3eb62685d32a1581729e2a4e26002bffc Mon Sep 17 00:00:00 2001 From: ToineSiebelink Date: Thu, 20 May 2021 16:44:21 +0100 Subject: Introducing Antlr4 for cpsPath parsing -created new module for cpPathParser -added antlr rule for cpsPathWithSingleLeafCondition -added antlr rule for cpsPathWithDescendant (and with leaf conditions) -added antlr rule for ancestor axis -added unit test (copied from existing CpsPathQuerySpec) -udpated cps-ri to use new cpPathQuery from parser module -'imported' lexer rules from publix xPath grammar -Re-used existing CpsPathException but conversion happens in cps-ri to prevent additional dependency in cps-path-parser module Issue-ID: CPS-376 Change-Id: I2c5df98969402cbf69f6573c52705879450ce606 Signed-off-by: ToineSiebelink --- .../java/org/onap/cps/spi/exceptions/CpsPathException.java | 7 ++++--- .../org/onap/cps/spi/exceptions/CpsExceptionsSpec.groovy | 12 +++++------- 2 files changed, 9 insertions(+), 10 deletions(-) (limited to 'cps-service') diff --git a/cps-service/src/main/java/org/onap/cps/spi/exceptions/CpsPathException.java b/cps-service/src/main/java/org/onap/cps/spi/exceptions/CpsPathException.java index fde5566b14..f1e8dc5256 100644 --- a/cps-service/src/main/java/org/onap/cps/spi/exceptions/CpsPathException.java +++ b/cps-service/src/main/java/org/onap/cps/spi/exceptions/CpsPathException.java @@ -23,13 +23,14 @@ public class CpsPathException extends CpsException { private static final long serialVersionUID = 1006899957127327791L; + private static final String ERROR_MESSAGE = "Error while parsing cpsPath expression"; + /** * Constructor. * - * @param message the error message * @param details the error details */ - public CpsPathException(final String message, final String details) { - super(message, details); + public CpsPathException(final String details) { + super(ERROR_MESSAGE, details); } } diff --git a/cps-service/src/test/groovy/org/onap/cps/spi/exceptions/CpsExceptionsSpec.groovy b/cps-service/src/test/groovy/org/onap/cps/spi/exceptions/CpsExceptionsSpec.groovy index 8592af908d..b0bd629056 100755 --- a/cps-service/src/test/groovy/org/onap/cps/spi/exceptions/CpsExceptionsSpec.groovy +++ b/cps-service/src/test/groovy/org/onap/cps/spi/exceptions/CpsExceptionsSpec.groovy @@ -115,8 +115,8 @@ class CpsExceptionsSpec extends Specification { def 'Creating an exception that the schema set being used and cannot be deleted.'() { expect: 'the exception details contains the correct message with dataspace and schema set names' (new SchemaSetInUseException(dataspaceName, schemaSetName)).details - == ("Schema Set with name ${schemaSetName} in dataspace ${dataspaceName} is having " - + "Anchor records associated.") + == ("Schema Set with name ${schemaSetName} in dataspace ${dataspaceName} is having" + + " Anchor records associated.") } def 'Creating a exception that a datanode with a specified xpath does not exist.'() { @@ -157,10 +157,8 @@ class CpsExceptionsSpec extends Specification { def 'Creating a cps path exception.'() { given: 'a cps path exception is created' - def exception = new CpsPathException(providedMessage, providedDetails) - expect: 'the exception has the provided message' - exception.message == providedMessage - and: 'the exception has the provided details' + def exception = new CpsPathException(providedDetails) + expect: 'the exception has the provided details' exception.details == providedDetails } -} \ No newline at end of file +} -- cgit 1.2.3-korg