Skip to content

Commit bdd01f7

Browse files
fishercoder1534fishercoder1534
committed
refactor 341
1 parent c08a3c0 commit bdd01f7

File tree

2 files changed

+69
-71
lines changed

2 files changed

+69
-71
lines changed

‎src/main/java/com/fishercoder/solutions/_341.java

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -23,34 +23,36 @@
2323
*/
2424
public class _341 {
2525

26-
public static class NestedIterator implements Iterator<Integer> {
26+
public static class Solution1 {
27+
public static class NestedIterator implements Iterator<Integer> {
2728

28-
private Queue<Integer> flattenedList;
29+
private Queue<Integer> flattenedList;
2930

30-
public NestedIterator(List<NestedInteger> nestedList) {
31-
flattenedList = new LinkedList<>();
32-
constructList(nestedList);
33-
}
31+
public NestedIterator(List<NestedInteger> nestedList) {
32+
flattenedList = new LinkedList<>();
33+
constructList(nestedList);
34+
}
3435

35-
private void constructList(List<NestedInteger> nestedList) {
36-
for (NestedInteger nestedInteger : nestedList) {
37-
if (nestedInteger.isInteger()) {
38-
flattenedList.add(nestedInteger.getInteger());
39-
} else {
40-
constructList(nestedInteger.getList());
36+
private void constructList(List<NestedInteger> nestedList) {
37+
for (NestedInteger nestedInteger : nestedList) {
38+
if (nestedInteger.isInteger()) {
39+
flattenedList.add(nestedInteger.getInteger());
40+
} else {
41+
constructList(nestedInteger.getList());
42+
}
4143
}
4244
}
43-
}
4445

45-
@Override
46-
public Integer next() {
47-
return flattenedList.poll();
48-
}
46+
@Override
47+
public Integer next() {
48+
return flattenedList.poll();
49+
}
4950

50-
@Override
51-
public boolean hasNext() {
52-
return !flattenedList.isEmpty();
51+
@Override
52+
public boolean hasNext() {
53+
return !flattenedList.isEmpty();
54+
}
5355
}
5456
}
5557

56-
}
58+
}

‎src/test/java/com/fishercoder/_341Test.java

Lines changed: 46 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -11,62 +11,58 @@
1111
import static junit.framework.TestCase.assertTrue;
1212
import static org.junit.Assert.assertEquals;
1313

14-
/**
15-
* Created by fishercoder on 5/9/17.
16-
*/
1714
public class _341Test {
18-
private static _341 test;
19-
private static List<NestedInteger> nestedList;
15+
private static _341.Solution1 test;
16+
private static List<NestedInteger> nestedList;
2017

21-
@BeforeClass
22-
public static void setup() {
23-
test = new _341();
24-
}
18+
@BeforeClass
19+
public static void setup() {
20+
test = new _341.Solution1();
21+
}
2522

26-
@Test
27-
public void test1() {
28-
NestedInteger six = new NestedInteger(6);
29-
List<NestedInteger> sixList = new ArrayList<>();
30-
sixList.add(six);
31-
NestedInteger four = new NestedInteger(4);
32-
List<NestedInteger> fourList = new ArrayList<>();
33-
fourList.add(four);
34-
fourList.addAll(sixList);
35-
NestedInteger one = new NestedInteger(1);
36-
List<NestedInteger> oneList = new ArrayList<>();
37-
oneList.add(one);
38-
oneList.addAll(fourList);
39-
_341.NestedIterator nestedIterator = new _341.NestedIterator(oneList);
40-
assertTrue(nestedIterator.hasNext());
41-
assertEquals(1, (int) nestedIterator.next());
42-
}
23+
@Test
24+
public void test1() {
25+
NestedInteger six = new NestedInteger(6);
26+
List<NestedInteger> sixList = new ArrayList<>();
27+
sixList.add(six);
28+
NestedInteger four = new NestedInteger(4);
29+
List<NestedInteger> fourList = new ArrayList<>();
30+
fourList.add(four);
31+
fourList.addAll(sixList);
32+
NestedInteger one = new NestedInteger(1);
33+
List<NestedInteger> oneList = new ArrayList<>();
34+
oneList.add(one);
35+
oneList.addAll(fourList);
36+
_341.Solution1.NestedIterator nestedIterator = new _341.Solution1.NestedIterator(oneList);
37+
assertTrue(nestedIterator.hasNext());
38+
assertEquals(1, (int) nestedIterator.next());
39+
}
4340

44-
@Test
45-
public void test2() {
46-
List<NestedInteger> bigList = new ArrayList<>();
41+
@Test
42+
public void test2() {
43+
List<NestedInteger> bigList = new ArrayList<>();
4744

48-
NestedInteger one = new NestedInteger(1);
49-
NestedInteger two = new NestedInteger(2);
50-
List<NestedInteger> oneList = new ArrayList<>();
51-
oneList.add(one);
52-
oneList.add(two);
53-
NestedInteger oneNestedInteger = new NestedInteger(oneList);
54-
bigList.add(oneNestedInteger);
45+
NestedInteger one = new NestedInteger(1);
46+
NestedInteger two = new NestedInteger(2);
47+
List<NestedInteger> oneList = new ArrayList<>();
48+
oneList.add(one);
49+
oneList.add(two);
50+
NestedInteger oneNestedInteger = new NestedInteger(oneList);
51+
bigList.add(oneNestedInteger);
5552

56-
NestedInteger three = new NestedInteger(3);
57-
bigList.add(three);
53+
NestedInteger three = new NestedInteger(3);
54+
bigList.add(three);
5855

59-
NestedInteger four = new NestedInteger(4);
60-
NestedInteger five = new NestedInteger(5);
61-
List<NestedInteger> threeList = new ArrayList<>();
62-
threeList.add(four);
63-
threeList.add(five);
64-
NestedInteger threeNestedInteger = new NestedInteger(threeList);
65-
bigList.add(threeNestedInteger);
66-
67-
_341.NestedIterator nestedIterator = new _341.NestedIterator(bigList);
68-
assertTrue(nestedIterator.hasNext());
69-
assertEquals(1, (int) nestedIterator.next());
70-
}
56+
NestedInteger four = new NestedInteger(4);
57+
NestedInteger five = new NestedInteger(5);
58+
List<NestedInteger> threeList = new ArrayList<>();
59+
threeList.add(four);
60+
threeList.add(five);
61+
NestedInteger threeNestedInteger = new NestedInteger(threeList);
62+
bigList.add(threeNestedInteger);
7163

64+
_341.Solution1.NestedIterator nestedIterator = new _341.Solution1.NestedIterator(bigList);
65+
assertTrue(nestedIterator.hasNext());
66+
assertEquals(1, (int) nestedIterator.next());
67+
}
7268
}

0 commit comments

Comments
 (0)