refactor

lib/android/app/src/main/java/com/reactnativenavigation/controllers/CommandsHandler.java

@@ -29,7 +29,7 @@ public class CommandsHandler {
 					}
 				}, new BottomTabsCreator());
 
-		final LayoutNode layoutTreeRoot = LayoutNode.fromTree(layoutTree);
+		final LayoutNode layoutTreeRoot = LayoutNode.parse(layoutTree);
 		final View rootView = factory.create(layoutTreeRoot);
 		activity.setContentView(rootView);
 	}
@@ -46,7 +46,7 @@ public class CommandsHandler {
 						return rootView;
 					}
 				}, new BottomTabsCreator());
-		final LayoutNode layoutNode = LayoutNode.fromTree(layoutTree);
+		final LayoutNode layoutNode = LayoutNode.parse(layoutTree);
 		final View rootView = factory.create(layoutNode);
 		((StackLayout) activity.getContentView()).push(rootView);
 	}

lib/android/app/src/main/java/com/reactnativenavigation/layout/parse/LayoutNode.java

@@ -1,5 +1,7 @@
 package com.reactnativenavigation.layout.parse;
 
+import android.support.annotation.NonNull;
+
 import org.json.JSONArray;
 import org.json.JSONObject;
 
@@ -21,9 +23,35 @@ public class LayoutNode {
 		}
 	}
 
+	@SuppressWarnings("unchecked")
+	public static LayoutNode parse(JSONObject layoutTree) {
+		String id = layoutTree.optString("id");
+		LayoutNode.Type type = LayoutNode.Type.fromString(layoutTree.optString("type"));
+		JSONObject data = parseData(layoutTree);
+		List<LayoutNode> children = parseChildren(layoutTree);
+		return new LayoutNode(id, type, data, children);
+	}
+
+	@NonNull
+	private static List<LayoutNode> parseChildren(JSONObject layoutTree) {
+		List<LayoutNode> children = new ArrayList<>();
+		if (layoutTree.has("children")) {
+			JSONArray rawChildren = layoutTree.optJSONArray("children");
+			for (int i = 0; i < rawChildren.length(); i++) {
+				children.add(LayoutNode.parse(rawChildren.optJSONObject(i)));
+			}
+		}
+		return children;
+	}
+
+	private static JSONObject parseData(JSONObject layoutTree) {
+		return layoutTree.has("data") ? layoutTree.optJSONObject("data") : new JSONObject();
+	}
+
 	public final String id;
 	public final Type type;
 	public final JSONObject data;
+
 	public final List<LayoutNode> children;
 
 	public LayoutNode(String id, Type type) {
@@ -36,27 +64,4 @@ public class LayoutNode {
 		this.data = data;
 		this.children = children;
 	}
-
-	@SuppressWarnings("unchecked")
-	public static LayoutNode fromTree(JSONObject layoutTree) {
-		String id = layoutTree.optString("id");
-		LayoutNode.Type type = LayoutNode.Type.fromString(layoutTree.optString("type"));
-
-		JSONObject data;
-		if (layoutTree.has("data")) {
-			data = layoutTree.optJSONObject("data");
-		} else {
-			data = new JSONObject();
-		}
-
-		List<LayoutNode> children = new ArrayList<>();
-		if (layoutTree.has("children")) {
-			JSONArray rawChildren = layoutTree.optJSONArray("children");
-			for (int i = 0; i < rawChildren.length(); i++) {
-				children.add(LayoutNode.fromTree(rawChildren.optJSONObject(i)));
-			}
-		}
-
-		return new LayoutNode(id, type, data, children);
-	}
 }

lib/android/app/src/test/java/com/reactnativenavigation/layout/parse/LayoutNodeTest.java

@@ -34,7 +34,7 @@ public class LayoutNodeTest extends BaseTest {
 				"data: {dataKey: dataValue}, " +
 				"children: [{id: childId1, type: Container}]}");
 
-		LayoutNode result = LayoutNode.fromTree(tree);
+		LayoutNode result = LayoutNode.parse(tree);
 
 		assertThat(result).isNotNull();
 		assertThat(result.id).isEqualTo("node1");