diff --git a/Java/README.md b/Java/README.md index 80ea24d8..ab73c7a6 100644 --- a/Java/README.md +++ b/Java/README.md @@ -29,4 +29,5 @@ ## Refactoring actions -[x] extract hardcoded variables +-[x] create polymorphism for items diff --git a/Java/src/main/java/com/gildedrose/GildedRose.java b/Java/src/main/java/com/gildedrose/GildedRose.java index 2f1ae636..2ef9c3e6 100644 --- a/Java/src/main/java/com/gildedrose/GildedRose.java +++ b/Java/src/main/java/com/gildedrose/GildedRose.java @@ -1,11 +1,12 @@ package com.gildedrose; +import com.gildedrose.item.Item; + class GildedRose { Item[] items; String BRIE = "Aged Brie"; String BACKSTAGE = "Backstage passes to a TAFKAL80ETC concert"; - String SULFURAS = "Sulfuras, Hand of Ragnaros"; public GildedRose(Item[] items) { diff --git a/Java/src/main/java/com/gildedrose/item/Backstage.java b/Java/src/main/java/com/gildedrose/item/Backstage.java new file mode 100644 index 00000000..28d85eba --- /dev/null +++ b/Java/src/main/java/com/gildedrose/item/Backstage.java @@ -0,0 +1,7 @@ +package com.gildedrose.item; + +public class Backstage extends Item { + public Backstage(String name, int sellIn, int quality) { + super(name, sellIn, quality); + } +} diff --git a/Java/src/main/java/com/gildedrose/item/Brie.java b/Java/src/main/java/com/gildedrose/item/Brie.java new file mode 100644 index 00000000..9474ac8f --- /dev/null +++ b/Java/src/main/java/com/gildedrose/item/Brie.java @@ -0,0 +1,7 @@ +package com.gildedrose.item; + +public class Brie extends Item { + public Brie(String name, int sellIn, int quality) { + super(name, sellIn, quality); + } +} diff --git a/Java/src/main/java/com/gildedrose/Item.java b/Java/src/main/java/com/gildedrose/item/Item.java similarity index 92% rename from Java/src/main/java/com/gildedrose/Item.java rename to Java/src/main/java/com/gildedrose/item/Item.java index 465729ec..3f219306 100644 --- a/Java/src/main/java/com/gildedrose/Item.java +++ b/Java/src/main/java/com/gildedrose/item/Item.java @@ -1,4 +1,4 @@ -package com.gildedrose; +package com.gildedrose.item; public class Item { diff --git a/Java/src/main/java/com/gildedrose/item/Sulfuras.java b/Java/src/main/java/com/gildedrose/item/Sulfuras.java new file mode 100644 index 00000000..c11933a9 --- /dev/null +++ b/Java/src/main/java/com/gildedrose/item/Sulfuras.java @@ -0,0 +1,7 @@ +package com.gildedrose.item; + +public class Sulfuras extends Item { + public Sulfuras(String name, int sellIn, int quality) { + super(name, sellIn, quality); + } +} diff --git a/Java/src/test/java/com/gildedrose/GildedRoseTest.java b/Java/src/test/java/com/gildedrose/GildedRoseTest.java index f1276e1a..7c25b6a5 100644 --- a/Java/src/test/java/com/gildedrose/GildedRoseTest.java +++ b/Java/src/test/java/com/gildedrose/GildedRoseTest.java @@ -2,6 +2,7 @@ package com.gildedrose; import static org.junit.jupiter.api.Assertions.*; +import com.gildedrose.item.Item; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; diff --git a/Java/src/test/java/com/gildedrose/TestHelper.java b/Java/src/test/java/com/gildedrose/TestHelper.java index 0fa445c4..2ee649e3 100644 --- a/Java/src/test/java/com/gildedrose/TestHelper.java +++ b/Java/src/test/java/com/gildedrose/TestHelper.java @@ -1,5 +1,7 @@ package com.gildedrose; +import com.gildedrose.item.Item; + public class TestHelper { static Item getItem(String name, Integer sellIn, Integer quality){ diff --git a/Java/src/test/java/com/gildedrose/TexttestFixture.java b/Java/src/test/java/com/gildedrose/TexttestFixture.java index 647fe317..1c530727 100644 --- a/Java/src/test/java/com/gildedrose/TexttestFixture.java +++ b/Java/src/test/java/com/gildedrose/TexttestFixture.java @@ -1,5 +1,7 @@ package com.gildedrose; +import com.gildedrose.item.Item; + public class TexttestFixture { public static void main(String[] args) { System.out.println("OMGHAI!");