Simplified TestUtil, Fixed MongoDB update issue

_build-and-test-all.sh

@@ -6,6 +6,12 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 DOCKER_COMPOSE="docker-compose -p event-sourcing-examples"
 
+if [ "$1" = "-f" ] ; then
+  shift;
+  DOCKER_COMPOSE="$DOCKER_COMPOSE -f ${1?}"
+  shift
+fi
+
 if [ "$1" = "--use-existing" ] ; then
   shift;
 else
@@ -13,6 +19,13 @@ else
   ${DOCKER_COMPOSE?} rm -v --force
 fi
 
+NO_RM=false
+
+if [ "$1" = "--no-rm" ] ; then
+  NO_RM=true
+  shift
+fi
+
 ${DOCKER_COMPOSE?} up -d mongodb
 
 if [ -z "$DOCKER_HOST_IP" ] ; then
@@ -47,5 +60,7 @@ set -e
 
 ./gradlew -a $* :e2e-test:cleanTest :e2e-test:test -P ignoreE2EFailures=false
 
-${DOCKER_COMPOSE?} stop
-${DOCKER_COMPOSE?} rm -v --force
+if [ $NO_RM = false ] ; then
+  ${DOCKER_COMPOSE?} stop
+  ${DOCKER_COMPOSE?} rm -v --force
+fi

java-spring/accounts-command-side-service/build.gradle

@@ -1,5 +1,6 @@
 apply plugin: VerifyMongoDBConfigurationPlugin
 apply plugin: VerifyEventStoreEnvironmentPlugin
+apply plugin: EventuateDependencyPlugin
 
 apply plugin: 'spring-boot'
 
@@ -10,9 +11,6 @@ dependencies {
     compile "org.springframework.boot:spring-boot-starter-web"
     compile "org.springframework.boot:spring-boot-starter-actuator"
 
-
-    compile "io.eventuate.client.java:eventuate-client-java-http-stomp-spring:$eventuateClientVersion"
-
     testCompile "org.springframework.boot:spring-boot-starter-test"
 
 }

java-spring/accounts-query-side-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/queryside/accounts/AccountChangeInfo.java

@@ -1,5 +1,8 @@
 package net.chrisrichardson.eventstore.javaexamples.banking.backend.queryside.accounts;
 
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+
 public class AccountChangeInfo {
 
   private String changeId;
@@ -15,4 +18,14 @@ public class AccountChangeInfo {
     this.amount = amount;
     this.balanceDelta = balanceDelta;
   }
+
+  @Override
+  public boolean equals(Object o) {
+    return EqualsBuilder.reflectionEquals(this, o);
+  }
+
+  @Override
+  public int hashCode() {
+    return HashCodeBuilder.reflectionHashCode(this);
+  }
 }

java-spring/accounts-query-side-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/queryside/accounts/AccountInfo.java

@@ -1,6 +1,9 @@
 package net.chrisrichardson.eventstore.javaexamples.banking.backend.queryside.accounts;
 
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by cer on 11/21/14.
@@ -13,13 +16,13 @@ public class AccountInfo {
   private String description;
   private long balance;
   private List<AccountChangeInfo> changes;
-  private List<AccountTransactionInfo> transactions;
+  private Map<String, AccountTransactionInfo> transactions;
   private String version;
 
   private AccountInfo() {
   }
 
-  public AccountInfo(String id, String customerId, String title, String description, long balance, List<AccountChangeInfo> changes, List<AccountTransactionInfo> transactions, String version) {
+  public AccountInfo(String id, String customerId, String title, String description, long balance, List<AccountChangeInfo> changes, Map<String, AccountTransactionInfo> transactions, String version) {
 
     this.id = id;
     this.customerId = customerId;
@@ -52,11 +55,11 @@ public class AccountInfo {
   }
 
   public List<AccountChangeInfo> getChanges() {
-    return changes;
+    return changes == null ? Collections.EMPTY_LIST : changes;
   }
 
   public List<AccountTransactionInfo> getTransactions() {
-    return transactions;
+    return transactions == null ? Collections.EMPTY_LIST : new ArrayList<>(transactions.values());
   }
 
   public String getVersion() {

java-spring/accounts-query-side-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/queryside/accounts/AccountInfoUpdateService.java

@@ -3,6 +3,7 @@ package net.chrisrichardson.eventstore.javaexamples.banking.backend.queryside.ac
 import com.mongodb.WriteResult;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.dao.DuplicateKeyException;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.Update;
@@ -16,11 +17,9 @@ import static org.springframework.data.mongodb.core.query.Criteria.where;
 public class AccountInfoUpdateService  {
   private Logger logger = LoggerFactory.getLogger(getClass());
 
-  private AccountInfoRepository accountInfoRepository;
   private MongoTemplate mongoTemplate;
 
-  public AccountInfoUpdateService(AccountInfoRepository accountInfoRepository, MongoTemplate mongoTemplate) {
-    this.accountInfoRepository = accountInfoRepository;
+  public AccountInfoUpdateService(MongoTemplate mongoTemplate) {
     this.mongoTemplate = mongoTemplate;
   }
 
@@ -28,29 +27,29 @@ public class AccountInfoUpdateService  {
 
   public void create(String accountId, String customerId, String title,  BigDecimal initialBalance, String description, String version) {
     try {
-      accountInfoRepository.save(new AccountInfo(
-              accountId,
-              customerId,
-              title,
-              description,
-              toIntegerRepr(initialBalance),
-              Collections.<AccountChangeInfo>emptyList(),
-              Collections.<AccountTransactionInfo>emptyList(),
-              version));
+      WriteResult x = mongoTemplate.upsert(new Query(where("id").is(accountId).and("version").exists(false)),
+              new Update()
+                      .set("customerId", customerId)
+                      .set("title", title)
+                      .set("description", description)
+                      .set("balance", toIntegerRepr(initialBalance))
+                      .set("version", version),
+              AccountInfo.class);
       logger.info("Saved in mongo");
+
+    } catch (DuplicateKeyException t) {
+      logger.warn("When saving ", t);
     } catch (Throwable t) {
-      logger.error("Error during saving: ");
       logger.error("Error during saving: ", t);
       throw new RuntimeException(t);
     }
   }
 
 
-  public void addTransaction(String eventId, String fromAccountId, AccountTransactionInfo ti) {
-    mongoTemplate.updateMulti(new Query(where("id").is(fromAccountId).and("version").lt(eventId)),
+  public void addTransaction(String eventId, String accountId, AccountTransactionInfo ti) {
+    mongoTemplate.upsert(new Query(where("id").is(accountId)),
             new Update().
-                    push("transactions", ti).
-                    set("version", eventId),
+                    set("transactions." + eventId, ti),
             AccountInfo.class);
   }
 

java-spring/accounts-query-side-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/queryside/accounts/AccountTransactionInfo.java

@@ -2,6 +2,7 @@ package net.chrisrichardson.eventstore.javaexamples.banking.backend.queryside.ac
 
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
 
 import java.util.Date;
 
@@ -21,6 +22,12 @@ public class AccountTransactionInfo {
     this(transactionId, fromAccountId, toAccountId, amount, new Date(),  "");
   }
 
+  @Override
+  public String toString() {
+    return ToStringBuilder.reflectionToString(this);
+  }
+
+
   public AccountTransactionInfo(String transactionId, String fromAccountId, String toAccountId, long amount, Date date, String description) {
     this.transactionId = transactionId;
     this.fromAccountId = fromAccountId;

java-spring/accounts-query-side-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/queryside/accounts/QuerySideAccountConfiguration.java

@@ -18,8 +18,8 @@ public class QuerySideAccountConfiguration {
   }
 
   @Bean
-  public AccountInfoUpdateService accountInfoUpdateService(AccountInfoRepository accountInfoRepository, MongoTemplate mongoTemplate) {
-    return new AccountInfoUpdateService(accountInfoRepository, mongoTemplate);
+  public AccountInfoUpdateService accountInfoUpdateService(MongoTemplate mongoTemplate) {
+    return new AccountInfoUpdateService(mongoTemplate);
   }
 
   @Bean

java-spring/accounts-query-side-backend/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/queryside/accounts/AccountInfoUpdateServiceTest.java

@@ -0,0 +1,112 @@
+package net.chrisrichardson.eventstore.javaexamples.banking.backend.queryside.accounts;
+
+import io.eventuate.javaclient.spring.jdbc.EventuateJdbcEventStoreConfiguration;
+import io.eventuate.javaclient.spring.jdbc.IdGenerator;
+import io.eventuate.javaclient.spring.jdbc.IdGeneratorImpl;
+import net.chrisrichardson.eventstore.javaexamples.banking.backend.common.accounts.AccountCreditedEvent;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.test.IntegrationTest;
+import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+
+import static org.junit.Assert.*;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringApplicationConfiguration(classes = AccountInfoUpdateServiceTest.AccountInfoUpdateServiceTestConfiguration.class)
+@IntegrationTest
+public class AccountInfoUpdateServiceTest {
+
+  @Configuration
+  @EnableAutoConfiguration
+  @Import({QuerySideAccountConfiguration.class, EventuateJdbcEventStoreConfiguration.class})
+  public static class AccountInfoUpdateServiceTestConfiguration {
+
+  }
+
+  @Autowired
+  private AccountInfoUpdateService accountInfoUpdateService;
+
+  @Autowired
+  private AccountQueryService accountQueryService;
+
+  @Test
+  public void shouldSaveAccountInfo() throws ExecutionException, InterruptedException {
+    IdGenerator x = new IdGeneratorImpl();
+    String accountId = x.genId().asString();
+    String customerId = x.genId().asString();
+    String version = x.genId().asString();
+
+    String title = "Checking account";
+    BigDecimal initialBalance = new BigDecimal("1345");
+    String description = "Some account";
+
+    accountInfoUpdateService.create(accountId, customerId, title, initialBalance, description, version);
+
+    AccountInfo accountInfo = accountQueryService.findByAccountId(accountId).get();
+
+    assertEquals(accountId, accountInfo.getId());
+    assertEquals(customerId, accountInfo.getCustomerId());
+    assertEquals(title, accountInfo.getTitle());
+    assertEquals(description, accountInfo.getDescription());
+    assertEquals(initialBalance.longValue() * 100, accountInfo.getBalance());
+    assertTrue(accountInfo.getChanges().isEmpty());
+    assertTrue(accountInfo.getTransactions().isEmpty());
+    assertEquals(version, accountInfo.getVersion());
+
+
+    String changeId = x.genId().asString();
+
+    String transactionId = x.genId().asString();
+
+    AccountChangeInfo change = new AccountChangeInfo(changeId, transactionId, AccountCreditedEvent.class.getSimpleName(),
+            500, +1);
+
+    accountInfoUpdateService.updateBalance(accountId, changeId, 500,
+            change);
+
+    accountInfo = accountQueryService.findByAccountId(accountId).get();
+    assertEquals(initialBalance.add(new BigDecimal(5)).longValue() * 100, accountInfo.getBalance());
+    assertFalse(accountInfo.getChanges().isEmpty());
+
+    assertEquals(change, accountInfo.getChanges().get(0));
+
+    String eventId = x.genId().asString();
+
+    AccountTransactionInfo ti = new AccountTransactionInfo(transactionId, accountId, accountId, 5, new Date(), "A transfer");
+
+    accountInfoUpdateService.addTransaction(eventId, accountId, ti);
+
+    accountInfo = accountQueryService.findByAccountId(accountId).get();
+    assertFalse(accountInfo.getTransactions().isEmpty());
+
+    assertEquals(ti, accountInfo.getTransactions().get(0));
+  }
+
+  @Test
+  public void shouldHandleDuplicateSaveAccountInfo() throws ExecutionException, InterruptedException {
+    IdGenerator x = new IdGeneratorImpl();
+    String accountId = x.genId().asString();
+    String customerId = x.genId().asString();
+    String version = x.genId().asString();
+
+    String title = "Checking account";
+    BigDecimal initialBalance = new BigDecimal("1345");
+    String description = "Some account";
+
+    accountInfoUpdateService.create(accountId, customerId, title, initialBalance, description, version);
+    accountInfoUpdateService.create(accountId, customerId, title, initialBalance, description, version);
+
+
+  }
+}

java-spring/accounts-query-side-service/build.gradle

@@ -1,5 +1,6 @@
 apply plugin: VerifyMongoDBConfigurationPlugin
 apply plugin: VerifyEventStoreEnvironmentPlugin
+apply plugin: EventuateDependencyPlugin
 
 apply plugin: 'spring-boot'
 
@@ -10,8 +11,6 @@ dependencies {
     compile "org.springframework.boot:spring-boot-starter-web"
     compile "org.springframework.boot:spring-boot-starter-actuator"
 
-    compile "io.eventuate.client.java:eventuate-client-java-http-stomp-spring:$eventuateClientVersion"
-
     testCompile project(":testutil")
     testCompile "org.springframework.boot:spring-boot-starter-test"
 

java-spring/api-gateway-service/build.gradle

@@ -1,5 +1,6 @@
 apply plugin: 'java'
 apply plugin: 'spring-boot'
+apply plugin: EventuateDependencyPlugin
 
 dependencies {
     compile project(":common-auth-web")
@@ -7,9 +8,6 @@ dependencies {
     compile "org.apache.httpcomponents:httpclient:4.5"
     compile "org.apache.httpcomponents:fluent-hc:4.5.1"
 
-    compile "io.eventuate.client.java:eventuate-client-java-spring:$eventuateClientVersion"
-    compile "io.eventuate.client.java:eventuate-client-java-http-stomp-spring:$eventuateClientVersion"
-
     compile "org.springframework.boot:spring-boot-starter-web:$springBootVersion"
     compile "org.springframework.boot:spring-boot-starter-actuator:$springBootVersion"
 

java-spring/backend-integration-tests/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/BankingTestConfiguration.java

@@ -3,11 +3,13 @@ package net.chrisrichardson.eventstore.javaexamples.banking.backend;
 import io.eventuate.javaclient.spring.jdbc.EventuateJdbcEventStoreConfiguration;
 import net.chrisrichardson.eventstore.javaexamples.banking.backend.commandside.accounts.AccountConfiguration;
 import net.chrisrichardson.eventstore.javaexamples.banking.backend.commandside.transactions.MoneyTransferConfiguration;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 
 @Configuration
 @Import({AccountConfiguration.class, MoneyTransferConfiguration.class, EventuateJdbcEventStoreConfiguration.class})
+@EnableAutoConfiguration
 public class BankingTestConfiguration {
 
 }

java-spring/buildSrc/src/main/groovy/EventuateDependencyPlugin.groovy

@@ -0,0 +1,16 @@
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+
+class EventuateDependencyPlugin implements Plugin<Project> {
+
+    @Override
+    void apply(Project project) {
+        project.dependencies {
+            if (project.hasProperty("eventuateLocal")) {
+                compile "io.eventuate.local.java:eventuate-local-java-jdbc:${project.eventuateLocalVersion}"
+                compile "io.eventuate.local.java:eventuate-local-java-embedded-cdc-autoconfigure:${project.eventuateLocalVersion}"
+            } else
+                compile "io.eventuate.client.java:eventuate-client-java-http-stomp-spring:${project.eventuateClientVersion}"
+        }
+    }
+}

java-spring/common-backend/src/main/resources/logback.xml

@@ -16,7 +16,7 @@
   <logger name="org.springframework" level='info'>
   </logger>
 
-  <logger name="net.chrisrichardson.eventstore.client" level='info'>
+  <logger name="io.eventuate" level='debug'>
   </logger>
 
 </configuration>

java-spring/customers-command-side-service/build.gradle

@@ -2,6 +2,7 @@ apply plugin: VerifyMongoDBConfigurationPlugin
 apply plugin: VerifyEventStoreEnvironmentPlugin
 
 apply plugin: 'spring-boot'
+apply plugin: EventuateDependencyPlugin
 
 dependencies {
     compile project(":customers-command-side-web")
@@ -10,8 +11,6 @@ dependencies {
     compile "org.springframework.boot:spring-boot-starter-web"
     compile "org.springframework.boot:spring-boot-starter-actuator"
 
-    compile "io.eventuate.client.java:eventuate-client-java-http-stomp-spring:$eventuateClientVersion"
-
     testCompile project(":testutil-customers")
     testCompile "org.springframework.boot:spring-boot-starter-test"
 }

java-spring/customers-query-side-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/queryside/customers/CustomerInfoUpdateService.java

@@ -5,6 +5,7 @@ import net.chrisrichardson.eventstore.javaexamples.banking.common.customers.Quer
 import net.chrisrichardson.eventstore.javaexamples.banking.common.customers.ToAccountInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.dao.DuplicateKeyException;
 
 import java.util.Collections;
 
@@ -15,15 +16,15 @@ public class CustomerInfoUpdateService {
 
     private Logger logger = LoggerFactory.getLogger(getClass());
 
-    private QuerySideCustomerRepository accountInfoRepository;
+    private QuerySideCustomerRepository querySideCustomerRepository;
 
-    public CustomerInfoUpdateService(QuerySideCustomerRepository accountInfoRepository) {
-        this.accountInfoRepository = accountInfoRepository;
+    public CustomerInfoUpdateService(QuerySideCustomerRepository querySideCustomerRepository) {
+        this.querySideCustomerRepository = querySideCustomerRepository;
     }
 
     public void create(String id, CustomerInfo customerInfo) {
         try {
-            accountInfoRepository.save(new QuerySideCustomer(id,
+            querySideCustomerRepository.save(new QuerySideCustomer(id,
                             customerInfo.getName(),
                             customerInfo.getEmail(),
                             customerInfo.getSsn(),
@@ -33,6 +34,8 @@ public class CustomerInfoUpdateService {
                     )
             );
             logger.info("Saved in mongo");
+        } catch (DuplicateKeyException t) {
+            logger.warn("When saving ", t);
         } catch (Throwable t) {
             logger.error("Error during saving: ", t);
             throw new RuntimeException(t);
@@ -40,9 +43,9 @@ public class CustomerInfoUpdateService {
     }
 
     public void addToAccount(String id, ToAccountInfo accountInfo) {
-        QuerySideCustomer customer = accountInfoRepository.findOne(id);
+        QuerySideCustomer customer = querySideCustomerRepository.findOne(id);
         customer.getToAccounts().put(accountInfo.getId(), accountInfo);
-        accountInfoRepository.save(customer);
+        querySideCustomerRepository.save(customer);
     }
 
 }

java-spring/customers-query-side-service/build.gradle

@@ -1,5 +1,6 @@
 apply plugin: VerifyMongoDBConfigurationPlugin
 apply plugin: VerifyEventStoreEnvironmentPlugin
+apply plugin: EventuateDependencyPlugin
 
 apply plugin: 'spring-boot'
 
@@ -10,8 +11,6 @@ dependencies {
     compile "org.springframework.boot:spring-boot-starter-web"
     compile "org.springframework.boot:spring-boot-starter-actuator"
 
-    compile "io.eventuate.client.java:eventuate-client-java-http-stomp-spring:$eventuateClientVersion"
-
     testCompile project(":testutil-customers")
     testCompile project(":customers-command-side-service")
     testCompile "org.springframework.boot:spring-boot-starter-test"

java-spring/docker-compose-eventuate-local.yml

@@ -0,0 +1,129 @@
+apigateway:
+  image: java:openjdk-8u91-jdk
+  working_dir: /app
+  volumes:
+    - ./api-gateway-service/build/libs:/app
+  command: java -jar /app/api-gateway-service.jar --accounts.commandside.service.host=accountscommandside --transactions.commandside.service.host=transactionscommandside --accounts.queryside.service.host=accountsqueryside --customers.commandside.service.host=customerscommandside  --customers.queryside.service.host=customersqueryside
+  ports:
+    - "8080:8080"
+  links:
+    - accountscommandside
+    - transactionscommandside
+    - accountsqueryside
+    - customerscommandside
+    - customersqueryside
+    - mongodb
+  environment:
+    SPRING_DATASOURCE_URL:
+    SPRING_DATASOURCE_USERNAME:
+    SPRING_DATASOURCE_PASSWORD:
+    SPRING_DATASOURCE_DRIVER_CLASS_NAME:
+    EVENTUATELOCAL_KAFKA_BOOTSTRAP_SERVERS:
+    EVENTUATELOCAL_ZOOKEEPER_CONNECTION_STRING:
+    SPRING_DATA_MONGODB_URI: mongodb://mongodb/mydb
+    EVENTUATELOCAL_EMBEDDED_CDC_DB_USER_NAME:
+    EVENTUATELOCAL_EMBEDDED_CDC_DB_PASSWORD:
+
+accountscommandside:
+  image: java:openjdk-8u91-jdk
+  working_dir: /app
+  volumes:
+    - ./accounts-command-side-service/build/libs:/app
+  command: java -jar /app/accounts-command-side-service.jar
+  ports:
+    - "8085:8080"
+  environment:
+    SPRING_DATASOURCE_URL:
+    SPRING_DATASOURCE_USERNAME:
+    SPRING_DATASOURCE_PASSWORD:
+    SPRING_DATASOURCE_DRIVER_CLASS_NAME:
+    EVENTUATELOCAL_KAFKA_BOOTSTRAP_SERVERS:
+    EVENTUATELOCAL_ZOOKEEPER_CONNECTION_STRING:
+    EVENTUATELOCAL_EMBEDDED_CDC_DB_USER_NAME:
+    EVENTUATELOCAL_EMBEDDED_CDC_DB_PASSWORD:
+
+transactionscommandside:
+  image: java:openjdk-8u91-jdk
+  working_dir: /app
+  volumes:
+    - ./transactions-command-side-service/build/libs:/app
+  command: java -jar /app/transactions-command-side-service.jar
+  ports:
+    - "8082:8080"
+  environment:
+    SPRING_DATASOURCE_URL:
+    SPRING_DATASOURCE_USERNAME:
+    SPRING_DATASOURCE_PASSWORD:
+    SPRING_DATASOURCE_DRIVER_CLASS_NAME:
+    EVENTUATELOCAL_KAFKA_BOOTSTRAP_SERVERS:
+    EVENTUATELOCAL_ZOOKEEPER_CONNECTION_STRING:
+    EVENTUATELOCAL_EMBEDDED_CDC_DB_USER_NAME:
+    EVENTUATELOCAL_EMBEDDED_CDC_DB_PASSWORD:
+
+
+accountsqueryside:
+  image: java:openjdk-8u91-jdk
+  working_dir: /app
+  volumes:
+    - ./accounts-query-side-service/build/libs:/app
+  command: java -jar /app/accounts-query-side-service.jar
+  ports:
+    - "8081:8080"
+  links:
+    - mongodb
+  environment:
+    SPRING_DATASOURCE_URL:
+    SPRING_DATASOURCE_USERNAME:
+    SPRING_DATASOURCE_PASSWORD:
+    SPRING_DATASOURCE_DRIVER_CLASS_NAME:
+    EVENTUATELOCAL_KAFKA_BOOTSTRAP_SERVERS:
+    SPRING_DATA_MONGODB_URI: mongodb://mongodb/mydb
+    EVENTUATELOCAL_ZOOKEEPER_CONNECTION_STRING:
+    EVENTUATELOCAL_EMBEDDED_CDC_DB_USER_NAME:
+    EVENTUATELOCAL_EMBEDDED_CDC_DB_PASSWORD:
+
+customerscommandside:
+  image: java:openjdk-8u91-jdk
+  working_dir: /app
+  volumes:
+    - ./customers-command-side-service/build/libs:/app
+  command: java -jar /app/customers-command-side-service.jar
+  ports:
+    - "8083:8080"
+  environment:
+    SPRING_DATASOURCE_URL:
+    SPRING_DATASOURCE_USERNAME:
+    SPRING_DATASOURCE_PASSWORD:
+    SPRING_DATASOURCE_DRIVER_CLASS_NAME:
+    EVENTUATELOCAL_KAFKA_BOOTSTRAP_SERVERS:
+    EVENTUATELOCAL_ZOOKEEPER_CONNECTION_STRING:
+    EVENTUATELOCAL_EMBEDDED_CDC_DB_USER_NAME:
+    EVENTUATELOCAL_EMBEDDED_CDC_DB_PASSWORD:
+
+customersqueryside:
+  image: java:openjdk-8u91-jdk
+  working_dir: /app
+  volumes:
+    - ./customers-query-side-service/build/libs:/app
+  command: java -jar /app/customers-query-side-service.jar
+  ports:
+    - "8084:8080"
+  links:
+    - mongodb
+  environment:
+    SPRING_DATASOURCE_URL:
+    SPRING_DATASOURCE_USERNAME:
+    SPRING_DATASOURCE_PASSWORD:
+    SPRING_DATASOURCE_DRIVER_CLASS_NAME:
+    EVENTUATELOCAL_KAFKA_BOOTSTRAP_SERVERS:
+    EVENTUATELOCAL_ZOOKEEPER_CONNECTION_STRING:
+    SPRING_DATA_MONGODB_URI: mongodb://mongodb/mydb
+    EVENTUATELOCAL_EMBEDDED_CDC_DB_USER_NAME:
+    EVENTUATELOCAL_EMBEDDED_CDC_DB_PASSWORD:
+
+mongodb:
+  image: mongo:3.0.4
+  hostname: mongodb
+  command: mongod --smallfiles
+  ports:
+    - "27017:27017"

java-spring/e2e-test/src/test/java/net/chrisrichardson/eventstore/examples/bank/web/EndToEndTest.java

@@ -28,6 +28,7 @@ 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 org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 public class EndToEndTest {
 
@@ -115,15 +116,26 @@ public class EndToEndTest {
 
     // TOOD - check state of money transfer
 
-    List<AccountTransactionInfo> transactionInfoList = restTemplate.exchange(accountsQuerySideBaseUrl("/accounts/"+fromAccountId+"/history"),
-            HttpMethod.GET,
-            new HttpEntity(BasicAuthUtils.basicAuthHeaders("test_user@mail.com")),
-            new ParameterizedTypeReference<List<AccountTransactionInfo>>() {}).getBody();
+    eventually(
+            () -> CompletableFuture.completedFuture(restTemplate.exchange(accountsQuerySideBaseUrl("/accounts/"+fromAccountId+"/history"),
+                    HttpMethod.GET,
+                    new HttpEntity(BasicAuthUtils.basicAuthHeaders("test_user@mail.com")),
+                    new ParameterizedTypeReference<List<AccountTransactionInfo>>() {}).getBody()),
+            transactionInfoList -> {
+              if (!(transactionInfoList.stream().filter(ti -> ti.getTransactionId().equals(moneyTransfer.getMoneyTransferId()) &&
+                      ti.getFromAccountId().equals(fromAccountId) &&
+                      ti.getToAccountId().equals(toAccountId) &&
+                      ti.getAmount() == toCents(amountToTransfer).longValue()).findFirst().isPresent())) {
+                fail(String.format("%s does not contain %s %s %s",
+                        moneyTransfer.getMoneyTransferId(),
+                        fromAccount,
+                        toAccount,
+                        toCents(amountToTransfer).longValue()));
+              }
+
+            }
+    );
 
-    assertTrue(transactionInfoList.stream().filter(ti -> ti.getTransactionId().equals(moneyTransfer.getMoneyTransferId()) &&
-            ti.getFromAccountId().equals(fromAccountId) &&
-            ti.getToAccountId().equals(toAccountId) &&
-            ti.getAmount() == toCents(amountToTransfer).longValue()).findFirst().isPresent());
   }
 
   @Test
@@ -163,14 +175,14 @@ public class EndToEndTest {
     return dollarAmount.multiply(new BigDecimal(100));
   }
 
-  private void assertAccountBalance(final String fromAccountId, final BigDecimal expectedBalanceInDollars) {
+  private void assertAccountBalance(final String accountId, final BigDecimal expectedBalanceInDollars) {
     final BigDecimal inCents = toCents(expectedBalanceInDollars);
-    eventually(
+      eventually(
             new Producer<GetAccountResponse>() {
               @Override
               public CompletableFuture<GetAccountResponse> produce() {
                   return CompletableFuture.completedFuture(BasicAuthUtils.doBasicAuthenticatedRequest(restTemplate,
-                          accountsQuerySideBaseUrl("/accounts/" + fromAccountId),
+                          accountsQuerySideBaseUrl("/accounts/" + accountId),
                           HttpMethod.GET,
                           GetAccountResponse.class));
               }
@@ -178,8 +190,8 @@ public class EndToEndTest {
             new Verifier<GetAccountResponse>() {
               @Override
               public void verify(GetAccountResponse accountInfo) {
-                Assert.assertEquals(fromAccountId, accountInfo.getAccountId());
-                Assert.assertEquals(inCents, accountInfo.getBalance());
+                Assert.assertEquals(accountId, accountInfo.getAccountId());
+                Assert.assertEquals(accountId, inCents, accountInfo.getBalance());
               }
             });
   }

java-spring/gradle.properties

@@ -5,5 +5,6 @@ eventuateMavenRepoUrl=http://mavenrepo.eventuate.io/release
 
 springBootVersion=1.3.5.RELEASE
 
-eventuateClientVersion=0.2.0.RELEASE
+eventuateClientVersion=0.8.0.RELEASE
+eventuateLocalVersion=0.2.0.RELEASE
 

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

@@ -35,6 +35,7 @@ import static net.chrisrichardson.eventstorestore.javaexamples.testutil.customer
 import static net.chrisrichardson.eventstorestore.javaexamples.testutil.customers.CustomersTestUtils.generateToAccountInfo;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringApplicationConfiguration(classes = BankingWebTestConfiguration.class)
@@ -102,23 +103,31 @@ public class BankingWebIntegrationTest {
         assertAccountBalance(fromAccountId, finalFromAccountBalance);
         assertAccountBalance(toAccountId, finalToAccountBalance);
 
-        List<AccountTransactionInfo> transactionInfoList = restTemplate.exchange(baseUrl("/accounts/"+fromAccountId+"/history"),
-                HttpMethod.GET,
-                new HttpEntity(BasicAuthUtils.basicAuthHeaders("test_user@mail.com")),
-                new ParameterizedTypeReference<List<AccountTransactionInfo>>() {}).getBody();
 
+        eventually(
+                () -> CompletableFuture.completedFuture(restTemplate.exchange(baseUrl("/accounts/"+fromAccountId+"/history"),
+                        HttpMethod.GET,
+                        new HttpEntity(BasicAuthUtils.basicAuthHeaders("test_user@mail.com")),
+                        new ParameterizedTypeReference<List<AccountTransactionInfo>>() {}).getBody()),
+                transactionInfoList -> {
+                    Optional<AccountTransactionInfo> txn = transactionInfoList.stream()
+                            .filter(ti -> ti.getTransactionId().equals(moneyTransfer.getMoneyTransferId()))
+                            .findFirst();
 
-        Optional<AccountTransactionInfo> first = transactionInfoList.stream().filter(ti -> ti.getTransactionId().equals(moneyTransfer.getMoneyTransferId())).findFirst();
+                    if (!txn.isPresent()) {
+                        fail(String.format("%s does not contain %s", transactionInfoList, moneyTransfer.getMoneyTransferId()));
+                    }
 
-        assertTrue(first.isPresent());
+                    AccountTransactionInfo ti = txn.get();
 
-        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());
+                }
+        );
 
-        assertEquals(fromAccountId, ti.getFromAccountId());
-        assertEquals(toAccountId, ti.getToAccountId());
-        assertEquals(toAccountId, ti.getToAccountId());
-        assertEquals(fromAccountId, ti.getFromAccountId());
-        assertEquals(toCents(amountToTransfer).longValue(), ti.getAmount());
 
     }
 

java-spring/testutil/src/main/java/net/chrisrichardson/eventstorestore/javaexamples/testutil/TestUtil.java

@@ -54,51 +54,26 @@ public class TestUtil {
     }
   }
 
-  public static <T> void eventually(final Producer<T> producer, final Verifier<T> verifier) {
-    final int n = 50;
-    Object possibleException = Observable.timer(0, 200, TimeUnit.MILLISECONDS).flatMap(new Func1<Long, Observable<Outcome<T>>>() {
-
-      @Override
-      public Observable<Outcome<T>> call(Long aLong) {
-        try {
-          return fromCompletableFuture(producer.produce()).map(new Func1<T, Outcome<T>>() {
-            @Override
-            public Outcome<T> call(T t) {
-              return new Success<T>(t);
-            }
-          });
-        } catch (Exception e) {
-          Outcome<T> value = new Failure<T>(e);
-          return Observable.just(value);
-        }
+  public static <T> void eventually(Producer<T> producer, Verifier<T> predicate) {
+    Throwable laste = null;
+    for (int i = 0; i < 30 ; i++) {
+      try {
+        T x = producer.produce().get(30, TimeUnit.SECONDS);
+        predicate.verify(x);
+        return;
+      } catch (Throwable t) {
+        laste = t;
       }
-    }).map(new Func1<Outcome<T>, Throwable>() {
-      @Override
-      public Throwable call(Outcome<T> t) {
-        try {
-          if (t instanceof Success) {
-            verifier.verify(((Success<T>) t).value);
-            return null;
-          } else
-            return ((Failure<T>) t).t;
-        } catch (Throwable e) {
-          return e;
-        }
+      try {
+        TimeUnit.SECONDS.sleep(1);
+      } catch (InterruptedException e) {
+        throw new RuntimeException(e);
       }
-    }).take(n).zipWith(Observable.range(0, n), new Func2<Throwable, Integer, Tuple2<Throwable, Integer>>() {
-      @Override
-      public Tuple2<Throwable, Integer> call(Throwable e, Integer idx) {
-        return new Tuple2<Throwable, Integer>(e, idx);
-      }
-    }).skipWhile(new Func1<Tuple2<Throwable, Integer>, Boolean>() {
-      @Override
-      public Boolean call(Tuple2<Throwable, Integer> tuple2) {
-        return tuple2.first != null && tuple2.second < n - 1;
-      }
-    }).first().toBlocking().getIterator().next().first;
-
-    if (possibleException != null)
-      throw new RuntimeException((Throwable)possibleException);
+    }
+    if (laste != null)
+      throw new RuntimeException("Last exception was", laste);
+    else
+      throw new RuntimeException("predicate never satisfied");
   }
 
   private static <T> Observable<T> fromCompletableFuture(CompletableFuture<T> future) {

java-spring/transactions-command-side-service/build.gradle

@@ -1,4 +1,5 @@
 apply plugin: 'spring-boot'
+apply plugin: EventuateDependencyPlugin
 
 apply plugin: VerifyEventStoreEnvironmentPlugin
 
@@ -9,8 +10,6 @@ dependencies {
     compile "org.springframework.boot:spring-boot-starter-web"
     compile "org.springframework.boot:spring-boot-starter-actuator"
 
-    compile "io.eventuate.client.java:eventuate-client-java-http-stomp-spring:$eventuateClientVersion"
-
     testCompile "org.springframework.boot:spring-boot-starter-test"
 
 }