From 2019741169ef6a97d3444cbac376f88c35329490 Mon Sep 17 00:00:00 2001 From: Aqsa Malik Date: Wed, 6 Sep 2023 16:00:40 -0400 Subject: [PATCH] Coffee shop kata project structure Signed-off-by: Aqsa Malik --- .github/workflows/solutions.yml | 2 +- .../{new-java-features-solutions => }/pom.xml | 35 +++++++------ .../coffeeshopkata}/CoffeeShopOrder.java | 34 ++++++------ .../codekatas/coffeeshopkata}/Item.java | 2 +- .../coffeeshopkata}/beverage/Americano.java | 2 +- .../coffeeshopkata}/beverage/Beverage.java | 4 +- .../coffeeshopkata}/beverage/CoffeeDrink.java | 2 +- .../beverage/DrinkTemperature.java | 2 +- .../coffeeshopkata}/beverage/FlavorSyrup.java | 2 +- .../coffeeshopkata}/beverage/Latte.java | 2 +- .../coffeeshopkata}/beverage/Macchiato.java | 2 +- .../coffeeshopkata}/beverage/MilkType.java | 2 +- .../coffeeshopkata}/beverage/Tea.java | 12 ++--- .../coffeeshopkata}/beverage/TeaType.java | 2 +- .../codekatas/coffeeshopkata}/food/Bagel.java | 2 +- .../coffeeshopkata}/food/BagelType.java | 2 +- .../coffeeshopkata}/food/BakeryItem.java | 4 +- .../coffeeshopkata}/food/Cookie.java | 2 +- .../coffeeshopkata}/food/CookieType.java | 2 +- .../codekatas/coffeeshopkata}/food/Donut.java | 2 +- .../coffeeshopkata}/food/DonutType.java | 2 +- .../coffeeshopkata}/food/SpreadType.java | 2 +- .../coffeeshopkata}/CoffeeShopTest.java | 28 +++++----- coffee-shop-kata/README.md | 26 +++++----- coffee-shop-kata/SETUP.md | 6 +-- .../{new-java-features => jdk21}/pom.xml | 42 +++++---------- .../coffeeshopkata}/CoffeeShopOrder.java | 7 +-- .../codekatas/coffeeshopkata}/Item.java | 2 +- .../coffeeshopkata}/beverage/Americano.java | 2 +- .../coffeeshopkata}/beverage/Beverage.java | 4 +- .../coffeeshopkata}/beverage/CoffeeDrink.java | 2 +- .../beverage/DrinkTemperature.java | 2 +- .../coffeeshopkata}/beverage/FlavorSyrup.java | 2 +- .../coffeeshopkata}/beverage/Latte.java | 13 ++++- .../coffeeshopkata}/beverage/Macchiato.java | 2 +- .../coffeeshopkata}/beverage/MilkType.java | 2 +- .../coffeeshopkata}/beverage/Tea.java | 12 ++++- .../coffeeshopkata}/beverage/TeaType.java | 2 +- .../codekatas/coffeeshopkata}/food/Bagel.java | 2 +- .../coffeeshopkata}/food/BagelType.java | 2 +- .../coffeeshopkata}/food/BakeryItem.java | 4 +- .../coffeeshopkata}/food/Cookie.java | 5 +- .../coffeeshopkata}/food/CookieType.java | 2 +- .../codekatas/coffeeshopkata}/food/Donut.java | 2 +- .../coffeeshopkata}/food/DonutType.java | 2 +- .../coffeeshopkata}/food/SpreadType.java | 2 +- .../coffeeshopkata}/CoffeeShopTest.java | 29 ++++++----- .../{old-java-features => jdk8}/pom.xml | 36 +++++-------- .../coffeeshopkata}/CoffeeShopOrder.java | 52 ++++++------------- .../codekatas/coffeeshopkata}/Item.java | 3 +- .../coffeeshopkata}/beverage/Americano.java | 3 +- .../coffeeshopkata}/beverage/Beverage.java | 4 +- .../coffeeshopkata}/beverage/CoffeeDrink.java | 2 +- .../beverage/DrinkTemperature.java | 2 +- .../coffeeshopkata}/beverage/FlavorSyrup.java | 2 +- .../coffeeshopkata}/beverage/Latte.java | 2 +- .../coffeeshopkata}/beverage/Macchiato.java | 9 +++- .../coffeeshopkata}/beverage/MilkType.java | 2 +- .../coffeeshopkata}/beverage/Tea.java | 12 ++--- .../coffeeshopkata}/beverage/TeaType.java | 2 +- .../codekatas/coffeeshopkata}/food/Bagel.java | 2 +- .../coffeeshopkata}/food/BagelType.java | 2 +- .../coffeeshopkata}/food/BakeryItem.java | 5 +- .../coffeeshopkata}/food/Cookie.java | 2 +- .../coffeeshopkata}/food/CookieType.java | 2 +- .../codekatas/coffeeshopkata}/food/Donut.java | 2 +- .../coffeeshopkata}/food/DonutType.java | 2 +- .../coffeeshopkata}/food/SpreadType.java | 2 +- .../coffeeshopkata}/CoffeeShopTest.java | 20 ++++--- coffee-shop-kata/pom.xml | 46 ++++++++++------ pom.xml | 2 +- 71 files changed, 268 insertions(+), 277 deletions(-) rename coffee-shop-kata-solutions/{new-java-features-solutions => }/pom.xml (73%) rename coffee-shop-kata-solutions/{new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata => src/main/java/bnymellon/codekatas/coffeeshopkata}/CoffeeShopOrder.java (81%) rename {coffee-shop-kata/old-java-features/src/main/java/bnymellon/codekatas/coffeekata => coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata}/Item.java (93%) rename {coffee-shop-kata/new-java-features/src/main/java/bnymellon/codekatas/coffeekata => coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata}/beverage/Americano.java (95%) rename coffee-shop-kata-solutions/{new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata => src/main/java/bnymellon/codekatas/coffeeshopkata}/beverage/Beverage.java (86%) rename coffee-shop-kata-solutions/{new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata => src/main/java/bnymellon/codekatas/coffeeshopkata}/beverage/CoffeeDrink.java (95%) rename {coffee-shop-kata/new-java-features/src/main/java/bnymellon/codekatas/coffeekata => coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata}/beverage/DrinkTemperature.java (92%) rename {coffee-shop-kata/new-java-features/src/main/java/bnymellon/codekatas/coffeekata => coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata}/beverage/FlavorSyrup.java (92%) rename {coffee-shop-kata/new-java-features/src/main/java/bnymellon/codekatas/coffeekata => coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata}/beverage/Latte.java (97%) rename coffee-shop-kata-solutions/{new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata => src/main/java/bnymellon/codekatas/coffeeshopkata}/beverage/Macchiato.java (96%) rename coffee-shop-kata-solutions/{new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata => src/main/java/bnymellon/codekatas/coffeeshopkata}/beverage/MilkType.java (92%) rename {coffee-shop-kata/new-java-features/src/main/java/bnymellon/codekatas/coffeekata => coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata}/beverage/Tea.java (95%) rename coffee-shop-kata-solutions/{new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata => src/main/java/bnymellon/codekatas/coffeeshopkata}/beverage/TeaType.java (92%) rename coffee-shop-kata-solutions/{new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata => src/main/java/bnymellon/codekatas/coffeeshopkata}/food/Bagel.java (94%) rename coffee-shop-kata-solutions/{new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata => src/main/java/bnymellon/codekatas/coffeeshopkata}/food/BagelType.java (93%) rename {coffee-shop-kata/old-java-features/src/main/java/bnymellon/codekatas/coffeekata => coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata}/food/BakeryItem.java (87%) rename coffee-shop-kata-solutions/{new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata => src/main/java/bnymellon/codekatas/coffeeshopkata}/food/Cookie.java (94%) rename coffee-shop-kata-solutions/{new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata => src/main/java/bnymellon/codekatas/coffeeshopkata}/food/CookieType.java (93%) rename coffee-shop-kata-solutions/{new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata => src/main/java/bnymellon/codekatas/coffeeshopkata}/food/Donut.java (93%) rename coffee-shop-kata-solutions/{new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata => src/main/java/bnymellon/codekatas/coffeeshopkata}/food/DonutType.java (93%) rename coffee-shop-kata-solutions/{new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata => src/main/java/bnymellon/codekatas/coffeeshopkata}/food/SpreadType.java (93%) rename coffee-shop-kata-solutions/{new-java-features-solutions/src/test/java => src/test/java/bnymellon/codekata/coffeeshopkata}/CoffeeShopTest.java (81%) rename coffee-shop-kata/{new-java-features => jdk21}/pom.xml (54%) rename coffee-shop-kata/{new-java-features/src/main/java/bnymellon/codekatas/coffeekata => jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata}/CoffeeShopOrder.java (89%) rename {coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata => coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata}/Item.java (93%) rename {coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata => coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata}/beverage/Americano.java (95%) rename coffee-shop-kata/{new-java-features/src/main/java/bnymellon/codekatas/coffeekata => jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata}/beverage/Beverage.java (86%) rename coffee-shop-kata/{new-java-features/src/main/java/bnymellon/codekatas/coffeekata => jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata}/beverage/CoffeeDrink.java (95%) rename {coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata => coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata}/beverage/DrinkTemperature.java (92%) rename coffee-shop-kata/{old-java-features/src/main/java/bnymellon/codekatas/coffeekata => jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata}/beverage/FlavorSyrup.java (92%) rename coffee-shop-kata/{old-java-features/src/main/java/bnymellon/codekatas/coffeekata => jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata}/beverage/Latte.java (78%) rename coffee-shop-kata/{new-java-features/src/main/java/bnymellon/codekatas/coffeekata => jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata}/beverage/Macchiato.java (96%) rename coffee-shop-kata/{new-java-features/src/main/java/bnymellon/codekatas/coffeekata => jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata}/beverage/MilkType.java (92%) rename coffee-shop-kata/{old-java-features/src/main/java/bnymellon/codekatas/coffeekata => jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata}/beverage/Tea.java (77%) rename coffee-shop-kata/{new-java-features/src/main/java/bnymellon/codekatas/coffeekata => jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata}/beverage/TeaType.java (92%) rename coffee-shop-kata/{new-java-features/src/main/java/bnymellon/codekatas/coffeekata => jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata}/food/Bagel.java (97%) rename coffee-shop-kata/{new-java-features/src/main/java/bnymellon/codekatas/coffeekata => jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata}/food/BagelType.java (93%) rename {coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata => coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata}/food/BakeryItem.java (87%) rename coffee-shop-kata/{new-java-features/src/main/java/bnymellon/codekatas/coffeekata => jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata}/food/Cookie.java (90%) rename coffee-shop-kata/{new-java-features/src/main/java/bnymellon/codekatas/coffeekata => jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata}/food/CookieType.java (93%) rename coffee-shop-kata/{new-java-features/src/main/java/bnymellon/codekatas/coffeekata => jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata}/food/Donut.java (96%) rename coffee-shop-kata/{new-java-features/src/main/java/bnymellon/codekatas/coffeekata => jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata}/food/DonutType.java (93%) rename coffee-shop-kata/{new-java-features/src/main/java/bnymellon/codekatas/coffeekata => jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata}/food/SpreadType.java (93%) rename coffee-shop-kata/{new-java-features/src/test/java => jdk21/src/test/java/bnymellon/codekatas/coffeeshopkata}/CoffeeShopTest.java (85%) rename coffee-shop-kata/{old-java-features => jdk8}/pom.xml (64%) rename coffee-shop-kata/{old-java-features/src/main/java/bnymellon/codekatas/coffeekata => jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata}/CoffeeShopOrder.java (73%) rename coffee-shop-kata/{new-java-features/src/main/java/bnymellon/codekatas/coffeekata => jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata}/Item.java (93%) rename coffee-shop-kata/{old-java-features/src/main/java/bnymellon/codekatas/coffeekata => jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata}/beverage/Americano.java (95%) rename coffee-shop-kata/{old-java-features/src/main/java/bnymellon/codekatas/coffeekata => jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata}/beverage/Beverage.java (86%) rename coffee-shop-kata/{old-java-features/src/main/java/bnymellon/codekatas/coffeekata => jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata}/beverage/CoffeeDrink.java (92%) rename coffee-shop-kata/{old-java-features/src/main/java/bnymellon/codekatas/coffeekata => jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata}/beverage/DrinkTemperature.java (92%) rename {coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata => coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata}/beverage/FlavorSyrup.java (92%) rename {coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata => coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata}/beverage/Latte.java (97%) rename coffee-shop-kata/{old-java-features/src/main/java/bnymellon/codekatas/coffeekata => jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata}/beverage/Macchiato.java (88%) rename coffee-shop-kata/{old-java-features/src/main/java/bnymellon/codekatas/coffeekata => jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata}/beverage/MilkType.java (92%) rename {coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata => coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata}/beverage/Tea.java (94%) rename coffee-shop-kata/{old-java-features/src/main/java/bnymellon/codekatas/coffeekata => jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata}/beverage/TeaType.java (92%) rename coffee-shop-kata/{old-java-features/src/main/java/bnymellon/codekatas/coffeekata => jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata}/food/Bagel.java (97%) rename coffee-shop-kata/{old-java-features/src/main/java/bnymellon/codekatas/coffeekata => jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata}/food/BagelType.java (93%) rename coffee-shop-kata/{new-java-features/src/main/java/bnymellon/codekatas/coffeekata => jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata}/food/BakeryItem.java (87%) rename coffee-shop-kata/{old-java-features/src/main/java/bnymellon/codekatas/coffeekata => jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata}/food/Cookie.java (97%) rename coffee-shop-kata/{old-java-features/src/main/java/bnymellon/codekatas/coffeekata => jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata}/food/CookieType.java (93%) rename coffee-shop-kata/{old-java-features/src/main/java/bnymellon/codekatas/coffeekata => jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata}/food/Donut.java (96%) rename coffee-shop-kata/{old-java-features/src/main/java/bnymellon/codekatas/coffeekata => jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata}/food/DonutType.java (93%) rename coffee-shop-kata/{old-java-features/src/main/java/bnymellon/codekatas/coffeekata => jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata}/food/SpreadType.java (93%) rename coffee-shop-kata/{old-java-features/src/test/java => jdk8/src/test/java/bnymellon/codekatas/coffeeshopkata}/CoffeeShopTest.java (86%) diff --git a/.github/workflows/solutions.yml b/.github/workflows/solutions.yml index 393818d7..1605fe55 100644 --- a/.github/workflows/solutions.yml +++ b/.github/workflows/solutions.yml @@ -47,6 +47,6 @@ jobs: restore-keys: | ${{ runner.os }}-maven- - name: Maven - run: mvn -pl calendar-kata-solutions,code-point-kata-solutions,deck-of-cards-kata-solutions,donut-kata-solutions,java-lambda-kata-solutions,pitest-mutation-kata-solutions,coffee-shop-kata-solutions/new-java-features-solutions,kata-of-katas-solutions verify -Dmaven.javadoc.skip=true -B -V --no-transfer-progress + run: mvn -pl calendar-kata-solutions,code-point-kata-solutions,deck-of-cards-kata-solutions,donut-kata-solutions,java-lambda-kata-solutions,pitest-mutation-kata-solutions,coffee-shop-kata-solutions,kata-of-katas-solutions verify -Dmaven.javadoc.skip=true -B -V --no-transfer-progress env: MAVEN_OPTS: "-Dmaven.repo.local=$HOME/.m2/repository -Xmx1g -Dorg.slf4j.simpleLogger.showDateTime=true -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss:SSS" diff --git a/coffee-shop-kata-solutions/new-java-features-solutions/pom.xml b/coffee-shop-kata-solutions/pom.xml similarity index 73% rename from coffee-shop-kata-solutions/new-java-features-solutions/pom.xml rename to coffee-shop-kata-solutions/pom.xml index 5eeffde9..44bcd3a7 100644 --- a/coffee-shop-kata-solutions/new-java-features-solutions/pom.xml +++ b/coffee-shop-kata-solutions/pom.xml @@ -21,8 +21,9 @@ 4.0.0 bnymellon.codekatas - 1.0.0 - new-java-features-solutions + 1.0.0-SNAPSHOT + + coffee-shop-kata-solutions Coffee Shop Kata Solutions @@ -31,35 +32,35 @@ UTF-8 - - 20 - 20 + 21 + 21 5.9.3 + + + + org.junit.jupiter + junit-jupiter + ${junit5.version} + test + + + + org.junit.jupiter junit-jupiter - ${junit5.version} - test + - - org.apache.maven.plugins - maven-compiler-plugin - - 21 - 21 - - 3.11.0 - org.apache.maven.plugins maven-surefire-plugin - 2.22.2 + 3.1.2 --enable-preview diff --git a/coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/CoffeeShopOrder.java b/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/CoffeeShopOrder.java similarity index 81% rename from coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/CoffeeShopOrder.java rename to coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/CoffeeShopOrder.java index c9387d41..10449b60 100644 --- a/coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/CoffeeShopOrder.java +++ b/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/CoffeeShopOrder.java @@ -14,24 +14,24 @@ * limitations under the License. */ -package bnymellon.codekatas.coffeekata; +package bnymellon.codekatas.coffeeshopkata; -import bnymellon.codekatas.coffeekata.beverage.Americano; -import bnymellon.codekatas.coffeekata.beverage.CoffeeDrink; -import bnymellon.codekatas.coffeekata.beverage.DrinkTemperature; -import bnymellon.codekatas.coffeekata.beverage.FlavorSyrup; -import bnymellon.codekatas.coffeekata.beverage.Latte; -import bnymellon.codekatas.coffeekata.beverage.Macchiato; -import bnymellon.codekatas.coffeekata.beverage.MilkType; -import bnymellon.codekatas.coffeekata.beverage.Tea; -import bnymellon.codekatas.coffeekata.beverage.TeaType; -import bnymellon.codekatas.coffeekata.food.Bagel; -import bnymellon.codekatas.coffeekata.food.BagelType; -import bnymellon.codekatas.coffeekata.food.Cookie; -import bnymellon.codekatas.coffeekata.food.CookieType; -import bnymellon.codekatas.coffeekata.food.Donut; -import bnymellon.codekatas.coffeekata.food.DonutType; -import bnymellon.codekatas.coffeekata.food.SpreadType; +import bnymellon.codekatas.coffeeshopkata.beverage.Americano; +import bnymellon.codekatas.coffeeshopkata.beverage.CoffeeDrink; +import bnymellon.codekatas.coffeeshopkata.beverage.DrinkTemperature; +import bnymellon.codekatas.coffeeshopkata.beverage.FlavorSyrup; +import bnymellon.codekatas.coffeeshopkata.beverage.Latte; +import bnymellon.codekatas.coffeeshopkata.beverage.Macchiato; +import bnymellon.codekatas.coffeeshopkata.beverage.MilkType; +import bnymellon.codekatas.coffeeshopkata.beverage.Tea; +import bnymellon.codekatas.coffeeshopkata.beverage.TeaType; +import bnymellon.codekatas.coffeeshopkata.food.Bagel; +import bnymellon.codekatas.coffeeshopkata.food.BagelType; +import bnymellon.codekatas.coffeeshopkata.food.Cookie; +import bnymellon.codekatas.coffeeshopkata.food.CookieType; +import bnymellon.codekatas.coffeeshopkata.food.Donut; +import bnymellon.codekatas.coffeeshopkata.food.DonutType; +import bnymellon.codekatas.coffeeshopkata.food.SpreadType; import java.util.ArrayList; import java.util.List; diff --git a/coffee-shop-kata/old-java-features/src/main/java/bnymellon/codekatas/coffeekata/Item.java b/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/Item.java similarity index 93% rename from coffee-shop-kata/old-java-features/src/main/java/bnymellon/codekatas/coffeekata/Item.java rename to coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/Item.java index 76685d42..edd0f136 100644 --- a/coffee-shop-kata/old-java-features/src/main/java/bnymellon/codekatas/coffeekata/Item.java +++ b/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/Item.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package bnymellon.codekatas.coffeekata; +package bnymellon.codekatas.coffeeshopkata; public interface Item { diff --git a/coffee-shop-kata/new-java-features/src/main/java/bnymellon/codekatas/coffeekata/beverage/Americano.java b/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Americano.java similarity index 95% rename from coffee-shop-kata/new-java-features/src/main/java/bnymellon/codekatas/coffeekata/beverage/Americano.java rename to coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Americano.java index b897a023..878fe1da 100644 --- a/coffee-shop-kata/new-java-features/src/main/java/bnymellon/codekatas/coffeekata/beverage/Americano.java +++ b/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Americano.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package bnymellon.codekatas.coffeekata.beverage; +package bnymellon.codekatas.coffeeshopkata.beverage; public final class Americano implements CoffeeDrink { diff --git a/coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/beverage/Beverage.java b/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Beverage.java similarity index 86% rename from coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/beverage/Beverage.java rename to coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Beverage.java index c4fa3a6e..e5a9bb40 100644 --- a/coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/beverage/Beverage.java +++ b/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Beverage.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package bnymellon.codekatas.coffeekata.beverage; +package bnymellon.codekatas.coffeeshopkata.beverage; -import bnymellon.codekatas.coffeekata.Item; +import bnymellon.codekatas.coffeeshopkata.Item; public interface Beverage extends Item { diff --git a/coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/beverage/CoffeeDrink.java b/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/CoffeeDrink.java similarity index 95% rename from coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/beverage/CoffeeDrink.java rename to coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/CoffeeDrink.java index bfc1069c..8d9d886a 100644 --- a/coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/beverage/CoffeeDrink.java +++ b/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/CoffeeDrink.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package bnymellon.codekatas.coffeekata.beverage; +package bnymellon.codekatas.coffeeshopkata.beverage; /** * Prior to Java 15, a class was either declared as 'final' or left 'open,' diff --git a/coffee-shop-kata/new-java-features/src/main/java/bnymellon/codekatas/coffeekata/beverage/DrinkTemperature.java b/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/DrinkTemperature.java similarity index 92% rename from coffee-shop-kata/new-java-features/src/main/java/bnymellon/codekatas/coffeekata/beverage/DrinkTemperature.java rename to coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/DrinkTemperature.java index 2accc13d..7c9b59ba 100644 --- a/coffee-shop-kata/new-java-features/src/main/java/bnymellon/codekatas/coffeekata/beverage/DrinkTemperature.java +++ b/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/DrinkTemperature.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package bnymellon.codekatas.coffeekata.beverage; +package bnymellon.codekatas.coffeeshopkata.beverage; public enum DrinkTemperature { diff --git a/coffee-shop-kata/new-java-features/src/main/java/bnymellon/codekatas/coffeekata/beverage/FlavorSyrup.java b/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/FlavorSyrup.java similarity index 92% rename from coffee-shop-kata/new-java-features/src/main/java/bnymellon/codekatas/coffeekata/beverage/FlavorSyrup.java rename to coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/FlavorSyrup.java index ee9ac59a..f6b94288 100644 --- a/coffee-shop-kata/new-java-features/src/main/java/bnymellon/codekatas/coffeekata/beverage/FlavorSyrup.java +++ b/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/FlavorSyrup.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package bnymellon.codekatas.coffeekata.beverage; +package bnymellon.codekatas.coffeeshopkata.beverage; public enum FlavorSyrup { diff --git a/coffee-shop-kata/new-java-features/src/main/java/bnymellon/codekatas/coffeekata/beverage/Latte.java b/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Latte.java similarity index 97% rename from coffee-shop-kata/new-java-features/src/main/java/bnymellon/codekatas/coffeekata/beverage/Latte.java rename to coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Latte.java index 1654db5f..77c87f18 100644 --- a/coffee-shop-kata/new-java-features/src/main/java/bnymellon/codekatas/coffeekata/beverage/Latte.java +++ b/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Latte.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package bnymellon.codekatas.coffeekata.beverage; +package bnymellon.codekatas.coffeeshopkata.beverage; public final class Latte implements CoffeeDrink { diff --git a/coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/beverage/Macchiato.java b/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Macchiato.java similarity index 96% rename from coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/beverage/Macchiato.java rename to coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Macchiato.java index 74b690c4..9c185bd4 100644 --- a/coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/beverage/Macchiato.java +++ b/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Macchiato.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package bnymellon.codekatas.coffeekata.beverage; +package bnymellon.codekatas.coffeeshopkata.beverage; public non-sealed class Macchiato implements CoffeeDrink { diff --git a/coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/beverage/MilkType.java b/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/MilkType.java similarity index 92% rename from coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/beverage/MilkType.java rename to coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/MilkType.java index 57e135b1..ff7984c7 100644 --- a/coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/beverage/MilkType.java +++ b/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/MilkType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package bnymellon.codekatas.coffeekata.beverage; +package bnymellon.codekatas.coffeeshopkata.beverage; public enum MilkType { diff --git a/coffee-shop-kata/new-java-features/src/main/java/bnymellon/codekatas/coffeekata/beverage/Tea.java b/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Tea.java similarity index 95% rename from coffee-shop-kata/new-java-features/src/main/java/bnymellon/codekatas/coffeekata/beverage/Tea.java rename to coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Tea.java index 14415f7b..089b60de 100644 --- a/coffee-shop-kata/new-java-features/src/main/java/bnymellon/codekatas/coffeekata/beverage/Tea.java +++ b/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Tea.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package bnymellon.codekatas.coffeekata.beverage; +package bnymellon.codekatas.coffeeshopkata.beverage; public class Tea implements Beverage { @@ -31,14 +31,14 @@ public double getPrice() return 1.50; } - public TeaType getTeaType() - { - return teaType; - } - @Override public String toString() { return teaType + " " + "Tea"; } + + public TeaType getTeaType() + { + return teaType; + } } diff --git a/coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/beverage/TeaType.java b/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/TeaType.java similarity index 92% rename from coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/beverage/TeaType.java rename to coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/TeaType.java index 7bf89dd0..3fb2976f 100644 --- a/coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/beverage/TeaType.java +++ b/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/TeaType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package bnymellon.codekatas.coffeekata.beverage; +package bnymellon.codekatas.coffeeshopkata.beverage; public enum TeaType { diff --git a/coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/food/Bagel.java b/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/food/Bagel.java similarity index 94% rename from coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/food/Bagel.java rename to coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/food/Bagel.java index 8300fe65..ef1de12b 100644 --- a/coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/food/Bagel.java +++ b/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/food/Bagel.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package bnymellon.codekatas.coffeekata.food; +package bnymellon.codekatas.coffeeshopkata.food; public record Bagel(BagelType bagelType, SpreadType spreadType, boolean toasted) implements BakeryItem { diff --git a/coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/food/BagelType.java b/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/food/BagelType.java similarity index 93% rename from coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/food/BagelType.java rename to coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/food/BagelType.java index d6fe0e59..5d0c8e14 100644 --- a/coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/food/BagelType.java +++ b/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/food/BagelType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package bnymellon.codekatas.coffeekata.food; +package bnymellon.codekatas.coffeeshopkata.food; public enum BagelType { diff --git a/coffee-shop-kata/old-java-features/src/main/java/bnymellon/codekatas/coffeekata/food/BakeryItem.java b/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/food/BakeryItem.java similarity index 87% rename from coffee-shop-kata/old-java-features/src/main/java/bnymellon/codekatas/coffeekata/food/BakeryItem.java rename to coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/food/BakeryItem.java index a080aebd..099ba0f3 100644 --- a/coffee-shop-kata/old-java-features/src/main/java/bnymellon/codekatas/coffeekata/food/BakeryItem.java +++ b/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/food/BakeryItem.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package bnymellon.codekatas.coffeekata.food; +package bnymellon.codekatas.coffeeshopkata.food; -import bnymellon.codekatas.coffeekata.Item; +import bnymellon.codekatas.coffeeshopkata.Item; public interface BakeryItem extends Item { diff --git a/coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/food/Cookie.java b/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/food/Cookie.java similarity index 94% rename from coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/food/Cookie.java rename to coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/food/Cookie.java index 04b13228..7f45f885 100644 --- a/coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/food/Cookie.java +++ b/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/food/Cookie.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package bnymellon.codekatas.coffeekata.food; +package bnymellon.codekatas.coffeeshopkata.food; public record Cookie(CookieType cookieType, boolean warmed) implements BakeryItem { diff --git a/coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/food/CookieType.java b/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/food/CookieType.java similarity index 93% rename from coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/food/CookieType.java rename to coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/food/CookieType.java index 5653c027..26bc6806 100644 --- a/coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/food/CookieType.java +++ b/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/food/CookieType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package bnymellon.codekatas.coffeekata.food; +package bnymellon.codekatas.coffeeshopkata.food; public enum CookieType { diff --git a/coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/food/Donut.java b/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/food/Donut.java similarity index 93% rename from coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/food/Donut.java rename to coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/food/Donut.java index aaa8fe06..5aedfa4e 100644 --- a/coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/food/Donut.java +++ b/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/food/Donut.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package bnymellon.codekatas.coffeekata.food; +package bnymellon.codekatas.coffeeshopkata.food; public record Donut(DonutType donutType) implements BakeryItem { diff --git a/coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/food/DonutType.java b/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/food/DonutType.java similarity index 93% rename from coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/food/DonutType.java rename to coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/food/DonutType.java index 883041e8..4859d435 100644 --- a/coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/food/DonutType.java +++ b/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/food/DonutType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package bnymellon.codekatas.coffeekata.food; +package bnymellon.codekatas.coffeeshopkata.food; public enum DonutType { diff --git a/coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/food/SpreadType.java b/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/food/SpreadType.java similarity index 93% rename from coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/food/SpreadType.java rename to coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/food/SpreadType.java index 1761730a..25c42445 100644 --- a/coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/food/SpreadType.java +++ b/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeeshopkata/food/SpreadType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package bnymellon.codekatas.coffeekata.food; +package bnymellon.codekatas.coffeeshopkata.food; public enum SpreadType { diff --git a/coffee-shop-kata-solutions/new-java-features-solutions/src/test/java/CoffeeShopTest.java b/coffee-shop-kata-solutions/src/test/java/bnymellon/codekata/coffeeshopkata/CoffeeShopTest.java similarity index 81% rename from coffee-shop-kata-solutions/new-java-features-solutions/src/test/java/CoffeeShopTest.java rename to coffee-shop-kata-solutions/src/test/java/bnymellon/codekata/coffeeshopkata/CoffeeShopTest.java index 0f8d104f..24a16a2a 100644 --- a/coffee-shop-kata-solutions/new-java-features-solutions/src/test/java/CoffeeShopTest.java +++ b/coffee-shop-kata-solutions/src/test/java/bnymellon/codekata/coffeeshopkata/CoffeeShopTest.java @@ -14,24 +14,26 @@ * limitations under the License. */ -import bnymellon.codekatas.coffeekata.CoffeeShopOrder; -import bnymellon.codekatas.coffeekata.Item; -import bnymellon.codekatas.coffeekata.beverage.Americano; -import bnymellon.codekatas.coffeekata.beverage.CoffeeDrink; -import bnymellon.codekatas.coffeekata.beverage.Latte; -import bnymellon.codekatas.coffeekata.beverage.Macchiato; -import bnymellon.codekatas.coffeekata.food.Bagel; -import bnymellon.codekatas.coffeekata.food.Cookie; -import bnymellon.codekatas.coffeekata.food.Donut; +package bnymellon.codekata.coffeeshopkata; + +import bnymellon.codekatas.coffeeshopkata.CoffeeShopOrder; +import bnymellon.codekatas.coffeeshopkata.Item; +import bnymellon.codekatas.coffeeshopkata.beverage.Americano; +import bnymellon.codekatas.coffeeshopkata.beverage.CoffeeDrink; +import bnymellon.codekatas.coffeeshopkata.beverage.Latte; +import bnymellon.codekatas.coffeeshopkata.beverage.Macchiato; +import bnymellon.codekatas.coffeeshopkata.food.Bagel; +import bnymellon.codekatas.coffeeshopkata.food.Cookie; +import bnymellon.codekatas.coffeeshopkata.food.Donut; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import java.util.List; -import static bnymellon.codekatas.coffeekata.food.BagelType.EVERYTHING; -import static bnymellon.codekatas.coffeekata.food.CookieType.CHOCOLATE_CHIP; -import static bnymellon.codekatas.coffeekata.food.DonutType.GLAZED; -import static bnymellon.codekatas.coffeekata.food.SpreadType.HERB_GARLIC_CREAM_CHEESE; +import static bnymellon.codekatas.coffeeshopkata.food.BagelType.EVERYTHING; +import static bnymellon.codekatas.coffeeshopkata.food.CookieType.CHOCOLATE_CHIP; +import static bnymellon.codekatas.coffeeshopkata.food.DonutType.GLAZED; +import static bnymellon.codekatas.coffeeshopkata.food.SpreadType.HERB_GARLIC_CREAM_CHEESE; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/coffee-shop-kata/README.md b/coffee-shop-kata/README.md index 1a357abe..0db20785 100644 --- a/coffee-shop-kata/README.md +++ b/coffee-shop-kata/README.md @@ -5,20 +5,20 @@ Java features while comparing them with older. The domain for the kata is a Coffee Shop. There are several domain classes that are shared by all the exercises. These are -[`Items`](./old-java-features/src/main/java/bnymellon/codekatas/coffeekata/Item.java), -[`CoffeeShopOrder`](./old-java-features/src/main/java/bnymellon/codekatas/coffeekata/CoffeeShopOrder.java), -[`Beverage`](./old-java-features/src/main/java/bnymellon/codekatas/coffeekata/beverage/Beverage.java), -[`Tea`](./old-java-features/src/main/java/bnymellon/codekatas/coffeekata/beverage/Tea.java), -[`CoffeeDrink`](./old-java-features/src/main/java/bnymellon/codekatas/coffeekata/beverage/CoffeeDrink.java), -[`Latte`](./old-java-features/src/main/java/bnymellon/codekatas/coffeekata/beverage/Latte.java), -[`Macchiato`](./old-java-features/src/main/java/bnymellon/codekatas/coffeekata/beverage/Macchiato.java), -[`Americano`](./old-java-features/src/main/java/bnymellon/codekatas/coffeekata/beverage/Americano.java), -[`BakeryItem`](./old-java-features/src/main/java/bnymellon/codekatas/coffeekata/food/BakeryItem.java), -[`Cookie`](./old-java-features/src/main/java/bnymellon/codekatas/coffeekata/food/Cookie.java), -[`Bagel`](./old-java-features/src/main/java/bnymellon/codekatas/coffeekata/food/Bagel.java), and -[`Donut`](./old-java-features/src/main/java/bnymellon/codekatas/coffeekata/food/Donut.java). +[`Items`](src/main/java/bnymellon/codekatas/coffeeshopkata/Item.java), +[`CoffeeShopOrder`](src/main/java/bnymellon/codekatas/coffeeshopkata/CoffeeShopOrder.java), +[`Beverage`](jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Beverage.java), +[`Tea`](jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Tea.java), +[`CoffeeDrink`](jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/CoffeeDrink.java), +[`Latte`](jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Latte.java), +[`Macchiato`](jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Macchiato.java), +[`Americano`](jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Americano.java), +[`BakeryItem`](jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/food/BakeryItem.java), +[`Cookie`](jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/food/Cookie.java), +[`Bagel`](jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/food/Bagel.java), and +[`Donut`](jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/food/Donut.java). ![Diagram](CoffeeShopDomain.png) ## Getting Started ## -This kata involves refactoring existing code and implementing missing code! In the [`new-java-features`](./new-java-features) module, you will find a test class called [CoffeeShopTest](./new-java-features/src/test/java/CoffeeShopTest.java). Each test case contains a TODO that needs to be completed in order to make the code pass. All the code you need to complete is in the [`new-java-features`](./new-java-features) module, with the corresponding solutions in [`coffee-shop-kata-solutions/new-java-features`](../coffee-shop-kata-solutions/new-java-features-solutions). The purpose of the [`old-java-features`](./old-java-features) module is to show you the Java 8 way of solving these problems; there are no TODOs in this module. For technical setup, follow the instructions in [`SETUP.md`](./SETUP.md)! \ No newline at end of file +This kata involves refactoring existing code and implementing missing code! In the [`new-java-features`](./new-java-features) module, you will find a test class called [bnymellon.codekata.coffeeshopkata.CoffeeShopTest](src/test/java/bnymellon/codekata/coffeeshopkata/jdk21/bnymellon.codekata.coffeeshopkata.CoffeeShopTest.java). Each test case contains a TODO that needs to be completed in order to make the code pass. All the code you need to complete is in the [`new-java-features`](./new-java-features) module, with the corresponding solutions in [`coffee-shop-kata-solutions/new-java-features`](../coffee-shop-kata-solutions/new-java-features-solutions). The purpose of the [`old-java-features`](./old-java-features) module is to show you the Java 8 way of solving these problems; there are no TODOs in this module. For technical setup, follow the instructions in [`SETUP.md`](./SETUP.md)! \ No newline at end of file diff --git a/coffee-shop-kata/SETUP.md b/coffee-shop-kata/SETUP.md index 39bd73c5..aca4ff63 100644 --- a/coffee-shop-kata/SETUP.md +++ b/coffee-shop-kata/SETUP.md @@ -9,9 +9,9 @@ #### Test Java 8 module 1. Verify that the module old-java-features uses JDK 8 -2. Run [CoffeeShopTest](/old-java-features/src/test/java/CoffeeShopTest.java), all tests should pass +2. Run [bnymellon.codekata.coffeeshopkata.CoffeeShopTest](/old-java-features/src/test/java/bnymellon.codekata.coffeeshopkata.CoffeeShopTest.java), all tests should pass #### Test Java 21 module 1. Verify that the module old-java-features uses JDK 20 -2. Run [CoffeeShopTest](/new-java-features/src/test/java/CoffeeShopTest.java), most tests should fail +2. Run [bnymellon.codekata.coffeeshopkata.CoffeeShopTest](/bnymellon/codekata/coffeeshopkata/newjavafeatures/bnymellon.codekata.coffeeshopkata.CoffeeShopTest.java), most tests should fail #### Get started -* Make the failing tests in [CoffeeShopTest](/new-java-features/src/test/java/CoffeeShopTest.java) pass by following and completing TODOs \ No newline at end of file +* Make the failing tests in [bnymellon.codekata.coffeeshopkata.CoffeeShopTest](/bnymellon/codekata/coffeeshopkata/newjavafeatures/bnymellon.codekata.coffeeshopkata.CoffeeShopTest.java) pass by following and completing TODOs \ No newline at end of file diff --git a/coffee-shop-kata/new-java-features/pom.xml b/coffee-shop-kata/jdk21/pom.xml similarity index 54% rename from coffee-shop-kata/new-java-features/pom.xml rename to coffee-shop-kata/jdk21/pom.xml index a3e71cfd..be277dff 100644 --- a/coffee-shop-kata/new-java-features/pom.xml +++ b/coffee-shop-kata/jdk21/pom.xml @@ -19,43 +19,27 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + + bnymellon.codekatas + code-katas + 1.0.0-SNAPSHOT + ../../pom.xml + - bnymellon.codekatas - 1.0.0 - new-java-features - - Coffee Shop Kata - - The Coffee Shop Kata can help developers learn the latest Java features. - + jdk21 + 21 + 21 UTF-8 - - 20 - 20 - 5.9.3 org.junit.jupiter - junit-jupiter - ${junit5.version} + junit-jupiter-api + 5.10.0 + test - - - - org.apache.maven.plugins - maven-compiler-plugin - - 21 - 21 - - 3.11.0 - - - - - \ No newline at end of file + diff --git a/coffee-shop-kata/new-java-features/src/main/java/bnymellon/codekatas/coffeekata/CoffeeShopOrder.java b/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/CoffeeShopOrder.java similarity index 89% rename from coffee-shop-kata/new-java-features/src/main/java/bnymellon/codekatas/coffeekata/CoffeeShopOrder.java rename to coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/CoffeeShopOrder.java index edf85693..6cf89876 100644 --- a/coffee-shop-kata/new-java-features/src/main/java/bnymellon/codekatas/coffeekata/CoffeeShopOrder.java +++ b/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/CoffeeShopOrder.java @@ -14,14 +14,9 @@ * limitations under the License. */ -package bnymellon.codekatas.coffeekata; +package bnymellon.codekatas.coffeeshopkata; -import bnymellon.codekatas.coffeekata.beverage.Americano; -import bnymellon.codekatas.coffeekata.beverage.Latte; -import bnymellon.codekatas.coffeekata.beverage.Macchiato; -import bnymellon.codekatas.coffeekata.beverage.Tea; -import java.util.ArrayList; import java.util.List; public class CoffeeShopOrder diff --git a/coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/Item.java b/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/Item.java similarity index 93% rename from coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/Item.java rename to coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/Item.java index 76685d42..edd0f136 100644 --- a/coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/Item.java +++ b/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/Item.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package bnymellon.codekatas.coffeekata; +package bnymellon.codekatas.coffeeshopkata; public interface Item { diff --git a/coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/beverage/Americano.java b/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Americano.java similarity index 95% rename from coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/beverage/Americano.java rename to coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Americano.java index b897a023..878fe1da 100644 --- a/coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/beverage/Americano.java +++ b/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Americano.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package bnymellon.codekatas.coffeekata.beverage; +package bnymellon.codekatas.coffeeshopkata.beverage; public final class Americano implements CoffeeDrink { diff --git a/coffee-shop-kata/new-java-features/src/main/java/bnymellon/codekatas/coffeekata/beverage/Beverage.java b/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Beverage.java similarity index 86% rename from coffee-shop-kata/new-java-features/src/main/java/bnymellon/codekatas/coffeekata/beverage/Beverage.java rename to coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Beverage.java index 686a845d..e3d1070b 100644 --- a/coffee-shop-kata/new-java-features/src/main/java/bnymellon/codekatas/coffeekata/beverage/Beverage.java +++ b/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Beverage.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package bnymellon.codekatas.coffeekata.beverage; +package bnymellon.codekatas.coffeeshopkata.beverage; -import bnymellon.codekatas.coffeekata.Item; +import bnymellon.codekatas.coffeeshopkata.Item; public interface Beverage extends Item { diff --git a/coffee-shop-kata/new-java-features/src/main/java/bnymellon/codekatas/coffeekata/beverage/CoffeeDrink.java b/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/CoffeeDrink.java similarity index 95% rename from coffee-shop-kata/new-java-features/src/main/java/bnymellon/codekatas/coffeekata/beverage/CoffeeDrink.java rename to coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/CoffeeDrink.java index 7fd3d860..b452d122 100644 --- a/coffee-shop-kata/new-java-features/src/main/java/bnymellon/codekatas/coffeekata/beverage/CoffeeDrink.java +++ b/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/CoffeeDrink.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package bnymellon.codekatas.coffeekata.beverage; +package bnymellon.codekatas.coffeeshopkata.beverage; /** * Prior to Java 15, a class was either declared as 'final' or left 'open,' diff --git a/coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/beverage/DrinkTemperature.java b/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/DrinkTemperature.java similarity index 92% rename from coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/beverage/DrinkTemperature.java rename to coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/DrinkTemperature.java index 2accc13d..7c9b59ba 100644 --- a/coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/beverage/DrinkTemperature.java +++ b/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/DrinkTemperature.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package bnymellon.codekatas.coffeekata.beverage; +package bnymellon.codekatas.coffeeshopkata.beverage; public enum DrinkTemperature { diff --git a/coffee-shop-kata/old-java-features/src/main/java/bnymellon/codekatas/coffeekata/beverage/FlavorSyrup.java b/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/FlavorSyrup.java similarity index 92% rename from coffee-shop-kata/old-java-features/src/main/java/bnymellon/codekatas/coffeekata/beverage/FlavorSyrup.java rename to coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/FlavorSyrup.java index ee9ac59a..f6b94288 100644 --- a/coffee-shop-kata/old-java-features/src/main/java/bnymellon/codekatas/coffeekata/beverage/FlavorSyrup.java +++ b/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/FlavorSyrup.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package bnymellon.codekatas.coffeekata.beverage; +package bnymellon.codekatas.coffeeshopkata.beverage; public enum FlavorSyrup { diff --git a/coffee-shop-kata/old-java-features/src/main/java/bnymellon/codekatas/coffeekata/beverage/Latte.java b/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Latte.java similarity index 78% rename from coffee-shop-kata/old-java-features/src/main/java/bnymellon/codekatas/coffeekata/beverage/Latte.java rename to coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Latte.java index 6b280ed2..634ed7fb 100644 --- a/coffee-shop-kata/old-java-features/src/main/java/bnymellon/codekatas/coffeekata/beverage/Latte.java +++ b/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Latte.java @@ -14,7 +14,12 @@ * limitations under the License. */ -package bnymellon.codekatas.coffeekata.beverage; +package bnymellon.codekatas.coffeeshopkata.beverage; + +import bnymellon.codekatas.coffeeshopkata.beverage.CoffeeDrink; +import bnymellon.codekatas.coffeeshopkata.beverage.DrinkTemperature; +import bnymellon.codekatas.coffeeshopkata.beverage.FlavorSyrup; +import bnymellon.codekatas.coffeeshopkata.beverage.MilkType; public final class Latte implements CoffeeDrink { @@ -57,6 +62,12 @@ public int espressoShot() return 1; } + @Override + public String toString() + { + return drinkTemperature + " " + flavorSyrup + " Latte with " + milkType; + } + @Override public double getPrice() { diff --git a/coffee-shop-kata/new-java-features/src/main/java/bnymellon/codekatas/coffeekata/beverage/Macchiato.java b/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Macchiato.java similarity index 96% rename from coffee-shop-kata/new-java-features/src/main/java/bnymellon/codekatas/coffeekata/beverage/Macchiato.java rename to coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Macchiato.java index 64a2c32c..b2907e20 100644 --- a/coffee-shop-kata/new-java-features/src/main/java/bnymellon/codekatas/coffeekata/beverage/Macchiato.java +++ b/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Macchiato.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package bnymellon.codekatas.coffeekata.beverage; +package bnymellon.codekatas.coffeeshopkata.beverage; public final class Macchiato implements CoffeeDrink { diff --git a/coffee-shop-kata/new-java-features/src/main/java/bnymellon/codekatas/coffeekata/beverage/MilkType.java b/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/MilkType.java similarity index 92% rename from coffee-shop-kata/new-java-features/src/main/java/bnymellon/codekatas/coffeekata/beverage/MilkType.java rename to coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/MilkType.java index 57e135b1..ff7984c7 100644 --- a/coffee-shop-kata/new-java-features/src/main/java/bnymellon/codekatas/coffeekata/beverage/MilkType.java +++ b/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/MilkType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package bnymellon.codekatas.coffeekata.beverage; +package bnymellon.codekatas.coffeeshopkata.beverage; public enum MilkType { diff --git a/coffee-shop-kata/old-java-features/src/main/java/bnymellon/codekatas/coffeekata/beverage/Tea.java b/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Tea.java similarity index 77% rename from coffee-shop-kata/old-java-features/src/main/java/bnymellon/codekatas/coffeekata/beverage/Tea.java rename to coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Tea.java index 60de2a87..1bdb12b3 100644 --- a/coffee-shop-kata/old-java-features/src/main/java/bnymellon/codekatas/coffeekata/beverage/Tea.java +++ b/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Tea.java @@ -14,11 +14,13 @@ * limitations under the License. */ -package bnymellon.codekatas.coffeekata.beverage; +package bnymellon.codekatas.coffeeshopkata.beverage; + +import bnymellon.codekatas.coffeeshopkata.beverage.Beverage; +import bnymellon.codekatas.coffeeshopkata.beverage.TeaType; public class Tea implements Beverage { - private final TeaType teaType; public Tea(TeaType teaType) @@ -36,4 +38,10 @@ public TeaType getTeaType() { return teaType; } + + @Override + public String toString() + { + return teaType + " " + "Tea"; + } } diff --git a/coffee-shop-kata/new-java-features/src/main/java/bnymellon/codekatas/coffeekata/beverage/TeaType.java b/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/TeaType.java similarity index 92% rename from coffee-shop-kata/new-java-features/src/main/java/bnymellon/codekatas/coffeekata/beverage/TeaType.java rename to coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/TeaType.java index 7bf89dd0..3fb2976f 100644 --- a/coffee-shop-kata/new-java-features/src/main/java/bnymellon/codekatas/coffeekata/beverage/TeaType.java +++ b/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/TeaType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package bnymellon.codekatas.coffeekata.beverage; +package bnymellon.codekatas.coffeeshopkata.beverage; public enum TeaType { diff --git a/coffee-shop-kata/new-java-features/src/main/java/bnymellon/codekatas/coffeekata/food/Bagel.java b/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/food/Bagel.java similarity index 97% rename from coffee-shop-kata/new-java-features/src/main/java/bnymellon/codekatas/coffeekata/food/Bagel.java rename to coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/food/Bagel.java index 60e0412d..56ef599d 100644 --- a/coffee-shop-kata/new-java-features/src/main/java/bnymellon/codekatas/coffeekata/food/Bagel.java +++ b/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/food/Bagel.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package bnymellon.codekatas.coffeekata.food; +package bnymellon.codekatas.coffeeshopkata.food; import java.util.Objects; diff --git a/coffee-shop-kata/new-java-features/src/main/java/bnymellon/codekatas/coffeekata/food/BagelType.java b/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/food/BagelType.java similarity index 93% rename from coffee-shop-kata/new-java-features/src/main/java/bnymellon/codekatas/coffeekata/food/BagelType.java rename to coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/food/BagelType.java index d6fe0e59..5d0c8e14 100644 --- a/coffee-shop-kata/new-java-features/src/main/java/bnymellon/codekatas/coffeekata/food/BagelType.java +++ b/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/food/BagelType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package bnymellon.codekatas.coffeekata.food; +package bnymellon.codekatas.coffeeshopkata.food; public enum BagelType { diff --git a/coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/food/BakeryItem.java b/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/food/BakeryItem.java similarity index 87% rename from coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/food/BakeryItem.java rename to coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/food/BakeryItem.java index a080aebd..099ba0f3 100644 --- a/coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/food/BakeryItem.java +++ b/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/food/BakeryItem.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package bnymellon.codekatas.coffeekata.food; +package bnymellon.codekatas.coffeeshopkata.food; -import bnymellon.codekatas.coffeekata.Item; +import bnymellon.codekatas.coffeeshopkata.Item; public interface BakeryItem extends Item { diff --git a/coffee-shop-kata/new-java-features/src/main/java/bnymellon/codekatas/coffeekata/food/Cookie.java b/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/food/Cookie.java similarity index 90% rename from coffee-shop-kata/new-java-features/src/main/java/bnymellon/codekatas/coffeekata/food/Cookie.java rename to coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/food/Cookie.java index 6f9b6522..04f39d50 100644 --- a/coffee-shop-kata/new-java-features/src/main/java/bnymellon/codekatas/coffeekata/food/Cookie.java +++ b/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/food/Cookie.java @@ -14,7 +14,10 @@ * limitations under the License. */ -package bnymellon.codekatas.coffeekata.food; +package bnymellon.codekatas.coffeeshopkata.food; + +import bnymellon.codekatas.coffeeshopkata.food.BakeryItem; +import bnymellon.codekatas.coffeeshopkata.food.CookieType; import java.util.Objects; diff --git a/coffee-shop-kata/new-java-features/src/main/java/bnymellon/codekatas/coffeekata/food/CookieType.java b/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/food/CookieType.java similarity index 93% rename from coffee-shop-kata/new-java-features/src/main/java/bnymellon/codekatas/coffeekata/food/CookieType.java rename to coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/food/CookieType.java index 5653c027..26bc6806 100644 --- a/coffee-shop-kata/new-java-features/src/main/java/bnymellon/codekatas/coffeekata/food/CookieType.java +++ b/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/food/CookieType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package bnymellon.codekatas.coffeekata.food; +package bnymellon.codekatas.coffeeshopkata.food; public enum CookieType { diff --git a/coffee-shop-kata/new-java-features/src/main/java/bnymellon/codekatas/coffeekata/food/Donut.java b/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/food/Donut.java similarity index 96% rename from coffee-shop-kata/new-java-features/src/main/java/bnymellon/codekatas/coffeekata/food/Donut.java rename to coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/food/Donut.java index 3f114766..2f52c40b 100644 --- a/coffee-shop-kata/new-java-features/src/main/java/bnymellon/codekatas/coffeekata/food/Donut.java +++ b/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/food/Donut.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package bnymellon.codekatas.coffeekata.food; +package bnymellon.codekatas.coffeeshopkata.food; import java.util.Objects; diff --git a/coffee-shop-kata/new-java-features/src/main/java/bnymellon/codekatas/coffeekata/food/DonutType.java b/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/food/DonutType.java similarity index 93% rename from coffee-shop-kata/new-java-features/src/main/java/bnymellon/codekatas/coffeekata/food/DonutType.java rename to coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/food/DonutType.java index 883041e8..4859d435 100644 --- a/coffee-shop-kata/new-java-features/src/main/java/bnymellon/codekatas/coffeekata/food/DonutType.java +++ b/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/food/DonutType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package bnymellon.codekatas.coffeekata.food; +package bnymellon.codekatas.coffeeshopkata.food; public enum DonutType { diff --git a/coffee-shop-kata/new-java-features/src/main/java/bnymellon/codekatas/coffeekata/food/SpreadType.java b/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/food/SpreadType.java similarity index 93% rename from coffee-shop-kata/new-java-features/src/main/java/bnymellon/codekatas/coffeekata/food/SpreadType.java rename to coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/food/SpreadType.java index 1761730a..25c42445 100644 --- a/coffee-shop-kata/new-java-features/src/main/java/bnymellon/codekatas/coffeekata/food/SpreadType.java +++ b/coffee-shop-kata/jdk21/src/main/java/bnymellon/codekatas/coffeeshopkata/food/SpreadType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package bnymellon.codekatas.coffeekata.food; +package bnymellon.codekatas.coffeeshopkata.food; public enum SpreadType { diff --git a/coffee-shop-kata/new-java-features/src/test/java/CoffeeShopTest.java b/coffee-shop-kata/jdk21/src/test/java/bnymellon/codekatas/coffeeshopkata/CoffeeShopTest.java similarity index 85% rename from coffee-shop-kata/new-java-features/src/test/java/CoffeeShopTest.java rename to coffee-shop-kata/jdk21/src/test/java/bnymellon/codekatas/coffeeshopkata/CoffeeShopTest.java index 022bf65a..a56fa2a2 100644 --- a/coffee-shop-kata/new-java-features/src/test/java/CoffeeShopTest.java +++ b/coffee-shop-kata/jdk21/src/test/java/bnymellon/codekatas/coffeeshopkata/CoffeeShopTest.java @@ -14,31 +14,32 @@ * limitations under the License. */ -import bnymellon.codekatas.coffeekata.CoffeeShopOrder; -import bnymellon.codekatas.coffeekata.Item; -import bnymellon.codekatas.coffeekata.beverage.Americano; -import bnymellon.codekatas.coffeekata.beverage.CoffeeDrink; -import bnymellon.codekatas.coffeekata.beverage.Latte; -import bnymellon.codekatas.coffeekata.beverage.Macchiato; -import bnymellon.codekatas.coffeekata.food.*; +package bnymellon.codekatas.coffeeshopkata; + +import bnymellon.codekatas.coffeeshopkata.beverage.Americano; +import bnymellon.codekatas.coffeeshopkata.beverage.CoffeeDrink; +import bnymellon.codekatas.coffeeshopkata.beverage.Latte; +import bnymellon.codekatas.coffeeshopkata.beverage.Macchiato; +import bnymellon.codekatas.coffeeshopkata.food.Bagel; +import bnymellon.codekatas.coffeeshopkata.food.Cookie; +import bnymellon.codekatas.coffeeshopkata.food.Donut; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; -import static bnymellon.codekatas.coffeekata.food.BagelType.EVERYTHING; -import static bnymellon.codekatas.coffeekata.food.CookieType.CHOCOLATE_CHIP; -import static bnymellon.codekatas.coffeekata.food.DonutType.GLAZED; -import static bnymellon.codekatas.coffeekata.food.SpreadType.HERB_GARLIC_CREAM_CHEESE; +import static bnymellon.codekatas.coffeeshopkata.food.BagelType.EVERYTHING; +import static bnymellon.codekatas.coffeeshopkata.food.CookieType.CHOCOLATE_CHIP; +import static bnymellon.codekatas.coffeeshopkata.food.DonutType.GLAZED; +import static bnymellon.codekatas.coffeeshopkata.food.SpreadType.HERB_GARLIC_CREAM_CHEESE; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; public class CoffeeShopTest { - - List itemList; + private List itemList; private CoffeeShopOrder coffeeShopOrder; private Bagel bagel1; private Cookie cookie1; @@ -149,4 +150,4 @@ public void getDrinkItems() "HOT VANILLA Macchiato with WHOLE_MILK", "MATCHA Tea"); assertEquals(expected, coffeeShopOrder.getDrinkForOrder()); } -} +} \ No newline at end of file diff --git a/coffee-shop-kata/old-java-features/pom.xml b/coffee-shop-kata/jdk8/pom.xml similarity index 64% rename from coffee-shop-kata/old-java-features/pom.xml rename to coffee-shop-kata/jdk8/pom.xml index 5ad94454..b6ca98f9 100644 --- a/coffee-shop-kata/old-java-features/pom.xml +++ b/coffee-shop-kata/jdk8/pom.xml @@ -19,40 +19,28 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + + bnymellon.codekatas + code-katas + 1.0.0-SNAPSHOT + ../../pom.xml + - bnymellon.codekatas - 1.0.0 - old-java-features - - Coffee Shop Kata - - The Coffee Shop Kata can help developers understand older Java features. - + jdk8 - UTF-8 - 8 8 - 5.9.3 + UTF-8 org.junit.jupiter - junit-jupiter - ${junit5.version} + junit-jupiter-api + 5.10.0 + test - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.11.0 - - - - - \ No newline at end of file + diff --git a/coffee-shop-kata/old-java-features/src/main/java/bnymellon/codekatas/coffeekata/CoffeeShopOrder.java b/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/CoffeeShopOrder.java similarity index 73% rename from coffee-shop-kata/old-java-features/src/main/java/bnymellon/codekatas/coffeekata/CoffeeShopOrder.java rename to coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/CoffeeShopOrder.java index e1a9cb40..bc6ed836 100644 --- a/coffee-shop-kata/old-java-features/src/main/java/bnymellon/codekatas/coffeekata/CoffeeShopOrder.java +++ b/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/CoffeeShopOrder.java @@ -1,44 +1,26 @@ -/* - * Copyright 2023 The Bank of New York Mellon. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +package bnymellon.codekatas.coffeeshopkata; -package bnymellon.codekatas.coffeekata; - -import bnymellon.codekatas.coffeekata.beverage.Americano; -import bnymellon.codekatas.coffeekata.beverage.CoffeeDrink; -import bnymellon.codekatas.coffeekata.beverage.DrinkTemperature; -import bnymellon.codekatas.coffeekata.beverage.FlavorSyrup; -import bnymellon.codekatas.coffeekata.beverage.Latte; -import bnymellon.codekatas.coffeekata.beverage.Macchiato; -import bnymellon.codekatas.coffeekata.beverage.MilkType; -import bnymellon.codekatas.coffeekata.beverage.Tea; -import bnymellon.codekatas.coffeekata.beverage.TeaType; -import bnymellon.codekatas.coffeekata.food.Bagel; -import bnymellon.codekatas.coffeekata.food.BagelType; -import bnymellon.codekatas.coffeekata.food.Cookie; -import bnymellon.codekatas.coffeekata.food.CookieType; -import bnymellon.codekatas.coffeekata.food.Donut; -import bnymellon.codekatas.coffeekata.food.DonutType; -import bnymellon.codekatas.coffeekata.food.SpreadType; +import bnymellon.codekatas.coffeeshopkata.beverage.Americano; +import bnymellon.codekatas.coffeeshopkata.beverage.CoffeeDrink; +import bnymellon.codekatas.coffeeshopkata.beverage.DrinkTemperature; +import bnymellon.codekatas.coffeeshopkata.beverage.FlavorSyrup; +import bnymellon.codekatas.coffeeshopkata.beverage.Latte; +import bnymellon.codekatas.coffeeshopkata.beverage.Macchiato; +import bnymellon.codekatas.coffeeshopkata.beverage.MilkType; +import bnymellon.codekatas.coffeeshopkata.beverage.Tea; +import bnymellon.codekatas.coffeeshopkata.beverage.TeaType; +import bnymellon.codekatas.coffeeshopkata.food.Bagel; +import bnymellon.codekatas.coffeeshopkata.food.BagelType; +import bnymellon.codekatas.coffeeshopkata.food.Cookie; +import bnymellon.codekatas.coffeeshopkata.food.CookieType; +import bnymellon.codekatas.coffeeshopkata.food.Donut; +import bnymellon.codekatas.coffeeshopkata.food.DonutType; import java.util.ArrayList; import java.util.List; public class CoffeeShopOrder { - private final String customerName; private final List orderItems; @@ -151,4 +133,4 @@ public List getDrinkForOrder() return drinkItems; } -} +} \ No newline at end of file diff --git a/coffee-shop-kata/new-java-features/src/main/java/bnymellon/codekatas/coffeekata/Item.java b/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/Item.java similarity index 93% rename from coffee-shop-kata/new-java-features/src/main/java/bnymellon/codekatas/coffeekata/Item.java rename to coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/Item.java index 76685d42..362dcfd4 100644 --- a/coffee-shop-kata/new-java-features/src/main/java/bnymellon/codekatas/coffeekata/Item.java +++ b/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/Item.java @@ -14,9 +14,10 @@ * limitations under the License. */ -package bnymellon.codekatas.coffeekata; +package bnymellon.codekatas.coffeeshopkata; public interface Item { double getPrice(); } + diff --git a/coffee-shop-kata/old-java-features/src/main/java/bnymellon/codekatas/coffeekata/beverage/Americano.java b/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Americano.java similarity index 95% rename from coffee-shop-kata/old-java-features/src/main/java/bnymellon/codekatas/coffeekata/beverage/Americano.java rename to coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Americano.java index b8d6e684..9e130139 100644 --- a/coffee-shop-kata/old-java-features/src/main/java/bnymellon/codekatas/coffeekata/beverage/Americano.java +++ b/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Americano.java @@ -14,11 +14,10 @@ * limitations under the License. */ -package bnymellon.codekatas.coffeekata.beverage; +package bnymellon.codekatas.coffeeshopkata.beverage; public final class Americano implements CoffeeDrink { - private final DrinkTemperature drinkTemperature; public Americano(DrinkTemperature drinkTemperature) diff --git a/coffee-shop-kata/old-java-features/src/main/java/bnymellon/codekatas/coffeekata/beverage/Beverage.java b/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Beverage.java similarity index 86% rename from coffee-shop-kata/old-java-features/src/main/java/bnymellon/codekatas/coffeekata/beverage/Beverage.java rename to coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Beverage.java index c4fa3a6e..e5a9bb40 100644 --- a/coffee-shop-kata/old-java-features/src/main/java/bnymellon/codekatas/coffeekata/beverage/Beverage.java +++ b/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Beverage.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package bnymellon.codekatas.coffeekata.beverage; +package bnymellon.codekatas.coffeeshopkata.beverage; -import bnymellon.codekatas.coffeekata.Item; +import bnymellon.codekatas.coffeeshopkata.Item; public interface Beverage extends Item { diff --git a/coffee-shop-kata/old-java-features/src/main/java/bnymellon/codekatas/coffeekata/beverage/CoffeeDrink.java b/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/CoffeeDrink.java similarity index 92% rename from coffee-shop-kata/old-java-features/src/main/java/bnymellon/codekatas/coffeekata/beverage/CoffeeDrink.java rename to coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/CoffeeDrink.java index 86bacb4c..ac038e66 100644 --- a/coffee-shop-kata/old-java-features/src/main/java/bnymellon/codekatas/coffeekata/beverage/CoffeeDrink.java +++ b/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/CoffeeDrink.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package bnymellon.codekatas.coffeekata.beverage; +package bnymellon.codekatas.coffeeshopkata.beverage; public interface CoffeeDrink extends Beverage { diff --git a/coffee-shop-kata/old-java-features/src/main/java/bnymellon/codekatas/coffeekata/beverage/DrinkTemperature.java b/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/DrinkTemperature.java similarity index 92% rename from coffee-shop-kata/old-java-features/src/main/java/bnymellon/codekatas/coffeekata/beverage/DrinkTemperature.java rename to coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/DrinkTemperature.java index 2accc13d..7c9b59ba 100644 --- a/coffee-shop-kata/old-java-features/src/main/java/bnymellon/codekatas/coffeekata/beverage/DrinkTemperature.java +++ b/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/DrinkTemperature.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package bnymellon.codekatas.coffeekata.beverage; +package bnymellon.codekatas.coffeeshopkata.beverage; public enum DrinkTemperature { diff --git a/coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/beverage/FlavorSyrup.java b/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/FlavorSyrup.java similarity index 92% rename from coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/beverage/FlavorSyrup.java rename to coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/FlavorSyrup.java index ee9ac59a..f6b94288 100644 --- a/coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/beverage/FlavorSyrup.java +++ b/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/FlavorSyrup.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package bnymellon.codekatas.coffeekata.beverage; +package bnymellon.codekatas.coffeeshopkata.beverage; public enum FlavorSyrup { diff --git a/coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/beverage/Latte.java b/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Latte.java similarity index 97% rename from coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/beverage/Latte.java rename to coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Latte.java index 1654db5f..77c87f18 100644 --- a/coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/beverage/Latte.java +++ b/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Latte.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package bnymellon.codekatas.coffeekata.beverage; +package bnymellon.codekatas.coffeeshopkata.beverage; public final class Latte implements CoffeeDrink { diff --git a/coffee-shop-kata/old-java-features/src/main/java/bnymellon/codekatas/coffeekata/beverage/Macchiato.java b/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Macchiato.java similarity index 88% rename from coffee-shop-kata/old-java-features/src/main/java/bnymellon/codekatas/coffeekata/beverage/Macchiato.java rename to coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Macchiato.java index 032b6dc4..ac0eb87f 100644 --- a/coffee-shop-kata/old-java-features/src/main/java/bnymellon/codekatas/coffeekata/beverage/Macchiato.java +++ b/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Macchiato.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package bnymellon.codekatas.coffeekata.beverage; +package bnymellon.codekatas.coffeeshopkata.beverage; public final class Macchiato implements CoffeeDrink { @@ -55,4 +55,11 @@ public double getPrice() { return 3.75; } + + @Override + public String toString() + { + return drinkTemperature + " " + flavorSyrup + " Macchiato with " + milkType; + } + } diff --git a/coffee-shop-kata/old-java-features/src/main/java/bnymellon/codekatas/coffeekata/beverage/MilkType.java b/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/MilkType.java similarity index 92% rename from coffee-shop-kata/old-java-features/src/main/java/bnymellon/codekatas/coffeekata/beverage/MilkType.java rename to coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/MilkType.java index 57e135b1..ff7984c7 100644 --- a/coffee-shop-kata/old-java-features/src/main/java/bnymellon/codekatas/coffeekata/beverage/MilkType.java +++ b/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/MilkType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package bnymellon.codekatas.coffeekata.beverage; +package bnymellon.codekatas.coffeeshopkata.beverage; public enum MilkType { diff --git a/coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/beverage/Tea.java b/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Tea.java similarity index 94% rename from coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/beverage/Tea.java rename to coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Tea.java index e3f9793c..ae82175a 100644 --- a/coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/beverage/Tea.java +++ b/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/Tea.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package bnymellon.codekatas.coffeekata.beverage; +package bnymellon.codekatas.coffeeshopkata.beverage; public class Tea implements Beverage { @@ -24,17 +24,15 @@ public Tea(TeaType teaType) { this.teaType = teaType; } - @Override - public double getPrice() + public String toString() { - return 1.50; + return teaType + " " + "Tea"; } - @Override - public String toString() + public double getPrice() { - return teaType + " " + "Tea"; + return 1.50; } public TeaType getTeaType() diff --git a/coffee-shop-kata/old-java-features/src/main/java/bnymellon/codekatas/coffeekata/beverage/TeaType.java b/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/TeaType.java similarity index 92% rename from coffee-shop-kata/old-java-features/src/main/java/bnymellon/codekatas/coffeekata/beverage/TeaType.java rename to coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/TeaType.java index 7bf89dd0..3fb2976f 100644 --- a/coffee-shop-kata/old-java-features/src/main/java/bnymellon/codekatas/coffeekata/beverage/TeaType.java +++ b/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/beverage/TeaType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package bnymellon.codekatas.coffeekata.beverage; +package bnymellon.codekatas.coffeeshopkata.beverage; public enum TeaType { diff --git a/coffee-shop-kata/old-java-features/src/main/java/bnymellon/codekatas/coffeekata/food/Bagel.java b/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/food/Bagel.java similarity index 97% rename from coffee-shop-kata/old-java-features/src/main/java/bnymellon/codekatas/coffeekata/food/Bagel.java rename to coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/food/Bagel.java index 60e0412d..56ef599d 100644 --- a/coffee-shop-kata/old-java-features/src/main/java/bnymellon/codekatas/coffeekata/food/Bagel.java +++ b/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/food/Bagel.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package bnymellon.codekatas.coffeekata.food; +package bnymellon.codekatas.coffeeshopkata.food; import java.util.Objects; diff --git a/coffee-shop-kata/old-java-features/src/main/java/bnymellon/codekatas/coffeekata/food/BagelType.java b/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/food/BagelType.java similarity index 93% rename from coffee-shop-kata/old-java-features/src/main/java/bnymellon/codekatas/coffeekata/food/BagelType.java rename to coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/food/BagelType.java index d6fe0e59..5d0c8e14 100644 --- a/coffee-shop-kata/old-java-features/src/main/java/bnymellon/codekatas/coffeekata/food/BagelType.java +++ b/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/food/BagelType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package bnymellon.codekatas.coffeekata.food; +package bnymellon.codekatas.coffeeshopkata.food; public enum BagelType { diff --git a/coffee-shop-kata/new-java-features/src/main/java/bnymellon/codekatas/coffeekata/food/BakeryItem.java b/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/food/BakeryItem.java similarity index 87% rename from coffee-shop-kata/new-java-features/src/main/java/bnymellon/codekatas/coffeekata/food/BakeryItem.java rename to coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/food/BakeryItem.java index 8a238cc9..099ba0f3 100644 --- a/coffee-shop-kata/new-java-features/src/main/java/bnymellon/codekatas/coffeekata/food/BakeryItem.java +++ b/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/food/BakeryItem.java @@ -14,10 +14,11 @@ * limitations under the License. */ -package bnymellon.codekatas.coffeekata.food; +package bnymellon.codekatas.coffeeshopkata.food; -import bnymellon.codekatas.coffeekata.Item; +import bnymellon.codekatas.coffeeshopkata.Item; public interface BakeryItem extends Item { + } diff --git a/coffee-shop-kata/old-java-features/src/main/java/bnymellon/codekatas/coffeekata/food/Cookie.java b/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/food/Cookie.java similarity index 97% rename from coffee-shop-kata/old-java-features/src/main/java/bnymellon/codekatas/coffeekata/food/Cookie.java rename to coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/food/Cookie.java index 6f9b6522..68ba7154 100644 --- a/coffee-shop-kata/old-java-features/src/main/java/bnymellon/codekatas/coffeekata/food/Cookie.java +++ b/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/food/Cookie.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package bnymellon.codekatas.coffeekata.food; +package bnymellon.codekatas.coffeeshopkata.food; import java.util.Objects; diff --git a/coffee-shop-kata/old-java-features/src/main/java/bnymellon/codekatas/coffeekata/food/CookieType.java b/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/food/CookieType.java similarity index 93% rename from coffee-shop-kata/old-java-features/src/main/java/bnymellon/codekatas/coffeekata/food/CookieType.java rename to coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/food/CookieType.java index 5653c027..26bc6806 100644 --- a/coffee-shop-kata/old-java-features/src/main/java/bnymellon/codekatas/coffeekata/food/CookieType.java +++ b/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/food/CookieType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package bnymellon.codekatas.coffeekata.food; +package bnymellon.codekatas.coffeeshopkata.food; public enum CookieType { diff --git a/coffee-shop-kata/old-java-features/src/main/java/bnymellon/codekatas/coffeekata/food/Donut.java b/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/food/Donut.java similarity index 96% rename from coffee-shop-kata/old-java-features/src/main/java/bnymellon/codekatas/coffeekata/food/Donut.java rename to coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/food/Donut.java index 3f114766..2f52c40b 100644 --- a/coffee-shop-kata/old-java-features/src/main/java/bnymellon/codekatas/coffeekata/food/Donut.java +++ b/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/food/Donut.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package bnymellon.codekatas.coffeekata.food; +package bnymellon.codekatas.coffeeshopkata.food; import java.util.Objects; diff --git a/coffee-shop-kata/old-java-features/src/main/java/bnymellon/codekatas/coffeekata/food/DonutType.java b/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/food/DonutType.java similarity index 93% rename from coffee-shop-kata/old-java-features/src/main/java/bnymellon/codekatas/coffeekata/food/DonutType.java rename to coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/food/DonutType.java index 883041e8..4859d435 100644 --- a/coffee-shop-kata/old-java-features/src/main/java/bnymellon/codekatas/coffeekata/food/DonutType.java +++ b/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/food/DonutType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package bnymellon.codekatas.coffeekata.food; +package bnymellon.codekatas.coffeeshopkata.food; public enum DonutType { diff --git a/coffee-shop-kata/old-java-features/src/main/java/bnymellon/codekatas/coffeekata/food/SpreadType.java b/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/food/SpreadType.java similarity index 93% rename from coffee-shop-kata/old-java-features/src/main/java/bnymellon/codekatas/coffeekata/food/SpreadType.java rename to coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/food/SpreadType.java index 1761730a..25c42445 100644 --- a/coffee-shop-kata/old-java-features/src/main/java/bnymellon/codekatas/coffeekata/food/SpreadType.java +++ b/coffee-shop-kata/jdk8/src/main/java/bnymellon/codekatas/coffeeshopkata/food/SpreadType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package bnymellon.codekatas.coffeekata.food; +package bnymellon.codekatas.coffeeshopkata.food; public enum SpreadType { diff --git a/coffee-shop-kata/old-java-features/src/test/java/CoffeeShopTest.java b/coffee-shop-kata/jdk8/src/test/java/bnymellon/codekatas/coffeeshopkata/CoffeeShopTest.java similarity index 86% rename from coffee-shop-kata/old-java-features/src/test/java/CoffeeShopTest.java rename to coffee-shop-kata/jdk8/src/test/java/bnymellon/codekatas/coffeeshopkata/CoffeeShopTest.java index 035abb4c..56b1a92d 100644 --- a/coffee-shop-kata/old-java-features/src/test/java/CoffeeShopTest.java +++ b/coffee-shop-kata/jdk8/src/test/java/bnymellon/codekatas/coffeeshopkata/CoffeeShopTest.java @@ -13,29 +13,27 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +package bnymellon.codekatas.coffeeshopkata; -import bnymellon.codekatas.coffeekata.CoffeeShopOrder; -import bnymellon.codekatas.coffeekata.Item; -import bnymellon.codekatas.coffeekata.food.Bagel; -import bnymellon.codekatas.coffeekata.food.Cookie; -import bnymellon.codekatas.coffeekata.food.Donut; +import bnymellon.codekatas.coffeeshopkata.food.Bagel; +import bnymellon.codekatas.coffeeshopkata.food.Cookie; +import bnymellon.codekatas.coffeeshopkata.food.Donut; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; -import static bnymellon.codekatas.coffeekata.food.BagelType.EVERYTHING; -import static bnymellon.codekatas.coffeekata.food.CookieType.CHOCOLATE_CHIP; -import static bnymellon.codekatas.coffeekata.food.DonutType.GLAZED; -import static bnymellon.codekatas.coffeekata.food.SpreadType.HERB_GARLIC_CREAM_CHEESE; +import static bnymellon.codekatas.coffeeshopkata.food.BagelType.EVERYTHING; +import static bnymellon.codekatas.coffeeshopkata.food.CookieType.CHOCOLATE_CHIP; +import static bnymellon.codekatas.coffeeshopkata.food.DonutType.GLAZED; +import static bnymellon.codekatas.coffeeshopkata.food.SpreadType.HERB_GARLIC_CREAM_CHEESE; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; class CoffeeShopTest { - - List itemList; + private List itemList; private CoffeeShopOrder coffeeShopOrder; private Bagel bagel1; private Cookie cookie1; diff --git a/coffee-shop-kata/pom.xml b/coffee-shop-kata/pom.xml index 38933f76..b555ba49 100644 --- a/coffee-shop-kata/pom.xml +++ b/coffee-shop-kata/pom.xml @@ -1,4 +1,19 @@ + 4.0.0 bnymellon.codekatas + 1.0.0-SNAPSHOT + coffee-shop-kata - 1.0.0 coffee-shop-kata pom UTF-8 - 20 - 20 - new-java-features - old-java-features + jdk8 + jdk21 + org.apache.maven.plugins maven-compiler-plugin 3.11.0 + + org.apache.maven.plugins + maven-surefire-plugin + 3.1.2 + + --enable-preview + + - - - - - org.junit.jupiter - junit-jupiter - 5.9.2 - test - - - - \ No newline at end of file + diff --git a/pom.xml b/pom.xml index 1f891f55..ccb42025 100644 --- a/pom.xml +++ b/pom.xml @@ -44,6 +44,6 @@ pitest-mutation-kata pitest-mutation-kata-solutions coffee-shop-kata - coffee-shop-kata-solutions/new-java-features-solutions + coffee-shop-kata-solutions