File tree Expand file tree Collapse file tree 4 files changed +7
-8
lines changed
main/java/com/iluwatar/iterator
test/java/com/iluwatar/iterator/list Expand file tree Collapse file tree 4 files changed +7
-8
lines changed Original file line number Diff line number Diff line change 2525
2626import com .iluwatar .iterator .bst .BstIterator ;
2727import com .iluwatar .iterator .bst .TreeNode ;
28+ import com .iluwatar .iterator .list .Item ;
2829import com .iluwatar .iterator .list .ItemType ;
2930import com .iluwatar .iterator .list .TreasureChest ;
3031import org .slf4j .Logger ;
@@ -47,7 +48,7 @@ public class App {
4748 private static void demonstrateTreasureChestIteratorForType (ItemType itemType ) {
4849 LOGGER .info ("------------------------" );
4950 LOGGER .info ("Item Iterator for ItemType " + itemType + ": " );
50- Iterator itemIterator = TREASURE_CHEST .iterator (itemType );
51+ Iterator < Item > itemIterator = TREASURE_CHEST .iterator (itemType );
5152 while (itemIterator .hasNext ()) {
5253 LOGGER .info (itemIterator .next ().toString ());
5354 }
Original file line number Diff line number Diff line change @@ -48,17 +48,15 @@ public TreasureChest() {
4848 items .add (new Item (ItemType .WEAPON , "Dagger of poison" ));
4949 }
5050
51- public Iterator iterator (ItemType itemType ) {
51+ public Iterator < Item > iterator (ItemType itemType ) {
5252 return new TreasureChestItemIterator (this , itemType );
5353 }
5454
5555 /**
5656 * Get all items
5757 */
5858 public List <Item > getItems () {
59- List <Item > list = new ArrayList <>();
60- list .addAll (items );
61- return list ;
59+ return new ArrayList <>(items );
6260 }
6361
6462}
Original file line number Diff line number Diff line change 2626 * TreasureChestItemIterator
2727 *
2828 */
29- public class TreasureChestItemIterator implements Iterator {
29+ public class TreasureChestItemIterator implements Iterator < Item > {
3030
3131 private TreasureChest chest ;
3232 private int idx ;
Original file line number Diff line number Diff line change @@ -63,11 +63,11 @@ public static List<Object[]> dataProvider() {
6363 @ MethodSource ("dataProvider" )
6464 public void testIterator (Item expectedItem ) {
6565 final TreasureChest chest = new TreasureChest ();
66- final Iterator iterator = chest .iterator (expectedItem .getType ());
66+ final Iterator < Item > iterator = chest .iterator (expectedItem .getType ());
6767 assertNotNull (iterator );
6868
6969 while (iterator .hasNext ()) {
70- final Item item = ( Item ) iterator .next ();
70+ final Item item = iterator .next ();
7171 assertNotNull (item );
7272 assertEquals (expectedItem .getType (), item .getType ());
7373
You can’t perform that action at this time.
0 commit comments