Merge "Bug 2906 - Added support of entering notification by #streamChild()"

[yangtools.git] / yang / yang-data-impl / src / main / java / org / opendaylight / yangtools / yang / data / impl / schema / tree / InMemoryDataTreeCandidate.java

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/InMemoryDataTreeCandidate.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/InMemoryDataTreeCandidate.java
index 1f6b0f01c263d4c4bced319a823750d5164daed8..1ce5e8b4831044ac27ad80746ba3182ddec35612 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/InMemoryDataTreeCandidate.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/InMemoryDataTreeCandidate.java
@@ -1,12 +1,19 @@
+/*
+ * Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
 package org.opendaylight.yangtools.yang.data.impl.schema.tree;
 
-
 import com.google.common.base.Function;
 import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
-import com.google.common.collect.Iterables;
-import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier;
-import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier.PathArgument;
+import com.google.common.collect.Collections2;
+import java.util.Collection;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidateNode;
 import org.opendaylight.yangtools.yang.data.api.schema.tree.ModificationType;
@@ -45,20 +52,24 @@ final class InMemoryDataTreeCandidate extends AbstractDataTreeCandidate {
             }
         }
 
+        private DataTreeCandidateNode childNode(final ModifiedNode input) {
+            final PathArgument id = input.getIdentifier();
+            return new ChildNode(input, childMeta(oldMeta, id), childMeta(newMeta, id));
+        }
+
         @Override
-        public Iterable<DataTreeCandidateNode> getChildNodes() {
-            return Iterables.transform(mod.getChildren(), new Function<ModifiedNode, DataTreeCandidateNode>() {
+        public Collection<DataTreeCandidateNode> getChildNodes() {
+            return Collections2.transform(mod.getChildren(), new Function<ModifiedNode, DataTreeCandidateNode>() {
                 @Override
                 public DataTreeCandidateNode apply(final ModifiedNode input) {
-                    final PathArgument id = input.getIdentifier();
-                    return new ChildNode(input, childMeta(oldMeta, id), childMeta(newMeta, id));
+                    return childNode(input);
                 }
             });
         }
 
         @Override
         public ModificationType getModificationType() {
-            return mod.getType();
+            return mod.modificationType();
         }
 
         private Optional<NormalizedNode<?, ?>> optionalData(final TreeNode meta) {
@@ -78,6 +89,15 @@ final class InMemoryDataTreeCandidate extends AbstractDataTreeCandidate {
         public Optional<NormalizedNode<?, ?>> getDataBefore() {
             return optionalData(oldMeta);
         }
+
+        @Override
+        public DataTreeCandidateNode getModifiedChild(final PathArgument identifier) {
+            final Optional<ModifiedNode> childMod = mod.getChild(identifier);
+            if (childMod.isPresent()) {
+                return childNode(mod);
+            }
+            return null;
+        }
     }
 
     private static final class ChildNode extends AbstractNode {
@@ -104,7 +124,7 @@ final class InMemoryDataTreeCandidate extends AbstractDataTreeCandidate {
 
     private final RootNode root;
 
-    InMemoryDataTreeCandidate(final InstanceIdentifier rootPath, final ModifiedNode modificationRoot,
+    InMemoryDataTreeCandidate(final YangInstanceIdentifier rootPath, final ModifiedNode modificationRoot,
             final TreeNode beforeRoot, final TreeNode afterRoot) {
         super(rootPath);
         this.root = new RootNode(modificationRoot, beforeRoot, afterRoot);