Fix followerDistributedDataStore tear down

[controller.git] / opendaylight / md-sal / sal-clustering-commons / src / main / java / org / opendaylight / controller / cluster / datastore / node / utils / NormalizedNodeNavigator.java

diff --git a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/NormalizedNodeNavigator.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/NormalizedNodeNavigator.java
index 0b7cb373d4d671d70bfd5ed9d2bf4c3e220e0b94..19df464f9e132c02a17e75294be460bad812887b 100644 (file)
--- a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/NormalizedNodeNavigator.java
+++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/NormalizedNodeNavigator.java
@@ -5,85 +5,67 @@
  * 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.controller.cluster.datastore.node.utils;
 
-import com.google.common.base.Preconditions;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
-import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild;
+import static java.util.Objects.requireNonNull;
+
 import org.opendaylight.yangtools.yang.data.api.schema.DataContainerNode;
 import org.opendaylight.yangtools.yang.data.api.schema.MixinNode;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNodeContainer;
 
 /**
- * NormalizedNodeNavigator walks a {@link NormalizedNodeVisitor} through the NormalizedNode
- *
- * {@link NormalizedNode } is a tree like structure that provides a generic structure for a yang data model
- *
- * For examples of visitors
- * @see NormalizedNodePrinter
- *
- *
+ * NormalizedNodeNavigator walks a {@link NormalizedNodeVisitor} through the NormalizedNode.
  */
 public class NormalizedNodeNavigator {
+    private final NormalizedNodeVisitor visitor;
 
-  private final org.opendaylight.controller.cluster.datastore.node.utils.NormalizedNodeVisitor
-      visitor;
-
-  public NormalizedNodeNavigator(
-      org.opendaylight.controller.cluster.datastore.node.utils.NormalizedNodeVisitor visitor){
-    Preconditions.checkNotNull(visitor, "visitor should not be null");
-    this.visitor = visitor;
-  }
-  public void navigate(String parentPath, NormalizedNode<?,?> normalizedNode){
-    if(parentPath == null){
-      parentPath = "";
+    public NormalizedNodeNavigator(final NormalizedNodeVisitor visitor) {
+        this.visitor = requireNonNull(visitor, "visitor should not be null");
     }
-    navigateNormalizedNode(0, parentPath, normalizedNode);
-  }
-
-  private void navigateDataContainerNode(int level, final String parentPath, final DataContainerNode<?> dataContainerNode){
-    visitor.visitNode(level, parentPath ,dataContainerNode);
-
-    String newParentPath = parentPath + "/" + dataContainerNode.getIdentifier().toString();
 
-    final Iterable<DataContainerChild<? extends YangInstanceIdentifier.PathArgument,?>> value = dataContainerNode.getValue();
-    for(NormalizedNode<?,?> node : value){
-      if(node instanceof MixinNode && node instanceof NormalizedNodeContainer){
-        navigateNormalizedNodeContainerMixin(level, newParentPath, (NormalizedNodeContainer<?, ?, ?>) node);
-      } else {
-        navigateNormalizedNode(level, newParentPath, node);
-      }
+    public void navigate(String parentPath, final NormalizedNode normalizedNode) {
+        if (parentPath == null) {
+            parentPath = "";
+        }
+        navigateNormalizedNode(0, parentPath, normalizedNode);
     }
 
-  }
+    private void navigateDataContainerNode(final int level, final String parentPath,
+            final DataContainerNode dataContainerNode) {
+        visitor.visitNode(level, parentPath, dataContainerNode);
 
-  private void navigateNormalizedNodeContainerMixin(int level, final String parentPath, NormalizedNodeContainer<?, ?, ?> node) {
-    visitor.visitNode(level, parentPath, node);
+        String newParentPath = parentPath + "/" + dataContainerNode.name().toString();
 
-    String newParentPath = parentPath + "/" + node.getIdentifier().toString();
-
-    final Iterable<? extends NormalizedNode<?, ?>> value = node.getValue();
-    for(NormalizedNode<?, ?> normalizedNode : value){
-      if(normalizedNode instanceof MixinNode && normalizedNode instanceof NormalizedNodeContainer){
-        navigateNormalizedNodeContainerMixin(level + 1, newParentPath, (NormalizedNodeContainer) normalizedNode);
-      } else {
-        navigateNormalizedNode(level, newParentPath, normalizedNode);
-      }
+        for (var node : dataContainerNode.body()) {
+            if (node instanceof MixinNode && node instanceof NormalizedNodeContainer<?> container) {
+                navigateNormalizedNodeContainerMixin(level, newParentPath, container);
+            } else {
+                navigateNormalizedNode(level, newParentPath, node);
+            }
+        }
     }
 
-  }
-
+    private void navigateNormalizedNodeContainerMixin(final int level, final String parentPath,
+            final NormalizedNodeContainer<?> node) {
+        visitor.visitNode(level, parentPath, node);
 
-  private void navigateNormalizedNode(int level, String parentPath, NormalizedNode<?,?> normalizedNode){
-    if(normalizedNode instanceof DataContainerNode){
+        String newParentPath = parentPath + "/" + node.name().toString();
 
-      final DataContainerNode<?> dataContainerNode = (DataContainerNode<?>) normalizedNode;
+        for (var normalizedNode : node.body()) {
+            if (normalizedNode instanceof MixinNode && normalizedNode instanceof NormalizedNodeContainer<?> container) {
+                navigateNormalizedNodeContainerMixin(level + 1, newParentPath, container);
+            } else {
+                navigateNormalizedNode(level, newParentPath, normalizedNode);
+            }
+        }
+    }
 
-      navigateDataContainerNode(level + 1, parentPath, dataContainerNode);
-    } else {
-      visitor.visitNode(level+1, parentPath, normalizedNode);
+    private void navigateNormalizedNode(final int level, final String parentPath, final NormalizedNode normalizedNode) {
+        if (normalizedNode instanceof DataContainerNode dataContainer) {
+            navigateDataContainerNode(level + 1, parentPath, dataContainer);
+        } else {
+            visitor.visitNode(level + 1, parentPath, normalizedNode);
+        }
     }
-  }
 }