X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=yang%2Fyang-data-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fdata%2Fimpl%2Fschema%2Ftree%2FAbstractDataTreeCandidateNode.java;h=082dfd4c870c05c9aa630651af781f8689c57182;hb=1eb87c819cc6881ca7be74917a5d0bb7a9cad41f;hp=f7bea78824c56a9442a062d6b6be39ace089a542;hpb=f6eae2a11c570c1097eb9202debc7e36ce72ef6d;p=yangtools.git

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractDataTreeCandidateNode.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractDataTreeCandidateNode.java
index f7bea78824..082dfd4c87 100644
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractDataTreeCandidateNode.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractDataTreeCandidateNode.java
@@ -23,11 +23,7 @@ abstract class AbstractDataTreeCandidateNode implements DataTreeCandidateNode {
     private static Optional<NormalizedNode<?, ?>> getChild(
             final NormalizedNodeContainer<?, PathArgument, NormalizedNode<?, ?>> container,
                     final PathArgument identifier) {
-        if (container != null) {
-            return container.getChild(identifier);
-        } else {
-            return Optional.absent();
-        }
+        return container == null ? Optional.absent() : container.getChild(identifier);
     }
 
     static DataTreeCandidateNode deltaChild(
@@ -40,19 +36,15 @@ abstract class AbstractDataTreeCandidateNode implements DataTreeCandidateNode {
             final NormalizedNode<?, ?> oldChild = maybeOldChild.get();
             if (maybeNewChild.isPresent()) {
                 return AbstractRecursiveCandidateNode.replaceNode(oldChild, maybeNewChild.get());
-            } else {
-                return AbstractRecursiveCandidateNode.deleteNode(oldChild);
-            }
-        } else {
-            if (maybeNewChild.isPresent()) {
-                return AbstractRecursiveCandidateNode.writeNode(maybeNewChild.get());
-            } else {
-                return null;
             }
+            return AbstractRecursiveCandidateNode.deleteNode(oldChild);
         }
+
+        return maybeNewChild.isPresent() ? AbstractRecursiveCandidateNode.writeNode(maybeNewChild.get()) : null;
     }
 
-    static Collection<DataTreeCandidateNode> deltaChildren(@Nullable final NormalizedNodeContainer<?, PathArgument, NormalizedNode<?, ?>> oldData,
+    static Collection<DataTreeCandidateNode> deltaChildren(
+            @Nullable final NormalizedNodeContainer<?, PathArgument, NormalizedNode<?, ?>> oldData,
             @Nullable final NormalizedNodeContainer<?, PathArgument, NormalizedNode<?, ?>> newData) {
         Preconditions.checkArgument(newData != null || oldData != null,
                 "No old or new data, modification type should be NONE and deltaChildren() mustn't be called.");