diff --git a/src/main/java/com/dddheroes/heroesofddd/GameConfiguration.java b/src/main/java/com/dddheroes/heroesofddd/GameConfiguration.java index 721be10..0cacb37 100644 --- a/src/main/java/com/dddheroes/heroesofddd/GameConfiguration.java +++ b/src/main/java/com/dddheroes/heroesofddd/GameConfiguration.java @@ -1,6 +1,6 @@ package com.dddheroes.heroesofddd; -import com.dddheroes.heroesofddd.shared.GameMetaData; +import com.dddheroes.heroesofddd.shared.application.GameMetaData; import org.axonframework.eventhandling.EventMessage; import org.axonframework.eventhandling.async.SequencingPolicy; import org.springframework.context.annotation.Bean; diff --git a/src/main/java/com/dddheroes/heroesofddd/armies/events/ArmyEvent.java b/src/main/java/com/dddheroes/heroesofddd/armies/events/ArmyEvent.java new file mode 100644 index 0000000..fb868c4 --- /dev/null +++ b/src/main/java/com/dddheroes/heroesofddd/armies/events/ArmyEvent.java @@ -0,0 +1,6 @@ +package com.dddheroes.heroesofddd.armies.events; + +public sealed interface ArmyEvent permits CreatureAddedToArmy, CreatureRemovedFromArmy { + + String armyId(); +} diff --git a/src/main/java/com/dddheroes/heroesofddd/armies/events/CreatureAddedToArmy.java b/src/main/java/com/dddheroes/heroesofddd/armies/events/CreatureAddedToArmy.java index fa17ec9..1362d93 100644 --- a/src/main/java/com/dddheroes/heroesofddd/armies/events/CreatureAddedToArmy.java +++ b/src/main/java/com/dddheroes/heroesofddd/armies/events/CreatureAddedToArmy.java @@ -1,9 +1,8 @@ package com.dddheroes.heroesofddd.armies.events; -import com.dddheroes.heroesofddd.armies.write.ArmyEvent; -import com.dddheroes.heroesofddd.shared.Amount; -import com.dddheroes.heroesofddd.shared.ArmyId; -import com.dddheroes.heroesofddd.shared.CreatureId; +import com.dddheroes.heroesofddd.shared.domain.valueobjects.Amount; +import com.dddheroes.heroesofddd.shared.domain.identifiers.ArmyId; +import com.dddheroes.heroesofddd.shared.domain.identifiers.CreatureId; public record CreatureAddedToArmy( String armyId, diff --git a/src/main/java/com/dddheroes/heroesofddd/armies/events/CreatureRemovedFromArmy.java b/src/main/java/com/dddheroes/heroesofddd/armies/events/CreatureRemovedFromArmy.java index f23b80c..931f50a 100644 --- a/src/main/java/com/dddheroes/heroesofddd/armies/events/CreatureRemovedFromArmy.java +++ b/src/main/java/com/dddheroes/heroesofddd/armies/events/CreatureRemovedFromArmy.java @@ -1,9 +1,8 @@ package com.dddheroes.heroesofddd.armies.events; -import com.dddheroes.heroesofddd.armies.write.ArmyEvent; -import com.dddheroes.heroesofddd.shared.Amount; -import com.dddheroes.heroesofddd.shared.ArmyId; -import com.dddheroes.heroesofddd.shared.CreatureId; +import com.dddheroes.heroesofddd.shared.domain.valueobjects.Amount; +import com.dddheroes.heroesofddd.shared.domain.identifiers.ArmyId; +import com.dddheroes.heroesofddd.shared.domain.identifiers.CreatureId; public record CreatureRemovedFromArmy( String armyId, 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 0b02175..85149d1 100644 --- a/src/main/java/com/dddheroes/heroesofddd/armies/write/Army.java +++ b/src/main/java/com/dddheroes/heroesofddd/armies/write/Army.java @@ -6,9 +6,9 @@ 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; -import com.dddheroes.heroesofddd.shared.ArmyId; -import com.dddheroes.heroesofddd.shared.CreatureId; +import com.dddheroes.heroesofddd.shared.domain.valueobjects.Amount; +import com.dddheroes.heroesofddd.shared.domain.identifiers.ArmyId; +import com.dddheroes.heroesofddd.shared.domain.identifiers.CreatureId; 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/armies/write/ArmyCommand.java b/src/main/java/com/dddheroes/heroesofddd/armies/write/ArmyCommand.java index 2c5ff04..7009c40 100644 --- a/src/main/java/com/dddheroes/heroesofddd/armies/write/ArmyCommand.java +++ b/src/main/java/com/dddheroes/heroesofddd/armies/write/ArmyCommand.java @@ -1,8 +1,9 @@ package com.dddheroes.heroesofddd.armies.write; -import com.dddheroes.heroesofddd.shared.ArmyId; +import com.dddheroes.heroesofddd.shared.domain.identifiers.ArmyId; +import com.dddheroes.heroesofddd.shared.slices.write.Command; -public interface ArmyCommand { +public interface ArmyCommand extends Command { ArmyId armyId(); } diff --git a/src/main/java/com/dddheroes/heroesofddd/armies/write/ArmyEvent.java b/src/main/java/com/dddheroes/heroesofddd/armies/write/ArmyEvent.java deleted file mode 100644 index fe2c200..0000000 --- a/src/main/java/com/dddheroes/heroesofddd/armies/write/ArmyEvent.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.dddheroes.heroesofddd.armies.write; - -public interface ArmyEvent { - - String armyId(); -} diff --git a/src/main/java/com/dddheroes/heroesofddd/armies/write/addcreature/AddCreatureToArmy.java b/src/main/java/com/dddheroes/heroesofddd/armies/write/addcreature/AddCreatureToArmy.java index 4f8a16b..a822a7e 100644 --- a/src/main/java/com/dddheroes/heroesofddd/armies/write/addcreature/AddCreatureToArmy.java +++ b/src/main/java/com/dddheroes/heroesofddd/armies/write/addcreature/AddCreatureToArmy.java @@ -1,8 +1,9 @@ package com.dddheroes.heroesofddd.armies.write.addcreature; -import com.dddheroes.heroesofddd.shared.Amount; -import com.dddheroes.heroesofddd.shared.ArmyId; -import com.dddheroes.heroesofddd.shared.CreatureId; +import com.dddheroes.heroesofddd.armies.write.ArmyCommand; +import com.dddheroes.heroesofddd.shared.domain.valueobjects.Amount; +import com.dddheroes.heroesofddd.shared.domain.identifiers.ArmyId; +import com.dddheroes.heroesofddd.shared.domain.identifiers.CreatureId; import org.axonframework.modelling.command.TargetAggregateIdentifier; public record AddCreatureToArmy( @@ -10,7 +11,7 @@ public record AddCreatureToArmy( ArmyId armyId, CreatureId creatureId, Amount quantity -) { +) implements ArmyCommand { public AddCreatureToArmy { if (quantity.raw() <= 0) { diff --git a/src/main/java/com/dddheroes/heroesofddd/armies/write/addcreature/CanHaveMax7CreatureStacksInArmy.java b/src/main/java/com/dddheroes/heroesofddd/armies/write/addcreature/CanHaveMax7CreatureStacksInArmy.java index 442ebbc..4d20a66 100644 --- a/src/main/java/com/dddheroes/heroesofddd/armies/write/addcreature/CanHaveMax7CreatureStacksInArmy.java +++ b/src/main/java/com/dddheroes/heroesofddd/armies/write/addcreature/CanHaveMax7CreatureStacksInArmy.java @@ -1,8 +1,8 @@ package com.dddheroes.heroesofddd.armies.write.addcreature; -import com.dddheroes.heroesofddd.shared.Amount; -import com.dddheroes.heroesofddd.shared.CreatureId; -import com.dddheroes.heroesofddd.shared.DomainRule; +import com.dddheroes.heroesofddd.shared.domain.valueobjects.Amount; +import com.dddheroes.heroesofddd.shared.domain.identifiers.CreatureId; +import com.dddheroes.heroesofddd.shared.domain.DomainRule; import java.util.Map; diff --git a/src/main/java/com/dddheroes/heroesofddd/armies/write/removecreature/CanRemoveOnlyPresentCreatures.java b/src/main/java/com/dddheroes/heroesofddd/armies/write/removecreature/CanRemoveOnlyPresentCreatures.java index 49c2454..4c61f74 100644 --- a/src/main/java/com/dddheroes/heroesofddd/armies/write/removecreature/CanRemoveOnlyPresentCreatures.java +++ b/src/main/java/com/dddheroes/heroesofddd/armies/write/removecreature/CanRemoveOnlyPresentCreatures.java @@ -1,8 +1,8 @@ package com.dddheroes.heroesofddd.armies.write.removecreature; -import com.dddheroes.heroesofddd.shared.Amount; -import com.dddheroes.heroesofddd.shared.CreatureId; -import com.dddheroes.heroesofddd.shared.DomainRule; +import com.dddheroes.heroesofddd.shared.domain.valueobjects.Amount; +import com.dddheroes.heroesofddd.shared.domain.identifiers.CreatureId; +import com.dddheroes.heroesofddd.shared.domain.DomainRule; import java.util.Map; diff --git a/src/main/java/com/dddheroes/heroesofddd/armies/write/removecreature/RemoveCreatureFromArmy.java b/src/main/java/com/dddheroes/heroesofddd/armies/write/removecreature/RemoveCreatureFromArmy.java index 0784d9d..0db140b 100644 --- a/src/main/java/com/dddheroes/heroesofddd/armies/write/removecreature/RemoveCreatureFromArmy.java +++ b/src/main/java/com/dddheroes/heroesofddd/armies/write/removecreature/RemoveCreatureFromArmy.java @@ -1,8 +1,9 @@ package com.dddheroes.heroesofddd.armies.write.removecreature; -import com.dddheroes.heroesofddd.shared.Amount; -import com.dddheroes.heroesofddd.shared.ArmyId; -import com.dddheroes.heroesofddd.shared.CreatureId; +import com.dddheroes.heroesofddd.armies.write.ArmyCommand; +import com.dddheroes.heroesofddd.shared.domain.valueobjects.Amount; +import com.dddheroes.heroesofddd.shared.domain.identifiers.ArmyId; +import com.dddheroes.heroesofddd.shared.domain.identifiers.CreatureId; import org.axonframework.modelling.command.TargetAggregateIdentifier; public record RemoveCreatureFromArmy( @@ -10,7 +11,7 @@ public record RemoveCreatureFromArmy( ArmyId armyId, CreatureId creatureId, Amount quantity -) { +) implements ArmyCommand { public RemoveCreatureFromArmy { if (quantity.raw() <= 0) { diff --git a/src/main/java/com/dddheroes/heroesofddd/astrologers/AstrologersConfiguration.java b/src/main/java/com/dddheroes/heroesofddd/astrologers/AstrologersConfiguration.java index 70c341b..ed7576c 100644 --- a/src/main/java/com/dddheroes/heroesofddd/astrologers/AstrologersConfiguration.java +++ b/src/main/java/com/dddheroes/heroesofddd/astrologers/AstrologersConfiguration.java @@ -2,7 +2,7 @@ import com.dddheroes.heroesofddd.astrologers.automation.whenweekstartedthenproclaimweeksymbol.WeekSymbolCalculator; import com.dddheroes.heroesofddd.astrologers.write.WeekSymbol; -import com.dddheroes.heroesofddd.shared.CreatureId; +import com.dddheroes.heroesofddd.shared.domain.identifiers.CreatureId; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; 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 a4cc165..21232b8 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 @@ -4,7 +4,7 @@ import com.dddheroes.heroesofddd.astrologers.write.MonthWeek; import com.dddheroes.heroesofddd.astrologers.write.proclaimweeksymbol.ProclaimWeekSymbol; import com.dddheroes.heroesofddd.calendar.events.DayStarted; -import com.dddheroes.heroesofddd.shared.GameMetaData; +import com.dddheroes.heroesofddd.shared.application.GameMetaData; import org.axonframework.commandhandling.gateway.CommandGateway; import org.axonframework.config.ProcessingGroup; import org.axonframework.eventhandling.DisallowReplay; 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 c7cbba0..7846a7f 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 @@ -3,7 +3,7 @@ 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 com.dddheroes.heroesofddd.shared.application.GameMetaData; import org.axonframework.commandhandling.gateway.CommandGateway; import org.axonframework.config.ProcessingGroup; import org.axonframework.eventhandling.DisallowReplay; diff --git a/src/main/java/com/dddheroes/heroesofddd/astrologers/events/AstrologersEvent.java b/src/main/java/com/dddheroes/heroesofddd/astrologers/events/AstrologersEvent.java new file mode 100644 index 0000000..f0f138b --- /dev/null +++ b/src/main/java/com/dddheroes/heroesofddd/astrologers/events/AstrologersEvent.java @@ -0,0 +1,6 @@ +package com.dddheroes.heroesofddd.astrologers.events; + +public sealed interface AstrologersEvent permits WeekSymbolProclaimed { + + String astrologersId(); +} diff --git a/src/main/java/com/dddheroes/heroesofddd/astrologers/events/WeekSymbolProclaimed.java b/src/main/java/com/dddheroes/heroesofddd/astrologers/events/WeekSymbolProclaimed.java index 874d4a2..e38fbfc 100644 --- a/src/main/java/com/dddheroes/heroesofddd/astrologers/events/WeekSymbolProclaimed.java +++ b/src/main/java/com/dddheroes/heroesofddd/astrologers/events/WeekSymbolProclaimed.java @@ -1,6 +1,5 @@ package com.dddheroes.heroesofddd.astrologers.events; -import com.dddheroes.heroesofddd.astrologers.write.AstrologersEvent; import com.dddheroes.heroesofddd.astrologers.write.AstrologersId; import com.dddheroes.heroesofddd.astrologers.write.MonthWeek; import com.dddheroes.heroesofddd.astrologers.write.WeekSymbol; diff --git a/src/main/java/com/dddheroes/heroesofddd/astrologers/write/AstrologersCommand.java b/src/main/java/com/dddheroes/heroesofddd/astrologers/write/AstrologersCommand.java index aec0448..3283983 100644 --- a/src/main/java/com/dddheroes/heroesofddd/astrologers/write/AstrologersCommand.java +++ b/src/main/java/com/dddheroes/heroesofddd/astrologers/write/AstrologersCommand.java @@ -1,7 +1,8 @@ package com.dddheroes.heroesofddd.astrologers.write; +import com.dddheroes.heroesofddd.shared.slices.write.Command; -public interface AstrologersCommand { +public interface AstrologersCommand extends Command { AstrologersId astrologersId(); } diff --git a/src/main/java/com/dddheroes/heroesofddd/astrologers/write/AstrologersEvent.java b/src/main/java/com/dddheroes/heroesofddd/astrologers/write/AstrologersEvent.java deleted file mode 100644 index b19561b..0000000 --- a/src/main/java/com/dddheroes/heroesofddd/astrologers/write/AstrologersEvent.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.dddheroes.heroesofddd.astrologers.write; - -public interface AstrologersEvent { - - String astrologersId(); -} diff --git a/src/main/java/com/dddheroes/heroesofddd/astrologers/write/WeekSymbol.java b/src/main/java/com/dddheroes/heroesofddd/astrologers/write/WeekSymbol.java index 1eccdbf..6f69b27 100644 --- a/src/main/java/com/dddheroes/heroesofddd/astrologers/write/WeekSymbol.java +++ b/src/main/java/com/dddheroes/heroesofddd/astrologers/write/WeekSymbol.java @@ -1,6 +1,6 @@ package com.dddheroes.heroesofddd.astrologers.write; -import com.dddheroes.heroesofddd.shared.CreatureId; +import com.dddheroes.heroesofddd.shared.domain.identifiers.CreatureId; // todo: polymorphism, support symbols which are not creatures public record WeekSymbol(CreatureId weekOf, Integer growth) { diff --git a/src/main/java/com/dddheroes/heroesofddd/astrologers/write/proclaimweeksymbol/OnlyOneSymbolPerWeek.java b/src/main/java/com/dddheroes/heroesofddd/astrologers/write/proclaimweeksymbol/OnlyOneSymbolPerWeek.java index a287a8c..4c3a261 100644 --- a/src/main/java/com/dddheroes/heroesofddd/astrologers/write/proclaimweeksymbol/OnlyOneSymbolPerWeek.java +++ b/src/main/java/com/dddheroes/heroesofddd/astrologers/write/proclaimweeksymbol/OnlyOneSymbolPerWeek.java @@ -1,11 +1,7 @@ package com.dddheroes.heroesofddd.astrologers.write.proclaimweeksymbol; import com.dddheroes.heroesofddd.astrologers.write.MonthWeek; -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.FinishDay; -import com.dddheroes.heroesofddd.shared.DomainRule; +import com.dddheroes.heroesofddd.shared.domain.DomainRule; public record OnlyOneSymbolPerWeek( ProclaimWeekSymbol command, diff --git a/src/main/java/com/dddheroes/heroesofddd/astrologers/write/proclaimweeksymbol/ProclaimWeekSymbol.java b/src/main/java/com/dddheroes/heroesofddd/astrologers/write/proclaimweeksymbol/ProclaimWeekSymbol.java index 2a5abe9..4a09a34 100644 --- a/src/main/java/com/dddheroes/heroesofddd/astrologers/write/proclaimweeksymbol/ProclaimWeekSymbol.java +++ b/src/main/java/com/dddheroes/heroesofddd/astrologers/write/proclaimweeksymbol/ProclaimWeekSymbol.java @@ -4,7 +4,7 @@ import com.dddheroes.heroesofddd.astrologers.write.AstrologersId; import com.dddheroes.heroesofddd.astrologers.write.MonthWeek; import com.dddheroes.heroesofddd.astrologers.write.WeekSymbol; -import com.dddheroes.heroesofddd.shared.CreatureId; +import com.dddheroes.heroesofddd.shared.domain.identifiers.CreatureId; import org.axonframework.modelling.command.TargetAggregateIdentifier; public record ProclaimWeekSymbol( diff --git a/src/main/java/com/dddheroes/heroesofddd/calendar/events/CalendarEvent.java b/src/main/java/com/dddheroes/heroesofddd/calendar/events/CalendarEvent.java new file mode 100644 index 0000000..fcc962c --- /dev/null +++ b/src/main/java/com/dddheroes/heroesofddd/calendar/events/CalendarEvent.java @@ -0,0 +1,6 @@ +package com.dddheroes.heroesofddd.calendar.events; + +public sealed interface CalendarEvent permits DayStarted, DayFinished { + + String calendarId(); +} diff --git a/src/main/java/com/dddheroes/heroesofddd/calendar/events/DayFinished.java b/src/main/java/com/dddheroes/heroesofddd/calendar/events/DayFinished.java index f85a83f..0f194f4 100644 --- a/src/main/java/com/dddheroes/heroesofddd/calendar/events/DayFinished.java +++ b/src/main/java/com/dddheroes/heroesofddd/calendar/events/DayFinished.java @@ -1,6 +1,5 @@ package com.dddheroes.heroesofddd.calendar.events; -import com.dddheroes.heroesofddd.calendar.write.CalendarEvent; import com.dddheroes.heroesofddd.calendar.write.CalendarId; import com.dddheroes.heroesofddd.calendar.write.Day; import com.dddheroes.heroesofddd.calendar.write.Month; diff --git a/src/main/java/com/dddheroes/heroesofddd/calendar/events/DayStarted.java b/src/main/java/com/dddheroes/heroesofddd/calendar/events/DayStarted.java index 56c5fab..fefb193 100644 --- a/src/main/java/com/dddheroes/heroesofddd/calendar/events/DayStarted.java +++ b/src/main/java/com/dddheroes/heroesofddd/calendar/events/DayStarted.java @@ -1,6 +1,5 @@ package com.dddheroes.heroesofddd.calendar.events; -import com.dddheroes.heroesofddd.calendar.write.CalendarEvent; import com.dddheroes.heroesofddd.calendar.write.CalendarId; import com.dddheroes.heroesofddd.calendar.write.Day; import com.dddheroes.heroesofddd.calendar.write.Month; diff --git a/src/main/java/com/dddheroes/heroesofddd/calendar/write/CalendarCommand.java b/src/main/java/com/dddheroes/heroesofddd/calendar/write/CalendarCommand.java index 9ca48c9..c69b636 100644 --- a/src/main/java/com/dddheroes/heroesofddd/calendar/write/CalendarCommand.java +++ b/src/main/java/com/dddheroes/heroesofddd/calendar/write/CalendarCommand.java @@ -1,6 +1,8 @@ package com.dddheroes.heroesofddd.calendar.write; -public interface CalendarCommand { +import com.dddheroes.heroesofddd.shared.slices.write.Command; + +public interface CalendarCommand extends Command { CalendarId calendarId(); } diff --git a/src/main/java/com/dddheroes/heroesofddd/calendar/write/CalendarEvent.java b/src/main/java/com/dddheroes/heroesofddd/calendar/write/CalendarEvent.java deleted file mode 100644 index fa22121..0000000 --- a/src/main/java/com/dddheroes/heroesofddd/calendar/write/CalendarEvent.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.dddheroes.heroesofddd.calendar.write; - -public interface CalendarEvent { - - String calendarId(); - -} diff --git a/src/main/java/com/dddheroes/heroesofddd/calendar/write/finishday/CanOnlyFinishCurrentDay.java b/src/main/java/com/dddheroes/heroesofddd/calendar/write/finishday/CanOnlyFinishCurrentDay.java index 4129c9a..9d12bb2 100644 --- a/src/main/java/com/dddheroes/heroesofddd/calendar/write/finishday/CanOnlyFinishCurrentDay.java +++ b/src/main/java/com/dddheroes/heroesofddd/calendar/write/finishday/CanOnlyFinishCurrentDay.java @@ -3,7 +3,7 @@ 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.shared.DomainRule; +import com.dddheroes.heroesofddd.shared.domain.DomainRule; public record CanOnlyFinishCurrentDay( FinishDay command, diff --git a/src/main/java/com/dddheroes/heroesofddd/calendar/write/startday/CannotSkipDays.java b/src/main/java/com/dddheroes/heroesofddd/calendar/write/startday/CannotSkipDays.java index dba7a51..18867b0 100644 --- a/src/main/java/com/dddheroes/heroesofddd/calendar/write/startday/CannotSkipDays.java +++ b/src/main/java/com/dddheroes/heroesofddd/calendar/write/startday/CannotSkipDays.java @@ -3,7 +3,7 @@ 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.shared.DomainRule; +import com.dddheroes.heroesofddd.shared.domain.DomainRule; public record CannotSkipDays( StartDay command, 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 02deedb..6815f30 100644 --- a/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/automation/WhenCreatureRecruitedThenAddToArmyProcessor.java +++ b/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/automation/WhenCreatureRecruitedThenAddToArmyProcessor.java @@ -3,7 +3,7 @@ import com.dddheroes.heroesofddd.armies.write.addcreature.AddCreatureToArmy; import com.dddheroes.heroesofddd.creaturerecruitment.write.changeavailablecreatures.IncreaseAvailableCreatures; import com.dddheroes.heroesofddd.creaturerecruitment.events.CreatureRecruited; -import com.dddheroes.heroesofddd.shared.GameMetaData; +import com.dddheroes.heroesofddd.shared.application.GameMetaData; import org.axonframework.commandhandling.gateway.CommandGateway; import org.axonframework.config.ProcessingGroup; import org.axonframework.eventhandling.DisallowReplay; diff --git a/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/events/AvailableCreaturesChanged.java b/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/events/AvailableCreaturesChanged.java index 9b6d838..819c6c9 100644 --- a/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/events/AvailableCreaturesChanged.java +++ b/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/events/AvailableCreaturesChanged.java @@ -1,9 +1,8 @@ package com.dddheroes.heroesofddd.creaturerecruitment.events; -import com.dddheroes.heroesofddd.creaturerecruitment.write.DwellingEvent; import com.dddheroes.heroesofddd.creaturerecruitment.write.DwellingId; -import com.dddheroes.heroesofddd.shared.Amount; -import com.dddheroes.heroesofddd.shared.CreatureId; +import com.dddheroes.heroesofddd.shared.domain.valueobjects.Amount; +import com.dddheroes.heroesofddd.shared.domain.identifiers.CreatureId; public record AvailableCreaturesChanged( String dwellingId, diff --git a/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/events/CreatureRecruited.java b/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/events/CreatureRecruited.java index 20d4b24..8503655 100644 --- a/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/events/CreatureRecruited.java +++ b/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/events/CreatureRecruited.java @@ -1,11 +1,10 @@ package com.dddheroes.heroesofddd.creaturerecruitment.events; -import com.dddheroes.heroesofddd.creaturerecruitment.write.DwellingEvent; import com.dddheroes.heroesofddd.creaturerecruitment.write.DwellingId; -import com.dddheroes.heroesofddd.shared.Amount; -import com.dddheroes.heroesofddd.shared.ArmyId; -import com.dddheroes.heroesofddd.shared.Resources; -import com.dddheroes.heroesofddd.shared.CreatureId; +import com.dddheroes.heroesofddd.shared.domain.valueobjects.Amount; +import com.dddheroes.heroesofddd.shared.domain.identifiers.ArmyId; +import com.dddheroes.heroesofddd.shared.domain.valueobjects.Resources; +import com.dddheroes.heroesofddd.shared.domain.identifiers.CreatureId; import java.util.Map; diff --git a/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/events/DwellingBuilt.java b/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/events/DwellingBuilt.java index fdbc8bf..f054f88 100644 --- a/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/events/DwellingBuilt.java +++ b/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/events/DwellingBuilt.java @@ -1,9 +1,8 @@ package com.dddheroes.heroesofddd.creaturerecruitment.events; -import com.dddheroes.heroesofddd.creaturerecruitment.write.DwellingEvent; import com.dddheroes.heroesofddd.creaturerecruitment.write.DwellingId; -import com.dddheroes.heroesofddd.shared.Resources; -import com.dddheroes.heroesofddd.shared.CreatureId; +import com.dddheroes.heroesofddd.shared.domain.valueobjects.Resources; +import com.dddheroes.heroesofddd.shared.domain.identifiers.CreatureId; import java.util.Map; diff --git a/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/events/DwellingEvent.java b/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/events/DwellingEvent.java new file mode 100644 index 0000000..adef98b --- /dev/null +++ b/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/events/DwellingEvent.java @@ -0,0 +1,6 @@ +package com.dddheroes.heroesofddd.creaturerecruitment.events; + +public sealed interface DwellingEvent permits DwellingBuilt, AvailableCreaturesChanged, CreatureRecruited { + + String 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 d1086a7..b5bd7c0 100644 --- a/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/read/DwellingReadModelProjector.java +++ b/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/read/DwellingReadModelProjector.java @@ -3,7 +3,7 @@ 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 com.dddheroes.heroesofddd.shared.application.GameMetaData; import org.axonframework.config.ProcessingGroup; import org.axonframework.eventhandling.EventHandler; import org.axonframework.eventhandling.ResetHandler; diff --git a/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/read/getalldwellings/GetAllDwellings.java b/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/read/getalldwellings/GetAllDwellings.java index a5f65ef..3f5725f 100644 --- a/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/read/getalldwellings/GetAllDwellings.java +++ b/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/read/getalldwellings/GetAllDwellings.java @@ -1,7 +1,7 @@ package com.dddheroes.heroesofddd.creaturerecruitment.read.getalldwellings; import com.dddheroes.heroesofddd.creaturerecruitment.read.DwellingReadModel; -import com.dddheroes.heroesofddd.shared.GameId; +import com.dddheroes.heroesofddd.shared.domain.identifiers.GameId; import java.util.List; 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 77b79ee..7aea88f 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 @@ -3,7 +3,7 @@ import com.dddheroes.heroesofddd.creaturerecruitment.read.DwellingReadModel; import com.dddheroes.heroesofddd.creaturerecruitment.read.DwellingReadModelRepository; import com.dddheroes.heroesofddd.creaturerecruitment.events.DwellingBuilt; -import com.dddheroes.heroesofddd.shared.GameMetaData; +import com.dddheroes.heroesofddd.shared.application.GameMetaData; import com.google.common.collect.Streams; import org.axonframework.config.ProcessingGroup; import org.axonframework.eventhandling.EventHandler; diff --git a/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/read/getdwellingbyid/GetDwellingById.java b/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/read/getdwellingbyid/GetDwellingById.java index 8cc6513..996f9c8 100644 --- a/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/read/getdwellingbyid/GetDwellingById.java +++ b/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/read/getdwellingbyid/GetDwellingById.java @@ -1,7 +1,7 @@ package com.dddheroes.heroesofddd.creaturerecruitment.read.getdwellingbyid; import com.dddheroes.heroesofddd.creaturerecruitment.write.DwellingId; -import com.dddheroes.heroesofddd.shared.GameId; +import com.dddheroes.heroesofddd.shared.domain.identifiers.GameId; public record GetDwellingById(GameId gameId, DwellingId dwellingId) { 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 d6ccb1e..cbfe81c 100644 --- a/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/write/Dwelling.java +++ b/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/write/Dwelling.java @@ -9,9 +9,9 @@ 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; -import com.dddheroes.heroesofddd.shared.Resources; -import com.dddheroes.heroesofddd.shared.CreatureId; +import com.dddheroes.heroesofddd.shared.domain.valueobjects.Amount; +import com.dddheroes.heroesofddd.shared.domain.valueobjects.Resources; +import com.dddheroes.heroesofddd.shared.domain.identifiers.CreatureId; 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/creaturerecruitment/write/DwellingCommand.java b/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/write/DwellingCommand.java index 873d235..8effc1c 100644 --- a/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/write/DwellingCommand.java +++ b/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/write/DwellingCommand.java @@ -1,6 +1,8 @@ package com.dddheroes.heroesofddd.creaturerecruitment.write; -public interface DwellingCommand { +import com.dddheroes.heroesofddd.shared.slices.write.Command; + +public interface DwellingCommand extends Command { DwellingId dwellingId(); } diff --git a/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/write/DwellingEvent.java b/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/write/DwellingEvent.java deleted file mode 100644 index 3b020c6..0000000 --- a/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/write/DwellingEvent.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.dddheroes.heroesofddd.creaturerecruitment.write; - -public interface DwellingEvent { - - String dwellingId(); -} diff --git a/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/write/builddwelling/BuildDwelling.java b/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/write/builddwelling/BuildDwelling.java index 26b7170..ac83788 100644 --- a/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/write/builddwelling/BuildDwelling.java +++ b/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/write/builddwelling/BuildDwelling.java @@ -2,8 +2,8 @@ import com.dddheroes.heroesofddd.creaturerecruitment.write.DwellingCommand; import com.dddheroes.heroesofddd.creaturerecruitment.write.DwellingId; -import com.dddheroes.heroesofddd.shared.Resources; -import com.dddheroes.heroesofddd.shared.CreatureId; +import com.dddheroes.heroesofddd.shared.domain.valueobjects.Resources; +import com.dddheroes.heroesofddd.shared.domain.identifiers.CreatureId; import org.axonframework.modelling.command.TargetAggregateIdentifier; import java.util.Map; diff --git a/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/write/builddwelling/BuildDwellingRestApi.java b/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/write/builddwelling/BuildDwellingRestApi.java index e073f30..130b3c4 100644 --- a/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/write/builddwelling/BuildDwellingRestApi.java +++ b/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/write/builddwelling/BuildDwellingRestApi.java @@ -1,6 +1,6 @@ package com.dddheroes.heroesofddd.creaturerecruitment.write.builddwelling; -import com.dddheroes.heroesofddd.shared.GameMetaData; +import com.dddheroes.heroesofddd.shared.application.GameMetaData; import com.dddheroes.heroesofddd.shared.restapi.Headers; import org.axonframework.commandhandling.gateway.CommandGateway; import org.springframework.web.bind.annotation.PathVariable; diff --git a/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/write/builddwelling/OnlyNotBuiltBuildingCanBeBuild.java b/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/write/builddwelling/OnlyNotBuiltBuildingCanBeBuild.java index 578475f..ac6b7c8 100644 --- a/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/write/builddwelling/OnlyNotBuiltBuildingCanBeBuild.java +++ b/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/write/builddwelling/OnlyNotBuiltBuildingCanBeBuild.java @@ -1,7 +1,7 @@ package com.dddheroes.heroesofddd.creaturerecruitment.write.builddwelling; import com.dddheroes.heroesofddd.creaturerecruitment.write.DwellingId; -import com.dddheroes.heroesofddd.shared.DomainRule; +import com.dddheroes.heroesofddd.shared.domain.DomainRule; public record OnlyNotBuiltBuildingCanBeBuild(DwellingId dwellingId) implements DomainRule { diff --git a/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/write/changeavailablecreatures/IncreaseAvailableCreatures.java b/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/write/changeavailablecreatures/IncreaseAvailableCreatures.java index 21c006b..2b79897 100644 --- a/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/write/changeavailablecreatures/IncreaseAvailableCreatures.java +++ b/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/write/changeavailablecreatures/IncreaseAvailableCreatures.java @@ -2,8 +2,8 @@ import com.dddheroes.heroesofddd.creaturerecruitment.write.DwellingCommand; import com.dddheroes.heroesofddd.creaturerecruitment.write.DwellingId; -import com.dddheroes.heroesofddd.shared.Amount; -import com.dddheroes.heroesofddd.shared.CreatureId; +import com.dddheroes.heroesofddd.shared.domain.valueobjects.Amount; +import com.dddheroes.heroesofddd.shared.domain.identifiers.CreatureId; import org.axonframework.modelling.command.TargetAggregateIdentifier; public record IncreaseAvailableCreatures( diff --git a/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/write/changeavailablecreatures/IncreaseAvailableCreaturesRestApi.java b/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/write/changeavailablecreatures/IncreaseAvailableCreaturesRestApi.java index 5934606..2f0275f 100644 --- a/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/write/changeavailablecreatures/IncreaseAvailableCreaturesRestApi.java +++ b/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/write/changeavailablecreatures/IncreaseAvailableCreaturesRestApi.java @@ -1,6 +1,6 @@ package com.dddheroes.heroesofddd.creaturerecruitment.write.changeavailablecreatures; -import com.dddheroes.heroesofddd.shared.GameMetaData; +import com.dddheroes.heroesofddd.shared.application.GameMetaData; import com.dddheroes.heroesofddd.shared.restapi.Headers; import org.axonframework.commandhandling.gateway.CommandGateway; import org.springframework.web.bind.annotation.PathVariable; diff --git a/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/write/changeavailablecreatures/OnlyBuiltDwellingCanHaveAvailableCreatures.java b/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/write/changeavailablecreatures/OnlyBuiltDwellingCanHaveAvailableCreatures.java index 217c6bd..35f8401 100644 --- a/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/write/changeavailablecreatures/OnlyBuiltDwellingCanHaveAvailableCreatures.java +++ b/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/write/changeavailablecreatures/OnlyBuiltDwellingCanHaveAvailableCreatures.java @@ -1,7 +1,7 @@ package com.dddheroes.heroesofddd.creaturerecruitment.write.changeavailablecreatures; import com.dddheroes.heroesofddd.creaturerecruitment.write.DwellingId; -import com.dddheroes.heroesofddd.shared.DomainRule; +import com.dddheroes.heroesofddd.shared.domain.DomainRule; public record OnlyBuiltDwellingCanHaveAvailableCreatures(DwellingId dwellingId) implements DomainRule { diff --git a/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/write/recruitcreature/RecruitCreature.java b/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/write/recruitcreature/RecruitCreature.java index 2b02669..b6fa39a 100644 --- a/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/write/recruitcreature/RecruitCreature.java +++ b/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/write/recruitcreature/RecruitCreature.java @@ -2,9 +2,9 @@ import com.dddheroes.heroesofddd.creaturerecruitment.write.DwellingCommand; import com.dddheroes.heroesofddd.creaturerecruitment.write.DwellingId; -import com.dddheroes.heroesofddd.shared.Amount; -import com.dddheroes.heroesofddd.shared.ArmyId; -import com.dddheroes.heroesofddd.shared.CreatureId; +import com.dddheroes.heroesofddd.shared.domain.valueobjects.Amount; +import com.dddheroes.heroesofddd.shared.domain.identifiers.ArmyId; +import com.dddheroes.heroesofddd.shared.domain.identifiers.CreatureId; import org.axonframework.modelling.command.TargetAggregateIdentifier; public record RecruitCreature( diff --git a/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/write/recruitcreature/RecruitCreatureRestApi.java b/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/write/recruitcreature/RecruitCreatureRestApi.java index eda6189..e188cfa 100644 --- a/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/write/recruitcreature/RecruitCreatureRestApi.java +++ b/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/write/recruitcreature/RecruitCreatureRestApi.java @@ -1,6 +1,6 @@ package com.dddheroes.heroesofddd.creaturerecruitment.write.recruitcreature; -import com.dddheroes.heroesofddd.shared.GameMetaData; +import com.dddheroes.heroesofddd.shared.application.GameMetaData; import com.dddheroes.heroesofddd.shared.restapi.Headers; import org.axonframework.commandhandling.gateway.CommandGateway; import org.springframework.web.bind.annotation.PathVariable; diff --git a/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/write/recruitcreature/RecruitCreaturesNotExceedAvailableCreatures.java b/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/write/recruitcreature/RecruitCreaturesNotExceedAvailableCreatures.java index 437e0c0..6a5c9d1 100644 --- a/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/write/recruitcreature/RecruitCreaturesNotExceedAvailableCreatures.java +++ b/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/write/recruitcreature/RecruitCreaturesNotExceedAvailableCreatures.java @@ -1,8 +1,8 @@ package com.dddheroes.heroesofddd.creaturerecruitment.write.recruitcreature; -import com.dddheroes.heroesofddd.shared.Amount; -import com.dddheroes.heroesofddd.shared.CreatureId; -import com.dddheroes.heroesofddd.shared.DomainRule; +import com.dddheroes.heroesofddd.shared.domain.valueobjects.Amount; +import com.dddheroes.heroesofddd.shared.domain.identifiers.CreatureId; +import com.dddheroes.heroesofddd.shared.domain.DomainRule; public record RecruitCreaturesNotExceedAvailableCreatures( CreatureId dwellingCreatureId, diff --git a/src/main/java/com/dddheroes/heroesofddd/resourcespool/events/ResourcesDeposited.java b/src/main/java/com/dddheroes/heroesofddd/resourcespool/events/ResourcesDeposited.java index ecc82c1..d6cef92 100644 --- a/src/main/java/com/dddheroes/heroesofddd/resourcespool/events/ResourcesDeposited.java +++ b/src/main/java/com/dddheroes/heroesofddd/resourcespool/events/ResourcesDeposited.java @@ -1,8 +1,7 @@ package com.dddheroes.heroesofddd.resourcespool.events; -import com.dddheroes.heroesofddd.resourcespool.write.ResourcesPoolEvent; import com.dddheroes.heroesofddd.resourcespool.write.ResourcesPoolId; -import com.dddheroes.heroesofddd.shared.Resources; +import com.dddheroes.heroesofddd.shared.domain.valueobjects.Resources; import java.util.Map; diff --git a/src/main/java/com/dddheroes/heroesofddd/resourcespool/events/ResourcesPoolEvent.java b/src/main/java/com/dddheroes/heroesofddd/resourcespool/events/ResourcesPoolEvent.java new file mode 100644 index 0000000..5b4c817 --- /dev/null +++ b/src/main/java/com/dddheroes/heroesofddd/resourcespool/events/ResourcesPoolEvent.java @@ -0,0 +1,6 @@ +package com.dddheroes.heroesofddd.resourcespool.events; + +public sealed interface ResourcesPoolEvent permits ResourcesWithdrawn, ResourcesDeposited { + + String resourcesPoolId(); +} diff --git a/src/main/java/com/dddheroes/heroesofddd/resourcespool/events/ResourcesWithdrawn.java b/src/main/java/com/dddheroes/heroesofddd/resourcespool/events/ResourcesWithdrawn.java index a5f2e3e..c4cab53 100644 --- a/src/main/java/com/dddheroes/heroesofddd/resourcespool/events/ResourcesWithdrawn.java +++ b/src/main/java/com/dddheroes/heroesofddd/resourcespool/events/ResourcesWithdrawn.java @@ -1,8 +1,7 @@ package com.dddheroes.heroesofddd.resourcespool.events; -import com.dddheroes.heroesofddd.resourcespool.write.ResourcesPoolEvent; import com.dddheroes.heroesofddd.resourcespool.write.ResourcesPoolId; -import com.dddheroes.heroesofddd.shared.Resources; +import com.dddheroes.heroesofddd.shared.domain.valueobjects.Resources; import java.util.Map; 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 c0a37e7..b2ab72a 100644 --- a/src/main/java/com/dddheroes/heroesofddd/resourcespool/write/ResourcesPool.java +++ b/src/main/java/com/dddheroes/heroesofddd/resourcespool/write/ResourcesPool.java @@ -5,7 +5,7 @@ import com.dddheroes.heroesofddd.resourcespool.write.withdraw.CannotWithdrawMoreThanDepositedResources; import com.dddheroes.heroesofddd.resourcespool.events.ResourcesWithdrawn; import com.dddheroes.heroesofddd.resourcespool.write.withdraw.WithdrawResources; -import com.dddheroes.heroesofddd.shared.Resources; +import com.dddheroes.heroesofddd.shared.domain.valueobjects.Resources; 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/resourcespool/write/ResourcesPoolCommand.java b/src/main/java/com/dddheroes/heroesofddd/resourcespool/write/ResourcesPoolCommand.java index 8b80a67..a0c06b7 100644 --- a/src/main/java/com/dddheroes/heroesofddd/resourcespool/write/ResourcesPoolCommand.java +++ b/src/main/java/com/dddheroes/heroesofddd/resourcespool/write/ResourcesPoolCommand.java @@ -1,6 +1,8 @@ package com.dddheroes.heroesofddd.resourcespool.write; -public interface ResourcesPoolCommand { +import com.dddheroes.heroesofddd.shared.slices.write.Command; + +public interface ResourcesPoolCommand extends Command { ResourcesPoolId resourcesPoolId(); } diff --git a/src/main/java/com/dddheroes/heroesofddd/resourcespool/write/ResourcesPoolEvent.java b/src/main/java/com/dddheroes/heroesofddd/resourcespool/write/ResourcesPoolEvent.java deleted file mode 100644 index ad4b10d..0000000 --- a/src/main/java/com/dddheroes/heroesofddd/resourcespool/write/ResourcesPoolEvent.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.dddheroes.heroesofddd.resourcespool.write; - -public interface ResourcesPoolEvent { - - String resourcesPoolId(); -} diff --git a/src/main/java/com/dddheroes/heroesofddd/resourcespool/write/deposit/DepositResources.java b/src/main/java/com/dddheroes/heroesofddd/resourcespool/write/deposit/DepositResources.java index fa95c66..31c4c14 100644 --- a/src/main/java/com/dddheroes/heroesofddd/resourcespool/write/deposit/DepositResources.java +++ b/src/main/java/com/dddheroes/heroesofddd/resourcespool/write/deposit/DepositResources.java @@ -2,7 +2,7 @@ import com.dddheroes.heroesofddd.resourcespool.write.ResourcesPoolCommand; import com.dddheroes.heroesofddd.resourcespool.write.ResourcesPoolId; -import com.dddheroes.heroesofddd.shared.Resources; +import com.dddheroes.heroesofddd.shared.domain.valueobjects.Resources; import org.axonframework.modelling.command.TargetAggregateIdentifier; import java.util.Map; diff --git a/src/main/java/com/dddheroes/heroesofddd/resourcespool/write/withdraw/CannotWithdrawMoreThanDepositedResources.java b/src/main/java/com/dddheroes/heroesofddd/resourcespool/write/withdraw/CannotWithdrawMoreThanDepositedResources.java index 8cbe350..95d47e5 100644 --- a/src/main/java/com/dddheroes/heroesofddd/resourcespool/write/withdraw/CannotWithdrawMoreThanDepositedResources.java +++ b/src/main/java/com/dddheroes/heroesofddd/resourcespool/write/withdraw/CannotWithdrawMoreThanDepositedResources.java @@ -1,7 +1,7 @@ package com.dddheroes.heroesofddd.resourcespool.write.withdraw; -import com.dddheroes.heroesofddd.shared.DomainRule; -import com.dddheroes.heroesofddd.shared.Resources; +import com.dddheroes.heroesofddd.shared.domain.DomainRule; +import com.dddheroes.heroesofddd.shared.domain.valueobjects.Resources; public record CannotWithdrawMoreThanDepositedResources(Resources balance, Resources toWithdraw) implements DomainRule { diff --git a/src/main/java/com/dddheroes/heroesofddd/resourcespool/write/withdraw/WithdrawResources.java b/src/main/java/com/dddheroes/heroesofddd/resourcespool/write/withdraw/WithdrawResources.java index 7b565ed..2972b19 100644 --- a/src/main/java/com/dddheroes/heroesofddd/resourcespool/write/withdraw/WithdrawResources.java +++ b/src/main/java/com/dddheroes/heroesofddd/resourcespool/write/withdraw/WithdrawResources.java @@ -2,7 +2,7 @@ import com.dddheroes.heroesofddd.resourcespool.write.ResourcesPoolCommand; import com.dddheroes.heroesofddd.resourcespool.write.ResourcesPoolId; -import com.dddheroes.heroesofddd.shared.Resources; +import com.dddheroes.heroesofddd.shared.domain.valueobjects.Resources; import org.axonframework.modelling.command.TargetAggregateIdentifier; import java.util.Map; diff --git a/src/main/java/com/dddheroes/heroesofddd/shared/GameMetaData.java b/src/main/java/com/dddheroes/heroesofddd/shared/application/GameMetaData.java similarity index 76% rename from src/main/java/com/dddheroes/heroesofddd/shared/GameMetaData.java rename to src/main/java/com/dddheroes/heroesofddd/shared/application/GameMetaData.java index b4215d3..deaf49d 100644 --- a/src/main/java/com/dddheroes/heroesofddd/shared/GameMetaData.java +++ b/src/main/java/com/dddheroes/heroesofddd/shared/application/GameMetaData.java @@ -1,5 +1,7 @@ -package com.dddheroes.heroesofddd.shared; +package com.dddheroes.heroesofddd.shared.application; +import com.dddheroes.heroesofddd.shared.domain.identifiers.GameId; +import com.dddheroes.heroesofddd.shared.domain.identifiers.PlayerId; import org.axonframework.messaging.MetaData; public class GameMetaData { diff --git a/src/main/java/com/dddheroes/heroesofddd/shared/DomainRule.java b/src/main/java/com/dddheroes/heroesofddd/shared/domain/DomainRule.java similarity index 91% rename from src/main/java/com/dddheroes/heroesofddd/shared/DomainRule.java rename to src/main/java/com/dddheroes/heroesofddd/shared/domain/DomainRule.java index afa4e54..f3d9e70 100644 --- a/src/main/java/com/dddheroes/heroesofddd/shared/DomainRule.java +++ b/src/main/java/com/dddheroes/heroesofddd/shared/domain/DomainRule.java @@ -1,4 +1,4 @@ -package com.dddheroes.heroesofddd.shared; +package com.dddheroes.heroesofddd.shared.domain; public interface DomainRule { diff --git a/src/main/java/com/dddheroes/heroesofddd/shared/ArmyId.java b/src/main/java/com/dddheroes/heroesofddd/shared/domain/identifiers/ArmyId.java similarity index 92% rename from src/main/java/com/dddheroes/heroesofddd/shared/ArmyId.java rename to src/main/java/com/dddheroes/heroesofddd/shared/domain/identifiers/ArmyId.java index 0c3243b..9233806 100644 --- a/src/main/java/com/dddheroes/heroesofddd/shared/ArmyId.java +++ b/src/main/java/com/dddheroes/heroesofddd/shared/domain/identifiers/ArmyId.java @@ -1,4 +1,4 @@ -package com.dddheroes.heroesofddd.shared; +package com.dddheroes.heroesofddd.shared.domain.identifiers; import java.util.UUID; diff --git a/src/main/java/com/dddheroes/heroesofddd/shared/CreatureId.java b/src/main/java/com/dddheroes/heroesofddd/shared/domain/identifiers/CreatureId.java similarity index 85% rename from src/main/java/com/dddheroes/heroesofddd/shared/CreatureId.java rename to src/main/java/com/dddheroes/heroesofddd/shared/domain/identifiers/CreatureId.java index 3e816ef..e05322d 100644 --- a/src/main/java/com/dddheroes/heroesofddd/shared/CreatureId.java +++ b/src/main/java/com/dddheroes/heroesofddd/shared/domain/identifiers/CreatureId.java @@ -1,4 +1,4 @@ -package com.dddheroes.heroesofddd.shared; +package com.dddheroes.heroesofddd.shared.domain.identifiers; public record CreatureId(String raw) { diff --git a/src/main/java/com/dddheroes/heroesofddd/shared/GameId.java b/src/main/java/com/dddheroes/heroesofddd/shared/domain/identifiers/GameId.java similarity index 88% rename from src/main/java/com/dddheroes/heroesofddd/shared/GameId.java rename to src/main/java/com/dddheroes/heroesofddd/shared/domain/identifiers/GameId.java index 68cb22b..9f65218 100644 --- a/src/main/java/com/dddheroes/heroesofddd/shared/GameId.java +++ b/src/main/java/com/dddheroes/heroesofddd/shared/domain/identifiers/GameId.java @@ -1,4 +1,4 @@ -package com.dddheroes.heroesofddd.shared; +package com.dddheroes.heroesofddd.shared.domain.identifiers; import java.util.UUID; diff --git a/src/main/java/com/dddheroes/heroesofddd/shared/PlayerId.java b/src/main/java/com/dddheroes/heroesofddd/shared/domain/identifiers/PlayerId.java similarity index 90% rename from src/main/java/com/dddheroes/heroesofddd/shared/PlayerId.java rename to src/main/java/com/dddheroes/heroesofddd/shared/domain/identifiers/PlayerId.java index 6a989f6..45b61d8 100644 --- a/src/main/java/com/dddheroes/heroesofddd/shared/PlayerId.java +++ b/src/main/java/com/dddheroes/heroesofddd/shared/domain/identifiers/PlayerId.java @@ -1,4 +1,4 @@ -package com.dddheroes.heroesofddd.shared; +package com.dddheroes.heroesofddd.shared.domain.identifiers; import java.util.UUID; diff --git a/src/main/java/com/dddheroes/heroesofddd/shared/Amount.java b/src/main/java/com/dddheroes/heroesofddd/shared/domain/valueobjects/Amount.java similarity index 90% rename from src/main/java/com/dddheroes/heroesofddd/shared/Amount.java rename to src/main/java/com/dddheroes/heroesofddd/shared/domain/valueobjects/Amount.java index 91b5b64..3aa0bb3 100644 --- a/src/main/java/com/dddheroes/heroesofddd/shared/Amount.java +++ b/src/main/java/com/dddheroes/heroesofddd/shared/domain/valueobjects/Amount.java @@ -1,4 +1,4 @@ -package com.dddheroes.heroesofddd.shared; +package com.dddheroes.heroesofddd.shared.domain.valueobjects; public record Amount(int raw) { diff --git a/src/main/java/com/dddheroes/heroesofddd/shared/ResourceType.java b/src/main/java/com/dddheroes/heroesofddd/shared/domain/valueobjects/ResourceType.java similarity index 88% rename from src/main/java/com/dddheroes/heroesofddd/shared/ResourceType.java rename to src/main/java/com/dddheroes/heroesofddd/shared/domain/valueobjects/ResourceType.java index 19264c2..ec1f2fa 100644 --- a/src/main/java/com/dddheroes/heroesofddd/shared/ResourceType.java +++ b/src/main/java/com/dddheroes/heroesofddd/shared/domain/valueobjects/ResourceType.java @@ -1,4 +1,4 @@ -package com.dddheroes.heroesofddd.shared; +package com.dddheroes.heroesofddd.shared.domain.valueobjects; import java.util.Arrays; diff --git a/src/main/java/com/dddheroes/heroesofddd/shared/Resources.java b/src/main/java/com/dddheroes/heroesofddd/shared/domain/valueobjects/Resources.java similarity index 98% rename from src/main/java/com/dddheroes/heroesofddd/shared/Resources.java rename to src/main/java/com/dddheroes/heroesofddd/shared/domain/valueobjects/Resources.java index 18f45e1..1bde934 100644 --- a/src/main/java/com/dddheroes/heroesofddd/shared/Resources.java +++ b/src/main/java/com/dddheroes/heroesofddd/shared/domain/valueobjects/Resources.java @@ -1,4 +1,4 @@ -package com.dddheroes.heroesofddd.shared; +package com.dddheroes.heroesofddd.shared.domain.valueobjects; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/com/dddheroes/heroesofddd/shared/slices/write/Command.java b/src/main/java/com/dddheroes/heroesofddd/shared/slices/write/Command.java new file mode 100644 index 0000000..1f5f68f --- /dev/null +++ b/src/main/java/com/dddheroes/heroesofddd/shared/slices/write/Command.java @@ -0,0 +1,5 @@ +package com.dddheroes.heroesofddd.shared.slices.write; + +public interface Command { + +} 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 fd7390d..5a8ab0c 100644 --- a/src/test/java/com/dddheroes/heroesofddd/armies/write/ArmyTest.java +++ b/src/test/java/com/dddheroes/heroesofddd/armies/write/ArmyTest.java @@ -2,9 +2,9 @@ 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; +import com.dddheroes.heroesofddd.shared.domain.valueobjects.Amount; +import com.dddheroes.heroesofddd.shared.domain.identifiers.ArmyId; +import com.dddheroes.heroesofddd.shared.domain.identifiers.CreatureId; import org.axonframework.test.aggregate.AggregateTestFixture; import org.junit.jupiter.api.*; diff --git a/src/test/java/com/dddheroes/heroesofddd/armies/write/addcreature/AddCreatureToArmyTest.java b/src/test/java/com/dddheroes/heroesofddd/armies/write/addcreature/AddCreatureToArmyTest.java index 1f61055..48d75f8 100644 --- a/src/test/java/com/dddheroes/heroesofddd/armies/write/addcreature/AddCreatureToArmyTest.java +++ b/src/test/java/com/dddheroes/heroesofddd/armies/write/addcreature/AddCreatureToArmyTest.java @@ -1,10 +1,10 @@ package com.dddheroes.heroesofddd.armies.write.addcreature; import com.dddheroes.heroesofddd.armies.write.ArmyTest; -import com.dddheroes.heroesofddd.shared.Amount; -import com.dddheroes.heroesofddd.shared.CreatureId; +import com.dddheroes.heroesofddd.shared.domain.valueobjects.Amount; +import com.dddheroes.heroesofddd.shared.domain.identifiers.CreatureId; import com.dddheroes.heroesofddd.shared.CreatureIds; -import com.dddheroes.heroesofddd.shared.DomainRule; +import com.dddheroes.heroesofddd.shared.domain.DomainRule; import org.junit.jupiter.api.*; import java.util.List; diff --git a/src/test/java/com/dddheroes/heroesofddd/armies/write/removecreature/RemoveCreatureFromArmyTest.java b/src/test/java/com/dddheroes/heroesofddd/armies/write/removecreature/RemoveCreatureFromArmyTest.java index 1b86f69..3ec6cdf 100644 --- a/src/test/java/com/dddheroes/heroesofddd/armies/write/removecreature/RemoveCreatureFromArmyTest.java +++ b/src/test/java/com/dddheroes/heroesofddd/armies/write/removecreature/RemoveCreatureFromArmyTest.java @@ -1,10 +1,10 @@ package com.dddheroes.heroesofddd.armies.write.removecreature; import com.dddheroes.heroesofddd.armies.write.ArmyTest; -import com.dddheroes.heroesofddd.shared.Amount; -import com.dddheroes.heroesofddd.shared.CreatureId; +import com.dddheroes.heroesofddd.shared.domain.valueobjects.Amount; +import com.dddheroes.heroesofddd.shared.domain.identifiers.CreatureId; import com.dddheroes.heroesofddd.shared.CreatureIds; -import com.dddheroes.heroesofddd.shared.DomainRule; +import com.dddheroes.heroesofddd.shared.domain.DomainRule; import org.axonframework.modelling.command.AggregateNotFoundException; import org.junit.jupiter.api.*; 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 ab95e05..eebe254 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 @@ -2,13 +2,13 @@ import com.dddheroes.heroesofddd.TestcontainersConfiguration; import com.dddheroes.heroesofddd.astrologers.write.proclaimweeksymbol.ProclaimWeekSymbol; -import com.dddheroes.heroesofddd.calendar.write.CalendarEvent; +import com.dddheroes.heroesofddd.calendar.events.CalendarEvent; import com.dddheroes.heroesofddd.calendar.write.CalendarId; 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; -import com.dddheroes.heroesofddd.shared.PlayerId; +import com.dddheroes.heroesofddd.shared.domain.identifiers.GameId; +import com.dddheroes.heroesofddd.shared.application.GameMetaData; +import com.dddheroes.heroesofddd.shared.domain.identifiers.PlayerId; import org.axonframework.commandhandling.gateway.CommandGateway; import org.axonframework.eventhandling.DomainEventMessage; import org.axonframework.eventhandling.GenericDomainEventMessage; 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 b9a5833..0fcbc5e 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 @@ -1,20 +1,20 @@ package com.dddheroes.heroesofddd.astrologers.automation.whenweeksymbolproclaimedthenincreasedwellingavailablecreatures; import com.dddheroes.heroesofddd.TestcontainersConfiguration; -import com.dddheroes.heroesofddd.astrologers.write.AstrologersEvent; +import com.dddheroes.heroesofddd.astrologers.events.AstrologersEvent; import com.dddheroes.heroesofddd.astrologers.write.AstrologersId; import com.dddheroes.heroesofddd.astrologers.events.WeekSymbolProclaimed; -import com.dddheroes.heroesofddd.creaturerecruitment.write.DwellingEvent; +import com.dddheroes.heroesofddd.creaturerecruitment.events.DwellingEvent; import com.dddheroes.heroesofddd.creaturerecruitment.write.DwellingId; 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; -import com.dddheroes.heroesofddd.shared.Resources; -import com.dddheroes.heroesofddd.shared.CreatureId; -import com.dddheroes.heroesofddd.shared.GameId; -import com.dddheroes.heroesofddd.shared.GameMetaData; -import com.dddheroes.heroesofddd.shared.ResourceType; +import com.dddheroes.heroesofddd.shared.domain.valueobjects.Amount; +import com.dddheroes.heroesofddd.shared.domain.identifiers.PlayerId; +import com.dddheroes.heroesofddd.shared.domain.valueobjects.Resources; +import com.dddheroes.heroesofddd.shared.domain.identifiers.CreatureId; +import com.dddheroes.heroesofddd.shared.domain.identifiers.GameId; +import com.dddheroes.heroesofddd.shared.application.GameMetaData; +import com.dddheroes.heroesofddd.shared.domain.valueobjects.ResourceType; import org.axonframework.commandhandling.gateway.CommandGateway; import org.axonframework.eventhandling.DomainEventMessage; import org.axonframework.eventhandling.GenericDomainEventMessage; 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 d019111..9a95110 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 @@ -5,8 +5,8 @@ import com.dddheroes.heroesofddd.astrologers.write.AstrologersTest; import com.dddheroes.heroesofddd.astrologers.write.MonthWeek; import com.dddheroes.heroesofddd.astrologers.write.WeekSymbol; -import com.dddheroes.heroesofddd.shared.CreatureId; -import com.dddheroes.heroesofddd.shared.DomainRule; +import com.dddheroes.heroesofddd.shared.domain.identifiers.CreatureId; +import com.dddheroes.heroesofddd.shared.domain.DomainRule; import org.junit.jupiter.api.*; import java.util.List; 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 578ff3d..e0ac480 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 @@ -7,7 +7,7 @@ import com.dddheroes.heroesofddd.calendar.write.Month; import com.dddheroes.heroesofddd.calendar.write.Week; import com.dddheroes.heroesofddd.calendar.events.DayStarted; -import com.dddheroes.heroesofddd.shared.DomainRule; +import com.dddheroes.heroesofddd.shared.domain.DomainRule; import org.axonframework.modelling.command.AggregateNotFoundException; import org.junit.jupiter.api.*; 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 63c7207..b2c8861 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 @@ -7,7 +7,7 @@ import com.dddheroes.heroesofddd.calendar.write.Month; import com.dddheroes.heroesofddd.calendar.write.Week; import com.dddheroes.heroesofddd.calendar.events.DayFinished; -import com.dddheroes.heroesofddd.shared.DomainRule; +import com.dddheroes.heroesofddd.shared.domain.DomainRule; import org.junit.jupiter.api.*; import java.util.List; 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 a40d6eb..03193b4 100644 --- a/src/test/java/com/dddheroes/heroesofddd/creaturerecruitment/automation/WhenCreatureRecruitedThenAddToArmyTest.java +++ b/src/test/java/com/dddheroes/heroesofddd/creaturerecruitment/automation/WhenCreatureRecruitedThenAddToArmyTest.java @@ -1,21 +1,21 @@ package com.dddheroes.heroesofddd.creaturerecruitment.automation; import com.dddheroes.heroesofddd.TestcontainersConfiguration; -import com.dddheroes.heroesofddd.armies.write.ArmyEvent; +import com.dddheroes.heroesofddd.armies.events.ArmyEvent; import com.dddheroes.heroesofddd.armies.write.addcreature.AddCreatureToArmy; import com.dddheroes.heroesofddd.armies.events.CreatureAddedToArmy; -import com.dddheroes.heroesofddd.creaturerecruitment.write.DwellingEvent; +import com.dddheroes.heroesofddd.creaturerecruitment.events.DwellingEvent; import com.dddheroes.heroesofddd.creaturerecruitment.write.DwellingId; 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.events.CreatureRecruited; -import com.dddheroes.heroesofddd.shared.ArmyId; +import com.dddheroes.heroesofddd.shared.domain.identifiers.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 com.dddheroes.heroesofddd.shared.domain.identifiers.GameId; +import com.dddheroes.heroesofddd.shared.application.GameMetaData; +import com.dddheroes.heroesofddd.shared.domain.identifiers.PlayerId; +import com.dddheroes.heroesofddd.shared.domain.valueobjects.ResourceType; import org.axonframework.commandhandling.gateway.CommandGateway; import org.axonframework.eventhandling.DomainEventMessage; import org.axonframework.eventhandling.GenericDomainEventMessage; diff --git a/src/test/java/com/dddheroes/heroesofddd/creaturerecruitment/read/DwellingReadModelTest.java b/src/test/java/com/dddheroes/heroesofddd/creaturerecruitment/read/DwellingReadModelTest.java index 9ee3a91..917ecdd 100644 --- a/src/test/java/com/dddheroes/heroesofddd/creaturerecruitment/read/DwellingReadModelTest.java +++ b/src/test/java/com/dddheroes/heroesofddd/creaturerecruitment/read/DwellingReadModelTest.java @@ -1,10 +1,10 @@ package com.dddheroes.heroesofddd.creaturerecruitment.read; -import com.dddheroes.heroesofddd.creaturerecruitment.write.DwellingEvent; -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 com.dddheroes.heroesofddd.creaturerecruitment.events.DwellingEvent; +import com.dddheroes.heroesofddd.shared.domain.identifiers.GameId; +import com.dddheroes.heroesofddd.shared.application.GameMetaData; +import com.dddheroes.heroesofddd.shared.domain.identifiers.PlayerId; +import com.dddheroes.heroesofddd.shared.domain.valueobjects.ResourceType; import org.axonframework.eventhandling.DomainEventMessage; import org.axonframework.eventhandling.GenericDomainEventMessage; import org.axonframework.eventhandling.gateway.EventGateway; 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 3b9bd2a..aa63add 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 @@ -7,7 +7,7 @@ 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.domain.identifiers.ArmyId; 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/write/DwellingTest.java b/src/test/java/com/dddheroes/heroesofddd/creaturerecruitment/write/DwellingTest.java index 41b68b9..53eee65 100644 --- a/src/test/java/com/dddheroes/heroesofddd/creaturerecruitment/write/DwellingTest.java +++ b/src/test/java/com/dddheroes/heroesofddd/creaturerecruitment/write/DwellingTest.java @@ -2,10 +2,10 @@ import com.dddheroes.heroesofddd.creaturerecruitment.write.builddwelling.BuildDwelling; 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; -import com.dddheroes.heroesofddd.shared.ResourceType; +import com.dddheroes.heroesofddd.shared.domain.valueobjects.Amount; +import com.dddheroes.heroesofddd.shared.domain.valueobjects.Resources; +import com.dddheroes.heroesofddd.shared.domain.identifiers.CreatureId; +import com.dddheroes.heroesofddd.shared.domain.valueobjects.ResourceType; import org.axonframework.test.aggregate.AggregateTestFixture; import org.junit.jupiter.api.*; diff --git a/src/test/java/com/dddheroes/heroesofddd/creaturerecruitment/write/builddwelling/BuildDwellingTest.java b/src/test/java/com/dddheroes/heroesofddd/creaturerecruitment/write/builddwelling/BuildDwellingTest.java index 72164b8..2105e71 100644 --- a/src/test/java/com/dddheroes/heroesofddd/creaturerecruitment/write/builddwelling/BuildDwellingTest.java +++ b/src/test/java/com/dddheroes/heroesofddd/creaturerecruitment/write/builddwelling/BuildDwellingTest.java @@ -1,7 +1,7 @@ package com.dddheroes.heroesofddd.creaturerecruitment.write.builddwelling; import com.dddheroes.heroesofddd.creaturerecruitment.write.DwellingTest; -import com.dddheroes.heroesofddd.shared.DomainRule; +import com.dddheroes.heroesofddd.shared.domain.DomainRule; import org.junit.jupiter.api.*; import java.util.List; 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 cbe55fd..5c59126 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 @@ -2,7 +2,7 @@ import com.dddheroes.heroesofddd.creaturerecruitment.events.AvailableCreaturesChanged; import com.dddheroes.heroesofddd.creaturerecruitment.write.DwellingTest; -import com.dddheroes.heroesofddd.shared.Amount; +import com.dddheroes.heroesofddd.shared.domain.valueobjects.Amount; import org.axonframework.modelling.command.AggregateNotFoundException; import org.junit.jupiter.api.*; 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 81c93b6..28def18 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 @@ -3,10 +3,10 @@ import com.dddheroes.heroesofddd.creaturerecruitment.events.CreatureRecruited; import com.dddheroes.heroesofddd.creaturerecruitment.write.DwellingTest; 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; -import com.dddheroes.heroesofddd.shared.DomainRule; +import com.dddheroes.heroesofddd.shared.domain.valueobjects.Amount; +import com.dddheroes.heroesofddd.shared.domain.identifiers.ArmyId; +import com.dddheroes.heroesofddd.shared.domain.identifiers.CreatureId; +import com.dddheroes.heroesofddd.shared.domain.DomainRule; import org.axonframework.modelling.command.AggregateNotFoundException; import org.junit.jupiter.api.*; 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 ec129f7..0e23834 100644 --- a/src/test/java/com/dddheroes/heroesofddd/resourcespool/write/ResourcesPoolTest.java +++ b/src/test/java/com/dddheroes/heroesofddd/resourcespool/write/ResourcesPoolTest.java @@ -2,9 +2,9 @@ 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; +import com.dddheroes.heroesofddd.shared.domain.valueobjects.Amount; +import com.dddheroes.heroesofddd.shared.domain.valueobjects.ResourceType; +import com.dddheroes.heroesofddd.shared.domain.valueobjects.Resources; import org.axonframework.test.aggregate.AggregateTestFixture; import org.junit.jupiter.api.*; diff --git a/src/test/java/com/dddheroes/heroesofddd/resourcespool/write/deposit/DepositResourcesTest.java b/src/test/java/com/dddheroes/heroesofddd/resourcespool/write/deposit/DepositResourcesTest.java index 0014b67..9eda958 100644 --- a/src/test/java/com/dddheroes/heroesofddd/resourcespool/write/deposit/DepositResourcesTest.java +++ b/src/test/java/com/dddheroes/heroesofddd/resourcespool/write/deposit/DepositResourcesTest.java @@ -1,13 +1,13 @@ package com.dddheroes.heroesofddd.resourcespool.write.deposit; import com.dddheroes.heroesofddd.resourcespool.write.ResourcesPoolTest; -import com.dddheroes.heroesofddd.shared.ResourceType; +import com.dddheroes.heroesofddd.shared.domain.valueobjects.ResourceType; import org.junit.jupiter.api.*; import java.util.List; -import static com.dddheroes.heroesofddd.shared.ResourceType.*; -import static com.dddheroes.heroesofddd.shared.ResourceType.ORE; +import static com.dddheroes.heroesofddd.shared.domain.valueobjects.ResourceType.*; +import static com.dddheroes.heroesofddd.shared.domain.valueobjects.ResourceType.ORE; class DepositResourcesTest extends ResourcesPoolTest { 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 ac3bb27..dd7d108 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,14 +1,14 @@ package com.dddheroes.heroesofddd.resourcespool.write.withdraw; import com.dddheroes.heroesofddd.resourcespool.write.ResourcesPoolTest; -import com.dddheroes.heroesofddd.shared.DomainRule; -import com.dddheroes.heroesofddd.shared.ResourceType; +import com.dddheroes.heroesofddd.shared.domain.DomainRule; +import com.dddheroes.heroesofddd.shared.domain.valueobjects.ResourceType; import org.axonframework.modelling.command.AggregateNotFoundException; import org.junit.jupiter.api.*; import java.util.List; -import static com.dddheroes.heroesofddd.shared.ResourceType.*; +import static com.dddheroes.heroesofddd.shared.domain.valueobjects.ResourceType.*; class WithdrawResourcesTest extends ResourcesPoolTest { diff --git a/src/test/java/com/dddheroes/heroesofddd/shared/AggregateIdsDoNotClashTest.java b/src/test/java/com/dddheroes/heroesofddd/shared/AggregateIdsDoNotClashTest.java index de07af5..3166845 100644 --- a/src/test/java/com/dddheroes/heroesofddd/shared/AggregateIdsDoNotClashTest.java +++ b/src/test/java/com/dddheroes/heroesofddd/shared/AggregateIdsDoNotClashTest.java @@ -5,6 +5,7 @@ import com.dddheroes.heroesofddd.calendar.write.CalendarId; import com.dddheroes.heroesofddd.creaturerecruitment.write.DwellingId; import com.dddheroes.heroesofddd.resourcespool.write.ResourcesPoolId; +import com.dddheroes.heroesofddd.shared.domain.identifiers.ArmyId; import org.axonframework.eventhandling.DomainEventMessage; import org.axonframework.eventhandling.GenericDomainEventMessage; import org.axonframework.eventsourcing.eventstore.EventStore; diff --git a/src/test/java/com/dddheroes/heroesofddd/shared/CreatureIds.java b/src/test/java/com/dddheroes/heroesofddd/shared/CreatureIds.java index ce98c17..5ae2c27 100644 --- a/src/test/java/com/dddheroes/heroesofddd/shared/CreatureIds.java +++ b/src/test/java/com/dddheroes/heroesofddd/shared/CreatureIds.java @@ -1,5 +1,7 @@ package com.dddheroes.heroesofddd.shared; +import com.dddheroes.heroesofddd.shared.domain.identifiers.CreatureId; + public class CreatureIds { public static CreatureId angel() { diff --git a/src/test/java/com/dddheroes/heroesofddd/utils/AxonUtils.java b/src/test/java/com/dddheroes/heroesofddd/utils/AxonUtils.java index 9270d05..979e5d4 100644 --- a/src/test/java/com/dddheroes/heroesofddd/utils/AxonUtils.java +++ b/src/test/java/com/dddheroes/heroesofddd/utils/AxonUtils.java @@ -1,10 +1,10 @@ package com.dddheroes.heroesofddd.utils; -import com.dddheroes.heroesofddd.shared.GameId; -import com.dddheroes.heroesofddd.shared.PlayerId; +import com.dddheroes.heroesofddd.shared.domain.identifiers.GameId; +import com.dddheroes.heroesofddd.shared.domain.identifiers.PlayerId; import org.axonframework.messaging.MetaData; -import static com.dddheroes.heroesofddd.shared.GameMetaData.*; +import static com.dddheroes.heroesofddd.shared.application.GameMetaData.*; public class AxonUtils {