From 857b6cd474287be9be1f626ef2ae6ddd7beab327 Mon Sep 17 00:00:00 2001 From: Konstantin Pavlov Date: Sun, 30 Jun 2019 07:13:39 +0200 Subject: [PATCH] get rid of lombok, inline variables --- Java/pom.xml | 2 +- Java/src/main/java/com/gildedrose/GildedRose.java | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Java/pom.xml b/Java/pom.xml index 318af002..da2ab7b2 100644 --- a/Java/pom.xml +++ b/Java/pom.xml @@ -33,7 +33,7 @@ org.projectlombok lombok ${lombok.version} - provided + test org.assertj diff --git a/Java/src/main/java/com/gildedrose/GildedRose.java b/Java/src/main/java/com/gildedrose/GildedRose.java index 8729787b..960b8876 100644 --- a/Java/src/main/java/com/gildedrose/GildedRose.java +++ b/Java/src/main/java/com/gildedrose/GildedRose.java @@ -7,7 +7,6 @@ import com.gildedrose.rules.DefaultQualityRule; import com.gildedrose.rules.QualityRule; import com.gildedrose.rules.Result; import com.gildedrose.rules.SulfurasQualityRule; -import lombok.val; import java.util.Arrays; import java.util.List; @@ -35,21 +34,19 @@ class GildedRose { private void processItem(final Item item) { - val newSellIn = calculateSellIn(item.name, item.sellIn); + item.sellIn = calculateSellIn(item.name, item.sellIn); - val newQuality = rules.stream() + item.quality = rules.stream() .reduce(new Result(item.quality, false), (q, rule) -> { if (q.isFinalValue() || !rule.shouldApply(item.name)) { return q; } else { - return rule.calculateQuality(q.getQuality(), newSellIn); + return rule.calculateQuality(q.getQuality(), item.sellIn); } }, (a, b) -> b).getQuality(); - item.quality = newQuality; - item.sellIn = newSellIn; } private int calculateSellIn(final String name, final int originalSellIn) {