commit 4070c049456df46166140903b99fa0a424485268
author Yuta HIGUCHI <y-higuchi@ak.jp.nec.com> Mon Aug 28 13:47:20 2017 -0700
committer Andrea Campanella <andrea@opennetworking.org> Tue Aug 29 15:13:29 2017 +0000
tree 6156980da159553be90d4d5f672628e329f248fa
parent 2308e52d639ae5b128c256a987325580e3251453

ONOS-6891 Fix ResourceIds#relativize

Change-Id: I29f0b4f591e8bbe8655da58d225ae8b2918fca9d

apps/config/src/main/java/org/onosproject/d/config/ResourceIds.java

diff --git a/apps/config/src/main/java/org/onosproject/d/config/ResourceIds.java b/apps/config/src/main/java/org/onosproject/d/config/ResourceIds.java
index 4340d27..fc875a9 100644
--- a/apps/config/src/main/java/org/onosproject/d/config/ResourceIds.java
+++ b/apps/config/src/main/java/org/onosproject/d/config/ResourceIds.java
@@ -22,9 +22,7 @@
 import org.onosproject.yang.model.KeyLeaf;
 import org.onosproject.yang.model.LeafListKey;
 import org.onosproject.yang.model.ListKey;
-import org.onosproject.yang.model.NodeKey;
 import org.onosproject.yang.model.ResourceId;
-import org.onosproject.yang.model.ResourceId.Builder;
 import org.onosproject.yang.model.SchemaId;
 import org.slf4j.Logger;
 
@@ -106,7 +104,7 @@
 
 
     /**
-     * Returns {@code child} ad relative ResourceId against {@code base}.
+     * Returns {@code child} as relative ResourceId against {@code base}.
      *
      * @param base ResourceId
      * @param child ResourceId to relativize
@@ -118,32 +116,8 @@
         checkArgument(base.nodeKeys().equals(child.nodeKeys().subList(0, base.nodeKeys().size())),
                       "%s is not a prefix of %s", child, base);
 
-        // FIXME waiting for Yang tools 2.2.0-b4 or later
-//        return ResourceId.builder().append(child.nodeKeys().subList(base.nodeKeys().size(),
-//                                                                    child.nodeKeys().size())).build();
-
-        Builder builder = ResourceId.builder();
-        for (NodeKey nodeKey : child.nodeKeys().subList(base.nodeKeys().size(),
-                                                        child.nodeKeys().size())) {
-            if (nodeKey instanceof ListKey) {
-                ListKey listKey = (ListKey) nodeKey;
-                for (KeyLeaf keyLeaf : listKey.keyLeafs()) {
-                    builder.addKeyLeaf(keyLeaf.leafSchema().name(),
-                                       keyLeaf.leafSchema().namespace(),
-                                       keyLeaf.leafValAsString());
-                }
-            } else if (nodeKey instanceof LeafListKey) {
-                LeafListKey llKey = (LeafListKey) nodeKey;
-                builder.addLeafListBranchPoint(llKey.schemaId().name(),
-                                               llKey.schemaId().namespace(),
-                                               llKey.value());
-
-            } else {
-                builder.addBranchPointSchema(nodeKey.schemaId().name(),
-                                             nodeKey.schemaId().namespace());
-            }
-        }
-        return builder.build();
+        return ResourceId.builder().append(child.nodeKeys().subList(base.nodeKeys().size(),
+                                                                    child.nodeKeys().size())).build();
     }
 
     /**