- fix issue #48

- fix issue #52

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;
   }

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;
 

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() {

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 {
 }

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{
+}

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;

java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/accounts/package-info.java

@@ -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;

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() {

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() {

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() {

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() {

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 {
+}

java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/transactions/package-info.java

@@ -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;

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;