Merge branch 'master' into fix/pass-metadata-to-events

Author: MateuszNaKodach

README.md

@@ -1,13 +1,16 @@
 # Heroes of Domain-Driven Design (Java)
 Shows how to use Domain-Driven Design, Event Storming, Event Modeling and Event Sourcing in Heroes of Might & Magic III domain.
 
-👉 See also implementations in: [Ruby](https://github.com/MateuszNaKodach/HeroesOfDomainDrivenDesign.EventSourcing.Ruby) | **Java + Spring + Axon**
+👉 See also implementations in:
+- [Kotlin + Axon Framework 5 (DCB)](https://github.com/MateuszNaKodach/HeroesOfDomainDrivenDesign.EventSourcing.DCB.Kotlin.Axon5.Spring)
+- [TypeScript + Emmett](https://github.com/MateuszNaKodach/HeroesOfDomainDrivenDesign.EventSourcing.TypeScript.Emmett.Express)
+- [Ruby + RailsEventStore](https://github.com/MateuszNaKodach/HeroesOfDomainDrivenDesign.EventSourcing.Ruby)
 
 👉 [Let's explore the Heroes of Domain-Driven Design blogpost series](https://dddheroes.com/)
 - There you will get familiar with the whole Software Development process: from knowledge crunching with domain experts, designing solution using Event Modeling, to implementation using DDD Building Blocks.
 
-This project probably won't be fully-functional HOMM3 engine implementation, because it's done for educational purposes.
-If you'd like to talk with me about mentioned development practices fell free to contact on [linkedin.com/in/mateusznakodach/](https://www.linkedin.com/in/mateusznakodach).
+This project probably won't be a fully functional HOMM3 engine implementation because it's done for educational purposes.
+If you'd like to talk with me about mentioned development practices, feel free to contact on [linkedin.com/in/mateusznakodach/](https://www.linkedin.com/in/mateusznakodach).
 
 I'm focused on domain modeling on the backend, but I'm going to implement UI like below in the future.
 

pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.4.2</version>
+		<version>3.4.5</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.dddheroes</groupId>
@@ -27,10 +27,11 @@
 		<url/>
 	</scm>
 	<properties>
+		<assertj.version>3.27.3</assertj.version>
 		<axon.version>4.11.1</axon.version>
 		<java.version>23</java.version>
 		<spring-doc.version>2.8.5</spring-doc.version>
-		<spring-modulith.version>1.3.2</spring-modulith.version>
+		<spring-modulith.version>1.3.5</spring-modulith.version>
 	</properties>
 	<dependencies>
 		<dependency>
@@ -134,7 +135,7 @@
 		<dependency>
 			<groupId>org.assertj</groupId>
 			<artifactId>assertj-core</artifactId>
-			<version>3.27.3</version>
+			<version>${assertj.version}</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>

src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/read/getalldwellings/GetAllDwellingsQueryHandler.java

@@ -4,14 +4,14 @@
 import com.dddheroes.heroesofddd.creaturerecruitment.read.DwellingReadModelRepository;
 import com.dddheroes.heroesofddd.creaturerecruitment.events.DwellingBuilt;
 import com.dddheroes.heroesofddd.shared.application.GameMetaData;
-import com.google.common.collect.Streams;
 import org.axonframework.config.ProcessingGroup;
 import org.axonframework.eventhandling.EventHandler;
 import org.axonframework.messaging.annotation.MetaDataValue;
 import org.axonframework.queryhandling.QueryHandler;
 import org.springframework.stereotype.Component;
 
 import java.util.concurrent.ConcurrentLinkedDeque;
+import java.util.stream.Stream;
 
 @ProcessingGroup("Read_GetAllDwellings_QueryCache")
 @Component
@@ -28,12 +28,12 @@ class GetAllDwellingsQueryHandler {
     GetAllDwellings.Result handle(GetAllDwellings query) {
         var gameId = query.gameId().raw();
         var dwellings = dwellingReadModelRepository.findAllByGameId(gameId);
-        var result = Streams.concat(
-                                    dwellings.stream(),
-                                    cache.stream().filter(it -> it.getGameId().equals(gameId))
-                            ) // todo: check ordering
-                            .distinct()
-                            .toList();
+        var result = Stream.concat(
+                        dwellings.stream(),
+                        cache.stream().filter(it -> it.getGameId().equals(gameId))
+                ) // todo: check ordering
+                .distinct()
+                .toList();
         return new GetAllDwellings.Result(result);
     }