Move generic portfolio command/event to higher level

AxonFramework · Jun 1, 2018 · f7f1228 · f7f1228
1 parent 41f7810
commit f7f1228
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 90 deletions.
diff --git a/.../src/main/java/org/axonframework/samples/trader/api/portfolio/CreatePortfolioCommand.java b/.../src/main/java/org/axonframework/samples/trader/api/portfolio/CreatePortfolioCommand.java
diff --git a/...i/src/main/java/org/axonframework/samples/trader/api/portfolio/PortfolioCreatedEvent.java b/...i/src/main/java/org/axonframework/samples/trader/api/portfolio/PortfolioCreatedEvent.java
diff --git a/core-api/src/main/java/org/axonframework/samples/trader/api/portfolio/cash/commands.kt b/core-api/src/main/java/org/axonframework/samples/trader/api/portfolio/cash/commands.kt
@@ -1,12 +1,10 @@
 package org.axonframework.samples.trader.api.portfolio.cash
 
-import org.axonframework.commandhandling.TargetAggregateIdentifier
 import org.axonframework.samples.trader.api.orders.transaction.TransactionId
+import org.axonframework.samples.trader.api.portfolio.PortfolioCommand
 import org.axonframework.samples.trader.api.portfolio.PortfolioId
 import javax.validation.constraints.Min
 
-abstract class PortfolioCommand(@TargetAggregateIdentifier open val portfolioId: PortfolioId)
-
 data class CancelCashReservationCommand(
         override val portfolioId: PortfolioId,
         val transactionId: TransactionId,

diff --git a/core-api/src/main/java/org/axonframework/samples/trader/api/portfolio/cash/events.kt b/core-api/src/main/java/org/axonframework/samples/trader/api/portfolio/cash/events.kt
@@ -1,9 +1,8 @@
 package org.axonframework.samples.trader.api.portfolio.cash
 
-import org.axonframework.samples.trader.api.orders.trades.PortfolioId
 import org.axonframework.samples.trader.api.orders.transaction.TransactionId
-
-abstract class PortfolioEvent(open val portfolioId: PortfolioId)
+import org.axonframework.samples.trader.api.portfolio.PortfolioEvent
+import org.axonframework.samples.trader.api.portfolio.PortfolioId
 
 data class CashDepositedEvent(
         override val portfolioId: PortfolioId,

diff --git a/core-api/src/main/java/org/axonframework/samples/trader/api/portfolio/commands.kt b/core-api/src/main/java/org/axonframework/samples/trader/api/portfolio/commands.kt
@@ -0,0 +1,11 @@
+package org.axonframework.samples.trader.api.portfolio
+
+import org.axonframework.commandhandling.TargetAggregateIdentifier
+import org.axonframework.samples.trader.api.users.UserId
+
+abstract class PortfolioCommand(@TargetAggregateIdentifier open val portfolioId: PortfolioId)
+
+data class CreatePortfolioCommand(
+        override val portfolioId: PortfolioId,
+        val userId: UserId
+) : PortfolioCommand(portfolioId)
diff --git a/core-api/src/main/java/org/axonframework/samples/trader/api/portfolio/events.kt b/core-api/src/main/java/org/axonframework/samples/trader/api/portfolio/events.kt
@@ -0,0 +1,10 @@
+package org.axonframework.samples.trader.api.portfolio
+
+import org.axonframework.samples.trader.api.users.UserId
+
+abstract class PortfolioEvent(open val portfolioId: PortfolioId)
+
+class PortfolioCreatedEvent(
+        override val portfolioId: PortfolioId,
+        val userId: UserId
+) : PortfolioEvent(portfolioId)