diff --git a/Java/src/main/java/com/gildedrose/item/AgedBrie.java b/Java/src/main/java/com/gildedrose/item/AgedBrie.java index 4efc314c..20688f06 100644 --- a/Java/src/main/java/com/gildedrose/item/AgedBrie.java +++ b/Java/src/main/java/com/gildedrose/item/AgedBrie.java @@ -1,10 +1,10 @@ package com.gildedrose.item; -public class AgedBrie extends CustomisedItem { +class AgedBrie extends CustomisedItem { private final Item item; - public AgedBrie(Item item) { + AgedBrie(Item item) { this.item = item; } @@ -17,14 +17,4 @@ public class AgedBrie extends CustomisedItem { int updatedItemQuality() { return item.quality += 1; } - - @Override - protected boolean hasReachedHighestQualityValue() { - return item.quality > QualityValues.highestValuePossible(item); - } - - @Override - protected boolean hasReachedLowestQualityValue() { - return item.quality < QualityValues.lowestValuePossible(); - } } diff --git a/Java/src/main/java/com/gildedrose/item/BackstagePassesItem.java b/Java/src/main/java/com/gildedrose/item/BackstagePassesItem.java index e2b4b105..50736f90 100644 --- a/Java/src/main/java/com/gildedrose/item/BackstagePassesItem.java +++ b/Java/src/main/java/com/gildedrose/item/BackstagePassesItem.java @@ -1,10 +1,10 @@ package com.gildedrose.item; -public class BackstagePassesItem extends CustomisedItem { +class BackstagePassesItem extends CustomisedItem { private final Item item; - public BackstagePassesItem(Item item) { + BackstagePassesItem(Item item) { this.item = item; } @@ -26,16 +26,6 @@ public class BackstagePassesItem extends CustomisedItem { } } - @Override - protected boolean hasReachedHighestQualityValue() { - return item.quality > QualityValues.highestValuePossible(item); - } - - @Override - protected boolean hasReachedLowestQualityValue() { - return item.quality < QualityValues.lowestValuePossible(); - } - private boolean sellByDayValueIsOver(int dayNumber) { return item.sellIn > dayNumber; } diff --git a/Java/src/main/java/com/gildedrose/item/ConjuredItem.java b/Java/src/main/java/com/gildedrose/item/ConjuredItem.java index 697f5b78..17d8d97e 100644 --- a/Java/src/main/java/com/gildedrose/item/ConjuredItem.java +++ b/Java/src/main/java/com/gildedrose/item/ConjuredItem.java @@ -1,23 +1,13 @@ package com.gildedrose.item; -public class ConjuredItem extends CustomisedItem { +class ConjuredItem extends CustomisedItem { private final Item item; - public ConjuredItem(Item item) { + ConjuredItem(Item item) { this.item = item; } - @Override - protected boolean hasReachedHighestQualityValue() { - return item.quality > QualityValues.highestValuePossible(item); - } - - @Override - protected boolean hasReachedLowestQualityValue() { - return item.quality < QualityValues.lowestValuePossible(); - } - @Override int updatedItemSellIn() { return item.sellIn -= 1; diff --git a/Java/src/main/java/com/gildedrose/item/CustomisedItem.java b/Java/src/main/java/com/gildedrose/item/CustomisedItem.java index 65e39119..293d3e34 100644 --- a/Java/src/main/java/com/gildedrose/item/CustomisedItem.java +++ b/Java/src/main/java/com/gildedrose/item/CustomisedItem.java @@ -6,9 +6,9 @@ public abstract class CustomisedItem { item.sellIn = updatedItemSellIn(); item.quality = updatedItemQuality(); - if (hasReachedLowestQualityValue()) { + if (hasReachedLowestQualityValue(item)) { item.quality = QualityValues.lowestValuePossible(); - } else if (hasReachedHighestQualityValue()) { + } else if (hasReachedHighestQualityValue(item)) { item.quality = QualityValues.highestValuePossible(item); } } @@ -17,7 +17,11 @@ public abstract class CustomisedItem { abstract int updatedItemQuality(); - protected abstract boolean hasReachedHighestQualityValue(); + private boolean hasReachedHighestQualityValue(Item item) { + return item.quality > QualityValues.highestValuePossible(item); + } - protected abstract boolean hasReachedLowestQualityValue(); + private boolean hasReachedLowestQualityValue(Item item) { + return item.quality < QualityValues.lowestValuePossible(); + } } diff --git a/Java/src/main/java/com/gildedrose/item/QualityValues.java b/Java/src/main/java/com/gildedrose/item/QualityValues.java index cc4d52a3..2d4cffd9 100644 --- a/Java/src/main/java/com/gildedrose/item/QualityValues.java +++ b/Java/src/main/java/com/gildedrose/item/QualityValues.java @@ -1,12 +1,12 @@ package com.gildedrose.item; -public final class QualityValues { +final class QualityValues { - public static int lowestValuePossible() { + static int lowestValuePossible() { return 0; } - public static int highestValuePossible(Item item) { + static int highestValuePossible(Item item) { if (item.name.equals(CustomisedItemFactory.SULFURAS)) { return 80; } diff --git a/Java/src/main/java/com/gildedrose/item/StandardItem.java b/Java/src/main/java/com/gildedrose/item/StandardItem.java index a89e99d9..2a60dcb6 100644 --- a/Java/src/main/java/com/gildedrose/item/StandardItem.java +++ b/Java/src/main/java/com/gildedrose/item/StandardItem.java @@ -1,10 +1,10 @@ package com.gildedrose.item; -public class StandardItem extends CustomisedItem { +class StandardItem extends CustomisedItem { private final Item item; - public StandardItem(Item item) { + StandardItem(Item item) { this.item = item; } @@ -22,16 +22,6 @@ public class StandardItem extends CustomisedItem { } } - @Override - protected boolean hasReachedHighestQualityValue() { - return item.quality > QualityValues.highestValuePossible(item); - } - - @Override - protected boolean hasReachedLowestQualityValue() { - return item.quality < QualityValues.lowestValuePossible(); - } - private boolean sellByDayValueIsOverZero() { return item.sellIn > 0; } diff --git a/Java/src/main/java/com/gildedrose/item/Sulfuras.java b/Java/src/main/java/com/gildedrose/item/Sulfuras.java index 451a9b5e..4f8e9188 100644 --- a/Java/src/main/java/com/gildedrose/item/Sulfuras.java +++ b/Java/src/main/java/com/gildedrose/item/Sulfuras.java @@ -1,10 +1,10 @@ package com.gildedrose.item; -public class Sulfuras extends CustomisedItem { +class Sulfuras extends CustomisedItem { private final Item item; - public Sulfuras(Item item) { + Sulfuras(Item item) { this.item = item; } @@ -17,14 +17,4 @@ public class Sulfuras extends CustomisedItem { int updatedItemQuality() { return item.quality; } - - @Override - protected boolean hasReachedHighestQualityValue() { - return item.quality > QualityValues.highestValuePossible(item) ; - } - - @Override - protected boolean hasReachedLowestQualityValue() { - return item.quality < QualityValues.lowestValuePossible(); - } }