From c31a2163ddfb6283a75a1fab75880775b5d06592 Mon Sep 17 00:00:00 2001 From: Bjorn Misseghers Date: Tue, 13 Apr 2021 11:12:26 +0200 Subject: [PATCH] Rename behavior classes Who are we to say what is regarded as 'Default behavior --- .../com/gildedrose/behavior/ItemBehaviorPicker.java | 10 +++++----- ...ityBehavior.java => DecreasingQualityBehavior.java} | 6 +++--- ...llInBehavior.java => DecreasingSellInBehavior.java} | 6 +++--- ...iorTest.java => DecreasingQualityBehaviorTest.java} | 4 ++-- ...viorTest.java => DecreasingSellInBehaviorTest.java} | 4 ++-- 5 files changed, 15 insertions(+), 15 deletions(-) rename Java/src/main/java/com/gildedrose/behavior/quality/{DefaultQualityBehavior.java => DecreasingQualityBehavior.java} (82%) rename Java/src/main/java/com/gildedrose/behavior/sellin/{DefaultSellInBehavior.java => DecreasingSellInBehavior.java} (61%) rename Java/src/test/java/com/gildedrose/behavior/quality/{DefaultQualityBehaviorTest.java => DecreasingQualityBehaviorTest.java} (93%) rename Java/src/test/java/com/gildedrose/behavior/sellin/{DefaultSellInBehaviorTest.java => DecreasingSellInBehaviorTest.java} (90%) diff --git a/Java/src/main/java/com/gildedrose/behavior/ItemBehaviorPicker.java b/Java/src/main/java/com/gildedrose/behavior/ItemBehaviorPicker.java index edca44ec..4baab216 100644 --- a/Java/src/main/java/com/gildedrose/behavior/ItemBehaviorPicker.java +++ b/Java/src/main/java/com/gildedrose/behavior/ItemBehaviorPicker.java @@ -2,12 +2,12 @@ package com.gildedrose.behavior; import com.gildedrose.behavior.item.ItemBehavior; import com.gildedrose.behavior.item.ItemBehaviorImpl; -import com.gildedrose.behavior.quality.DefaultQualityBehavior; +import com.gildedrose.behavior.quality.DecreasingQualityBehavior; import com.gildedrose.behavior.quality.ImmutableQualityBehavior; import com.gildedrose.behavior.quality.IncreasingQualityBehavior; import com.gildedrose.behavior.quality.QualityStage; import com.gildedrose.behavior.quality.StagedIncreasingQualityBehavior; -import com.gildedrose.behavior.sellin.DefaultSellInBehavior; +import com.gildedrose.behavior.sellin.DecreasingSellInBehavior; import com.gildedrose.behavior.sellin.ImmutableSellInBehavior; import java.util.ArrayList; @@ -30,7 +30,7 @@ public class ItemBehaviorPicker { } private static ItemBehavior getAgedBrieItemBehavior() { - return ItemBehaviorImpl.of(IncreasingQualityBehavior.newInstance(), DefaultSellInBehavior.newInstance()); + return ItemBehaviorImpl.of(IncreasingQualityBehavior.newInstance(), DecreasingSellInBehavior.newInstance()); } private static ItemBehavior getSulfurusHandOfRagnarosItemBehavior() { @@ -39,10 +39,10 @@ public class ItemBehaviorPicker { private static ItemBehavior getBackstagePassesItemBehavior() { List stages = new ArrayList<>(Arrays.asList(QualityStage.of(10,2), QualityStage.of(5,3))); - return ItemBehaviorImpl.of(StagedIncreasingQualityBehavior.withStages(stages, 1), DefaultSellInBehavior.newInstance()); + return ItemBehaviorImpl.of(StagedIncreasingQualityBehavior.withStages(stages, 1), DecreasingSellInBehavior.newInstance()); } private static ItemBehavior getDefaultItemBehavior() { - return ItemBehaviorImpl.of(DefaultQualityBehavior.newInstance(), DefaultSellInBehavior.newInstance()); + return ItemBehaviorImpl.of(DecreasingQualityBehavior.newInstance(), DecreasingSellInBehavior.newInstance()); } } diff --git a/Java/src/main/java/com/gildedrose/behavior/quality/DefaultQualityBehavior.java b/Java/src/main/java/com/gildedrose/behavior/quality/DecreasingQualityBehavior.java similarity index 82% rename from Java/src/main/java/com/gildedrose/behavior/quality/DefaultQualityBehavior.java rename to Java/src/main/java/com/gildedrose/behavior/quality/DecreasingQualityBehavior.java index 3571fcd3..4b00258e 100644 --- a/Java/src/main/java/com/gildedrose/behavior/quality/DefaultQualityBehavior.java +++ b/Java/src/main/java/com/gildedrose/behavior/quality/DecreasingQualityBehavior.java @@ -2,15 +2,15 @@ package com.gildedrose.behavior.quality; import com.gildedrose.Item; -public class DefaultQualityBehavior implements QualityBehavior { +public class DecreasingQualityBehavior implements QualityBehavior { public static final int MAX_QUALITY_LEVEL = 50; public static final int MIN_QUALITY_LEVEL = 0; public static final int DEFAULT_QUALITY_DECREASE = 1; public static final int FASTER_QUALITY_DECREASE = 2; - public static DefaultQualityBehavior newInstance() { - return new DefaultQualityBehavior(); + public static DecreasingQualityBehavior newInstance() { + return new DecreasingQualityBehavior(); } @Override diff --git a/Java/src/main/java/com/gildedrose/behavior/sellin/DefaultSellInBehavior.java b/Java/src/main/java/com/gildedrose/behavior/sellin/DecreasingSellInBehavior.java similarity index 61% rename from Java/src/main/java/com/gildedrose/behavior/sellin/DefaultSellInBehavior.java rename to Java/src/main/java/com/gildedrose/behavior/sellin/DecreasingSellInBehavior.java index 962c133e..54fd7e0f 100644 --- a/Java/src/main/java/com/gildedrose/behavior/sellin/DefaultSellInBehavior.java +++ b/Java/src/main/java/com/gildedrose/behavior/sellin/DecreasingSellInBehavior.java @@ -2,10 +2,10 @@ package com.gildedrose.behavior.sellin; import com.gildedrose.Item; -public class DefaultSellInBehavior implements SellInBehavior { +public class DecreasingSellInBehavior implements SellInBehavior { - public static DefaultSellInBehavior newInstance() { - return new DefaultSellInBehavior(); + public static DecreasingSellInBehavior newInstance() { + return new DecreasingSellInBehavior(); } @Override diff --git a/Java/src/test/java/com/gildedrose/behavior/quality/DefaultQualityBehaviorTest.java b/Java/src/test/java/com/gildedrose/behavior/quality/DecreasingQualityBehaviorTest.java similarity index 93% rename from Java/src/test/java/com/gildedrose/behavior/quality/DefaultQualityBehaviorTest.java rename to Java/src/test/java/com/gildedrose/behavior/quality/DecreasingQualityBehaviorTest.java index ce5b13fd..ff53009c 100644 --- a/Java/src/test/java/com/gildedrose/behavior/quality/DefaultQualityBehaviorTest.java +++ b/Java/src/test/java/com/gildedrose/behavior/quality/DecreasingQualityBehaviorTest.java @@ -6,13 +6,13 @@ import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; -public class DefaultQualityBehaviorTest { +public class DecreasingQualityBehaviorTest { private QualityBehavior qualityBehavior; @BeforeEach public void setUp() throws Exception { - qualityBehavior = new DefaultQualityBehavior(); + qualityBehavior = new DecreasingQualityBehavior(); } @Test diff --git a/Java/src/test/java/com/gildedrose/behavior/sellin/DefaultSellInBehaviorTest.java b/Java/src/test/java/com/gildedrose/behavior/sellin/DecreasingSellInBehaviorTest.java similarity index 90% rename from Java/src/test/java/com/gildedrose/behavior/sellin/DefaultSellInBehaviorTest.java rename to Java/src/test/java/com/gildedrose/behavior/sellin/DecreasingSellInBehaviorTest.java index d2ea7514..362aa59c 100644 --- a/Java/src/test/java/com/gildedrose/behavior/sellin/DefaultSellInBehaviorTest.java +++ b/Java/src/test/java/com/gildedrose/behavior/sellin/DecreasingSellInBehaviorTest.java @@ -6,13 +6,13 @@ import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; -public class DefaultSellInBehaviorTest { +public class DecreasingSellInBehaviorTest { private SellInBehavior sellInBehavior; @BeforeEach public void setUp() throws Exception { - sellInBehavior = new DefaultSellInBehavior(); + sellInBehavior = new DecreasingSellInBehavior(); } @Test