mirror of
https://github.com/emilybache/GildedRose-Refactoring-Kata.git
synced 2026-02-15 06:21:29 +00:00
Final cleanup
This commit is contained in:
parent
afc32f86f7
commit
0102736d4c
@ -1,7 +1,6 @@
|
||||
package com.gildedrose;
|
||||
|
||||
import com.gildedrose.domain.*;
|
||||
import com.gildedrose.domain.InventoryItem;
|
||||
|
||||
import static java.util.stream.Stream.of;
|
||||
|
||||
|
||||
@ -12,8 +12,7 @@ public class AgedBrie extends InventoryItem {
|
||||
|
||||
@Override
|
||||
public int handleQuality() {
|
||||
quality = increaseQualityBelowMaximum();
|
||||
return quality;
|
||||
return increaseQualityBelowMaximum();
|
||||
}
|
||||
|
||||
@Override
|
||||
@ -23,7 +22,6 @@ public class AgedBrie extends InventoryItem {
|
||||
|
||||
@Override
|
||||
public int handleQualityAfterSellIn() {
|
||||
quality = increaseQualityBelowMaximum();
|
||||
return quality;
|
||||
return increaseQualityBelowMaximum();
|
||||
}
|
||||
}
|
||||
|
||||
@ -12,8 +12,7 @@ public class BackstagePass extends InventoryItem {
|
||||
|
||||
@Override
|
||||
public int handleQuality() {
|
||||
quality = increaseQualityBelowMaximum();
|
||||
return quality;
|
||||
return increaseQualityBelowMaximum();
|
||||
}
|
||||
|
||||
@Override
|
||||
@ -23,31 +22,29 @@ public class BackstagePass extends InventoryItem {
|
||||
|
||||
@Override
|
||||
public int handleQualityAfterSellIn() {
|
||||
quality = 0;
|
||||
return quality;
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int increaseQualityBelowMaximum() {
|
||||
quality = increaseQualityIfNotMaximum();
|
||||
increaseQualityIfNotMaximum();
|
||||
|
||||
// increase backstage pass further when sellIn date approaches
|
||||
quality = increaseBackstagePass();
|
||||
return quality;
|
||||
return increaseBackstagePass();
|
||||
}
|
||||
|
||||
private int increaseBackstagePass() {
|
||||
if (sellIn < 10) {
|
||||
quality = increaseQualityIfNotMaximum();
|
||||
increaseQualityIfNotMaximum();
|
||||
|
||||
if (sellIn < 5) {
|
||||
quality = increaseQualityIfNotMaximum();
|
||||
increaseQualityIfNotMaximum();
|
||||
}
|
||||
}
|
||||
return quality;
|
||||
}
|
||||
|
||||
private int increaseQualityIfNotMaximum() {
|
||||
return super.increaseQualityBelowMaximum();
|
||||
private void increaseQualityIfNotMaximum() {
|
||||
quality = super.increaseQualityBelowMaximum();
|
||||
}
|
||||
}
|
||||
|
||||
@ -17,7 +17,6 @@ public class ConjuredItem extends InventoryItem {
|
||||
|
||||
@Override
|
||||
public int handleQualityAfterSellIn() {
|
||||
quality = decreaseQualityAboveZero();
|
||||
return quality;
|
||||
return decreaseQualityAboveZero();
|
||||
}
|
||||
}
|
||||
|
||||
@ -17,7 +17,6 @@ public class DefaultItem extends InventoryItem {
|
||||
|
||||
@Override
|
||||
public int handleQualityAfterSellIn() {
|
||||
quality = decreaseQualityAboveZero();
|
||||
return quality;
|
||||
return decreaseQualityAboveZero();
|
||||
}
|
||||
}
|
||||
|
||||
@ -19,8 +19,7 @@ public abstract class InventoryItem {
|
||||
public abstract int handleQualityAfterSellIn();
|
||||
|
||||
public int decreaseQualityAboveZero() {
|
||||
quality = quality > 0 ? quality - 1 : 0;
|
||||
return quality;
|
||||
return quality > 0 ? quality - 1 : 0;
|
||||
}
|
||||
|
||||
public int increaseQualityBelowMaximum() {
|
||||
@ -31,8 +30,7 @@ public abstract class InventoryItem {
|
||||
}
|
||||
|
||||
public int reduceSellIn() {
|
||||
sellIn--;
|
||||
return sellIn;
|
||||
return --sellIn;
|
||||
}
|
||||
|
||||
public int handleQuality() {
|
||||
|
||||
@ -5,7 +5,6 @@ import com.gildedrose.Item;
|
||||
public class Legendary extends InventoryItem {
|
||||
|
||||
public Legendary(Item item) {
|
||||
super();
|
||||
setName(item.name);
|
||||
setSellIn(item.sellIn);
|
||||
setQuality(item.quality);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user