diff --git a/README.md b/README.md index 9d68fee..d6a5357 100644 --- a/README.md +++ b/README.md @@ -94,12 +94,12 @@ Aggregates: The project follows a Screaming Architecture pattern organized around vertical slices that mirror Event Modeling concepts. -![ScreamingArchitecture](docs/images/ScreamingArchitecture.png) +![ScreamingArchitecture](docs/images/ScreamingArchitectureEvents.png) The package structure screams the capabilities of the system by making explicit: commands available to users, events that capture what happened, queries for retrieving information, business rules, and system automations. This architecture makes it immediately obvious what the system can do, what rules govern those actions, and how different parts of the system interact through events. -Each module is structured into three distinct types of slices: +Each module is structured into three distinct types of slices (packages `write`, `read`, `automation`) and there are events (package `events`) between them, which are a system backbone - a contract between all other parts: ### Write Slices Contains commands that represent user intentions, defines business rules through aggregates, produces domain events, and enforces invariants (e.g., RecruitCreature command → CreatureRecruited event, with RecruitCreaturesNotExceedAvailableCreatures rule). diff --git a/docs/images/ScreamingArchitecture.png b/docs/images/ScreamingArchitecture.png deleted file mode 100644 index 53c8813..0000000 Binary files a/docs/images/ScreamingArchitecture.png and /dev/null differ diff --git a/docs/images/ScreamingArchitectureEvents.png b/docs/images/ScreamingArchitectureEvents.png new file mode 100644 index 0000000..9e41414 Binary files /dev/null and b/docs/images/ScreamingArchitectureEvents.png differ diff --git a/src/main/java/com/dddheroes/heroesofddd/armies/write/addcreature/CreatureAddedToArmy.java b/src/main/java/com/dddheroes/heroesofddd/armies/events/CreatureAddedToArmy.java similarity index 91% rename from src/main/java/com/dddheroes/heroesofddd/armies/write/addcreature/CreatureAddedToArmy.java rename to src/main/java/com/dddheroes/heroesofddd/armies/events/CreatureAddedToArmy.java index 7a17f68..fa17ec9 100644 --- a/src/main/java/com/dddheroes/heroesofddd/armies/write/addcreature/CreatureAddedToArmy.java +++ b/src/main/java/com/dddheroes/heroesofddd/armies/events/CreatureAddedToArmy.java @@ -1,4 +1,4 @@ -package com.dddheroes.heroesofddd.armies.write.addcreature; +package com.dddheroes.heroesofddd.armies.events; import com.dddheroes.heroesofddd.armies.write.ArmyEvent; import com.dddheroes.heroesofddd.shared.Amount; diff --git a/src/main/java/com/dddheroes/heroesofddd/armies/write/removecreature/CreatureRemovedFromArmy.java b/src/main/java/com/dddheroes/heroesofddd/armies/events/CreatureRemovedFromArmy.java similarity index 91% rename from src/main/java/com/dddheroes/heroesofddd/armies/write/removecreature/CreatureRemovedFromArmy.java rename to src/main/java/com/dddheroes/heroesofddd/armies/events/CreatureRemovedFromArmy.java index 84f1b8a..f23b80c 100644 --- a/src/main/java/com/dddheroes/heroesofddd/armies/write/removecreature/CreatureRemovedFromArmy.java +++ b/src/main/java/com/dddheroes/heroesofddd/armies/events/CreatureRemovedFromArmy.java @@ -1,4 +1,4 @@ -package com.dddheroes.heroesofddd.armies.write.removecreature; +package com.dddheroes.heroesofddd.armies.events; import com.dddheroes.heroesofddd.armies.write.ArmyEvent; import com.dddheroes.heroesofddd.shared.Amount; diff --git a/src/main/java/com/dddheroes/heroesofddd/armies/write/Army.java b/src/main/java/com/dddheroes/heroesofddd/armies/write/Army.java index 922ba32..0b02175 100644 --- a/src/main/java/com/dddheroes/heroesofddd/armies/write/Army.java +++ b/src/main/java/com/dddheroes/heroesofddd/armies/write/Army.java @@ -1,9 +1,9 @@ package com.dddheroes.heroesofddd.armies.write; import com.dddheroes.heroesofddd.armies.write.addcreature.AddCreatureToArmy; -import com.dddheroes.heroesofddd.armies.write.addcreature.CreatureAddedToArmy; +import com.dddheroes.heroesofddd.armies.events.CreatureAddedToArmy; import com.dddheroes.heroesofddd.armies.write.addcreature.CanHaveMax7CreatureStacksInArmy; -import com.dddheroes.heroesofddd.armies.write.removecreature.CreatureRemovedFromArmy; +import com.dddheroes.heroesofddd.armies.events.CreatureRemovedFromArmy; import com.dddheroes.heroesofddd.armies.write.removecreature.CanRemoveOnlyPresentCreatures; import com.dddheroes.heroesofddd.armies.write.removecreature.RemoveCreatureFromArmy; import com.dddheroes.heroesofddd.shared.Amount; diff --git a/src/main/java/com/dddheroes/heroesofddd/astrologers/automation/whenweekstartedthenproclaimweeksymbol/WhenWeekStartedThenProclaimWeekSymbolProcessor.java b/src/main/java/com/dddheroes/heroesofddd/astrologers/automation/whenweekstartedthenproclaimweeksymbol/WhenWeekStartedThenProclaimWeekSymbolProcessor.java index cb0e07f..a4cc165 100644 --- a/src/main/java/com/dddheroes/heroesofddd/astrologers/automation/whenweekstartedthenproclaimweeksymbol/WhenWeekStartedThenProclaimWeekSymbolProcessor.java +++ b/src/main/java/com/dddheroes/heroesofddd/astrologers/automation/whenweekstartedthenproclaimweeksymbol/WhenWeekStartedThenProclaimWeekSymbolProcessor.java @@ -3,7 +3,7 @@ import com.dddheroes.heroesofddd.astrologers.write.MonthWeek; import com.dddheroes.heroesofddd.astrologers.write.proclaimweeksymbol.ProclaimWeekSymbol; -import com.dddheroes.heroesofddd.calendar.write.startday.DayStarted; +import com.dddheroes.heroesofddd.calendar.events.DayStarted; import com.dddheroes.heroesofddd.shared.GameMetaData; import org.axonframework.commandhandling.gateway.CommandGateway; import org.axonframework.config.ProcessingGroup; diff --git a/src/main/java/com/dddheroes/heroesofddd/astrologers/automation/whenweeksymbolproclaimedthenincreasedwellingavailablecreatures/WhenWeekSymbolProclaimedThenIncreaseDwellingAvailableCreaturesProcessor.java b/src/main/java/com/dddheroes/heroesofddd/astrologers/automation/whenweeksymbolproclaimedthenincreasedwellingavailablecreatures/WhenWeekSymbolProclaimedThenIncreaseDwellingAvailableCreaturesProcessor.java index 7f64de2..c7cbba0 100644 --- a/src/main/java/com/dddheroes/heroesofddd/astrologers/automation/whenweeksymbolproclaimedthenincreasedwellingavailablecreatures/WhenWeekSymbolProclaimedThenIncreaseDwellingAvailableCreaturesProcessor.java +++ b/src/main/java/com/dddheroes/heroesofddd/astrologers/automation/whenweeksymbolproclaimedthenincreasedwellingavailablecreatures/WhenWeekSymbolProclaimedThenIncreaseDwellingAvailableCreaturesProcessor.java @@ -1,7 +1,7 @@ package com.dddheroes.heroesofddd.astrologers.automation.whenweeksymbolproclaimedthenincreasedwellingavailablecreatures; -import com.dddheroes.heroesofddd.astrologers.write.proclaimweeksymbol.WeekSymbolProclaimed; -import com.dddheroes.heroesofddd.creaturerecruitment.write.builddwelling.DwellingBuilt; +import com.dddheroes.heroesofddd.astrologers.events.WeekSymbolProclaimed; +import com.dddheroes.heroesofddd.creaturerecruitment.events.DwellingBuilt; import com.dddheroes.heroesofddd.creaturerecruitment.write.changeavailablecreatures.IncreaseAvailableCreatures; import com.dddheroes.heroesofddd.shared.GameMetaData; import org.axonframework.commandhandling.gateway.CommandGateway; diff --git a/src/main/java/com/dddheroes/heroesofddd/astrologers/write/proclaimweeksymbol/WeekSymbolProclaimed.java b/src/main/java/com/dddheroes/heroesofddd/astrologers/events/WeekSymbolProclaimed.java similarity index 92% rename from src/main/java/com/dddheroes/heroesofddd/astrologers/write/proclaimweeksymbol/WeekSymbolProclaimed.java rename to src/main/java/com/dddheroes/heroesofddd/astrologers/events/WeekSymbolProclaimed.java index 73b1980..874d4a2 100644 --- a/src/main/java/com/dddheroes/heroesofddd/astrologers/write/proclaimweeksymbol/WeekSymbolProclaimed.java +++ b/src/main/java/com/dddheroes/heroesofddd/astrologers/events/WeekSymbolProclaimed.java @@ -1,4 +1,4 @@ -package com.dddheroes.heroesofddd.astrologers.write.proclaimweeksymbol; +package com.dddheroes.heroesofddd.astrologers.events; import com.dddheroes.heroesofddd.astrologers.write.AstrologersEvent; import com.dddheroes.heroesofddd.astrologers.write.AstrologersId; diff --git a/src/main/java/com/dddheroes/heroesofddd/astrologers/write/Astrologers.java b/src/main/java/com/dddheroes/heroesofddd/astrologers/write/Astrologers.java index 43aaa9f..d22906a 100644 --- a/src/main/java/com/dddheroes/heroesofddd/astrologers/write/Astrologers.java +++ b/src/main/java/com/dddheroes/heroesofddd/astrologers/write/Astrologers.java @@ -2,7 +2,7 @@ import com.dddheroes.heroesofddd.astrologers.write.proclaimweeksymbol.OnlyOneSymbolPerWeek; import com.dddheroes.heroesofddd.astrologers.write.proclaimweeksymbol.ProclaimWeekSymbol; -import com.dddheroes.heroesofddd.astrologers.write.proclaimweeksymbol.WeekSymbolProclaimed; +import com.dddheroes.heroesofddd.astrologers.events.WeekSymbolProclaimed; import org.axonframework.commandhandling.CommandHandler; import org.axonframework.eventsourcing.EventSourcingHandler; import org.axonframework.modelling.command.AggregateCreationPolicy; diff --git a/src/main/java/com/dddheroes/heroesofddd/calendar/write/finishday/DayFinished.java b/src/main/java/com/dddheroes/heroesofddd/calendar/events/DayFinished.java similarity index 91% rename from src/main/java/com/dddheroes/heroesofddd/calendar/write/finishday/DayFinished.java rename to src/main/java/com/dddheroes/heroesofddd/calendar/events/DayFinished.java index 50877e0..f85a83f 100644 --- a/src/main/java/com/dddheroes/heroesofddd/calendar/write/finishday/DayFinished.java +++ b/src/main/java/com/dddheroes/heroesofddd/calendar/events/DayFinished.java @@ -1,4 +1,4 @@ -package com.dddheroes.heroesofddd.calendar.write.finishday; +package com.dddheroes.heroesofddd.calendar.events; import com.dddheroes.heroesofddd.calendar.write.CalendarEvent; import com.dddheroes.heroesofddd.calendar.write.CalendarId; diff --git a/src/main/java/com/dddheroes/heroesofddd/calendar/write/startday/DayStarted.java b/src/main/java/com/dddheroes/heroesofddd/calendar/events/DayStarted.java similarity index 91% rename from src/main/java/com/dddheroes/heroesofddd/calendar/write/startday/DayStarted.java rename to src/main/java/com/dddheroes/heroesofddd/calendar/events/DayStarted.java index 20df7a1..56c5fab 100644 --- a/src/main/java/com/dddheroes/heroesofddd/calendar/write/startday/DayStarted.java +++ b/src/main/java/com/dddheroes/heroesofddd/calendar/events/DayStarted.java @@ -1,4 +1,4 @@ -package com.dddheroes.heroesofddd.calendar.write.startday; +package com.dddheroes.heroesofddd.calendar.events; import com.dddheroes.heroesofddd.calendar.write.CalendarEvent; import com.dddheroes.heroesofddd.calendar.write.CalendarId; diff --git a/src/main/java/com/dddheroes/heroesofddd/calendar/write/Calendar.java b/src/main/java/com/dddheroes/heroesofddd/calendar/write/Calendar.java index fc0fd92..39d989e 100644 --- a/src/main/java/com/dddheroes/heroesofddd/calendar/write/Calendar.java +++ b/src/main/java/com/dddheroes/heroesofddd/calendar/write/Calendar.java @@ -1,10 +1,10 @@ package com.dddheroes.heroesofddd.calendar.write; import com.dddheroes.heroesofddd.calendar.write.finishday.CanOnlyFinishCurrentDay; -import com.dddheroes.heroesofddd.calendar.write.finishday.DayFinished; +import com.dddheroes.heroesofddd.calendar.events.DayFinished; import com.dddheroes.heroesofddd.calendar.write.finishday.FinishDay; import com.dddheroes.heroesofddd.calendar.write.startday.CannotSkipDays; -import com.dddheroes.heroesofddd.calendar.write.startday.DayStarted; +import com.dddheroes.heroesofddd.calendar.events.DayStarted; import com.dddheroes.heroesofddd.calendar.write.startday.StartDay; import org.axonframework.commandhandling.CommandHandler; import org.axonframework.eventsourcing.EventSourcingHandler; diff --git a/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/automation/WhenCreatureRecruitedThenAddToArmyProcessor.java b/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/automation/WhenCreatureRecruitedThenAddToArmyProcessor.java index cf12461..02deedb 100644 --- a/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/automation/WhenCreatureRecruitedThenAddToArmyProcessor.java +++ b/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/automation/WhenCreatureRecruitedThenAddToArmyProcessor.java @@ -2,7 +2,7 @@ import com.dddheroes.heroesofddd.armies.write.addcreature.AddCreatureToArmy; import com.dddheroes.heroesofddd.creaturerecruitment.write.changeavailablecreatures.IncreaseAvailableCreatures; -import com.dddheroes.heroesofddd.creaturerecruitment.write.recruitcreature.CreatureRecruited; +import com.dddheroes.heroesofddd.creaturerecruitment.events.CreatureRecruited; import com.dddheroes.heroesofddd.shared.GameMetaData; import org.axonframework.commandhandling.gateway.CommandGateway; import org.axonframework.config.ProcessingGroup; diff --git a/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/write/changeavailablecreatures/AvailableCreaturesChanged.java b/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/events/AvailableCreaturesChanged.java similarity index 87% rename from src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/write/changeavailablecreatures/AvailableCreaturesChanged.java rename to src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/events/AvailableCreaturesChanged.java index 246a80d..9b6d838 100644 --- a/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/write/changeavailablecreatures/AvailableCreaturesChanged.java +++ b/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/events/AvailableCreaturesChanged.java @@ -1,4 +1,4 @@ -package com.dddheroes.heroesofddd.creaturerecruitment.write.changeavailablecreatures; +package com.dddheroes.heroesofddd.creaturerecruitment.events; import com.dddheroes.heroesofddd.creaturerecruitment.write.DwellingEvent; import com.dddheroes.heroesofddd.creaturerecruitment.write.DwellingId; diff --git a/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/write/recruitcreature/CreatureRecruited.java b/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/events/CreatureRecruited.java similarity index 92% rename from src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/write/recruitcreature/CreatureRecruited.java rename to src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/events/CreatureRecruited.java index 6d23e89..20d4b24 100644 --- a/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/write/recruitcreature/CreatureRecruited.java +++ b/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/events/CreatureRecruited.java @@ -1,4 +1,4 @@ -package com.dddheroes.heroesofddd.creaturerecruitment.write.recruitcreature; +package com.dddheroes.heroesofddd.creaturerecruitment.events; import com.dddheroes.heroesofddd.creaturerecruitment.write.DwellingEvent; import com.dddheroes.heroesofddd.creaturerecruitment.write.DwellingId; diff --git a/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/write/builddwelling/DwellingBuilt.java b/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/events/DwellingBuilt.java similarity index 89% rename from src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/write/builddwelling/DwellingBuilt.java rename to src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/events/DwellingBuilt.java index f783933..fdbc8bf 100644 --- a/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/write/builddwelling/DwellingBuilt.java +++ b/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/events/DwellingBuilt.java @@ -1,4 +1,4 @@ -package com.dddheroes.heroesofddd.creaturerecruitment.write.builddwelling; +package com.dddheroes.heroesofddd.creaturerecruitment.events; import com.dddheroes.heroesofddd.creaturerecruitment.write.DwellingEvent; import com.dddheroes.heroesofddd.creaturerecruitment.write.DwellingId; diff --git a/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/read/DwellingReadModelProjector.java b/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/read/DwellingReadModelProjector.java index 01e211f..d1086a7 100644 --- a/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/read/DwellingReadModelProjector.java +++ b/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/read/DwellingReadModelProjector.java @@ -1,8 +1,8 @@ package com.dddheroes.heroesofddd.creaturerecruitment.read; -import com.dddheroes.heroesofddd.creaturerecruitment.write.builddwelling.DwellingBuilt; -import com.dddheroes.heroesofddd.creaturerecruitment.write.changeavailablecreatures.AvailableCreaturesChanged; -import com.dddheroes.heroesofddd.creaturerecruitment.write.recruitcreature.CreatureRecruited; +import com.dddheroes.heroesofddd.creaturerecruitment.events.DwellingBuilt; +import com.dddheroes.heroesofddd.creaturerecruitment.events.AvailableCreaturesChanged; +import com.dddheroes.heroesofddd.creaturerecruitment.events.CreatureRecruited; import com.dddheroes.heroesofddd.shared.GameMetaData; import org.axonframework.config.ProcessingGroup; import org.axonframework.eventhandling.EventHandler; diff --git a/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/read/getalldwellings/GetAllDwellingsQueryHandler.java b/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/read/getalldwellings/GetAllDwellingsQueryHandler.java index e19fd14..77b79ee 100644 --- a/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/read/getalldwellings/GetAllDwellingsQueryHandler.java +++ b/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/read/getalldwellings/GetAllDwellingsQueryHandler.java @@ -2,7 +2,7 @@ import com.dddheroes.heroesofddd.creaturerecruitment.read.DwellingReadModel; import com.dddheroes.heroesofddd.creaturerecruitment.read.DwellingReadModelRepository; -import com.dddheroes.heroesofddd.creaturerecruitment.write.builddwelling.DwellingBuilt; +import com.dddheroes.heroesofddd.creaturerecruitment.events.DwellingBuilt; import com.dddheroes.heroesofddd.shared.GameMetaData; import com.google.common.collect.Streams; import org.axonframework.config.ProcessingGroup; diff --git a/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/write/Dwelling.java b/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/write/Dwelling.java index b47092a..d6ccb1e 100644 --- a/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/write/Dwelling.java +++ b/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/write/Dwelling.java @@ -1,12 +1,12 @@ package com.dddheroes.heroesofddd.creaturerecruitment.write; import com.dddheroes.heroesofddd.creaturerecruitment.write.builddwelling.BuildDwelling; -import com.dddheroes.heroesofddd.creaturerecruitment.write.builddwelling.DwellingBuilt; +import com.dddheroes.heroesofddd.creaturerecruitment.events.DwellingBuilt; import com.dddheroes.heroesofddd.creaturerecruitment.write.builddwelling.OnlyNotBuiltBuildingCanBeBuild; -import com.dddheroes.heroesofddd.creaturerecruitment.write.changeavailablecreatures.AvailableCreaturesChanged; +import com.dddheroes.heroesofddd.creaturerecruitment.events.AvailableCreaturesChanged; import com.dddheroes.heroesofddd.creaturerecruitment.write.changeavailablecreatures.IncreaseAvailableCreatures; import com.dddheroes.heroesofddd.creaturerecruitment.write.changeavailablecreatures.OnlyBuiltDwellingCanHaveAvailableCreatures; -import com.dddheroes.heroesofddd.creaturerecruitment.write.recruitcreature.CreatureRecruited; +import com.dddheroes.heroesofddd.creaturerecruitment.events.CreatureRecruited; import com.dddheroes.heroesofddd.creaturerecruitment.write.recruitcreature.RecruitCreature; import com.dddheroes.heroesofddd.creaturerecruitment.write.recruitcreature.RecruitCreaturesNotExceedAvailableCreatures; import com.dddheroes.heroesofddd.shared.Amount; diff --git a/src/main/java/com/dddheroes/heroesofddd/resourcespool/write/deposit/ResourcesDeposited.java b/src/main/java/com/dddheroes/heroesofddd/resourcespool/events/ResourcesDeposited.java similarity index 89% rename from src/main/java/com/dddheroes/heroesofddd/resourcespool/write/deposit/ResourcesDeposited.java rename to src/main/java/com/dddheroes/heroesofddd/resourcespool/events/ResourcesDeposited.java index 71b0917..ecc82c1 100644 --- a/src/main/java/com/dddheroes/heroesofddd/resourcespool/write/deposit/ResourcesDeposited.java +++ b/src/main/java/com/dddheroes/heroesofddd/resourcespool/events/ResourcesDeposited.java @@ -1,4 +1,4 @@ -package com.dddheroes.heroesofddd.resourcespool.write.deposit; +package com.dddheroes.heroesofddd.resourcespool.events; import com.dddheroes.heroesofddd.resourcespool.write.ResourcesPoolEvent; import com.dddheroes.heroesofddd.resourcespool.write.ResourcesPoolId; diff --git a/src/main/java/com/dddheroes/heroesofddd/resourcespool/write/withdraw/ResourcesWithdrawn.java b/src/main/java/com/dddheroes/heroesofddd/resourcespool/events/ResourcesWithdrawn.java similarity index 89% rename from src/main/java/com/dddheroes/heroesofddd/resourcespool/write/withdraw/ResourcesWithdrawn.java rename to src/main/java/com/dddheroes/heroesofddd/resourcespool/events/ResourcesWithdrawn.java index 81280bf..a5f2e3e 100644 --- a/src/main/java/com/dddheroes/heroesofddd/resourcespool/write/withdraw/ResourcesWithdrawn.java +++ b/src/main/java/com/dddheroes/heroesofddd/resourcespool/events/ResourcesWithdrawn.java @@ -1,4 +1,4 @@ -package com.dddheroes.heroesofddd.resourcespool.write.withdraw; +package com.dddheroes.heroesofddd.resourcespool.events; import com.dddheroes.heroesofddd.resourcespool.write.ResourcesPoolEvent; import com.dddheroes.heroesofddd.resourcespool.write.ResourcesPoolId; diff --git a/src/main/java/com/dddheroes/heroesofddd/resourcespool/write/ResourcesPool.java b/src/main/java/com/dddheroes/heroesofddd/resourcespool/write/ResourcesPool.java index 9d5ef12..c0a37e7 100644 --- a/src/main/java/com/dddheroes/heroesofddd/resourcespool/write/ResourcesPool.java +++ b/src/main/java/com/dddheroes/heroesofddd/resourcespool/write/ResourcesPool.java @@ -1,9 +1,9 @@ package com.dddheroes.heroesofddd.resourcespool.write; import com.dddheroes.heroesofddd.resourcespool.write.deposit.DepositResources; -import com.dddheroes.heroesofddd.resourcespool.write.deposit.ResourcesDeposited; +import com.dddheroes.heroesofddd.resourcespool.events.ResourcesDeposited; import com.dddheroes.heroesofddd.resourcespool.write.withdraw.CannotWithdrawMoreThanDepositedResources; -import com.dddheroes.heroesofddd.resourcespool.write.withdraw.ResourcesWithdrawn; +import com.dddheroes.heroesofddd.resourcespool.events.ResourcesWithdrawn; import com.dddheroes.heroesofddd.resourcespool.write.withdraw.WithdrawResources; import com.dddheroes.heroesofddd.shared.Resources; import org.axonframework.commandhandling.CommandHandler; diff --git a/src/test/java/com/dddheroes/heroesofddd/armies/write/ArmyTest.java b/src/test/java/com/dddheroes/heroesofddd/armies/write/ArmyTest.java index e9bb72a..fd7390d 100644 --- a/src/test/java/com/dddheroes/heroesofddd/armies/write/ArmyTest.java +++ b/src/test/java/com/dddheroes/heroesofddd/armies/write/ArmyTest.java @@ -1,7 +1,7 @@ package com.dddheroes.heroesofddd.armies.write; -import com.dddheroes.heroesofddd.armies.write.addcreature.CreatureAddedToArmy; -import com.dddheroes.heroesofddd.armies.write.removecreature.CreatureRemovedFromArmy; +import com.dddheroes.heroesofddd.armies.events.CreatureAddedToArmy; +import com.dddheroes.heroesofddd.armies.events.CreatureRemovedFromArmy; import com.dddheroes.heroesofddd.shared.Amount; import com.dddheroes.heroesofddd.shared.ArmyId; import com.dddheroes.heroesofddd.shared.CreatureId; diff --git a/src/test/java/com/dddheroes/heroesofddd/astrologers/automation/whenweekstartedthenproclaimweeksymbol/WhenWeekStartedThenProclaimWeekSymbolTest.java b/src/test/java/com/dddheroes/heroesofddd/astrologers/automation/whenweekstartedthenproclaimweeksymbol/WhenWeekStartedThenProclaimWeekSymbolTest.java index d06082e..ab95e05 100644 --- a/src/test/java/com/dddheroes/heroesofddd/astrologers/automation/whenweekstartedthenproclaimweeksymbol/WhenWeekStartedThenProclaimWeekSymbolTest.java +++ b/src/test/java/com/dddheroes/heroesofddd/astrologers/automation/whenweekstartedthenproclaimweeksymbol/WhenWeekStartedThenProclaimWeekSymbolTest.java @@ -4,7 +4,7 @@ import com.dddheroes.heroesofddd.astrologers.write.proclaimweeksymbol.ProclaimWeekSymbol; import com.dddheroes.heroesofddd.calendar.write.CalendarEvent; import com.dddheroes.heroesofddd.calendar.write.CalendarId; -import com.dddheroes.heroesofddd.calendar.write.startday.DayStarted; +import com.dddheroes.heroesofddd.calendar.events.DayStarted; import com.dddheroes.heroesofddd.maintenance.write.resetprocessor.StreamProcessorsOperations; import com.dddheroes.heroesofddd.shared.GameId; import com.dddheroes.heroesofddd.shared.GameMetaData; diff --git a/src/test/java/com/dddheroes/heroesofddd/astrologers/automation/whenweeksymbolproclaimedthenincreasedwellingavailablecreatures/WhenWeekSymbolProclaimedThenIncreaseDwellingAvailableCreaturesTest.java b/src/test/java/com/dddheroes/heroesofddd/astrologers/automation/whenweeksymbolproclaimedthenincreasedwellingavailablecreatures/WhenWeekSymbolProclaimedThenIncreaseDwellingAvailableCreaturesTest.java index 94287f4..b9a5833 100644 --- a/src/test/java/com/dddheroes/heroesofddd/astrologers/automation/whenweeksymbolproclaimedthenincreasedwellingavailablecreatures/WhenWeekSymbolProclaimedThenIncreaseDwellingAvailableCreaturesTest.java +++ b/src/test/java/com/dddheroes/heroesofddd/astrologers/automation/whenweeksymbolproclaimedthenincreasedwellingavailablecreatures/WhenWeekSymbolProclaimedThenIncreaseDwellingAvailableCreaturesTest.java @@ -3,10 +3,10 @@ import com.dddheroes.heroesofddd.TestcontainersConfiguration; import com.dddheroes.heroesofddd.astrologers.write.AstrologersEvent; import com.dddheroes.heroesofddd.astrologers.write.AstrologersId; -import com.dddheroes.heroesofddd.astrologers.write.proclaimweeksymbol.WeekSymbolProclaimed; +import com.dddheroes.heroesofddd.astrologers.events.WeekSymbolProclaimed; import com.dddheroes.heroesofddd.creaturerecruitment.write.DwellingEvent; import com.dddheroes.heroesofddd.creaturerecruitment.write.DwellingId; -import com.dddheroes.heroesofddd.creaturerecruitment.write.builddwelling.DwellingBuilt; +import com.dddheroes.heroesofddd.creaturerecruitment.events.DwellingBuilt; import com.dddheroes.heroesofddd.creaturerecruitment.write.changeavailablecreatures.IncreaseAvailableCreatures; import com.dddheroes.heroesofddd.shared.Amount; import com.dddheroes.heroesofddd.shared.PlayerId; diff --git a/src/test/java/com/dddheroes/heroesofddd/astrologers/write/proclaimweeksymbol/ProclaimWeekSymbolTest.java b/src/test/java/com/dddheroes/heroesofddd/astrologers/write/proclaimweeksymbol/ProclaimWeekSymbolTest.java index 6a4aa0e..d019111 100644 --- a/src/test/java/com/dddheroes/heroesofddd/astrologers/write/proclaimweeksymbol/ProclaimWeekSymbolTest.java +++ b/src/test/java/com/dddheroes/heroesofddd/astrologers/write/proclaimweeksymbol/ProclaimWeekSymbolTest.java @@ -1,5 +1,6 @@ package com.dddheroes.heroesofddd.astrologers.write.proclaimweeksymbol; +import com.dddheroes.heroesofddd.astrologers.events.WeekSymbolProclaimed; import com.dddheroes.heroesofddd.astrologers.write.AstrologersId; import com.dddheroes.heroesofddd.astrologers.write.AstrologersTest; import com.dddheroes.heroesofddd.astrologers.write.MonthWeek; diff --git a/src/test/java/com/dddheroes/heroesofddd/calendar/write/finishday/FinishDayTest.java b/src/test/java/com/dddheroes/heroesofddd/calendar/write/finishday/FinishDayTest.java index c5b25d4..578ff3d 100644 --- a/src/test/java/com/dddheroes/heroesofddd/calendar/write/finishday/FinishDayTest.java +++ b/src/test/java/com/dddheroes/heroesofddd/calendar/write/finishday/FinishDayTest.java @@ -1,19 +1,17 @@ package com.dddheroes.heroesofddd.calendar.write.finishday; +import com.dddheroes.heroesofddd.calendar.events.DayFinished; import com.dddheroes.heroesofddd.calendar.write.CalendarId; import com.dddheroes.heroesofddd.calendar.write.CalendarTest; import com.dddheroes.heroesofddd.calendar.write.Day; import com.dddheroes.heroesofddd.calendar.write.Month; import com.dddheroes.heroesofddd.calendar.write.Week; -import com.dddheroes.heroesofddd.calendar.write.startday.DayStarted; -import com.dddheroes.heroesofddd.calendar.write.startday.StartDay; +import com.dddheroes.heroesofddd.calendar.events.DayStarted; import com.dddheroes.heroesofddd.shared.DomainRule; import org.axonframework.modelling.command.AggregateNotFoundException; import org.junit.jupiter.api.*; import java.util.List; -import java.util.stream.Collectors; -import java.util.stream.IntStream; public class FinishDayTest extends CalendarTest { diff --git a/src/test/java/com/dddheroes/heroesofddd/calendar/write/startday/StartDayTest.java b/src/test/java/com/dddheroes/heroesofddd/calendar/write/startday/StartDayTest.java index 3d3e847..63c7207 100644 --- a/src/test/java/com/dddheroes/heroesofddd/calendar/write/startday/StartDayTest.java +++ b/src/test/java/com/dddheroes/heroesofddd/calendar/write/startday/StartDayTest.java @@ -1,11 +1,12 @@ package com.dddheroes.heroesofddd.calendar.write.startday; +import com.dddheroes.heroesofddd.calendar.events.DayStarted; import com.dddheroes.heroesofddd.calendar.write.CalendarId; import com.dddheroes.heroesofddd.calendar.write.CalendarTest; import com.dddheroes.heroesofddd.calendar.write.Day; import com.dddheroes.heroesofddd.calendar.write.Month; import com.dddheroes.heroesofddd.calendar.write.Week; -import com.dddheroes.heroesofddd.calendar.write.finishday.DayFinished; +import com.dddheroes.heroesofddd.calendar.events.DayFinished; import com.dddheroes.heroesofddd.shared.DomainRule; import org.junit.jupiter.api.*; diff --git a/src/test/java/com/dddheroes/heroesofddd/creaturerecruitment/automation/WhenCreatureRecruitedThenAddToArmyTest.java b/src/test/java/com/dddheroes/heroesofddd/creaturerecruitment/automation/WhenCreatureRecruitedThenAddToArmyTest.java index 4b7d26d..a40d6eb 100644 --- a/src/test/java/com/dddheroes/heroesofddd/creaturerecruitment/automation/WhenCreatureRecruitedThenAddToArmyTest.java +++ b/src/test/java/com/dddheroes/heroesofddd/creaturerecruitment/automation/WhenCreatureRecruitedThenAddToArmyTest.java @@ -3,13 +3,13 @@ import com.dddheroes.heroesofddd.TestcontainersConfiguration; import com.dddheroes.heroesofddd.armies.write.ArmyEvent; import com.dddheroes.heroesofddd.armies.write.addcreature.AddCreatureToArmy; -import com.dddheroes.heroesofddd.armies.write.addcreature.CreatureAddedToArmy; +import com.dddheroes.heroesofddd.armies.events.CreatureAddedToArmy; import com.dddheroes.heroesofddd.creaturerecruitment.write.DwellingEvent; import com.dddheroes.heroesofddd.creaturerecruitment.write.DwellingId; -import com.dddheroes.heroesofddd.creaturerecruitment.write.builddwelling.DwellingBuilt; -import com.dddheroes.heroesofddd.creaturerecruitment.write.changeavailablecreatures.AvailableCreaturesChanged; +import com.dddheroes.heroesofddd.creaturerecruitment.events.DwellingBuilt; +import com.dddheroes.heroesofddd.creaturerecruitment.events.AvailableCreaturesChanged; import com.dddheroes.heroesofddd.creaturerecruitment.write.changeavailablecreatures.IncreaseAvailableCreatures; -import com.dddheroes.heroesofddd.creaturerecruitment.write.recruitcreature.CreatureRecruited; +import com.dddheroes.heroesofddd.creaturerecruitment.events.CreatureRecruited; import com.dddheroes.heroesofddd.shared.ArmyId; import com.dddheroes.heroesofddd.shared.CreatureIds; import com.dddheroes.heroesofddd.shared.GameId; diff --git a/src/test/java/com/dddheroes/heroesofddd/creaturerecruitment/read/getalldwellings/GetAllDwellingsTest.java b/src/test/java/com/dddheroes/heroesofddd/creaturerecruitment/read/getalldwellings/GetAllDwellingsTest.java index 4f68473..8d27f00 100644 --- a/src/test/java/com/dddheroes/heroesofddd/creaturerecruitment/read/getalldwellings/GetAllDwellingsTest.java +++ b/src/test/java/com/dddheroes/heroesofddd/creaturerecruitment/read/getalldwellings/GetAllDwellingsTest.java @@ -3,7 +3,7 @@ import com.dddheroes.heroesofddd.TestcontainersConfiguration; import com.dddheroes.heroesofddd.creaturerecruitment.read.DwellingReadModelTest; import com.dddheroes.heroesofddd.creaturerecruitment.write.DwellingId; -import com.dddheroes.heroesofddd.creaturerecruitment.write.builddwelling.DwellingBuilt; +import com.dddheroes.heroesofddd.creaturerecruitment.events.DwellingBuilt; import com.dddheroes.heroesofddd.shared.CreatureIds; import org.axonframework.eventhandling.gateway.EventGateway; import org.axonframework.queryhandling.QueryGateway; diff --git a/src/test/java/com/dddheroes/heroesofddd/creaturerecruitment/read/getdwellingbyid/GetDwellingByIdTest.java b/src/test/java/com/dddheroes/heroesofddd/creaturerecruitment/read/getdwellingbyid/GetDwellingByIdTest.java index 0e3f70f..3b9bd2a 100644 --- a/src/test/java/com/dddheroes/heroesofddd/creaturerecruitment/read/getdwellingbyid/GetDwellingByIdTest.java +++ b/src/test/java/com/dddheroes/heroesofddd/creaturerecruitment/read/getdwellingbyid/GetDwellingByIdTest.java @@ -3,19 +3,12 @@ import com.dddheroes.heroesofddd.TestcontainersConfiguration; import com.dddheroes.heroesofddd.creaturerecruitment.read.DwellingReadModel; import com.dddheroes.heroesofddd.creaturerecruitment.read.DwellingReadModelTest; -import com.dddheroes.heroesofddd.creaturerecruitment.write.DwellingEvent; import com.dddheroes.heroesofddd.creaturerecruitment.write.DwellingId; -import com.dddheroes.heroesofddd.creaturerecruitment.write.builddwelling.DwellingBuilt; -import com.dddheroes.heroesofddd.creaturerecruitment.write.changeavailablecreatures.AvailableCreaturesChanged; -import com.dddheroes.heroesofddd.creaturerecruitment.write.recruitcreature.CreatureRecruited; +import com.dddheroes.heroesofddd.creaturerecruitment.events.DwellingBuilt; +import com.dddheroes.heroesofddd.creaturerecruitment.events.AvailableCreaturesChanged; +import com.dddheroes.heroesofddd.creaturerecruitment.events.CreatureRecruited; import com.dddheroes.heroesofddd.shared.ArmyId; import com.dddheroes.heroesofddd.shared.CreatureIds; -import com.dddheroes.heroesofddd.shared.GameId; -import com.dddheroes.heroesofddd.shared.GameMetaData; -import com.dddheroes.heroesofddd.shared.PlayerId; -import com.dddheroes.heroesofddd.shared.ResourceType; -import org.axonframework.eventhandling.DomainEventMessage; -import org.axonframework.eventhandling.GenericDomainEventMessage; import org.axonframework.eventhandling.gateway.EventGateway; import org.axonframework.queryhandling.QueryGateway; import org.junit.jupiter.api.*; @@ -23,8 +16,6 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Import; -import java.util.Map; - import static com.dddheroes.heroesofddd.utils.AwaitilityUtils.*; import static org.assertj.core.api.Assertions.*; diff --git a/src/test/java/com/dddheroes/heroesofddd/creaturerecruitment/write/DwellingTest.java b/src/test/java/com/dddheroes/heroesofddd/creaturerecruitment/write/DwellingTest.java index 1044f43..41b68b9 100644 --- a/src/test/java/com/dddheroes/heroesofddd/creaturerecruitment/write/DwellingTest.java +++ b/src/test/java/com/dddheroes/heroesofddd/creaturerecruitment/write/DwellingTest.java @@ -1,7 +1,7 @@ package com.dddheroes.heroesofddd.creaturerecruitment.write; import com.dddheroes.heroesofddd.creaturerecruitment.write.builddwelling.BuildDwelling; -import com.dddheroes.heroesofddd.creaturerecruitment.write.builddwelling.DwellingBuilt; +import com.dddheroes.heroesofddd.creaturerecruitment.events.DwellingBuilt; import com.dddheroes.heroesofddd.shared.Amount; import com.dddheroes.heroesofddd.shared.Resources; import com.dddheroes.heroesofddd.shared.CreatureId; diff --git a/src/test/java/com/dddheroes/heroesofddd/creaturerecruitment/write/changeavailablecreatures/IncreaseAvailableCreaturesTest.java b/src/test/java/com/dddheroes/heroesofddd/creaturerecruitment/write/changeavailablecreatures/IncreaseAvailableCreaturesTest.java index 0ec85f1..cbe55fd 100644 --- a/src/test/java/com/dddheroes/heroesofddd/creaturerecruitment/write/changeavailablecreatures/IncreaseAvailableCreaturesTest.java +++ b/src/test/java/com/dddheroes/heroesofddd/creaturerecruitment/write/changeavailablecreatures/IncreaseAvailableCreaturesTest.java @@ -1,5 +1,6 @@ package com.dddheroes.heroesofddd.creaturerecruitment.write.changeavailablecreatures; +import com.dddheroes.heroesofddd.creaturerecruitment.events.AvailableCreaturesChanged; import com.dddheroes.heroesofddd.creaturerecruitment.write.DwellingTest; import com.dddheroes.heroesofddd.shared.Amount; import org.axonframework.modelling.command.AggregateNotFoundException; diff --git a/src/test/java/com/dddheroes/heroesofddd/creaturerecruitment/write/recruitcreature/RecruitCreatureTest.java b/src/test/java/com/dddheroes/heroesofddd/creaturerecruitment/write/recruitcreature/RecruitCreatureTest.java index 2567301..81c93b6 100644 --- a/src/test/java/com/dddheroes/heroesofddd/creaturerecruitment/write/recruitcreature/RecruitCreatureTest.java +++ b/src/test/java/com/dddheroes/heroesofddd/creaturerecruitment/write/recruitcreature/RecruitCreatureTest.java @@ -1,7 +1,8 @@ package com.dddheroes.heroesofddd.creaturerecruitment.write.recruitcreature; +import com.dddheroes.heroesofddd.creaturerecruitment.events.CreatureRecruited; import com.dddheroes.heroesofddd.creaturerecruitment.write.DwellingTest; -import com.dddheroes.heroesofddd.creaturerecruitment.write.changeavailablecreatures.AvailableCreaturesChanged; +import com.dddheroes.heroesofddd.creaturerecruitment.events.AvailableCreaturesChanged; import com.dddheroes.heroesofddd.shared.Amount; import com.dddheroes.heroesofddd.shared.ArmyId; import com.dddheroes.heroesofddd.shared.CreatureId; diff --git a/src/test/java/com/dddheroes/heroesofddd/resourcespool/write/ResourcesPoolTest.java b/src/test/java/com/dddheroes/heroesofddd/resourcespool/write/ResourcesPoolTest.java index 32844a3..ec129f7 100644 --- a/src/test/java/com/dddheroes/heroesofddd/resourcespool/write/ResourcesPoolTest.java +++ b/src/test/java/com/dddheroes/heroesofddd/resourcespool/write/ResourcesPoolTest.java @@ -1,7 +1,7 @@ package com.dddheroes.heroesofddd.resourcespool.write; -import com.dddheroes.heroesofddd.resourcespool.write.deposit.ResourcesDeposited; -import com.dddheroes.heroesofddd.resourcespool.write.withdraw.ResourcesWithdrawn; +import com.dddheroes.heroesofddd.resourcespool.events.ResourcesDeposited; +import com.dddheroes.heroesofddd.resourcespool.events.ResourcesWithdrawn; import com.dddheroes.heroesofddd.shared.Amount; import com.dddheroes.heroesofddd.shared.ResourceType; import com.dddheroes.heroesofddd.shared.Resources; diff --git a/src/test/java/com/dddheroes/heroesofddd/resourcespool/write/withdraw/WithdrawResourcesTest.java b/src/test/java/com/dddheroes/heroesofddd/resourcespool/write/withdraw/WithdrawResourcesTest.java index efc39ef..ac3bb27 100644 --- a/src/test/java/com/dddheroes/heroesofddd/resourcespool/write/withdraw/WithdrawResourcesTest.java +++ b/src/test/java/com/dddheroes/heroesofddd/resourcespool/write/withdraw/WithdrawResourcesTest.java @@ -1,9 +1,6 @@ package com.dddheroes.heroesofddd.resourcespool.write.withdraw; import com.dddheroes.heroesofddd.resourcespool.write.ResourcesPoolTest; -import com.dddheroes.heroesofddd.resourcespool.write.deposit.DepositResources; -import com.dddheroes.heroesofddd.resourcespool.write.deposit.ResourcesDeposited; -import com.dddheroes.heroesofddd.shared.Amount; import com.dddheroes.heroesofddd.shared.DomainRule; import com.dddheroes.heroesofddd.shared.ResourceType; import org.axonframework.modelling.command.AggregateNotFoundException;