refactor 341

fishercoder1534 · fishercoder1534 · commit 9de220bf6218 · 2019-01-13T08:55:34.000-08:00
diff --git a/src/main/java/com/fishercoder/solutions/_341.java b/src/main/java/com/fishercoder/solutions/_341.java
@@ -23,34 +23,36 @@
  */
 public class _341 {
 
-    public static class NestedIterator implements Iterator<Integer> {
+    public static class Solution1 {
+        public static class NestedIterator implements Iterator<Integer> {
 
-        private Queue<Integer> flattenedList;
+            private Queue<Integer> flattenedList;
 
-        public NestedIterator(List<NestedInteger> nestedList) {
-            flattenedList = new LinkedList<>();
-            constructList(nestedList);
-        }
+            public NestedIterator(List<NestedInteger> nestedList) {
+                flattenedList = new LinkedList<>();
+                constructList(nestedList);
+            }
 
-        private void constructList(List<NestedInteger> nestedList) {
-            for (NestedInteger nestedInteger : nestedList) {
-                if (nestedInteger.isInteger()) {
-                    flattenedList.add(nestedInteger.getInteger());
-                } else {
-                    constructList(nestedInteger.getList());
+            private void constructList(List<NestedInteger> nestedList) {
+                for (NestedInteger nestedInteger : nestedList) {
+                    if (nestedInteger.isInteger()) {
+                        flattenedList.add(nestedInteger.getInteger());
+                    } else {
+                        constructList(nestedInteger.getList());
+                    }
                 }
             }
-        }
 
-        @Override
-        public Integer next() {
-            return flattenedList.poll();
-        }
+            @Override
+            public Integer next() {
+                return flattenedList.poll();
+            }
 
-        @Override
-        public boolean hasNext() {
-            return !flattenedList.isEmpty();
+            @Override
+            public boolean hasNext() {
+                return !flattenedList.isEmpty();
+            }
         }
     }
 
-}
+}
diff --git a/src/test/java/com/fishercoder/_341Test.java b/src/test/java/com/fishercoder/_341Test.java
@@ -11,62 +11,58 @@
 import static junit.framework.TestCase.assertTrue;
 import static org.junit.Assert.assertEquals;
 
-/**
- * Created by fishercoder on 5/9/17.
- */
 public class _341Test {
-    private static _341 test;
-    private static List<NestedInteger> nestedList;
+  private static _341.Solution1 test;
+  private static List<NestedInteger> nestedList;
 
-    @BeforeClass
-    public static void setup() {
-        test = new _341();
-    }
+  @BeforeClass
+  public static void setup() {
+    test = new _341.Solution1();
+  }
 
-    @Test
-    public void test1() {
-        NestedInteger six = new NestedInteger(6);
-        List<NestedInteger> sixList = new ArrayList<>();
-        sixList.add(six);
-        NestedInteger four = new NestedInteger(4);
-        List<NestedInteger> fourList = new ArrayList<>();
-        fourList.add(four);
-        fourList.addAll(sixList);
-        NestedInteger one = new NestedInteger(1);
-        List<NestedInteger> oneList = new ArrayList<>();
-        oneList.add(one);
-        oneList.addAll(fourList);
-        _341.NestedIterator nestedIterator = new _341.NestedIterator(oneList);
-        assertTrue(nestedIterator.hasNext());
-        assertEquals(1, (int) nestedIterator.next());
-    }
+  @Test
+  public void test1() {
+    NestedInteger six = new NestedInteger(6);
+    List<NestedInteger> sixList = new ArrayList<>();
+    sixList.add(six);
+    NestedInteger four = new NestedInteger(4);
+    List<NestedInteger> fourList = new ArrayList<>();
+    fourList.add(four);
+    fourList.addAll(sixList);
+    NestedInteger one = new NestedInteger(1);
+    List<NestedInteger> oneList = new ArrayList<>();
+    oneList.add(one);
+    oneList.addAll(fourList);
+    _341.Solution1.NestedIterator nestedIterator = new _341.Solution1.NestedIterator(oneList);
+    assertTrue(nestedIterator.hasNext());
+    assertEquals(1, (int) nestedIterator.next());
+  }
 
-    @Test
-    public void test2() {
-        List<NestedInteger> bigList = new ArrayList<>();
+  @Test
+  public void test2() {
+    List<NestedInteger> bigList = new ArrayList<>();
 
-        NestedInteger one = new NestedInteger(1);
-        NestedInteger two = new NestedInteger(2);
-        List<NestedInteger> oneList = new ArrayList<>();
-        oneList.add(one);
-        oneList.add(two);
-        NestedInteger oneNestedInteger = new NestedInteger(oneList);
-        bigList.add(oneNestedInteger);
+    NestedInteger one = new NestedInteger(1);
+    NestedInteger two = new NestedInteger(2);
+    List<NestedInteger> oneList = new ArrayList<>();
+    oneList.add(one);
+    oneList.add(two);
+    NestedInteger oneNestedInteger = new NestedInteger(oneList);
+    bigList.add(oneNestedInteger);
 
-        NestedInteger three = new NestedInteger(3);
-        bigList.add(three);
+    NestedInteger three = new NestedInteger(3);
+    bigList.add(three);
 
-        NestedInteger four = new NestedInteger(4);
-        NestedInteger five = new NestedInteger(5);
-        List<NestedInteger> threeList = new ArrayList<>();
-        threeList.add(four);
-        threeList.add(five);
-        NestedInteger threeNestedInteger = new NestedInteger(threeList);
-        bigList.add(threeNestedInteger);
-
-        _341.NestedIterator nestedIterator = new _341.NestedIterator(bigList);
-        assertTrue(nestedIterator.hasNext());
-        assertEquals(1, (int) nestedIterator.next());
-    }
+    NestedInteger four = new NestedInteger(4);
+    NestedInteger five = new NestedInteger(5);
+    List<NestedInteger> threeList = new ArrayList<>();
+    threeList.add(four);
+    threeList.add(five);
+    NestedInteger threeNestedInteger = new NestedInteger(threeList);
+    bigList.add(threeNestedInteger);
 
+    _341.Solution1.NestedIterator nestedIterator = new _341.Solution1.NestedIterator(bigList);
+    assertTrue(nestedIterator.hasNext());
+    assertEquals(1, (int) nestedIterator.next());
+  }
 }
