From 2968b0e0037fa238c13290df43b2306524f5271b Mon Sep 17 00:00:00 2001 From: niamhcore Date: Tue, 9 Mar 2021 14:23:52 +0000 Subject: Improve error reporting for invalid cps path query Issue-ID: CPS-276 Signed-off-by: niamhcore Change-Id: I0e0abbaff32c936c67fc1092dc8385a0bc5ae49e --- cps-ri/src/main/java/org/onap/cps/spi/query/CpsPathQuery.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'cps-ri/src') diff --git a/cps-ri/src/main/java/org/onap/cps/spi/query/CpsPathQuery.java b/cps-ri/src/main/java/org/onap/cps/spi/query/CpsPathQuery.java index e85414cdc9..54a6a96c4e 100644 --- a/cps-ri/src/main/java/org/onap/cps/spi/query/CpsPathQuery.java +++ b/cps-ri/src/main/java/org/onap/cps/spi/query/CpsPathQuery.java @@ -59,7 +59,7 @@ public class CpsPathQuery { cpsPathQuery.setCpsPathQueryType(CpsPathQueryType.XPATH_LEAF_VALUE); cpsPathQuery.setXpathPrefix(matcher.group(1)); cpsPathQuery.setLeafName(matcher.group(2)); - cpsPathQuery.setLeafValue(convertLeafValueToCorrectType(matcher.group(3))); + cpsPathQuery.setLeafValue(convertLeafValueToCorrectType(matcher.group(3), cpsPath)); return cpsPathQuery; } matcher = QUERY_CPS_PATH_ENDS_WITH_PATTERN.matcher(cpsPath); @@ -69,10 +69,10 @@ public class CpsPathQuery { return cpsPathQuery; } throw new CpsPathException("Invalid cps path.", - String.format("Cannot interpret or parse cps path %s.", cpsPath)); + String.format("Cannot interpret or parse cps path '%s'.", cpsPath)); } - private static Object convertLeafValueToCorrectType(final String leafValueString) { + private static Object convertLeafValueToCorrectType(final String leafValueString, final String cpsPath) { final Matcher stringValueWithQuotesMatcher = LEAF_STRING_VALUE_PATTERN.matcher(leafValueString); if (stringValueWithQuotesMatcher.matches()) { return stringValueWithQuotesMatcher.group(1); @@ -82,6 +82,6 @@ public class CpsPathQuery { return Integer.valueOf(leafValueString); } throw new CpsPathException("Unsupported leaf value.", - String.format("Unsupported leaf value %s in cps path.", leafValueString)); + String.format("Unsupported leaf value '%s' in cps path '%s'.", leafValueString, cpsPath)); } } -- cgit 1.2.3-korg