From e4a0d6773dd2e6ebac7e398c545c207b331ca552 Mon Sep 17 00:00:00 2001 From: dartpopikyardo Date: Fri, 23 Sep 2016 17:02:54 +0300 Subject: [PATCH 1/2] - fix issue #48 - fix issue #52 --- .../banking/apigateway/controller/GatewayController.java | 6 +++--- .../backend/common/accounts/AccountChangedEvent.java | 4 +--- .../AccountDebitFailedDueToInsufficientFundsEvent.java | 4 +--- .../backend/common/accounts/AccountDeletedEvent.java | 6 +----- .../banking/backend/common/accounts/AccountEvent.java | 8 ++++++++ .../backend/common/accounts/AccountOpenedEvent.java | 5 +---- .../banking/backend/common/accounts/package-info.java | 2 -- .../backend/common/transactions/CreditRecordedEvent.java | 3 +-- .../backend/common/transactions/DebitRecordedEvent.java | 6 +----- .../common/transactions/FailedDebitRecordedEvent.java | 3 +-- .../common/transactions/MoneyTransferCreatedEvent.java | 4 +--- .../backend/common/transactions/MoneyTransferEvent.java | 8 ++++++++ .../banking/backend/common/transactions/package-info.java | 2 -- .../banking/common/customers/QuerySideCustomer.java | 2 ++ 14 files changed, 29 insertions(+), 34 deletions(-) create mode 100644 java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/accounts/AccountEvent.java delete mode 100644 java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/accounts/package-info.java create mode 100644 java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/transactions/MoneyTransferEvent.java delete mode 100644 java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/transactions/package-info.java diff --git a/java-spring/api-gateway-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/apigateway/controller/GatewayController.java b/java-spring/api-gateway-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/apigateway/controller/GatewayController.java index 73e7ac5..71b9e51 100755 --- a/java-spring/api-gateway-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/apigateway/controller/GatewayController.java +++ b/java-spring/api-gateway-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/apigateway/controller/GatewayController.java @@ -29,7 +29,6 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.net.URISyntaxException; import java.util.stream.Collectors; -import java.util.stream.Stream; import static org.springframework.web.bind.annotation.RequestMethod.*; @@ -59,11 +58,12 @@ public class GatewayController { logger.info("request: {}", proxiedRequest); HttpResponse proxiedResponse = httpClient.execute(proxiedRequest); logger.info("Response {}", proxiedResponse.getStatusLine().getStatusCode()); - return new ResponseEntity<>(read(proxiedResponse.getEntity().getContent()), processHeaders(proxiedResponse.getFirstHeader("Content-Type")), HttpStatus.valueOf(proxiedResponse.getStatusLine().getStatusCode())); + return new ResponseEntity<>(read(proxiedResponse.getEntity().getContent()), makeResponseHeaders(proxiedResponse), HttpStatus.valueOf(proxiedResponse.getStatusLine().getStatusCode())); } - private HttpHeaders processHeaders(Header h) { + private HttpHeaders makeResponseHeaders(HttpResponse response) { HttpHeaders result = new HttpHeaders(); + Header h = response.getFirstHeader("Content-Type"); result.set(h.getName(), h.getValue()); return result; } diff --git a/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/accounts/AccountChangedEvent.java b/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/accounts/AccountChangedEvent.java index 08cec47..4506c45 100644 --- a/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/accounts/AccountChangedEvent.java +++ b/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/accounts/AccountChangedEvent.java @@ -1,10 +1,8 @@ package net.chrisrichardson.eventstore.javaexamples.banking.backend.common.accounts; -import io.eventuate.Event; - import java.math.BigDecimal; -public class AccountChangedEvent implements Event { +public class AccountChangedEvent extends AccountEvent { protected BigDecimal amount; protected String transactionId; diff --git a/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/accounts/AccountDebitFailedDueToInsufficientFundsEvent.java b/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/accounts/AccountDebitFailedDueToInsufficientFundsEvent.java index daea33a..5bc24c1 100644 --- a/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/accounts/AccountDebitFailedDueToInsufficientFundsEvent.java +++ b/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/accounts/AccountDebitFailedDueToInsufficientFundsEvent.java @@ -1,8 +1,6 @@ package net.chrisrichardson.eventstore.javaexamples.banking.backend.common.accounts; -import io.eventuate.Event; - -public class AccountDebitFailedDueToInsufficientFundsEvent implements Event { +public class AccountDebitFailedDueToInsufficientFundsEvent extends AccountEvent { private String transactionId; private AccountDebitFailedDueToInsufficientFundsEvent() { diff --git a/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/accounts/AccountDeletedEvent.java b/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/accounts/AccountDeletedEvent.java index 5b49081..61240a1 100644 --- a/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/accounts/AccountDeletedEvent.java +++ b/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/accounts/AccountDeletedEvent.java @@ -1,8 +1,4 @@ package net.chrisrichardson.eventstore.javaexamples.banking.backend.common.accounts; -import io.eventuate.Event; - -import java.util.Date; - -public class AccountDeletedEvent implements Event { +public class AccountDeletedEvent extends AccountEvent { } diff --git a/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/accounts/AccountEvent.java b/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/accounts/AccountEvent.java new file mode 100644 index 0000000..f3bd3d4 --- /dev/null +++ b/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/accounts/AccountEvent.java @@ -0,0 +1,8 @@ +package net.chrisrichardson.eventstore.javaexamples.banking.backend.common.accounts; + +import io.eventuate.Event; +import io.eventuate.EventEntity; + +@EventEntity(entity="net.chrisrichardson.eventstore.javaexamples.banking.backend.commandside.accounts.Account") +public abstract class AccountEvent implements Event{ +} diff --git a/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/accounts/AccountOpenedEvent.java b/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/accounts/AccountOpenedEvent.java index 314f4c1..77fd89a 100644 --- a/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/accounts/AccountOpenedEvent.java +++ b/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/accounts/AccountOpenedEvent.java @@ -1,11 +1,8 @@ package net.chrisrichardson.eventstore.javaexamples.banking.backend.common.accounts; - -import io.eventuate.Event; - import java.math.BigDecimal; -public class AccountOpenedEvent implements Event { +public class AccountOpenedEvent extends AccountEvent { private String customerId; private String title; diff --git a/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/accounts/package-info.java b/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/accounts/package-info.java deleted file mode 100644 index 9fc9927..0000000 --- a/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/accounts/package-info.java +++ /dev/null @@ -1,2 +0,0 @@ -@io.eventuate.EventEntity(entity="net.chrisrichardson.eventstore.javaexamples.banking.backend.commandside.accounts.Account") -package net.chrisrichardson.eventstore.javaexamples.banking.backend.common.accounts; \ No newline at end of file diff --git a/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/transactions/CreditRecordedEvent.java b/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/transactions/CreditRecordedEvent.java index 1185f75..eebddbd 100644 --- a/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/transactions/CreditRecordedEvent.java +++ b/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/transactions/CreditRecordedEvent.java @@ -1,8 +1,7 @@ package net.chrisrichardson.eventstore.javaexamples.banking.backend.common.transactions; -import io.eventuate.Event; -public class CreditRecordedEvent implements Event { +public class CreditRecordedEvent extends MoneyTransferEvent { private TransferDetails details; private CreditRecordedEvent() { diff --git a/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/transactions/DebitRecordedEvent.java b/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/transactions/DebitRecordedEvent.java index 4e666c8..e0fd751 100644 --- a/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/transactions/DebitRecordedEvent.java +++ b/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/transactions/DebitRecordedEvent.java @@ -1,10 +1,6 @@ package net.chrisrichardson.eventstore.javaexamples.banking.backend.common.transactions; -// import io.eventuate.Event; - -import io.eventuate.Event; - -public class DebitRecordedEvent implements Event { +public class DebitRecordedEvent extends MoneyTransferEvent { private TransferDetails details; private DebitRecordedEvent() { diff --git a/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/transactions/FailedDebitRecordedEvent.java b/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/transactions/FailedDebitRecordedEvent.java index 9defba0..1a089e6 100644 --- a/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/transactions/FailedDebitRecordedEvent.java +++ b/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/transactions/FailedDebitRecordedEvent.java @@ -1,8 +1,7 @@ package net.chrisrichardson.eventstore.javaexamples.banking.backend.common.transactions; -import io.eventuate.Event; -public class FailedDebitRecordedEvent implements Event { +public class FailedDebitRecordedEvent extends MoneyTransferEvent { private TransferDetails details; private FailedDebitRecordedEvent() { diff --git a/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/transactions/MoneyTransferCreatedEvent.java b/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/transactions/MoneyTransferCreatedEvent.java index bf6aabe..a09759b 100644 --- a/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/transactions/MoneyTransferCreatedEvent.java +++ b/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/transactions/MoneyTransferCreatedEvent.java @@ -1,9 +1,7 @@ package net.chrisrichardson.eventstore.javaexamples.banking.backend.common.transactions; -import io.eventuate.Event; - -public class MoneyTransferCreatedEvent implements Event { +public class MoneyTransferCreatedEvent extends MoneyTransferEvent { private TransferDetails details; private MoneyTransferCreatedEvent() { diff --git a/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/transactions/MoneyTransferEvent.java b/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/transactions/MoneyTransferEvent.java new file mode 100644 index 0000000..2b001cb --- /dev/null +++ b/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/transactions/MoneyTransferEvent.java @@ -0,0 +1,8 @@ +package net.chrisrichardson.eventstore.javaexamples.banking.backend.common.transactions; + +import io.eventuate.Event; +import io.eventuate.EventEntity; + +@EventEntity(entity="net.chrisrichardson.eventstore.javaexamples.banking.backend.commandside.transactions.MoneyTransfer") +public abstract class MoneyTransferEvent implements Event { +} diff --git a/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/transactions/package-info.java b/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/transactions/package-info.java deleted file mode 100644 index 29ed21d..0000000 --- a/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/transactions/package-info.java +++ /dev/null @@ -1,2 +0,0 @@ -@io.eventuate.EventEntity(entity="net.chrisrichardson.eventstore.javaexamples.banking.backend.commandside.transactions.MoneyTransfer") -package net.chrisrichardson.eventstore.javaexamples.banking.backend.common.transactions; \ No newline at end of file diff --git a/java-spring/common/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/common/customers/QuerySideCustomer.java b/java-spring/common/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/common/customers/QuerySideCustomer.java index 1310f23..363ab56 100644 --- a/java-spring/common/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/common/customers/QuerySideCustomer.java +++ b/java-spring/common/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/common/customers/QuerySideCustomer.java @@ -1,12 +1,14 @@ package net.chrisrichardson.eventstore.javaexamples.banking.common.customers; import org.springframework.data.mongodb.core.index.Indexed; +import org.springframework.data.mongodb.core.mapping.Document; import java.util.Map; /** * Created by Main on 05.02.2016. */ +@Document public class QuerySideCustomer { private String id; From 4b78658dd84675133893919cd9325dc31d4f4a10 Mon Sep 17 00:00:00 2001 From: dartpopikyardo Date: Tue, 27 Sep 2016 11:20:47 +0300 Subject: [PATCH 2/2] fixed issue #54 --- .../backend/queryside/accounts/AccountInfoUpdateService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-spring/accounts-query-side-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/queryside/accounts/AccountInfoUpdateService.java b/java-spring/accounts-query-side-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/queryside/accounts/AccountInfoUpdateService.java index f1639b3..973e661 100644 --- a/java-spring/accounts-query-side-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/queryside/accounts/AccountInfoUpdateService.java +++ b/java-spring/accounts-query-side-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/queryside/accounts/AccountInfoUpdateService.java @@ -40,7 +40,7 @@ public class AccountInfoUpdateService { .set("description", description) .set("balance", toIntegerRepr(initialBalance)) .push("changes", ci) - .set("date", getFromEventId(version)) + .set("creationDate", getFromEventId(version)) .set("version", version), AccountInfo.class); logger.info("Saved in mongo");