Skip to content
This repository has been archived by the owner on Dec 14, 2021. It is now read-only.

Commit

Permalink
Fix a bunch of issue due to class move/function renames (Kotlin)
Browse files Browse the repository at this point in the history 
Fix a bunch of issue due to class move/function renames (Kotlin)
Also, remove useless `@author` tags and reindent file according to axon
style guide

#28
  • Loading branch information
@smcvb
smcvb committed Jun 1, 2018
1 parent 1f03f05 commit 65ade34
Show file tree
Hide file tree
Showing 37 changed files with 640 additions and 656 deletions.
2 changes: 1 addition & 1 deletion .../main/java/org/axonframework/samples/trader/company/command/CompanyOrderBookListener.java
View file
Expand Up @@ -21,8 +21,8 @@
import org.axonframework.eventhandling.EventHandler;
import org.axonframework.samples.trader.api.company.AddOrderBookToCompanyCommand;
import org.axonframework.samples.trader.api.company.CompanyCreatedEvent;
import org.axonframework.samples.trader.api.orders.OrderBookId;
import org.axonframework.samples.trader.api.orders.trades.CreateOrderBookCommand;
import org.axonframework.samples.trader.api.orders.trades.OrderBookId;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
Expand Down
52 changes: 0 additions & 52 deletions ...test/java/org/axonframework/samples/trader/company/command/CompanyCommandHandlerTest.java
View file

This file was deleted.

75 changes: 37 additions & 38 deletions ...rs/src/main/java/org/axonframework/samples/trader/orders/command/BuyTradeManagerSaga.java
View file
Expand Up @@ -22,12 +22,12 @@
import org.axonframework.eventhandling.saga.EndSaga;
import org.axonframework.eventhandling.saga.SagaEventHandler;
import org.axonframework.eventhandling.saga.StartSaga;
import org.axonframework.samples.trader.api.portfolio.stock.AddItemsToPortfolioCommand;
import org.axonframework.samples.trader.api.portfolio.cash.*;
import org.axonframework.samples.trader.api.orders.transaction.*;
import org.axonframework.samples.trader.api.orders.OrderId;
import org.axonframework.samples.trader.api.orders.trades.CreateBuyOrderCommand;
import org.axonframework.samples.trader.api.orders.trades.OrderId;
import org.axonframework.samples.trader.api.orders.trades.TradeExecutedEvent;
import org.axonframework.samples.trader.api.orders.transaction.*;
import org.axonframework.samples.trader.api.portfolio.cash.*;
import org.axonframework.samples.trader.api.portfolio.stock.AddItemsToPortfolioCommand;
import org.axonframework.spring.stereotype.Saga;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down Expand Up @@ -62,9 +62,9 @@ public void handle(BuyTransactionStartedEvent event) {
setTotalItems(event.getTotalItems());

ReserveCashCommand command = new ReserveCashCommand(getPortfolioIdentifier(),
getTransactionIdentifier(),
getTotalItems()
* getPricePerItem());
getTransactionIdentifier(),
getTotalItems()
* getPricePerItem());
getCommandBus().dispatch(new GenericCommandMessage<>(command));
}

Expand All @@ -73,19 +73,19 @@ public void handle(CashReservedEvent event) {
logger.debug("Money for transaction with identifier {} is reserved", getTransactionIdentifier());
ConfirmTransactionCommand command = new ConfirmTransactionCommand(getTransactionIdentifier());
getCommandBus().dispatch(new GenericCommandMessage<>(command),
new CommandCallback<ConfirmTransactionCommand, Void>() {

@Override
public void onSuccess(CommandMessage commandMessage, Void result) {
// TODO jettro : Do we really need this?
logger.debug("Confirm transaction is dispatched successfully!");
}

@Override
public void onFailure(CommandMessage commandMessage, Throwable cause) {
logger.error("********* WOW!!!", cause);
}
});
new CommandCallback<ConfirmTransactionCommand, Void>() {

@Override
public void onSuccess(CommandMessage commandMessage, Void result) {
// TODO jettro : Do we really need this?
logger.debug("Confirm transaction is dispatched successfully!");
}

@Override
public void onFailure(CommandMessage commandMessage, Throwable cause) {
logger.error("********* WOW!!!", cause);
}
});
}

@SagaEventHandler(associationProperty = "transactionIdentifier")
Expand All @@ -102,19 +102,19 @@ public void handle(CashReservationRejectedEvent event) {
public void handle(BuyTransactionConfirmedEvent event) {
logger.debug("Buy Transaction {} is approved to make the buy order", event.getTransactionId());
CreateBuyOrderCommand command = new CreateBuyOrderCommand(new OrderId(), getPortfolioIdentifier(),
getOrderbookIdentifier(),
getTransactionIdentifier(),
getTotalItems(),
getPricePerItem());
getOrderbookIdentifier(),
getTransactionIdentifier(),
getTotalItems(),
getPricePerItem());
getCommandBus().dispatch(new GenericCommandMessage<>(command));
}

@SagaEventHandler(associationProperty = "transactionIdentifier")
public void handle(BuyTransactionCancelledEvent event) {
long amountToCancel = (event.getTotalAmountOfItems() - event.getAmountOfExecutedItems()) * getPricePerItem();
logger.debug("Buy Transaction {} is cancelled, amount of cash reserved to cancel is {}",
event.getTransactionId(),
amountToCancel);
event.getTransactionId(),
amountToCancel);
CancelCashReservationCommand command = new CancelCashReservationCommand(
getPortfolioIdentifier(),
getTransactionIdentifier(),
Expand All @@ -127,8 +127,8 @@ public void handle(TradeExecutedEvent event) {
logger.debug("Buy Transaction {} is executed, items for transaction are {} for a price of {}",
getTransactionIdentifier(), event.getTradeCount(), event.getTradePrice());
ExecutedTransactionCommand command = new ExecutedTransactionCommand(getTransactionIdentifier(),
event.getTradeCount(),
event.getTradePrice());
event.getTradeCount(),
event.getTradePrice());
getCommandBus().dispatch(new GenericCommandMessage<>(command));
}

Expand All @@ -142,13 +142,13 @@ public void handle(BuyTransactionExecutedEvent event) {

ConfirmCashReservationCommand confirmCommand =
new ConfirmCashReservationCommand(getPortfolioIdentifier(),
getTransactionIdentifier(),
event.getAmountOfItems() * event.getItemPrice());
getTransactionIdentifier(),
event.getAmountOfItems() * event.getItemPrice());
getCommandBus().dispatch(new GenericCommandMessage<>(confirmCommand));
AddItemsToPortfolioCommand addItemsCommand =
new AddItemsToPortfolioCommand(getPortfolioIdentifier(),
getOrderbookIdentifier(),
event.getAmountOfItems());
getOrderbookIdentifier(),
event.getAmountOfItems());
getCommandBus().dispatch(new GenericCommandMessage<>(addItemsCommand));
}

Expand All @@ -165,14 +165,14 @@ public void handle(BuyTransactionPartiallyExecutedEvent event) {

ConfirmCashReservationCommand confirmCommand =
new ConfirmCashReservationCommand(getPortfolioIdentifier(),
getTransactionIdentifier(),
event.getAmountOfExecutedItems() * event
.getItemPrice());
getTransactionIdentifier(),
event.getAmountOfExecutedItems() * event
.getItemPrice());
getCommandBus().dispatch(new GenericCommandMessage<>(confirmCommand));
AddItemsToPortfolioCommand addItemsCommand =
new AddItemsToPortfolioCommand(getPortfolioIdentifier(),
getOrderbookIdentifier(),
event.getAmountOfExecutedItems());
getOrderbookIdentifier(),
event.getAmountOfExecutedItems());
getCommandBus().dispatch(new GenericCommandMessage<>(addItemsCommand));
}

Expand All @@ -189,5 +189,4 @@ private void returnDifferenceInBidPriceAndExecutedPrice(long bidPrice, long exec
cancelCashReservationCommand));
}
}

}
34 changes: 23 additions & 11 deletions orders/src/main/java/org/axonframework/samples/trader/orders/command/Portfolio.java
View file
Expand Up @@ -19,10 +19,10 @@
import org.axonframework.commandhandling.model.AggregateIdentifier;
import org.axonframework.commandhandling.model.AggregateRoot;
import org.axonframework.eventhandling.EventHandler;
import org.axonframework.samples.trader.api.orders.trades.OrderBookId;
import org.axonframework.samples.trader.api.orders.trades.PortfolioId;
import org.axonframework.samples.trader.api.orders.OrderBookId;
import org.axonframework.samples.trader.api.orders.transaction.TransactionId;
import org.axonframework.samples.trader.api.portfolio.PortfolioCreatedEvent;
import org.axonframework.samples.trader.api.portfolio.PortfolioId;
import org.axonframework.samples.trader.api.portfolio.cash.*;
import org.axonframework.samples.trader.api.portfolio.stock.*;
import org.axonframework.samples.trader.api.users.UserId;
Expand All @@ -43,6 +43,7 @@
*/
@AggregateRoot
public class Portfolio {

private static final long serialVersionUID = 996371335141649977L;

@AggregateIdentifier
Expand All @@ -64,16 +65,26 @@ public void addItems(OrderBookId orderBookIdentifier, long amountOfItemsToAdd) {
apply(new ItemsAddedToPortfolioEvent(portfolioId, orderBookIdentifier, amountOfItemsToAdd));
}

public void reserveItems(OrderBookId orderBookIdentifier, TransactionId transactionIdentifier, long amountOfItemsToReserve) {
public void reserveItems(OrderBookId orderBookIdentifier, TransactionId transactionIdentifier,
long amountOfItemsToReserve) {
if (!availableItems.containsKey(orderBookIdentifier)) {
apply(new ItemToReserveNotAvailableInPortfolioEvent(portfolioId, orderBookIdentifier, transactionIdentifier));
apply(new ItemToReserveNotAvailableInPortfolioEvent(portfolioId,
orderBookIdentifier,
transactionIdentifier));
} else {
Long availableAmountOfItems = availableItems.get(orderBookIdentifier);
if (availableAmountOfItems < amountOfItemsToReserve) {
apply(new NotEnoughItemsAvailableToReserveInPortfolioEvent(
portfolioId, orderBookIdentifier, transactionIdentifier, availableAmountOfItems, amountOfItemsToReserve));
portfolioId,
orderBookIdentifier,
transactionIdentifier,
availableAmountOfItems,
amountOfItemsToReserve));
} else {
apply(new ItemsReservedEvent(portfolioId, orderBookIdentifier, transactionIdentifier, amountOfItemsToReserve));
apply(new ItemsReservedEvent(portfolioId,
orderBookIdentifier,
transactionIdentifier,
amountOfItemsToReserve));
}
}
}
Expand All @@ -87,7 +98,8 @@ public void confirmReservation(OrderBookId orderBookIdentifier, TransactionId tr
amountOfItemsToConfirm));
}

public void cancelReservation(OrderBookId orderBookIdentifier, TransactionId transactionIdentifier, long amountOfItemsToCancel) {
public void cancelReservation(OrderBookId orderBookIdentifier, TransactionId transactionIdentifier,
long amountOfItemsToCancel) {
apply(new ItemReservationCancelledForPortfolioEvent(
portfolioId,
orderBookIdentifier,
Expand Down Expand Up @@ -133,11 +145,11 @@ public void onItemsAddedToPortfolio(ItemsAddedToPortfolioEvent event) {

@EventHandler
public void onItemsReserved(ItemsReservedEvent event) {
long available = obtainCurrentAvailableItems(event.getOrderBookIdentifier());
availableItems.put(event.getOrderBookIdentifier(), available - event.getAmountOfItemsReserved());
long available = obtainCurrentAvailableItems(event.getOrderBookId());
availableItems.put(event.getOrderBookId(), available - event.getAmountOfItemsReserved());

long reserved = obtainCurrentReservedItems(event.getOrderBookIdentifier());
reservedItems.put(event.getOrderBookIdentifier(), reserved + event.getAmountOfItemsReserved());
long reserved = obtainCurrentReservedItems(event.getOrderBookId());
reservedItems.put(event.getOrderBookId(), reserved + event.getAmountOfItemsReserved());
}

@EventHandler
Expand Down
6 changes: 3 additions & 3 deletions ...rc/main/java/org/axonframework/samples/trader/orders/command/PortfolioCommandHandler.java
View file
Expand Up @@ -66,17 +66,17 @@ public void handleAddItemsToPortfolioCommand(AddItemsToPortfolioCommand command)

@CommandHandler
public void handleConfirmReservationCommand(ConfirmItemReservationForPortfolioCommand command) {
Aggregate<Portfolio> portfolio = portfolioRepository.load(command.getPortfolioIdentifier().toString());
Aggregate<Portfolio> portfolio = portfolioRepository.load(command.getPortfolioId().toString());
portfolio.execute(aggregateRoot -> {
aggregateRoot.confirmReservation(command.getOrderBookIdentifier(),
aggregateRoot.confirmReservation(command.getOrderBookId(),
command.getTransactionId(),
command.getAmountOfItemsToConfirm());
});
}

@CommandHandler
public void handleCancelReservationCommand(CancelItemReservationForPortfolioCommand command) {
Aggregate<Portfolio> portfolio = portfolioRepository.load(command.getPortfolioIdentifier().toString());
Aggregate<Portfolio> portfolio = portfolioRepository.load(command.getPortfolioId().toString());
portfolio.execute(aggregateRoot -> {
aggregateRoot.cancelReservation(command.getOrderBookId(),
command.getTransactionId(),
Expand Down
2 changes: 1 addition & 1 deletion ...java/org/axonframework/samples/trader/orders/command/PortfolioManagementUserListener.java
View file
Expand Up @@ -20,7 +20,7 @@
import org.axonframework.commandhandling.GenericCommandMessage;
import org.axonframework.eventhandling.EventHandler;
import org.axonframework.samples.trader.api.portfolio.CreatePortfolioCommand;
import org.axonframework.samples.trader.api.orders.trades.PortfolioId;
import org.axonframework.samples.trader.api.portfolio.PortfolioId;
import org.axonframework.samples.trader.api.users.UserCreatedEvent;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down

0 comments on commit 65ade34

Please sign in to comment.