From d4ccdfe0e98d117946a7db6bd04d1d39d0ad01ba Mon Sep 17 00:00:00 2001 From: tbuckinx Date: Thu, 23 Nov 2023 22:31:19 +0100 Subject: [PATCH] Refactoring abstract inventory item --- Java/src/main/java/com/gildedrose/GildedRose.java | 2 +- Java/src/main/java/com/gildedrose/domain/AgedBrie.java | 1 - Java/src/main/java/com/gildedrose/domain/BackstagePass.java | 1 - Java/src/main/java/com/gildedrose/domain/ConjuredItem.java | 1 - Java/src/main/java/com/gildedrose/domain/DefaultItem.java | 1 - .../java/com/gildedrose/{service => domain}/InventoryItem.java | 2 +- Java/src/main/java/com/gildedrose/domain/Legendary.java | 1 - 7 files changed, 2 insertions(+), 7 deletions(-) rename Java/src/main/java/com/gildedrose/{service => domain}/InventoryItem.java (95%) diff --git a/Java/src/main/java/com/gildedrose/GildedRose.java b/Java/src/main/java/com/gildedrose/GildedRose.java index 8bea43df..9dbdec28 100644 --- a/Java/src/main/java/com/gildedrose/GildedRose.java +++ b/Java/src/main/java/com/gildedrose/GildedRose.java @@ -1,7 +1,7 @@ package com.gildedrose; import com.gildedrose.domain.*; -import com.gildedrose.service.InventoryItem; +import com.gildedrose.domain.InventoryItem; import static java.util.stream.IntStream.range; import static java.util.stream.Stream.of; diff --git a/Java/src/main/java/com/gildedrose/domain/AgedBrie.java b/Java/src/main/java/com/gildedrose/domain/AgedBrie.java index 000da7f4..f9511087 100644 --- a/Java/src/main/java/com/gildedrose/domain/AgedBrie.java +++ b/Java/src/main/java/com/gildedrose/domain/AgedBrie.java @@ -1,7 +1,6 @@ package com.gildedrose.domain; import com.gildedrose.Item; -import com.gildedrose.service.InventoryItem; public class AgedBrie extends InventoryItem { diff --git a/Java/src/main/java/com/gildedrose/domain/BackstagePass.java b/Java/src/main/java/com/gildedrose/domain/BackstagePass.java index 77f6872e..d87dcf37 100644 --- a/Java/src/main/java/com/gildedrose/domain/BackstagePass.java +++ b/Java/src/main/java/com/gildedrose/domain/BackstagePass.java @@ -1,7 +1,6 @@ package com.gildedrose.domain; import com.gildedrose.Item; -import com.gildedrose.service.InventoryItem; public class BackstagePass extends InventoryItem { diff --git a/Java/src/main/java/com/gildedrose/domain/ConjuredItem.java b/Java/src/main/java/com/gildedrose/domain/ConjuredItem.java index 84939511..fe149bd6 100644 --- a/Java/src/main/java/com/gildedrose/domain/ConjuredItem.java +++ b/Java/src/main/java/com/gildedrose/domain/ConjuredItem.java @@ -1,7 +1,6 @@ package com.gildedrose.domain; import com.gildedrose.Item; -import com.gildedrose.service.InventoryItem; public class ConjuredItem extends InventoryItem { diff --git a/Java/src/main/java/com/gildedrose/domain/DefaultItem.java b/Java/src/main/java/com/gildedrose/domain/DefaultItem.java index 905b33e9..2daee8aa 100644 --- a/Java/src/main/java/com/gildedrose/domain/DefaultItem.java +++ b/Java/src/main/java/com/gildedrose/domain/DefaultItem.java @@ -1,7 +1,6 @@ package com.gildedrose.domain; import com.gildedrose.Item; -import com.gildedrose.service.InventoryItem; public class DefaultItem extends InventoryItem { diff --git a/Java/src/main/java/com/gildedrose/service/InventoryItem.java b/Java/src/main/java/com/gildedrose/domain/InventoryItem.java similarity index 95% rename from Java/src/main/java/com/gildedrose/service/InventoryItem.java rename to Java/src/main/java/com/gildedrose/domain/InventoryItem.java index de06ad9d..720dc619 100644 --- a/Java/src/main/java/com/gildedrose/service/InventoryItem.java +++ b/Java/src/main/java/com/gildedrose/domain/InventoryItem.java @@ -1,4 +1,4 @@ -package com.gildedrose.service; +package com.gildedrose.domain; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/Java/src/main/java/com/gildedrose/domain/Legendary.java b/Java/src/main/java/com/gildedrose/domain/Legendary.java index df85b668..4a106710 100644 --- a/Java/src/main/java/com/gildedrose/domain/Legendary.java +++ b/Java/src/main/java/com/gildedrose/domain/Legendary.java @@ -1,7 +1,6 @@ package com.gildedrose.domain; import com.gildedrose.Item; -import com.gildedrose.service.InventoryItem; public class Legendary extends InventoryItem {