diff options
author | 2021-04-16 13:47:52 +0100 | |
---|---|---|
committer | 2021-04-22 16:09:49 +0100 | |
commit | efe679def187d07560601a3ff3beb719755b3d7a (patch) | |
tree | 81203c07c2a96c203a3a3547fc16911ff2548424 /cps-ri/src/main/java/org/onap/cps/spi/query/CpsPathQuery.java | |
parent | 98c078768b2ee6c8ce1a910f42ce46845eacc2c1 (diff) |
Implement ends with cps path query to support multiple attributes with 'and' condition
Issue-ID: CPS-309
Signed-off-by: puthuparambil.aditya <aditya.puthuparambil@bell.ca>
Change-Id: I80bf2650e2cd979b806fc29302fc5cb295f65241
Signed-off-by: puthuparambil.aditya <aditya.puthuparambil@bell.ca>
Diffstat (limited to 'cps-ri/src/main/java/org/onap/cps/spi/query/CpsPathQuery.java')
-rw-r--r-- | cps-ri/src/main/java/org/onap/cps/spi/query/CpsPathQuery.java | 52 |
1 files changed, 46 insertions, 6 deletions
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 ce78c06d4..c5861bd4b 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 @@ -1,7 +1,7 @@ /* * ============LICENSE_START======================================================= * Copyright (C) 2021 Nordix Foundation - * Modifications Copyright (C) 2021 Bell Canada. All rights reserved. + * Modifications Copyright (C) 2021 Bell Canada. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,6 +20,8 @@ package org.onap.cps.spi.query; +import java.util.HashMap; +import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; import lombok.AccessLevel; @@ -36,6 +38,7 @@ public class CpsPathQuery { private String leafName; private Object leafValue; private String descendantName; + private Map<String, Object> leavesData; private static final String NON_CAPTURING_GROUP_1_TO_99_YANG_CONTAINERS = "((?:\\/[^\\/]+){1,99})"; @@ -51,6 +54,15 @@ public class CpsPathQuery { private static final Pattern LEAF_STRING_VALUE_PATTERN = Pattern.compile("['\"](.*)['\"]"); + private static final String YANG_MULTIPLE_LEAF_VALUE_EQUALS_CONDITION = "\\[(.*?)\\s{0,9}]"; + + private static final Pattern DESCENDANT_ANYWHERE_PATTERN_WITH_MULTIPLE_LEAF_PATTERN = + Pattern.compile(DESCENDANT_ANYWHERE_PATTERN + YANG_MULTIPLE_LEAF_VALUE_EQUALS_CONDITION); + + private static final String INDIVIDUAL_LEAF_DETAIL_PATTERN = ("\\s{0,9}and\\s{0,9}"); + + private static final Pattern LEAF_VALUE_PATTERN = Pattern.compile("@(\\S+?)=(.*)"); + /** * Returns a cps path query. * @@ -61,11 +73,11 @@ public class CpsPathQuery { Matcher matcher = QUERY_CPS_PATH_WITH_SINGLE_LEAF_PATTERN.matcher(cpsPath); final CpsPathQuery cpsPathQuery = new CpsPathQuery(); if (matcher.matches()) { - cpsPathQuery.setCpsPathQueryType(CpsPathQueryType.XPATH_LEAF_VALUE); - cpsPathQuery.setXpathPrefix(matcher.group(1)); - cpsPathQuery.setLeafName(matcher.group(2)); - cpsPathQuery.setLeafValue(convertLeafValueToCorrectType(matcher.group(3), cpsPath)); - return cpsPathQuery; + return buildCpsPathQueryWithSingleLeafPattern(cpsPath, matcher, cpsPathQuery); + } + matcher = DESCENDANT_ANYWHERE_PATTERN_WITH_MULTIPLE_LEAF_PATTERN.matcher(cpsPath); + if (matcher.matches()) { + return buildCpsQueryForDescendentWithLeafPattern(cpsPath, matcher, cpsPathQuery); } matcher = DESCENDANT_ANYWHERE_PATTERN.matcher(cpsPath); if (matcher.matches()) { @@ -77,6 +89,34 @@ public class CpsPathQuery { String.format("Cannot interpret or parse cps path '%s'.", cpsPath)); } + private static CpsPathQuery buildCpsPathQueryWithSingleLeafPattern(final String cpsPath, final Matcher matcher, + final CpsPathQuery cpsPathQuery) { + cpsPathQuery.setCpsPathQueryType(CpsPathQueryType.XPATH_LEAF_VALUE); + cpsPathQuery.setXpathPrefix(matcher.group(1)); + cpsPathQuery.setLeafName(matcher.group(2)); + cpsPathQuery.setLeafValue(convertLeafValueToCorrectType(matcher.group(3), cpsPath)); + return cpsPathQuery; + } + + private static CpsPathQuery buildCpsQueryForDescendentWithLeafPattern(final String cpsPath, final Matcher matcher, + final CpsPathQuery cpsPathQuery) { + cpsPathQuery.setCpsPathQueryType(CpsPathQueryType.XPATH_HAS_DESCENDANT_WITH_LEAF_VALUES); + cpsPathQuery.setDescendantName(matcher.group(1)); + final Map<String, Object> leafData = new HashMap<>(); + for (final String leafValuePair : matcher.group(2).split(INDIVIDUAL_LEAF_DETAIL_PATTERN)) { + final Matcher descendentMatcher = LEAF_VALUE_PATTERN.matcher(leafValuePair); + if (descendentMatcher.matches()) { + leafData.put(descendentMatcher.group(1), + convertLeafValueToCorrectType(descendentMatcher.group(2), cpsPath)); + } else { + throw new CpsPathException("Invalid cps path.", + String.format("Cannot interpret or parse attributes in cps path '%s'.", cpsPath)); + } + } + cpsPathQuery.setLeavesData(leafData); + return cpsPathQuery; + } + private static Object convertLeafValueToCorrectType(final String leafValueString, final String cpsPath) { final Matcher stringValueWithQuotesMatcher = LEAF_STRING_VALUE_PATTERN.matcher(leafValueString); if (stringValueWithQuotesMatcher.matches()) { |