Fix modernization issues

[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 a4e0b70a0216abb66af500c45bcfaff90d5bd869..0bf1a2fe01fbba2d693832a0a1a66d2e8042da02 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,12 +5,10 @@
  * 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;
@@ -21,30 +19,26 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNodeContainer;
  */
 public class NormalizedNodeNavigator {
 
-    private final org.opendaylight.controller.cluster.datastore.node.utils.NormalizedNodeVisitor visitor;
+    private final 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 NormalizedNodeNavigator(final NormalizedNodeVisitor visitor) {
+        this.visitor = requireNonNull(visitor, "visitor should not be null");
     }
 
-    public void navigate(String parentPath, NormalizedNode<?, ?> normalizedNode) {
+    public void navigate(String parentPath, final NormalizedNode<?, ?> normalizedNode) {
         if (parentPath == null) {
             parentPath = "";
         }
         navigateNormalizedNode(0, parentPath, normalizedNode);
     }
 
-    private void navigateDataContainerNode(int level, final String parentPath,
+    private void navigateDataContainerNode(final 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) {
+        for (NormalizedNode<?, ?> node : dataContainerNode.getValue()) {
             if (node instanceof MixinNode && node instanceof NormalizedNodeContainer) {
                 navigateNormalizedNodeContainerMixin(level, newParentPath, (NormalizedNodeContainer<?, ?, ?>) node);
             } else {
@@ -54,14 +48,13 @@ public class NormalizedNodeNavigator {
 
     }
 
-    private void navigateNormalizedNodeContainerMixin(int level, final String parentPath,
-            NormalizedNodeContainer<?, ?, ?> node) {
+    private void navigateNormalizedNodeContainerMixin(final int level, final String parentPath,
+            final NormalizedNodeContainer<?, ?, ?> node) {
         visitor.visitNode(level, parentPath, node);
 
         String newParentPath = parentPath + "/" + node.getIdentifier().toString();
 
-        final Iterable<? extends NormalizedNode<?, ?>> value = node.getValue();
-        for (NormalizedNode<?, ?> normalizedNode : value) {
+        for (NormalizedNode<?, ?> normalizedNode : node.getValue()) {
             if (normalizedNode instanceof MixinNode && normalizedNode instanceof NormalizedNodeContainer) {
                 navigateNormalizedNodeContainerMixin(level + 1, newParentPath,
                         (NormalizedNodeContainer<?, ?, ?>) normalizedNode);
@@ -72,7 +65,8 @@ public class NormalizedNodeNavigator {
 
     }
 
-    private void navigateNormalizedNode(int level, String parentPath, NormalizedNode<?, ?> normalizedNode) {
+    private void navigateNormalizedNode(final int level, final String parentPath,
+            final NormalizedNode<?, ?> normalizedNode) {
         if (normalizedNode instanceof DataContainerNode) {
 
             final DataContainerNode<?> dataContainerNode = (DataContainerNode<?>) normalizedNode;