NormalizedNodeAggregator should also report empty

[controller.git] / opendaylight / md-sal / sal-distributed-datastore / src / main / java / org / opendaylight / controller / cluster / datastore / utils / PruningDataTreeModification.java

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/PruningDataTreeModification.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/PruningDataTreeModification.java
index 8ce7119651ddf743065600094cdcc572064d9484..029b5f1c6a38dc8f9f6685d6556fc47a4f19fc09 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/PruningDataTreeModification.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/PruningDataTreeModification.java
@@ -19,11 +19,11 @@ 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.stream.NormalizedNodeWriter;
-import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTree;
-import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeModification;
-import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeModificationCursor;
-import org.opendaylight.yangtools.yang.data.impl.schema.tree.SchemaValidationFailedException;
-import org.opendaylight.yangtools.yang.model.api.SchemaContext;
+import org.opendaylight.yangtools.yang.data.tree.api.DataTree;
+import org.opendaylight.yangtools.yang.data.tree.api.DataTreeModification;
+import org.opendaylight.yangtools.yang.data.tree.api.DataTreeModificationCursor;
+import org.opendaylight.yangtools.yang.data.tree.api.SchemaValidationFailedException;
+import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -43,12 +43,12 @@ public abstract class PruningDataTreeModification extends ForwardingObject imple
         }
 
         @Override
-        public void merge(final YangInstanceIdentifier path, final NormalizedNode<?, ?> data) {
+        public void merge(final YangInstanceIdentifier path, final NormalizedNode data) {
             pruneAndMergeNode(path, data);
         }
 
         @Override
-        public void write(final YangInstanceIdentifier path, final NormalizedNode<?, ?> data) {
+        public void write(final YangInstanceIdentifier path, final NormalizedNode data) {
             pruneAndWriteNode(path, data);
         }
 
@@ -71,7 +71,7 @@ public abstract class PruningDataTreeModification extends ForwardingObject imple
         }
 
         @Override
-        public void merge(final YangInstanceIdentifier path, final NormalizedNode<?, ?> data) {
+        public void merge(final YangInstanceIdentifier path, final NormalizedNode data) {
             if (path.isEmpty()) {
                 pruneAndMergeNode(path, data);
                 return;
@@ -86,7 +86,7 @@ public abstract class PruningDataTreeModification extends ForwardingObject imple
         }
 
         @Override
-        public void write(final YangInstanceIdentifier path, final NormalizedNode<?, ?> data) {
+        public void write(final YangInstanceIdentifier path, final NormalizedNode data) {
             if (path.isEmpty()) {
                 pruneAndWriteNode(path, data);
                 return;
@@ -127,8 +127,8 @@ public abstract class PruningDataTreeModification extends ForwardingObject imple
     }
 
     @Override
-    public final SchemaContext getSchemaContext() {
-        return delegate.getSchemaContext();
+    public final EffectiveModelContext getEffectiveModelContext() {
+        return delegate.getEffectiveModelContext();
     }
 
     @Override
@@ -140,15 +140,15 @@ public abstract class PruningDataTreeModification extends ForwardingObject imple
         }
     }
 
-    final void pruneAndMergeNode(final YangInstanceIdentifier path, final NormalizedNode<?, ?> data) {
-        final NormalizedNode<?, ?> pruned = pruneNormalizedNode(path, data);
+    final void pruneAndMergeNode(final YangInstanceIdentifier path, final NormalizedNode data) {
+        final NormalizedNode pruned = pruneNormalizedNode(path, data);
         if (pruned != null) {
             delegate.merge(path, pruned);
         }
     }
 
-    final void pruneAndWriteNode(final YangInstanceIdentifier path, final NormalizedNode<?, ?> data) {
-        final NormalizedNode<?, ?> pruned = pruneNormalizedNode(path, data);
+    final void pruneAndWriteNode(final YangInstanceIdentifier path, final NormalizedNode data) {
+        final NormalizedNode pruned = pruneNormalizedNode(path, data);
         if (pruned != null) {
             delegate.write(path, pruned);
         }
@@ -173,7 +173,7 @@ public abstract class PruningDataTreeModification extends ForwardingObject imple
     }
 
     @Override
-    public final Optional<NormalizedNode<?, ?>> readNode(final YangInstanceIdentifier yangInstanceIdentifier) {
+    public final Optional<NormalizedNode> readNode(final YangInstanceIdentifier yangInstanceIdentifier) {
         return delegate.readNode(yangInstanceIdentifier);
     }
 
@@ -183,8 +183,7 @@ public abstract class PruningDataTreeModification extends ForwardingObject imple
     }
 
     @VisibleForTesting
-    final NormalizedNode<?, ?> pruneNormalizedNode(final YangInstanceIdentifier path,
-            final NormalizedNode<?, ?> input) {
+    final NormalizedNode pruneNormalizedNode(final YangInstanceIdentifier path, final NormalizedNode input) {
         pruner.initializeForPath(path);
         try {
             NormalizedNodeWriter.forStreamWriter(pruner).write(input);
@@ -210,18 +209,18 @@ public abstract class PruningDataTreeModification extends ForwardingObject imple
         }
 
         @Override
-        public void write(final PathArgument child, final NormalizedNode<?, ?> data) {
+        public void write(final PathArgument child, final NormalizedNode data) {
             final YangInstanceIdentifier path = current().node(child);
-            final NormalizedNode<?, ?> prunedNode = pruningModification.pruneNormalizedNode(path, data);
+            final NormalizedNode prunedNode = pruningModification.pruneNormalizedNode(path, data);
             if (prunedNode != null) {
                 toModification.write(path, prunedNode);
             }
         }
 
         @Override
-        public void merge(final PathArgument child, final NormalizedNode<?, ?> data) {
+        public void merge(final PathArgument child, final NormalizedNode data) {
             final YangInstanceIdentifier path = current().node(child);
-            final NormalizedNode<?, ?> prunedNode = pruningModification.pruneNormalizedNode(path, data);
+            final NormalizedNode prunedNode = pruningModification.pruneNormalizedNode(path, data);
             if (prunedNode != null) {
                 toModification.merge(path, prunedNode);
             }