correcting raw types for the item Iterator.

mxi1809 · mxi1809 · commit 8458e426bcce · 2018-08-29T07:36:52.000-04:00
diff --git a/iterator/src/main/java/com/iluwatar/iterator/App.java b/iterator/src/main/java/com/iluwatar/iterator/App.java
@@ -25,6 +25,7 @@
 
 import com.iluwatar.iterator.bst.BstIterator;
 import com.iluwatar.iterator.bst.TreeNode;
+import com.iluwatar.iterator.list.Item;
 import com.iluwatar.iterator.list.ItemType;
 import com.iluwatar.iterator.list.TreasureChest;
 import org.slf4j.Logger;
@@ -47,7 +48,7 @@ public class App {
   private static void demonstrateTreasureChestIteratorForType(ItemType itemType) {
     LOGGER.info("------------------------");
     LOGGER.info("Item Iterator for ItemType " + itemType + ": ");
-    Iterator itemIterator = TREASURE_CHEST.iterator(itemType);
+    Iterator<Item> itemIterator = TREASURE_CHEST.iterator(itemType);
     while (itemIterator.hasNext()) {
       LOGGER.info(itemIterator.next().toString());
     }
diff --git a/iterator/src/main/java/com/iluwatar/iterator/list/TreasureChest.java b/iterator/src/main/java/com/iluwatar/iterator/list/TreasureChest.java
@@ -48,17 +48,15 @@ public TreasureChest() {
     items.add(new Item(ItemType.WEAPON, "Dagger of poison"));
   }
 
-  public Iterator iterator(ItemType itemType) {
+  public Iterator<Item> iterator(ItemType itemType) {
     return new TreasureChestItemIterator(this, itemType);
   }
 
   /**
    * Get all items
    */
   public List<Item> getItems() {
-    List<Item> list = new ArrayList<>();
-    list.addAll(items);
-    return list;
+    return new ArrayList<>(items);
   }
 
 }
diff --git a/iterator/src/main/java/com/iluwatar/iterator/list/TreasureChestItemIterator.java b/iterator/src/main/java/com/iluwatar/iterator/list/TreasureChestItemIterator.java
@@ -26,7 +26,7 @@
  * TreasureChestItemIterator
  *
  */
-public class TreasureChestItemIterator implements Iterator {
+public class TreasureChestItemIterator implements Iterator<Item> {
 
   private TreasureChest chest;
   private int idx;
diff --git a/iterator/src/test/java/com/iluwatar/iterator/list/TreasureChestTest.java b/iterator/src/test/java/com/iluwatar/iterator/list/TreasureChestTest.java
@@ -63,11 +63,11 @@ public static List<Object[]> dataProvider() {
   @MethodSource("dataProvider")
   public void testIterator(Item expectedItem) {
     final TreasureChest chest = new TreasureChest();
-    final Iterator iterator = chest.iterator(expectedItem.getType());
+    final Iterator<Item> iterator = chest.iterator(expectedItem.getType());
     assertNotNull(iterator);
 
     while (iterator.hasNext()) {
-      final Item item = (Item) iterator.next();
+      final Item item = iterator.next();
       assertNotNull(item);
       assertEquals(expectedItem.getType(), item.getType());
 

Original file line number	Diff line number	Diff line change
`@@ -48,17 +48,15 @@ public TreasureChest() {`
`48`	`48`	`items.add(new Item(ItemType.WEAPON, "Dagger of poison"));`
`49`	`49`	`}`
`50`	`50`
`51`		`- public Iterator iterator(ItemType itemType) {`
	`51`	`+ public Iterator<Item> iterator(ItemType itemType) {`
`52`	`52`	`return new TreasureChestItemIterator(this, itemType);`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`/**`
`56`	`56`	`* Get all items`
`57`	`57`	`*/`
`58`	`58`	`public List<Item> getItems() {`
`59`		`- List<Item> list = new ArrayList<>();`
`60`		`- list.addAll(items);`
`61`		`- return list;`
	`59`	`+ return new ArrayList<>(items);`
`62`	`60`	`}`
`63`	`61`
`64`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`* TreasureChestItemIterator`
`27`	`27`	`*`
`28`	`28`	`*/`
`29`		`-public class TreasureChestItemIterator implements Iterator {`
	`29`	`+public class TreasureChestItemIterator implements Iterator<Item> {`
`30`	`30`
`31`	`31`	`private TreasureChest chest;`
`32`	`32`	`private int idx;`