From f5e5cefadbf97e16f4c9d5ac6dd497fa8df0c8b7 Mon Sep 17 00:00:00 2001 From: julien Lengrand-Lambert Date: Mon, 8 May 2017 16:48:29 +0200 Subject: [PATCH] Starts translating to English --- ...cipeUtils.java => PeaSoupRecipeUtils.java} | 15 ++++++------ ...ddRookWorst.java => AddSmokedSausage.java} | 8 +++---- .../interactions/ChopVegetables.java | 4 ++-- ...wtenSoep.java => CombineDutchPeaSoup.java} | 8 +++---- .../interactions/CutBoiledMeat.java | 8 +++---- .../erwtensoep/interactions/PreheatSoup.java | 4 ++-- .../ServeErwtenSoepWithSmokedSausage.java | 23 ------------------- src/main/scala/ErwtenSoepCooker.scala | 8 +++---- .../events/Cooked5MinutesEvent.scala | 4 ++-- ...happenGedaan.scala => GroceriesDone.scala} | 2 +- .../erwtensoep/events/KitchenToolsReady.scala | 8 +++---- .../erwtensoep/ingredients/KitchenTools.scala | 8 +++---- .../erwtensoep/ingredients/SoupElements.scala | 13 +++++------ 13 files changed, 43 insertions(+), 70 deletions(-) rename src/main/java/erwtensoep/{ErwtenSoepRecipeUtils.java => PeaSoupRecipeUtils.java} (73%) rename src/main/java/erwtensoep/interactions/{AddRookWorst.java => AddSmokedSausage.java} (68%) rename src/main/java/erwtensoep/interactions/{CombineErwtenSoep.java => CombineDutchPeaSoup.java} (77%) delete mode 100644 src/main/java/erwtensoep/interactions/ServeErwtenSoepWithSmokedSausage.java rename src/main/scala/erwtensoep/events/{BoodschappenGedaan.scala => GroceriesDone.scala} (91%) diff --git a/src/main/java/erwtensoep/ErwtenSoepRecipeUtils.java b/src/main/java/erwtensoep/PeaSoupRecipeUtils.java similarity index 73% rename from src/main/java/erwtensoep/ErwtenSoepRecipeUtils.java rename to src/main/java/erwtensoep/PeaSoupRecipeUtils.java index 94a132f..dbcd746 100644 --- a/src/main/java/erwtensoep/ErwtenSoepRecipeUtils.java +++ b/src/main/java/erwtensoep/PeaSoupRecipeUtils.java @@ -4,8 +4,7 @@ import com.google.common.collect.ImmutableList; import com.ing.baker.core.Interaction; import com.ing.baker.java_api.JInteractionDescriptor; import com.ing.baker.java_api.JRecipe; -import erwtensoep.events.BoodschappenGedaan; -import erwtensoep.events.Cooked5MinutesEvent; +import erwtensoep.events.GroceriesDone; import erwtensoep.events.KitchenToolsReady; import erwtensoep.interactions.*; @@ -16,7 +15,7 @@ import java.util.List; * The class should be removed and replaced by scala implementations instead * Created by jll on 5/4/2017. */ -public final class ErwtenSoepRecipeUtils { +public final class PeaSoupRecipeUtils { public JRecipe createRecipe(){ return new JRecipe("ErwtenSoepRecipe") @@ -24,11 +23,11 @@ public final class ErwtenSoepRecipeUtils { JInteractionDescriptor.of(PreheatSoup.class), JInteractionDescriptor.of(ChopVegetables.class), JInteractionDescriptor.of(CutBoiledMeat.class), - JInteractionDescriptor.of(CombineErwtenSoep.class), - JInteractionDescriptor.of(AddRookWorst.class)) + JInteractionDescriptor.of(CombineDutchPeaSoup.class), + JInteractionDescriptor.of(AddSmokedSausage.class)) .withSensoryEvents( KitchenToolsReady.class, - BoodschappenGedaan.class); + GroceriesDone.class); } public List getInteractions(){ @@ -36,8 +35,8 @@ public final class ErwtenSoepRecipeUtils { new PreheatSoup(), new ChopVegetables(), new CutBoiledMeat(), - new CombineErwtenSoep(), - new AddRookWorst() + new CombineDutchPeaSoup(), + new AddSmokedSausage() ); } } diff --git a/src/main/java/erwtensoep/interactions/AddRookWorst.java b/src/main/java/erwtensoep/interactions/AddSmokedSausage.java similarity index 68% rename from src/main/java/erwtensoep/interactions/AddRookWorst.java rename to src/main/java/erwtensoep/interactions/AddSmokedSausage.java index 95ea709..00df882 100644 --- a/src/main/java/erwtensoep/interactions/AddRookWorst.java +++ b/src/main/java/erwtensoep/interactions/AddSmokedSausage.java @@ -2,22 +2,20 @@ package erwtensoep.interactions; import com.ing.baker.java_api.FiresEvent; import com.ing.baker.java_api.JInteraction; -import com.ing.baker.java_api.ProvidesIngredient; import com.ing.baker.java_api.RequiresIngredient; import erwtensoep.events.Cooked5MinutesEvent; -import erwtensoep.ingredients.ErwtenSoep; -import erwtensoep.ingredients.ErwtenSoepMetRookWorst; +import erwtensoep.ingredients.DutchPeaSoup; import erwtensoep.ingredients.RookWorst; /** * Created by jll on 5/5/2017. */ -public class AddRookWorst implements JInteraction{ +public class AddSmokedSausage implements JInteraction{ @FiresEvent(oneOf = Cooked5MinutesEvent.class) public Cooked5MinutesEvent apply( @RequiresIngredient("rookWorst")RookWorst rookWorst, - @RequiresIngredient("ErwtenSoep")ErwtenSoep erwtenSoep + @RequiresIngredient("ErwtenSoep") DutchPeaSoup erwtenSoep ){ System.out.println("Adding sausage"); return new Cooked5MinutesEvent(); diff --git a/src/main/java/erwtensoep/interactions/ChopVegetables.java b/src/main/java/erwtensoep/interactions/ChopVegetables.java index 33fd102..e01e818 100644 --- a/src/main/java/erwtensoep/interactions/ChopVegetables.java +++ b/src/main/java/erwtensoep/interactions/ChopVegetables.java @@ -12,8 +12,8 @@ public class ChopVegetables implements JInteraction{ @ProvidesIngredient("ChoppedVegetables") public ChoppedVegetables apply( - @RequiresIngredient("snijPlank")SnijPlank snijPlank, - @RequiresIngredient("mes")Mes mes, + @RequiresIngredient("cuttingBoard") CuttingBoard cuttingBoard, + @RequiresIngredient("knife") Knife knife, @RequiresIngredient("prei")Prei prei, @RequiresIngredient("aardappel")Aardappel aardappel, @RequiresIngredient("winterwortel")WinterWortel winterwortel, diff --git a/src/main/java/erwtensoep/interactions/CombineErwtenSoep.java b/src/main/java/erwtensoep/interactions/CombineDutchPeaSoup.java similarity index 77% rename from src/main/java/erwtensoep/interactions/CombineErwtenSoep.java rename to src/main/java/erwtensoep/interactions/CombineDutchPeaSoup.java index cf1d161..8097d5b 100644 --- a/src/main/java/erwtensoep/interactions/CombineErwtenSoep.java +++ b/src/main/java/erwtensoep/interactions/CombineDutchPeaSoup.java @@ -8,17 +8,17 @@ import erwtensoep.ingredients.*; /** * Created by jll on 5/5/2017. */ -public class CombineErwtenSoep implements JInteraction{ +public class CombineDutchPeaSoup implements JInteraction{ @ProvidesIngredient("ErwtenSoep") - public ErwtenSoep apply( + public DutchPeaSoup apply( @RequiresIngredient("ChoppedMeat")ChoppedMeat choppedMeat, @RequiresIngredient("ChoppedVegetables")ChoppedVegetables choppedVegetables, @RequiresIngredient("HeatedBasicSoup")HeatedBasicSoup heatedBasicSoup, - @RequiresIngredient("lepel") Lepel lepel + @RequiresIngredient("spoon") Spoon spoon ){ System.out.println("Mixing all ingredients together"); - return new ErwtenSoep(); + return new DutchPeaSoup(); } } diff --git a/src/main/java/erwtensoep/interactions/CutBoiledMeat.java b/src/main/java/erwtensoep/interactions/CutBoiledMeat.java index 6fd3dba..a353fd3 100644 --- a/src/main/java/erwtensoep/interactions/CutBoiledMeat.java +++ b/src/main/java/erwtensoep/interactions/CutBoiledMeat.java @@ -5,8 +5,8 @@ import com.ing.baker.java_api.ProvidesIngredient; import com.ing.baker.java_api.RequiresIngredient; import erwtensoep.ingredients.ChoppedMeat; import erwtensoep.ingredients.HeatedBasicSoup; -import erwtensoep.ingredients.Mes; -import erwtensoep.ingredients.SnijPlank; +import erwtensoep.ingredients.Knife; +import erwtensoep.ingredients.CuttingBoard; /** * Created by jll on 5/5/2017. @@ -15,8 +15,8 @@ public class CutBoiledMeat implements JInteraction { @ProvidesIngredient("ChoppedMeat") public ChoppedMeat apply( - @RequiresIngredient("snijPlank")SnijPlank snijPlank, - @RequiresIngredient("mes")Mes mes, + @RequiresIngredient("cuttingBoard") CuttingBoard cuttingBoard, + @RequiresIngredient("knife") Knife knife, @RequiresIngredient("HeatedBasicSoup")HeatedBasicSoup heatedBasicSoup ){ System.out.println("Chopping boiled meat"); diff --git a/src/main/java/erwtensoep/interactions/PreheatSoup.java b/src/main/java/erwtensoep/interactions/PreheatSoup.java index 9dc8e47..8229c3c 100644 --- a/src/main/java/erwtensoep/interactions/PreheatSoup.java +++ b/src/main/java/erwtensoep/interactions/PreheatSoup.java @@ -18,8 +18,8 @@ public class PreheatSoup implements JInteraction{ @RequiresIngredient("hamschrijf") Hamschijf hamschijf, @RequiresIngredient("zout") Zout zout, @RequiresIngredient("pan") Pan pan, - @RequiresIngredient("lepel") Lepel lepel, - @RequiresIngredient("gasFournuis") GasFournuis gasFournuis + @RequiresIngredient("spoon") Spoon spoon, + @RequiresIngredient("furnace") Furnace furnace ){ System.out.println("Heating Basic Soup ingredients"); return new HeatedBasicSoup(); diff --git a/src/main/java/erwtensoep/interactions/ServeErwtenSoepWithSmokedSausage.java b/src/main/java/erwtensoep/interactions/ServeErwtenSoepWithSmokedSausage.java deleted file mode 100644 index 38900ab..0000000 --- a/src/main/java/erwtensoep/interactions/ServeErwtenSoepWithSmokedSausage.java +++ /dev/null @@ -1,23 +0,0 @@ -package erwtensoep.interactions; - -import com.ing.baker.java_api.JInteraction; -import com.ing.baker.java_api.ProvidesIngredient; -import com.ing.baker.java_api.RequiresIngredient; -import erwtensoep.ingredients.CookedErwtenSoepMetRookWorst; -import erwtensoep.ingredients.ErwtenSoep; -import erwtensoep.ingredients.ErwtenSoepMetRookWorst; -import erwtensoep.ingredients.RookWorst; - -/** - * Created by jll on 5/8/2017. - */ -public class ServeErwtenSoepWithSmokedSausage implements JInteraction { - - @ProvidesIngredient("cookedErwtenSoepMetRookWorst") - public CookedErwtenSoepMetRookWorst apply( - @RequiresIngredient("erwtenSoepMetRookWorst") ErwtenSoepMetRookWorst erwtenSoepMetRookWorst - ){ - System.out.println("Finished cooking 5 minutes. Ready to serve!"); - return new CookedErwtenSoepMetRookWorst(); - } -} diff --git a/src/main/scala/ErwtenSoepCooker.scala b/src/main/scala/ErwtenSoepCooker.scala index 26e2495..4b200cb 100644 --- a/src/main/scala/ErwtenSoepCooker.scala +++ b/src/main/scala/ErwtenSoepCooker.scala @@ -2,8 +2,8 @@ import java.util.UUID import com.google.common.collect.ImmutableList import com.ing.baker.java_api.{JBaker, JCompiledRecipe} -import erwtensoep.ErwtenSoepRecipeUtils -import erwtensoep.events.{BoodschappenGedaan, KitchenToolsReady} +import erwtensoep.PeaSoupRecipeUtils +import erwtensoep.events.{GroceriesDone, KitchenToolsReady} import erwtensoep.ingredients.SplitErwten import erwtensoep.interactions.PreheatSoup @@ -14,7 +14,7 @@ object ErwtenSoepCooker { def main(args: Array[String]): Unit = { // Let's create a recipe and validate it - val recipeCreator = new ErwtenSoepRecipeUtils + val recipeCreator = new PeaSoupRecipeUtils val recipe = recipeCreator.createRecipe() val compiledRecipe = recipe.compileRecipe @@ -32,7 +32,7 @@ object ErwtenSoepCooker { //Firing events baker.processEvent(id, new KitchenToolsReady()) - baker.processEvent(id, new BoodschappenGedaan()) + baker.processEvent(id, new GroceriesDone()) // Recipe should be ran now val ingredients = baker.getIngredients(id); diff --git a/src/main/scala/erwtensoep/events/Cooked5MinutesEvent.scala b/src/main/scala/erwtensoep/events/Cooked5MinutesEvent.scala index a009019..a97e723 100644 --- a/src/main/scala/erwtensoep/events/Cooked5MinutesEvent.scala +++ b/src/main/scala/erwtensoep/events/Cooked5MinutesEvent.scala @@ -1,12 +1,12 @@ package erwtensoep.events import com.ing.baker.api.Event -import erwtensoep.ingredients.ErwtenSoepMetRookWorst +import erwtensoep.ingredients.PeaSoupWithSmokedSausage /** * Created by jll on 5/8/2017. */ class Cooked5MinutesEvent extends Event{ - val erwtenSoepMetRookWorst = new ErwtenSoepMetRookWorst() + val erwtenSoepMetRookWorst = new PeaSoupWithSmokedSausage() } diff --git a/src/main/scala/erwtensoep/events/BoodschappenGedaan.scala b/src/main/scala/erwtensoep/events/GroceriesDone.scala similarity index 91% rename from src/main/scala/erwtensoep/events/BoodschappenGedaan.scala rename to src/main/scala/erwtensoep/events/GroceriesDone.scala index ef72913..58ba2bb 100644 --- a/src/main/scala/erwtensoep/events/BoodschappenGedaan.scala +++ b/src/main/scala/erwtensoep/events/GroceriesDone.scala @@ -6,7 +6,7 @@ import erwtensoep.ingredients._ /** * Created by jll on 5/4/2017. */ -class BoodschappenGedaan extends Event { +class GroceriesDone extends Event { val zout = new Zout val laurier = new Laurier val prei = new Prei diff --git a/src/main/scala/erwtensoep/events/KitchenToolsReady.scala b/src/main/scala/erwtensoep/events/KitchenToolsReady.scala index 559d4bd..8805022 100644 --- a/src/main/scala/erwtensoep/events/KitchenToolsReady.scala +++ b/src/main/scala/erwtensoep/events/KitchenToolsReady.scala @@ -8,8 +8,8 @@ import erwtensoep.ingredients._ */ class KitchenToolsReady extends Event{ val pan = new Pan - val mes = new Mes - val lepel = new Lepel - val gasFournuis = new GasFournuis - val snijPlank = new SnijPlank + val knife = new Knife + val spoon = new Spoon + val furnace = new Furnace + val cuttingBoard = new CuttingBoard } diff --git a/src/main/scala/erwtensoep/ingredients/KitchenTools.scala b/src/main/scala/erwtensoep/ingredients/KitchenTools.scala index ec3ceec..cd51cdc 100644 --- a/src/main/scala/erwtensoep/ingredients/KitchenTools.scala +++ b/src/main/scala/erwtensoep/ingredients/KitchenTools.scala @@ -8,7 +8,7 @@ import com.ing.baker.api.Ingredient class KitchenTools class Pan extends Ingredient -class Mes extends Ingredient -class Lepel extends Ingredient -class GasFournuis extends Ingredient -class SnijPlank extends Ingredient \ No newline at end of file +class Knife extends Ingredient +class Spoon extends Ingredient +class Furnace extends Ingredient +class CuttingBoard extends Ingredient \ No newline at end of file diff --git a/src/main/scala/erwtensoep/ingredients/SoupElements.scala b/src/main/scala/erwtensoep/ingredients/SoupElements.scala index 9820463..01feaf2 100644 --- a/src/main/scala/erwtensoep/ingredients/SoupElements.scala +++ b/src/main/scala/erwtensoep/ingredients/SoupElements.scala @@ -9,16 +9,15 @@ class SoupElements class ChoppedVegetables extends Ingredient class HeatedBasicSoup extends Ingredient{ - val boiledHamschrijf = new BoiledHamSchrijf(); - val boiledRookSpek = new BoiledRookSpek(); + val boiledHamschrijf = new BoiledHam(); + val boiledRookSpek = new BoiledBacon(); val broth = new Broth(); } -class BoiledHamSchrijf extends Ingredient -class BoiledRookSpek extends Ingredient +class BoiledHam extends Ingredient +class BoiledBacon extends Ingredient class Broth extends Ingredient class ChoppedMeat extends Ingredient -class ErwtenSoep extends Ingredient -class ErwtenSoepMetRookWorst extends Ingredient -class CookedErwtenSoepMetRookWorst extends Ingredient \ No newline at end of file +class DutchPeaSoup extends Ingredient +class PeaSoupWithSmokedSausage extends Ingredient \ No newline at end of file