Merge "Hashmark support in 3gpp objects"

2 files changed, 12 insertions, 7 deletions

diff --git a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/impl/utils/AlternateIdMatcher.java b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/impl/utils/AlternateIdMatcher.java
index c526dfb297..9facd630a2 100644
--- a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/impl/utils/AlternateIdMatcher.java
+++ b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/impl/utils/AlternateIdMatcher.java
@@ -38,14 +38,15 @@ public class AlternateIdMatcher {
 
     /**
      * Get data node that matches longest alternate id by removing elements (as defined by the separator string)
-     * from right to left.
+     * from right to left. If alternate id contains a hash then all elements after that hash are ignored.
      *
      * @param alternateId alternate ID
      * @param separator   a string that separates each element from the next.
      * @return data node
      */
     public DataNode getCmHandleDataNodeByLongestMatchingAlternateId(final String alternateId, final String separator) {
-        String bestMatch = alternateId;
+        final String[] splitPath = alternateId.split("#", 2);
+        String bestMatch = splitPath[0];
         while (StringUtils.isNotEmpty(bestMatch)) {
             try {
                 return inventoryPersistence.getCmHandleDataNodeByAlternateId(bestMatch);
diff --git a/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/impl/utils/AlternateIdMatcherSpec.groovy b/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/impl/utils/AlternateIdMatcherSpec.groovy
index a497b4554a..bd1faa2705 100644
--- a/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/impl/utils/AlternateIdMatcherSpec.groovy
+++ b/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/impl/utils/AlternateIdMatcherSpec.groovy
@@ -42,11 +42,15 @@ class AlternateIdMatcherSpec extends Specification {
         expect: 'querying for alternate id a matching result found'
             assert objectUnderTest.getCmHandleDataNodeByLongestMatchingAlternateId(targetAlternateId, '/') != null
         where: 'the following parameters are used'
-            scenario                   | targetAlternateId
-            'exact match'              | '/a/b'
-            'parent match'             | '/a/b/c'
-            'grand parent match'       | '/a/b/c/d'
-            'trailing separator match' | '/a/b/'
+            scenario                                | targetAlternateId
+            'exact match'                           | '/a/b'
+            'parent match'                          | '/a/b/c'
+            'grand parent match'                    | '/a/b/c/d'
+            'trailing separator match'              | '/a/b/'
+            'trailing hash'                         | '/a/b#q'
+            'trailing hash parent match'            | '/a/b/c#q'
+            'trailing hash grand parent match'      | '/a/b/c/d#q'
+            'trailing separator then hash match'    | '/a/b/#q'
     }
 
     def 'Attempt to find longest alternate id match without any matches.'() {