correcting raw types for the item Iterator.
This commit is contained in:
parent
e6f84f2f41
commit
8458e426bc
@ -25,6 +25,7 @@ import static com.iluwatar.iterator.list.ItemType.WEAPON;
|
|||||||
|
|
||||||
import com.iluwatar.iterator.bst.BstIterator;
|
import com.iluwatar.iterator.bst.BstIterator;
|
||||||
import com.iluwatar.iterator.bst.TreeNode;
|
import com.iluwatar.iterator.bst.TreeNode;
|
||||||
|
import com.iluwatar.iterator.list.Item;
|
||||||
import com.iluwatar.iterator.list.ItemType;
|
import com.iluwatar.iterator.list.ItemType;
|
||||||
import com.iluwatar.iterator.list.TreasureChest;
|
import com.iluwatar.iterator.list.TreasureChest;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
@ -47,7 +48,7 @@ public class App {
|
|||||||
private static void demonstrateTreasureChestIteratorForType(ItemType itemType) {
|
private static void demonstrateTreasureChestIteratorForType(ItemType itemType) {
|
||||||
LOGGER.info("------------------------");
|
LOGGER.info("------------------------");
|
||||||
LOGGER.info("Item Iterator for ItemType " + itemType + ": ");
|
LOGGER.info("Item Iterator for ItemType " + itemType + ": ");
|
||||||
Iterator itemIterator = TREASURE_CHEST.iterator(itemType);
|
Iterator<Item> itemIterator = TREASURE_CHEST.iterator(itemType);
|
||||||
while (itemIterator.hasNext()) {
|
while (itemIterator.hasNext()) {
|
||||||
LOGGER.info(itemIterator.next().toString());
|
LOGGER.info(itemIterator.next().toString());
|
||||||
}
|
}
|
||||||
|
@ -48,7 +48,7 @@ public class TreasureChest {
|
|||||||
items.add(new Item(ItemType.WEAPON, "Dagger of poison"));
|
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);
|
return new TreasureChestItemIterator(this, itemType);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -56,9 +56,7 @@ public class TreasureChest {
|
|||||||
* Get all items
|
* Get all items
|
||||||
*/
|
*/
|
||||||
public List<Item> getItems() {
|
public List<Item> getItems() {
|
||||||
List<Item> list = new ArrayList<>();
|
return new ArrayList<>(items);
|
||||||
list.addAll(items);
|
|
||||||
return list;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -26,7 +26,7 @@ import java.util.List;
|
|||||||
* TreasureChestItemIterator
|
* TreasureChestItemIterator
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
public class TreasureChestItemIterator implements Iterator {
|
public class TreasureChestItemIterator implements Iterator<Item> {
|
||||||
|
|
||||||
private TreasureChest chest;
|
private TreasureChest chest;
|
||||||
private int idx;
|
private int idx;
|
||||||
|
@ -63,11 +63,11 @@ public class TreasureChestTest {
|
|||||||
@MethodSource("dataProvider")
|
@MethodSource("dataProvider")
|
||||||
public void testIterator(Item expectedItem) {
|
public void testIterator(Item expectedItem) {
|
||||||
final TreasureChest chest = new TreasureChest();
|
final TreasureChest chest = new TreasureChest();
|
||||||
final Iterator iterator = chest.iterator(expectedItem.getType());
|
final Iterator<Item> iterator = chest.iterator(expectedItem.getType());
|
||||||
assertNotNull(iterator);
|
assertNotNull(iterator);
|
||||||
|
|
||||||
while (iterator.hasNext()) {
|
while (iterator.hasNext()) {
|
||||||
final Item item = (Item) iterator.next();
|
final Item item = iterator.next();
|
||||||
assertNotNull(item);
|
assertNotNull(item);
|
||||||
assertEquals(expectedItem.getType(), item.getType());
|
assertEquals(expectedItem.getType(), item.getType());
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user