diff --git a/core-java/src/test/java/org/baeldung/java/collections/CollectionsConcatenateUnitTest.java b/core-java/src/test/java/org/baeldung/java/collections/CollectionsConcatenateUnitTest.java index 3ee08767bd..0d913db1bd 100644 --- a/core-java/src/test/java/org/baeldung/java/collections/CollectionsConcatenateUnitTest.java +++ b/core-java/src/test/java/org/baeldung/java/collections/CollectionsConcatenateUnitTest.java @@ -1,21 +1,15 @@ package org.baeldung.java.collections; -import static java.util.Arrays.asList; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Iterator; -import java.util.List; -import java.util.NoSuchElementException; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import org.junit.Assert; -import org.junit.Test; - import com.google.common.collect.Iterables; import com.google.common.collect.Lists; +import org.junit.Assert; +import org.junit.Test; + +import java.util.*; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import static java.util.Arrays.asList; public class CollectionsConcatenateUnitTest { @@ -63,16 +57,16 @@ public class CollectionsConcatenateUnitTest { Assert.assertEquals(Arrays.asList("S", "T", "U", "V"), collectionCombined); } - public static Iterable concat(Iterable list1, Iterable list2) { + public static Iterable concat(Iterable i1, Iterable i2) { return new Iterable() { public Iterator iterator() { return new Iterator() { - protected Iterator listIterator = list1.iterator(); - protected Boolean checkedHasNext; - protected E nextValue; + Iterator listIterator = i1.iterator(); + Boolean checkedHasNext; + E nextValue; private boolean startTheSecond; - public void theNext() { + void theNext() { if (listIterator.hasNext()) { checkedHasNext = true; nextValue = listIterator.next(); @@ -80,7 +74,7 @@ public class CollectionsConcatenateUnitTest { checkedHasNext = false; else { startTheSecond = true; - listIterator = list2.iterator(); + listIterator = i2.iterator(); theNext(); } } @@ -107,7 +101,7 @@ public class CollectionsConcatenateUnitTest { } public static List makeListFromIterable(Iterable iter) { - List list = new ArrayList(); + List list = new ArrayList<>(); for (E item : iter) { list.add(item); }