Address trivial eclipse warnings

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

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractModifiedNodeBasedCandidateNode.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractModifiedNodeBasedCandidateNode.java
index 439c43193a9bc228dcaa808b277a3d4b86a43478..02d961eed3c05d1fb0dd1dfd802623b01dfa4252 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractModifiedNodeBasedCandidateNode.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractModifiedNodeBasedCandidateNode.java
@@ -1,18 +1,17 @@
 /*
- * Copyright (c) 2015 Cisco Systems, Inc. and others.  All rights reserved.
+ * Copyright (c) 2015, 2016 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.base.Verify;
 import com.google.common.collect.Collections2;
+import com.google.common.collect.ImmutableList;
 import java.util.Collection;
-import java.util.Collections;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
@@ -23,20 +22,12 @@ import org.opendaylight.yangtools.yang.data.api.schema.tree.ModificationType;
 import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.TreeNode;
 
 abstract class AbstractModifiedNodeBasedCandidateNode implements DataTreeCandidateNode {
-
-    private static final Function<NormalizedNode<?, ?>, DataTreeCandidateNode> TO_UNMODIFIED_NODE = new Function<NormalizedNode<?, ?>, DataTreeCandidateNode>() {
-        @Override
-        public DataTreeCandidateNode apply(final NormalizedNode<?, ?> input) {
-            return AbstractRecursiveCandidateNode.unmodifiedNode(input);
-        }
-    };
-
     private final ModifiedNode mod;
     private final TreeNode newMeta;
     private final TreeNode oldMeta;
 
-    protected AbstractModifiedNodeBasedCandidateNode(final ModifiedNode mod,
-            final TreeNode oldMeta, final TreeNode newMeta) {
+    protected AbstractModifiedNodeBasedCandidateNode(final ModifiedNode mod, final TreeNode oldMeta,
+            final TreeNode newMeta) {
         this.newMeta = newMeta;
         this.oldMeta = oldMeta;
         this.mod = Preconditions.checkNotNull(mod);
@@ -55,11 +46,7 @@ abstract class AbstractModifiedNodeBasedCandidateNode implements DataTreeCandida
     }
 
     private static TreeNode childMeta(final TreeNode parent, final PathArgument id) {
-        if (parent != null) {
-            return parent.getChild(id).orNull();
-        } else {
-            return null;
-        }
+        return parent == null ? null : parent.getChild(id).orNull();
     }
 
     private static boolean canHaveChildren(@Nullable final TreeNode oldMeta, @Nullable final TreeNode newMeta) {
@@ -89,29 +76,24 @@ abstract class AbstractModifiedNodeBasedCandidateNode implements DataTreeCandida
         case APPEARED:
         case DISAPPEARED:
         case SUBTREE_MODIFIED:
-            return Collections2.transform(mod.getChildren(), new Function<ModifiedNode, DataTreeCandidateNode>() {
-                @Override
-                public DataTreeCandidateNode apply(final ModifiedNode input) {
-                    return childNode(input);
-                }
-            });
+            return Collections2.transform(mod.getChildren(), this::childNode);
         case UNMODIFIED:
             // Unmodified node, but we still need to resolve potential children. canHaveChildren returns
             // false if both arguments are null.
-            if (canHaveChildren(oldMeta, newMeta)) {
-                return Collections2.transform(getContainer(newMeta != null ? newMeta : oldMeta).getValue(), TO_UNMODIFIED_NODE);
-            } else {
-                return Collections.emptyList();
+            if (!canHaveChildren(oldMeta, newMeta)) {
+                return ImmutableList.of();
             }
+
+            return Collections2.transform(getContainer(newMeta != null ? newMeta : oldMeta).getValue(),
+                AbstractRecursiveCandidateNode::unmodifiedNode);
         case DELETE:
         case WRITE:
             // This is unusual, the user is requesting we follow into an otherwise-terminal node.
             // We need to fudge things based on before/after data to correctly fake the expectations.
-            if (canHaveChildren(oldMeta, newMeta)) {
-                return AbstractDataTreeCandidateNode.deltaChildren(getContainer(oldMeta), getContainer(newMeta));
-            } else {
-                return Collections.emptyList();
+            if (!canHaveChildren(oldMeta, newMeta)) {
+                return ImmutableList.of();
             }
+            return AbstractDataTreeCandidateNode.deltaChildren(getContainer(oldMeta), getContainer(newMeta));
         default:
             throw new IllegalArgumentException("Unhandled modification type " + mod.getModificationType());
         }
@@ -124,11 +106,7 @@ abstract class AbstractModifiedNodeBasedCandidateNode implements DataTreeCandida
     }
 
     private static Optional<NormalizedNode<?, ?>> optionalData(final TreeNode meta) {
-        if (meta != null) {
-            return Optional.<NormalizedNode<?,?>>of(meta.getData());
-        } else {
-            return Optional.absent();
-        }
+        return meta == null ? Optional.absent() : Optional.of(meta.getData());
     }
 
     @Override
@@ -155,23 +133,18 @@ abstract class AbstractModifiedNodeBasedCandidateNode implements DataTreeCandida
             }
             return null;
         case UNMODIFIED:
-            if (canHaveChildren(oldMeta, newMeta)) {
-                final Optional<NormalizedNode<?, ?>> maybeChild = getContainer(newMeta != null ? newMeta : oldMeta).getChild(identifier);
-                if (maybeChild.isPresent()) {
-                    return TO_UNMODIFIED_NODE.apply(maybeChild.get());
-                } else {
-                    return null;
-                }
-            } else {
+            if (!canHaveChildren(oldMeta, newMeta)) {
                 return null;
             }
+            final Optional<NormalizedNode<?, ?>> maybeChild = getContainer(newMeta != null ? newMeta : oldMeta)
+                    .getChild(identifier);
+            return maybeChild.isPresent() ? AbstractRecursiveCandidateNode.unmodifiedNode(maybeChild.get()) : null;
         case DELETE:
         case WRITE:
-            if (canHaveChildren(oldMeta, newMeta)) {
-                return AbstractDataTreeCandidateNode.deltaChild(getContainer(oldMeta), getContainer(newMeta), identifier);
-            } else {
+            if (!canHaveChildren(oldMeta, newMeta)) {
                 return null;
             }
+            return AbstractDataTreeCandidateNode.deltaChild(getContainer(oldMeta), getContainer(newMeta), identifier);
         default:
             throw new IllegalArgumentException("Unhandled modification type " + mod.getModificationType());
         }