refactor 545

fishercoder1534 · fishercoder1534 · commit 7fb9c6811398 · 2019-06-21T07:34:57.000-07:00
diff --git a/src/main/java/com/fishercoder/solutions/_545.java b/src/main/java/com/fishercoder/solutions/_545.java
@@ -7,6 +7,7 @@
 
 /**
  * 545. Boundary of Binary Tree
+ *
  * Given a binary tree, return the values of its boundary in anti-clockwise direction starting from root.
  * Boundary includes left boundary, addLeaves, and right boundary in order without duplicate nodes.
  * Left boundary is defined as the path from root to the left-most node.
@@ -58,56 +59,58 @@
 
  */
 public class _545 {
-    public List<Integer> boundaryOfBinaryTree(TreeNode root) {
-        List<Integer> nodes = new ArrayList<>();
-        if (root == null) {
-            return nodes;
-        }
-
-        nodes.add(root.val);
-        leftBoundary(root.left, nodes);
-        addLeaves(root.left, nodes);
-        addLeaves(root.right, nodes);
-        rightBoundary(root.right, nodes);
-        return nodes;
-    }
+    public static class Solution1 {
+        public List<Integer> boundaryOfBinaryTree(TreeNode root) {
+            List<Integer> nodes = new ArrayList<>();
+            if (root == null) {
+                return nodes;
+            }
 
-    public void leftBoundary(TreeNode root, List<Integer> nodes) {
-        if (root == null || (root.left == null && root.right == null)) {
-            /**we don't want to add any LEAVES in leftBoundary and rightBoundary functions either,
-             * that's why we have the later condition in the if branch.*/
-            return;
-        }
-        nodes.add(root.val);// add BEFORE child visit
-        if (root.left == null) {
-            leftBoundary(root.right, nodes);
-        } else {
+            nodes.add(root.val);
             leftBoundary(root.left, nodes);
+            addLeaves(root.left, nodes);
+            addLeaves(root.right, nodes);
+            rightBoundary(root.right, nodes);
+            return nodes;
         }
-    }
 
-    public void rightBoundary(TreeNode root, List<Integer> nodes) {
-        if (root == null || (root.right == null && root.left == null)) {
-            return;
-        }
-        if (root.right == null) {
-            rightBoundary(root.left, nodes);
-        } else {
-            rightBoundary(root.right, nodes);
+        public void leftBoundary(TreeNode root, List<Integer> nodes) {
+            if (root == null || (root.left == null && root.right == null)) {
+                /**we don't want to add any LEAVES in leftBoundary and rightBoundary functions either,
+                 * that's why we have the later condition in the if branch.*/
+                return;
+            }
+            nodes.add(root.val);// add BEFORE child visit
+            if (root.left == null) {
+                leftBoundary(root.right, nodes);
+            } else {
+                leftBoundary(root.left, nodes);
+            }
         }
-        nodes.add(root.val); // add AFTER child visit(reverse)
-    }
 
-    public void addLeaves(TreeNode root, List<Integer> nodes) {
-        if (root == null) {
-            return;
+        public void rightBoundary(TreeNode root, List<Integer> nodes) {
+            if (root == null || (root.right == null && root.left == null)) {
+                return;
+            }
+            if (root.right == null) {
+                rightBoundary(root.left, nodes);
+            } else {
+                rightBoundary(root.right, nodes);
+            }
+            nodes.add(root.val); // add AFTER child visit(reverse)
         }
-        if (root.left == null && root.right == null) {
-            nodes.add(root.val);
-            return;
+
+        public void addLeaves(TreeNode root, List<Integer> nodes) {
+            if (root == null) {
+                return;
+            }
+            if (root.left == null && root.right == null) {
+                nodes.add(root.val);
+                return;
+            }
+            addLeaves(root.left, nodes);
+            addLeaves(root.right, nodes);
         }
-        addLeaves(root.left, nodes);
-        addLeaves(root.right, nodes);
     }
 
 }
diff --git a/src/test/java/com/fishercoder/_545Test.java b/src/test/java/com/fishercoder/_545Test.java
@@ -12,13 +12,13 @@
 import static junit.framework.Assert.assertEquals;
 
 public class _545Test {
-    private static _545 test;
+    private static _545.Solution1 test;
     private static TreeNode root;
     private static List<Integer> expected;
 
     @BeforeClass
     public static void setup() {
-        test = new _545();
+        test = new _545.Solution1();
     }
 
     @Test
