Permalink
Browse files

Some renaming to conform a bit more with trading terminology

Still not perfect, but it is a bit more realistic now.
  • Loading branch information...
abuijze committed Sep 26, 2012
1 parent 1fc8566 commit 8bd2dc737c998285bb74d90e4e49306ef4c99148
Showing with 186 additions and 186 deletions.
  1. +5 −5 .../{money/CancelMoneyReservationFromPortfolioCommand.java → cash/CancelCashReservationCommand.java}
  2. +3 −3 ...s/trader/api/portfolio/{money/MoneyDepositedToPortfolioEvent.java → cash/CashDepositedEvent.java}
  3. +5 −5 ...money/MoneyReservationCancelledFromPortfolioEvent.java → cash/CashReservationCancelledEvent.java}
  4. +5 −5 ...money/MoneyReservationConfirmedFromPortfolioEvent.java → cash/CashReservationConfirmedEvent.java}
  5. +4 −4 ...ey/NotEnoughMoneyInPortfolioToMakeReservationEvent.java → cash/CashReservationRejectedEvent.java}
  6. +3 −3 ...s/trader/api/portfolio/{money/MoneyReservedFromPortfolioEvent.java → cash/CashReservedEvent.java}
  7. +3 −3 ...trader/api/portfolio/{money/MoneyWithdrawnFromPortfolioEvent.java → cash/CashWithdrawnEvent.java}
  8. +6 −6 ...oney/ConfirmMoneyReservationFromPortfolionCommand.java → cash/ConfirmCashReservationCommand.java}
  9. +4 −4 ...s/trader/api/portfolio/{money/DepositMoneyToPortfolioCommand.java → cash/DepositCashCommand.java}
  10. +5 −5 ...trader/api/portfolio/{money/ReserveMoneyFromPortfolioCommand.java → cash/ReserveCashCommand.java}
  11. +3 −3 ...ader/api/portfolio/{money/WithdrawMoneyFromPortfolioCommand.java → cash/WithdrawCashCommand.java}
  12. +1 −1 ...ava/org/axonframework/samples/trader/api/portfolio/{item → stock}/AddItemsToPortfolioCommand.java
  13. +1 −1 ...amework/samples/trader/api/portfolio/{item → stock}/CancelItemReservationForPortfolioCommand.java
  14. +1 −1 ...mework/samples/trader/api/portfolio/{item → stock}/ConfirmItemReservationForPortfolioCommand.java
  15. +1 −1 ...mework/samples/trader/api/portfolio/{item → stock}/ItemReservationCancelledForPortfolioEvent.java
  16. +1 −1 ...mework/samples/trader/api/portfolio/{item → stock}/ItemReservationConfirmedForPortfolioEvent.java
  17. +1 −1 ...mework/samples/trader/api/portfolio/{item → stock}/ItemToReserveNotAvailableInPortfolioEvent.java
  18. +1 −1 ...ava/org/axonframework/samples/trader/api/portfolio/{item → stock}/ItemsAddedToPortfolioEvent.java
  19. +1 −1 ...c/main/java/org/axonframework/samples/trader/api/portfolio/{item → stock}/ItemsReservedEvent.java
  20. +1 −1 ...work/samples/trader/api/portfolio/{item → stock}/NotEnoughItemsAvailableToReserveInPortfolio.java
  21. +1 −1 .../main/java/org/axonframework/samples/trader/api/portfolio/{item → stock}/ReserveItemsCommand.java
  22. +16 −16 orders/src/main/java/org/axonframework/samples/trader/orders/command/BuyTradeManagerSaga.java
  23. +14 −14 orders/src/main/java/org/axonframework/samples/trader/orders/command/Portfolio.java
  24. +10 −10 orders/src/main/java/org/axonframework/samples/trader/orders/command/PortfolioCommandHandler.java
  25. +9 −9 orders/src/main/java/org/axonframework/samples/trader/orders/command/SellTradeManagerSaga.java
  26. +9 −9 orders/src/test/java/org/axonframework/samples/trader/orders/command/BuyTradeManagerSagaTest.java
  27. +22 −22 ...rs/src/test/java/org/axonframework/samples/trader/orders/command/PortfolioCommandHandlerTest.java
  28. +2 −2 orders/src/test/java/org/axonframework/samples/trader/orders/command/SellTradeManagerSagaTest.java
  29. +1 −1 ...a/org/axonframework/samples/trader/orders/command/matchers/AddItemsToPortfolioCommandMatcher.java
  30. +1 −1 ...ework/samples/trader/orders/command/matchers/CancelItemReservationForPortfolioCommandMatcher.java
  31. +4 −4 ...ork/samples/trader/orders/command/matchers/CancelMoneyReservationFromPortfolioCommandMatcher.java
  32. +1 −1 ...work/samples/trader/orders/command/matchers/ConfirmItemReservationForPortfolioCommandMatcher.java
  33. +4 −4 ...k/samples/trader/orders/command/matchers/ConfirmMoneyReservationFromPortfolionCommandMatcher.java
  34. +4 −4 ...g/axonframework/samples/trader/orders/command/matchers/DepositMoneyToPortfolioCommandMatcher.java
  35. +4 −4 ...axonframework/samples/trader/orders/command/matchers/ReserveMoneyFromPortfolioCommandMatcher.java
  36. +1 −1 ...st/java/org/axonframework/samples/trader/orders/command/matchers/ReservedItemsCommandMatcher.java
  37. +4 −4 query/src/main/java/org/axonframework/samples/trader/query/portfolio/PortfolioItemEventListener.java
  38. +6 −6 ...y/src/main/java/org/axonframework/samples/trader/query/portfolio/PortfolioMoneyEventListener.java
  39. +4 −4 ...rc/test/java/org/axonframework/samples/trader/query/portfolio/PortfolioItemEventListenerTest.java
  40. +5 −5 web-ui/src/main/java/org/axonframework/samples/trader/webui/admin/AdminController.java
  41. +1 −1 web-ui/src/main/java/org/axonframework/samples/trader/webui/companies/CompanyController.java
  42. +5 −5 web-ui/src/main/java/org/axonframework/samples/trader/webui/init/DBInit.java
  43. +1 −1 web-ui/src/main/java/org/axonframework/samples/trader/webui/init/MongoController.java
  44. +2 −2 web-ui/src/test/java/org/axonframework/samples/trader/test/CommandCreator.groovy
@@ -14,23 +14,23 @@
* limitations under the License.
*/
-package org.axonframework.samples.trader.api.portfolio.money;
+package org.axonframework.samples.trader.api.portfolio.cash;
import org.axonframework.samples.trader.api.orders.trades.PortfolioId;
import org.axonframework.samples.trader.api.orders.trades.TransactionId;
/**
* @author Jettro Coenradie
*/
-public class CancelMoneyReservationFromPortfolioCommand {
+public class CancelCashReservationCommand {
private PortfolioId portfolioIdentifier;
private TransactionId transactionIdentifier;
private long amountOfMoneyToCancel;
- public CancelMoneyReservationFromPortfolioCommand(PortfolioId portfolioIdentifier,
- TransactionId transactionIdentifier,
- long amountOfMoneyToCancel) {
+ public CancelCashReservationCommand(PortfolioId portfolioIdentifier,
+ TransactionId transactionIdentifier,
+ long amountOfMoneyToCancel) {
this.portfolioIdentifier = portfolioIdentifier;
this.transactionIdentifier = transactionIdentifier;
this.amountOfMoneyToCancel = amountOfMoneyToCancel;
@@ -14,18 +14,18 @@
* limitations under the License.
*/
-package org.axonframework.samples.trader.api.portfolio.money;
+package org.axonframework.samples.trader.api.portfolio.cash;
import org.axonframework.samples.trader.api.orders.trades.PortfolioId;
/**
* @author Jettro Coenradie
*/
-public class MoneyDepositedToPortfolioEvent {
+public class CashDepositedEvent {
private PortfolioId portfolioId;
private long moneyAddedInCents;
- public MoneyDepositedToPortfolioEvent(PortfolioId portfolioId, long moneyAddedInCents) {
+ public CashDepositedEvent(PortfolioId portfolioId, long moneyAddedInCents) {
this.portfolioId = portfolioId;
this.moneyAddedInCents = moneyAddedInCents;
}
@@ -14,22 +14,22 @@
* limitations under the License.
*/
-package org.axonframework.samples.trader.api.portfolio.money;
+package org.axonframework.samples.trader.api.portfolio.cash;
import org.axonframework.samples.trader.api.orders.trades.PortfolioId;
import org.axonframework.samples.trader.api.orders.trades.TransactionId;
/**
* @author Jettro Coenradie
*/
-public class MoneyReservationCancelledFromPortfolioEvent {
+public class CashReservationCancelledEvent {
private PortfolioId portfolioIdentifier;
private TransactionId transactionIdentifier;
private long amountOfMoneyToCancel;
- public MoneyReservationCancelledFromPortfolioEvent(PortfolioId portfolioIdentifier,
- TransactionId transactionIdentifier,
- long amountOfMoneyToCancel) {
+ public CashReservationCancelledEvent(PortfolioId portfolioIdentifier,
+ TransactionId transactionIdentifier,
+ long amountOfMoneyToCancel) {
this.portfolioIdentifier = portfolioIdentifier;
this.transactionIdentifier = transactionIdentifier;
this.amountOfMoneyToCancel = amountOfMoneyToCancel;
@@ -14,22 +14,22 @@
* limitations under the License.
*/
-package org.axonframework.samples.trader.api.portfolio.money;
+package org.axonframework.samples.trader.api.portfolio.cash;
import org.axonframework.samples.trader.api.orders.trades.PortfolioId;
import org.axonframework.samples.trader.api.orders.trades.TransactionId;
/**
* @author Jettro Coenradie
*/
-public class MoneyReservationConfirmedFromPortfolioEvent {
+public class CashReservationConfirmedEvent {
private TransactionId transactionIdentifier;
private PortfolioId portfolioIdentifier;
private long amountOfMoneyConfirmedInCents;
- public MoneyReservationConfirmedFromPortfolioEvent(PortfolioId portfolioIdentifier,
- TransactionId transactionId,
- long amountOfMoneyConfirmedInCents) {
+ public CashReservationConfirmedEvent(PortfolioId portfolioIdentifier,
+ TransactionId transactionId,
+ long amountOfMoneyConfirmedInCents) {
this.portfolioIdentifier = portfolioIdentifier;
this.transactionIdentifier = transactionId;
this.amountOfMoneyConfirmedInCents = amountOfMoneyConfirmedInCents;
@@ -14,21 +14,21 @@
* limitations under the License.
*/
-package org.axonframework.samples.trader.api.portfolio.money;
+package org.axonframework.samples.trader.api.portfolio.cash;
import org.axonframework.samples.trader.api.orders.trades.PortfolioId;
import org.axonframework.samples.trader.api.orders.trades.TransactionId;
/**
* @author Jettro Coenradie
*/
-public class NotEnoughMoneyInPortfolioToMakeReservationEvent {
+public class CashReservationRejectedEvent {
private PortfolioId portfolioIdentifier;
private TransactionId transactionIdentifier;
private long amountToPayInCents;
- public NotEnoughMoneyInPortfolioToMakeReservationEvent(PortfolioId portfolioIdentifier, TransactionId transactionIdentifier,
- long amountToPayInCents) {
+ public CashReservationRejectedEvent(PortfolioId portfolioIdentifier, TransactionId transactionIdentifier,
+ long amountToPayInCents) {
this.portfolioIdentifier = portfolioIdentifier;
this.transactionIdentifier = transactionIdentifier;
this.amountToPayInCents = amountToPayInCents;
@@ -14,20 +14,20 @@
* limitations under the License.
*/
-package org.axonframework.samples.trader.api.portfolio.money;
+package org.axonframework.samples.trader.api.portfolio.cash;
import org.axonframework.samples.trader.api.orders.trades.PortfolioId;
import org.axonframework.samples.trader.api.orders.trades.TransactionId;
/**
* @author Jettro Coenradie
*/
-public class MoneyReservedFromPortfolioEvent {
+public class CashReservedEvent {
private PortfolioId portfolioIdentifier;
private TransactionId transactionIdentifier;
private long amountToReserve;
- public MoneyReservedFromPortfolioEvent(PortfolioId portfolioIdentifier, TransactionId transactionIdentifier, long amountToReserve) {
+ public CashReservedEvent(PortfolioId portfolioIdentifier, TransactionId transactionIdentifier, long amountToReserve) {
this.portfolioIdentifier = portfolioIdentifier;
this.transactionIdentifier = transactionIdentifier;
this.amountToReserve = amountToReserve;
@@ -14,18 +14,18 @@
* limitations under the License.
*/
-package org.axonframework.samples.trader.api.portfolio.money;
+package org.axonframework.samples.trader.api.portfolio.cash;
import org.axonframework.samples.trader.api.orders.trades.PortfolioId;
/**
* @author Jettro Coenradie
*/
-public class MoneyWithdrawnFromPortfolioEvent {
+public class CashWithdrawnEvent {
private PortfolioId portfolioIdentifier;
private long amountPaidInCents;
- public MoneyWithdrawnFromPortfolioEvent(PortfolioId portfolioIdentifier, long amountPaidInCents) {
+ public CashWithdrawnEvent(PortfolioId portfolioIdentifier, long amountPaidInCents) {
this.portfolioIdentifier = portfolioIdentifier;
this.amountPaidInCents = amountPaidInCents;
}
@@ -14,24 +14,24 @@
* limitations under the License.
*/
-package org.axonframework.samples.trader.api.portfolio.money;
+package org.axonframework.samples.trader.api.portfolio.cash;
import org.axonframework.samples.trader.api.orders.trades.PortfolioId;
import org.axonframework.samples.trader.api.orders.trades.TransactionId;
/**
* @author Jettro Coenradie
*/
-public class ConfirmMoneyReservationFromPortfolionCommand {
+public class ConfirmCashReservationCommand {
private PortfolioId portfolioIdentifier;
private TransactionId transactionIdentifier;
private long amountOfMoneyToConfirmInCents;
- public ConfirmMoneyReservationFromPortfolionCommand(PortfolioId portfolioIdentifier,
- TransactionId transactionIdentifier,
- long amountOfMoneyToConfirmInCents) {
+ public ConfirmCashReservationCommand(PortfolioId portfolioIdentifier,
+ TransactionId transactionIdentifier,
+ long amountOfMoneyToConfirmInCents) {
this.portfolioIdentifier = portfolioIdentifier;
this.transactionIdentifier = transactionIdentifier;
this.amountOfMoneyToConfirmInCents = amountOfMoneyToConfirmInCents;
@@ -51,7 +51,7 @@ public TransactionId getTransactionIdentifier() {
@Override
public String toString() {
- return "ConfirmMoneyReservationFromPortfolionCommand{" +
+ return "ConfirmCashReservationCommand{" +
"amountOfMoneyToConfirmInCents=" + amountOfMoneyToConfirmInCents +
", portfolioIdentifier=" + portfolioIdentifier +
", transactionIdentifier=" + transactionIdentifier +
@@ -14,21 +14,21 @@
* limitations under the License.
*/
-package org.axonframework.samples.trader.api.portfolio.money;
+package org.axonframework.samples.trader.api.portfolio.cash;
import org.axonframework.samples.trader.api.orders.trades.PortfolioId;
/**
- * Adding money to your Portfolio through a deposit
+ * Adding cash to your Portfolio through a deposit
*
* @author Jettro Coenradie
*/
-public class DepositMoneyToPortfolioCommand {
+public class DepositCashCommand {
private PortfolioId portfolioIdentifier;
private long moneyToAddInCents;
- public DepositMoneyToPortfolioCommand(PortfolioId portfolioIdentifier, long moneyToAddInCents) {
+ public DepositCashCommand(PortfolioId portfolioIdentifier, long moneyToAddInCents) {
this.portfolioIdentifier = portfolioIdentifier;
this.moneyToAddInCents = moneyToAddInCents;
}
@@ -14,23 +14,23 @@
* limitations under the License.
*/
-package org.axonframework.samples.trader.api.portfolio.money;
+package org.axonframework.samples.trader.api.portfolio.cash;
import org.axonframework.samples.trader.api.orders.trades.PortfolioId;
import org.axonframework.samples.trader.api.orders.trades.TransactionId;
/**
* @author Jettro Coenradie
*/
-public class ReserveMoneyFromPortfolioCommand {
+public class ReserveCashCommand {
private PortfolioId portfolioIdentifier;
private TransactionId transactionIdentifier;
private long amountOfMoneyToReserve;
- public ReserveMoneyFromPortfolioCommand(PortfolioId portfolioIdentifier,
- TransactionId transactionIdentifier,
- long amountOfMoneyToReserve) {
+ public ReserveCashCommand(PortfolioId portfolioIdentifier,
+ TransactionId transactionIdentifier,
+ long amountOfMoneyToReserve) {
this.portfolioIdentifier = portfolioIdentifier;
this.transactionIdentifier = transactionIdentifier;
this.amountOfMoneyToReserve = amountOfMoneyToReserve;
@@ -14,19 +14,19 @@
* limitations under the License.
*/
-package org.axonframework.samples.trader.api.portfolio.money;
+package org.axonframework.samples.trader.api.portfolio.cash;
import org.axonframework.samples.trader.api.orders.trades.PortfolioId;
/**
* @author Jettro Coenradie
*/
-public class WithdrawMoneyFromPortfolioCommand {
+public class WithdrawCashCommand {
private PortfolioId portfolioIdentifier;
private long amountToPayInCents;
- public WithdrawMoneyFromPortfolioCommand(PortfolioId portfolioIdentifier, long amountToPayInCents) {
+ public WithdrawCashCommand(PortfolioId portfolioIdentifier, long amountToPayInCents) {
this.portfolioIdentifier = portfolioIdentifier;
this.amountToPayInCents = amountToPayInCents;
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.axonframework.samples.trader.api.portfolio.item;
+package org.axonframework.samples.trader.api.portfolio.stock;
import org.axonframework.samples.trader.api.orders.trades.OrderBookId;
import org.axonframework.samples.trader.api.orders.trades.PortfolioId;
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.axonframework.samples.trader.api.portfolio.item;
+package org.axonframework.samples.trader.api.portfolio.stock;
import org.axonframework.samples.trader.api.orders.trades.OrderBookId;
import org.axonframework.samples.trader.api.orders.trades.PortfolioId;
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.axonframework.samples.trader.api.portfolio.item;
+package org.axonframework.samples.trader.api.portfolio.stock;
import org.axonframework.samples.trader.api.orders.trades.OrderBookId;
import org.axonframework.samples.trader.api.orders.trades.PortfolioId;
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.axonframework.samples.trader.api.portfolio.item;
+package org.axonframework.samples.trader.api.portfolio.stock;
import org.axonframework.samples.trader.api.orders.trades.OrderBookId;
import org.axonframework.samples.trader.api.orders.trades.PortfolioId;
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.axonframework.samples.trader.api.portfolio.item;
+package org.axonframework.samples.trader.api.portfolio.stock;
import org.axonframework.samples.trader.api.orders.trades.OrderBookId;
import org.axonframework.samples.trader.api.orders.trades.PortfolioId;
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.axonframework.samples.trader.api.portfolio.item;
+package org.axonframework.samples.trader.api.portfolio.stock;
import org.axonframework.samples.trader.api.orders.trades.OrderBookId;
import org.axonframework.samples.trader.api.orders.trades.PortfolioId;
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.axonframework.samples.trader.api.portfolio.item;
+package org.axonframework.samples.trader.api.portfolio.stock;
import org.axonframework.samples.trader.api.orders.trades.OrderBookId;
import org.axonframework.samples.trader.api.orders.trades.PortfolioId;
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.axonframework.samples.trader.api.portfolio.item;
+package org.axonframework.samples.trader.api.portfolio.stock;
import org.axonframework.samples.trader.api.orders.trades.OrderBookId;
import org.axonframework.samples.trader.api.orders.trades.PortfolioId;
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.axonframework.samples.trader.api.portfolio.item;
+package org.axonframework.samples.trader.api.portfolio.stock;
import org.axonframework.samples.trader.api.orders.trades.OrderBookId;
import org.axonframework.samples.trader.api.orders.trades.PortfolioId;
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.axonframework.samples.trader.api.portfolio.item;
+package org.axonframework.samples.trader.api.portfolio.stock;
import org.axonframework.samples.trader.api.orders.trades.OrderBookId;
Oops, something went wrong.

0 comments on commit 8bd2dc7

Please sign in to comment.