From 40f49fd832db73cf8fd04260e4b4d249b8334dd6 Mon Sep 17 00:00:00 2001
From: Paul Campbell <pcampbell@kemitix.net>
Date: Sun, 4 Sep 2016 19:40:08 +0100
Subject: [PATCH] NodeItem: refactored insertInPath to be easier to understand

---
 src/main/java/net/kemitix/node/NodeItem.java | 59 +++++++++++---------
 1 file changed, 34 insertions(+), 25 deletions(-)

diff --git a/src/main/java/net/kemitix/node/NodeItem.java b/src/main/java/net/kemitix/node/NodeItem.java
index 067ef5e..6c5f241 100644
--- a/src/main/java/net/kemitix/node/NodeItem.java
+++ b/src/main/java/net/kemitix/node/NodeItem.java
@@ -1,6 +1,7 @@
 package net.kemitix.node;
 
 import lombok.NonNull;
+import lombok.val;
 
 import java.util.*;
 import java.util.function.Function;
@@ -279,32 +280,40 @@ class NodeItem<T> implements Node<T> {
     @Override
     public void insertInPath(final Node<T> nodeItem, final String... path) {
         if (path.length == 0) {
-            if (!nodeItem.isNamed()) {
-                // nothing to conflict with
-                addChild(nodeItem);
-                return;
-            }
-            String nodeName = nodeItem.getName();
-            final Optional<Node<T>> childNamed = findChildByName(nodeName);
-            if (!childNamed.isPresent()) {
-                // nothing with the same name exists
-                addChild(nodeItem);
-                return;
-            }
-            // we have an existing node with the same name
-            final Node<T> existing = childNamed.get();
-            if (!existing.isEmpty()) {
-                throw new NodeException("A non-empty node named '" + nodeName
-                        + "' already exists here");
-            } else {
-                nodeItem.getData().ifPresent(existing::setData);
-            }
-            return;
+            insertChild(nodeItem);
+        } else {
+            val item = path[0];
+            findChildByName(item)
+                    .orElseGet(() -> new NodeItem<>(null, item, this))
+                    .insertInPath(nodeItem, Arrays.copyOfRange(path, 1, path.length));
+        }
+    }
+
+    private void insertChild(final Node<T> nodeItem) {
+        if (nodeItem.isNamed()) {
+            insertNamedChild(nodeItem);
+        } else {
+            // nothing to conflict with
+            addChild(nodeItem);
+        }
+    }
+
+    private void insertNamedChild(final Node<T> nodeItem) {
+        val childByName = findChildByName(nodeItem.getName());
+        if (childByName.isPresent()) {
+            // we have an existing node with the same name
+            val existing = childByName.get();
+            if (existing.isEmpty()) {
+                // place any data in the new node into the existing empty node
+                nodeItem.getData().ifPresent(existing::setData);
+            } else {
+                throw new NodeException("A non-empty node named '" + nodeItem.getName()
+                        + "' already exists here");
+            }
+        } else {
+            // nothing with the same name exists
+            addChild(nodeItem);
         }
-        val item = path[0];
-        findChildByName(item)
-                .orElseGet(() -> new NodeItem<>(null, item, this))
-                .insertInPath(nodeItem, Arrays.copyOfRange(path, 1, path.length));
     }
 
     @Override