Misc changes

java-spring/accounts-command-side-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/commandside/accounts/AccountWorkflow.java

@@ -15,7 +15,7 @@ import java.util.concurrent.CompletableFuture;
 public class AccountWorkflow  {
 
   @EventHandlerMethod
-  public CompletableFuture<EntityWithIdAndVersion<Account>> debitAccount(EventHandlerContext<MoneyTransferCreatedEvent> ctx) {
+  public CompletableFuture<?> debitAccount(EventHandlerContext<MoneyTransferCreatedEvent> ctx) {
     MoneyTransferCreatedEvent event = ctx.getEvent();
     BigDecimal amount = event.getDetails().getAmount();
     String transactionId = ctx.getEntityId();

java-spring/docker-compose.yml

@@ -1,5 +1,5 @@
 apigateway:
-  image: java:8
+  image: java:openjdk-8u91-jdk
   working_dir: /app
   volumes:
     - ./api-gateway-service/build/libs:/app
@@ -19,7 +19,7 @@ apigateway:
     SPRING_DATA_MONGODB_URI: mongodb://mongodb/mydb
 
 accountscommandside:
-  image: java:8
+  image: java:openjdk-8u91-jdk
   working_dir: /app
   volumes:
     - ./accounts-command-side-service/build/libs:/app
@@ -31,7 +31,7 @@ accountscommandside:
     EVENTUATE_API_KEY_SECRET:
 
 transactionscommandside:
-  image: java:8
+  image: java:openjdk-8u91-jdk
   working_dir: /app
   volumes:
     - ./transactions-command-side-service/build/libs:/app
@@ -44,7 +44,7 @@ transactionscommandside:
 
 
 accountsqueryside:
-  image: java:8
+  image: java:openjdk-8u91-jdk
   working_dir: /app
   volumes:
     - ./accounts-query-side-service/build/libs:/app
@@ -59,7 +59,7 @@ accountsqueryside:
     SPRING_DATA_MONGODB_URI: mongodb://mongodb/mydb
 
 customerscommandside:
-  image: java:8
+  image: java:openjdk-8u91-jdk
   working_dir: /app
   volumes:
     - ./customers-command-side-service/build/libs:/app
@@ -71,7 +71,7 @@ customerscommandside:
     EVENTUATE_API_KEY_SECRET:
 
 customersqueryside:
-  image: java:8
+  image: java:openjdk-8u91-jdk
   working_dir: /app
   volumes:
     - ./customers-query-side-service/build/libs:/app

java-spring/monolithic-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/web/BankingWebIntegrationTest.java

@@ -28,10 +28,12 @@ import javax.annotation.PostConstruct;
 import java.math.BigDecimal;
 
 import java.util.List;
+import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import static net.chrisrichardson.eventstorestore.javaexamples.testutil.TestUtil.eventually;
 import static net.chrisrichardson.eventstorestore.javaexamples.testutil.customers.CustomersTestUtils.generateCustomerInfo;
 import static net.chrisrichardson.eventstorestore.javaexamples.testutil.customers.CustomersTestUtils.generateToAccountInfo;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 @RunWith(SpringJUnit4ClassRunner.class)
@@ -106,10 +108,18 @@ public class BankingWebIntegrationTest {
                 new ParameterizedTypeReference<List<AccountTransactionInfo>>() {}).getBody();
 
 
-        assertTrue(transactionInfoList.stream().filter(ti -> ti.getTransactionId().equals(moneyTransfer.getMoneyTransferId()) &&
+        Optional<AccountTransactionInfo> first = transactionInfoList.stream().filter(ti -> ti.getTransactionId().equals(moneyTransfer.getMoneyTransferId())).findFirst();
-                                                            ti.getFromAccountId().equals(fromAccountId) &&
+
-                                                            ti.getToAccountId().equals(toAccountId) &&
+        assertTrue(first.isPresent());
-                                                            ti.getAmount() == toCents(amountToTransfer).longValue()).findFirst().isPresent());
+
+        AccountTransactionInfo ti = first.get();
+
+        assertEquals(fromAccountId, ti.getFromAccountId());
+        assertEquals(toAccountId, ti.getToAccountId());
+        assertEquals(toAccountId, ti.getToAccountId());
+        assertEquals(fromAccountId, ti.getFromAccountId());
+        assertEquals(toCents(amountToTransfer).longValue(), ti.getAmount());
+
     }
 
     @Test
@@ -121,7 +131,7 @@ public class BankingWebIntegrationTest {
         final String customerId = customerResponse.getId();
 
         Assert.assertNotNull(customerId);
-        Assert.assertEquals(customerInfo, customerResponse.getCustomerInfo());
+        assertEquals(customerInfo, customerResponse.getCustomerInfo());
 
         customersTestUtils.assertCustomerResponse(customerId, customerInfo);
 
@@ -153,7 +163,7 @@ public class BankingWebIntegrationTest {
         final String customerId = customerResponse.getId();
 
         Assert.assertNotNull(customerId);
-        Assert.assertEquals(customerInfo, customerResponse.getCustomerInfo());
+        assertEquals(customerInfo, customerResponse.getCustomerInfo());
 
         customersTestUtils.assertCustomerResponse(customerId, customerInfo);
 
@@ -188,8 +198,8 @@ public class BankingWebIntegrationTest {
                 new Verifier<GetAccountResponse>() {
                     @Override
                     public void verify(GetAccountResponse accountInfo) {
-                        Assert.assertEquals(fromAccountId, accountInfo.getAccountId());
+                        assertEquals(fromAccountId, accountInfo.getAccountId());
-                        Assert.assertEquals(inCents, accountInfo.getBalance());
+                        assertEquals(inCents, accountInfo.getBalance());
                     }
                 });
     }
@@ -208,7 +218,7 @@ public class BankingWebIntegrationTest {
                 new Verifier<QuerySideCustomer>() {
                     @Override
                     public void verify(QuerySideCustomer customerResponse) {
-                        Assert.assertEquals(customerId, customerResponse.getId());
+                        assertEquals(customerId, customerResponse.getId());
                         assertTrue(customerResponse.getToAccounts().values().stream().anyMatch(t -> t.equals(toAccountInfo)));
                     }
                 });