From bef68f00684c6a7642e5f9eadea5452aad5aae34 Mon Sep 17 00:00:00 2001 From: Konstantin Pavlov Date: Sun, 30 Jun 2019 06:58:11 +0200 Subject: [PATCH] cleanup --- .../main/java/com/gildedrose/GildedRose.java | 49 ------------------- .../gildedrose/rules/AgedBrieQualityRule.java | 2 +- .../rules/BackstagePassQualityRule.java | 8 +-- .../gildedrose/rules/DefaultQualityRule.java | 4 +- .../com/gildedrose/rules/QualityRule.java | 3 +- .../gildedrose/rules/SulfurasQualityRule.java | 2 +- 6 files changed, 10 insertions(+), 58 deletions(-) diff --git a/Java/src/main/java/com/gildedrose/GildedRose.java b/Java/src/main/java/com/gildedrose/GildedRose.java index 6d48b0d8..d29a9b03 100644 --- a/Java/src/main/java/com/gildedrose/GildedRose.java +++ b/Java/src/main/java/com/gildedrose/GildedRose.java @@ -46,55 +46,6 @@ class GildedRose { }, (a, b) -> b).getQuality(); -/* - if (!item.name.equals("Aged Brie") - && !item.name.equals("Backstage passes to a TAFKAL80ETC concert")) { - if (item.quality > 0) { - if (!item.name.equals("Sulfuras, Hand of Ragnaros")) { - item.quality = item.quality - 1; - } - } - } else { - if (item.quality < 50) { - item.quality = item.quality + 1; - - if (item.name.equals("Backstage passes to a TAFKAL80ETC concert")) { - if (item.sellIn < 11) { - if (item.quality < 50) { - item.quality = item.quality + 1; - } - } - - if (item.sellIn < 6) { - if (item.quality < 50) { - item.quality = item.quality + 1; - } - } - } - } - } -*/ - - - -/* if (newSellIn < 0) { - if (!item.name.equals("Aged Brie")) { - if (!item.name.equals("Backstage passes to a TAFKAL80ETC concert")) { - if (item.quality > 0) { - if (!item.name.equals("Sulfuras, Hand of Ragnaros")) { - item.quality = item.quality - 1; - } - } - } else { - item.quality = item.quality - item.quality; - } - } else { - if (item.quality < 50) { - item.quality = item.quality + 1; - } - } - }*/ - item.quality = newQuality; item.sellIn = newSellIn; } diff --git a/Java/src/main/java/com/gildedrose/rules/AgedBrieQualityRule.java b/Java/src/main/java/com/gildedrose/rules/AgedBrieQualityRule.java index b31acb2c..81efeab3 100644 --- a/Java/src/main/java/com/gildedrose/rules/AgedBrieQualityRule.java +++ b/Java/src/main/java/com/gildedrose/rules/AgedBrieQualityRule.java @@ -10,7 +10,7 @@ public class AgedBrieQualityRule implements QualityRule { } @Override - public Result calculateQuality(int oldQuality, int sellIn) { + public Result calculateQuality(int oldQuality, int newSellIn) { return new Result(min(oldQuality + 1, 50), true); } } diff --git a/Java/src/main/java/com/gildedrose/rules/BackstagePassQualityRule.java b/Java/src/main/java/com/gildedrose/rules/BackstagePassQualityRule.java index bc1b3556..4b23231b 100644 --- a/Java/src/main/java/com/gildedrose/rules/BackstagePassQualityRule.java +++ b/Java/src/main/java/com/gildedrose/rules/BackstagePassQualityRule.java @@ -10,14 +10,14 @@ public class BackstagePassQualityRule implements QualityRule { } @Override - public Result calculateQuality(int oldQuality, int sellIn) { + public Result calculateQuality(int oldQuality, int newSellIn) { final int newQuality; - if (sellIn < 0) { + if (newSellIn < 0) { newQuality = 0; - } else if (sellIn < 5) { + } else if (newSellIn < 5) { newQuality = oldQuality + 3; - } else if (sellIn < 10) { + } else if (newSellIn < 10) { newQuality = oldQuality + 2; } else { newQuality = oldQuality + 1; diff --git a/Java/src/main/java/com/gildedrose/rules/DefaultQualityRule.java b/Java/src/main/java/com/gildedrose/rules/DefaultQualityRule.java index 7b2f3ab2..1a2eb403 100644 --- a/Java/src/main/java/com/gildedrose/rules/DefaultQualityRule.java +++ b/Java/src/main/java/com/gildedrose/rules/DefaultQualityRule.java @@ -10,9 +10,9 @@ public class DefaultQualityRule implements QualityRule { } @Override - public Result calculateQuality(int oldQuality, int sellIn) { + public Result calculateQuality(int oldQuality, int newSellIn) { final int newQuality; - if (sellIn < 0) { + if (newSellIn < 0) { newQuality = oldQuality - 2; } else { newQuality = oldQuality - 1; diff --git a/Java/src/main/java/com/gildedrose/rules/QualityRule.java b/Java/src/main/java/com/gildedrose/rules/QualityRule.java index b7bd0ad2..4288857d 100644 --- a/Java/src/main/java/com/gildedrose/rules/QualityRule.java +++ b/Java/src/main/java/com/gildedrose/rules/QualityRule.java @@ -1,7 +1,8 @@ package com.gildedrose.rules; public interface QualityRule { + boolean shouldApply(String itemName); - Result calculateQuality(int oldQuality, int sellIn); + Result calculateQuality(int oldQuality, int newSellIn); } diff --git a/Java/src/main/java/com/gildedrose/rules/SulfurasQualityRule.java b/Java/src/main/java/com/gildedrose/rules/SulfurasQualityRule.java index 91c1ace0..41c5cf65 100644 --- a/Java/src/main/java/com/gildedrose/rules/SulfurasQualityRule.java +++ b/Java/src/main/java/com/gildedrose/rules/SulfurasQualityRule.java @@ -8,7 +8,7 @@ public class SulfurasQualityRule implements QualityRule { } @Override - public Result calculateQuality(int oldQuality, int sellIn) { + public Result calculateQuality(int oldQuality, int newSellIn) { return new Result(oldQuality, true); } }