Merge pull request #34 from dartpopikyardo/event-sourcing-examples-33

updated Eventuate versions and the app Docker containers

README.md

@@ -1,4 +1,4 @@
-#Event-Sourcing+CQRS example application
+# Event-Sourcing+CQRS example application
 
 This example application is the money transfer application described in my talk [Building and deploying microservices with event sourcing, CQRS and Docker](http://plainoldobjects.com/presentations/building-and-deploying-microservices-with-event-sourcing-cqrs-and-docker/).
 This talk describes a way of architecting highly scalable and available applications that is based on microservices, polyglot persistence,
@@ -35,111 +35,89 @@ The following diagram shows the architecture:
 
 ![Money transfer architecture](https://github.com/cer/event-sourcing-examples/wiki/i/applicationarchitecture.png)
 
-There are four logical services:
+There are the following  services:
 
-* Accounts (command-side) - REST API for creating accounts
+* Customers Service - REST API for creating customers
-* Money transfers (command-side) - REST API for transferring money
+* Accounts Service - REST API for creating accounts
-* Account view updater (query-side) - subscribes to events and updates a MongoDB View
+* Transactions Service - REST API for transferring money
-* Account view reader (query-side) - REST API for retrieving accounts
+* Customers View Service  - subscribes to events and updates a MongoDB View, and provides an API for retrieving customers
+* Accounts View Service - subscribes to events and updates a MongoDB View, and provides an API for retrieving accounts
 
-One of the neat things about the modular architecture is that there are two ways to deploy these four services:
+There is also an [API gateway](http://microservices.io/patterns/apigateway.html) service that acts as a Facade in front of the services.
-
-* monolithic-service - all services are packaged as a single Spring Boot executable JAR
-* Microservices - three separate Spring Boot executable JARs
- * accounts-command-side-service - command-side accounts
- * transactions-command-side-service - command-side money transfers
- * accounts-query-side-service - Account View Updater and Account View Reader
 
 # About the examples
 
 There are currently the following versions of the example application:
 
   * java-spring - a Java and Spring Boot example
-  * scala-spring - a Scala and Spring Boot example
+  * scala-spring - a Scala and Spring Boot example (NOTE: this version is lagging the Java Spring and hasn't been updated in a longtime.)
 
 Other examples will be added shortly including a Scala/Play example.
 
 For more information, please see the [wiki](../../wiki)
 
-# About the Event Store
+# About the Eventuate Platform
 
-The application uses one of two event stores:
+The application is built using [Eventuate](http://eventuate.io/), which is an application platform for writing transactional microservices.
+It provides a simple yet powerful event-driven programming model that is based on event sourcing and Command Query Responsibility Segregation (CQRS).
+Eventuate solves the distributed data management problems inherent in a microservice architecture.
+It consists of a scalable, distributed event store and client libraries for various languages and frameworks including Java, Scala, and the Spring framework.
 
-* Embedded SQL-based event store, which is great for integration tests.
+There are two versions of Eventuate:
-It is also used when running the monolithic version of the application.
-* Event Store server - this is a full featured event store.
-See this [wiki page](../../wiki/AboutTheEventStoreServer) for more details.
 
-# Building the application (and running the tests)
+* [Eventuate SaaS server](http://eventuate.io/usingeventuate.html) - this is a full featured event store that is hosted on AWS
+* [Eventuate Local](http://eventuate.io/usingeventuate.html) - an open-source event store that is built using MySQL and Kafka
 
-Both versions of the application use Gradle.
+There is also an embedded test event store, which is great for integration tests.
-To build an application, execute this command  in the application's top-level directory:
+
+# Building and running the microservices
+
+This is a Gradle project.
+However, you do not need to install Gradle since it will be downloaded automatically.
+You just need to have Java 8 installed.
+
+The details of how to build and run the services depend slightly on whether you are using Eventuate SaaS or Eventuate Local.
+
+## Building and running using Eventuate SaaS
+
+First, must [sign up to get your credentials](https://signup.eventuate.io/) in order to get free access to the SaaS version.
+
+Next, build the application
 
 ```
+cd java-spring
 ./gradlew assemble
 ```
 
-Note: you do not need to install Gradle.
+Next, you can launch the services using [Docker Compose](https://docs.docker.com/compose/):
-It will be automatically downloaded by `./gradlew`.
-
-This will build a Spring Boot jar in each of the `*-service` directories.
-
-You can also run the tests using `gradle build`.
-However, you must set some environment variables.
-
-First, you need to tell the query side code how to connect to MongoDB:
 
 ```
-  export SPRING_DATA_MONGODB_URI=mongodb://192.168.59.103/yourdb
+docker-compose up -d
 ```
 
-[Docker Compose](https://docs.docker.com/compose/) is a great way to run MongoDB.
+Finally, you can open the home page, which is served up by the API Gateway: `http://$DOCKER_HOST_IP:8080`
-You can run the `docker-compose up -d mongodb` to run MongoDB and then set `SPRING_DATA_MONGODB_URI` as follows:
-```
-  export SPRING_DATA_MONGODB_URI=mongodb://$(docker-machine ip default)/yourdb
-```
 
-Second, some of the tests in accounts-command-side-service, transactions-command-side-service, accounts-query-side-service and e2e-test require you to set some environment variables that tell them how to connect to the Event Store server.
+Note: `DOCKER_HOST_IP` is the IP address of the machine where Docker is running, e.g. the IP address of the VirtualBox VM.
-But don't worry.
-The build is configured to ignore failures for those projects.
 
-# Running the application
+## Building and running using Eventuate Local
 
-To run the application, you must to set the SPRING_DATA_MONGODB_URI environment variable, which tells the query services how to connect to MongoDB.
+First, build the application
-
-There are a couple of different ways of running the application.
-
-## Running the monolithic application
-
-One option is to run the self-contained monolithic application.
-It uses the embedded event store.
-
-Simply use this command:
 
 ```
-java -jar monolithic-service/build/libs/monolithic-service.jar
+cd java-spring
+./gradlew assemble -P eventuateDriver=local
 ```
 
-This will start the service running on port 8080 (you can change using the --server.port=9999 option).
+Next, launch the services using [Docker Compose](https://docs.docker.com/compose/):
 
-Once the service has started you can open the Swagger UI: http://localhost:8080/swagger-ui.html.
+```
-You can then:
+export DOCKER_HOST_IP=...
+docker-compose -f docker-compose-eventuate-local.yml up -d
+```
 
-1. Create two accounts (save the account ids)
+Note: You need to set `DOCKER_HOST_IP` before running Docker Compose.
-2. Create a money transfer
+This must be an IP address or resolvable hostname.
-3. View the updated account balances
+It cannot be `localhost`.
+See this [guide to setting `DOCKER_HOST_IP`](http://eventuate.io/docs/usingdocker.html) for more information.
 
-## Running the microservices
+Finally, you can open the home page, which is served up by the API Gateway: `http://$DOCKER_HOST_IP:8080`
-
-The other option is to run the services separately.
-However, in order to do this you need to [get credentials for the Event Store](../../wiki/AboutTheEventStoreServer).
-
-One way to run the services is to use the scripts `run-all-services.sh`, which runs the services, and `kill-all-services.sh`, which kills the processes.
-
-A much better way, however, is to use Docker Compose.
-Simply run the command `docker-compose up` to launch the services.
-This will create containers for MongoDB and each of the services.
-
-You can now, for example, use the curl commands in `handy-curl-commands.sh` to interact with the server.
-
-You can also use the Swagger UI exposed by each service `http://host:port/swagger-ui.html`.

Vagrantfile

@@ -1,103 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-# All Vagrant configuration is done below. The "2" in Vagrant.configure
-# configures the configuration version (we support older styles for
-# backwards compatibility). Please don't change it unless you know what
-# you're doing.
-Vagrant.configure(2) do |config|
-  # The most common configuration options are documented and commented below.
-  # For a complete reference, please see the online documentation at
-  # https://docs.vagrantup.com.
-
-  # Every Vagrant development environment requires a box. You can search for
-  # boxes at https://atlas.hashicorp.com/search.
-  config.vm.box = "ubuntu/trusty64"
-
-  config.vm.provider "virtualbox" do |v|
-    v.memory = 2048
-    v.cpus = 2
-  end
-
-  # Disable automatic box update checking. If you disable this, then
-  # boxes will only be checked for updates when the user runs
-  # `vagrant box outdated`. This is not recommended.
-  # config.vm.box_check_update = false
-
-  # Create a forwarded port mapping which allows access to a specific port
-  # within the machine from a port on the host machine. In the example below,
-  # accessing "localhost:8080" will access port 80 on the guest machine.
-  # config.vm.network "forwarded_port", guest: 80, host: 8080
-
-  # Create a private network, which allows host-only access to the machine
-  # using a specific IP.
-  # config.vm.network "private_network", ip: "192.168.33.10"
-
-  # Create a public network, which generally matched to bridged network.
-  # Bridged networks make the machine appear as another physical device on
-  # your network.
-  # config.vm.network "public_network"
-
-  # Share an additional folder to the guest VM. The first argument is
-  # the path on the host to the actual folder. The second argument is
-  # the path on the guest to mount the folder. And the optional third
-  # argument is a set of non-required options.
-  # config.vm.synced_folder "../data", "/vagrant_data"
-
-  # Provider-specific configuration so you can fine-tune various
-  # backing providers for Vagrant. These expose provider-specific options.
-  # Example for VirtualBox:
-  #
-  # config.vm.provider "virtualbox" do |vb|
-  #   # Display the VirtualBox GUI when booting the machine
-  #   vb.gui = true
-  #
-  #   # Customize the amount of memory on the VM:
-  #   vb.memory = "1024"
-  # end
-  #
-  # View the documentation for the provider you are using for more
-  # information on available options.
-
-  # Define a Vagrant Push strategy for pushing to Atlas. Other push strategies
-  # such as FTP and Heroku are also available. See the documentation at
-  # https://docs.vagrantup.com/v2/push/atlas.html for more information.
-  # config.push.define "atlas" do |push|
-  #   push.app = "YOUR_ATLAS_USERNAME/YOUR_APPLICATION_NAME"
-  # end
-
-  # Enable provisioning with a shell script. Additional provisioners such as
-  # Puppet, Chef, Ansible, Salt, and Docker are also available. Please see the
-  # documentation for more information about their specific syntax and use.
-
-  config.vm.provision "shell", inline: <<-SHELL
-  #!/bin/sh
-
-  # https://github.com/pussinboots/vagrant-devel/blob/master/provision/packages/java8.sh
-
-  if which java >/dev/null; then
-     	echo "skip java 8 installation"
-  else
-  	echo "java 8 installation"
-  	apt-get install --yes python-software-properties
-  	add-apt-repository ppa:webupd8team/java
-  	apt-get update -qq
-  	echo debconf shared/accepted-oracle-license-v1-1 select true | /usr/bin/debconf-set-selections
-  	echo debconf shared/accepted-oracle-license-v1-1 seen true | /usr/bin/debconf-set-selections
-  	apt-get install --yes oracle-java8-installer
-  	yes "" | apt-get -f install
-  fi
-SHELL
-
-  config.vm.provision "docker" do |d|
-  end
-
-  config.vm.provision "shell", inline: <<-SHELL
-  if which docker-compose >/dev/null; then
-     	echo "skip docker-compose installation"
-  else
-   sudo  bash -c "curl -L https://github.com/docker/compose/releases/download/1.6.0/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose ; chmod +x /usr/local/bin/docker-compose"
- fi
-SHELL
-
-end

_build-and-test-all.sh

@@ -2,6 +2,17 @@
 
 set -e
 
+if [ -z "$DOCKER_HOST_IP" ] ; then
+  if [ -z "$DOCKER_HOST" ] ; then
+    export DOCKER_HOST_IP=`hostname`
+  else
+    echo using ${DOCKER_HOST?}
+    XX=${DOCKER_HOST%\:*}
+    export DOCKER_HOST_IP=${XX#tcp\:\/\/}
+  fi
+  echo set DOCKER_HOST_IP $DOCKER_HOST_IP
+fi
+
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 DOCKER_COMPOSE="docker-compose -p event-sourcing-examples"
@@ -26,16 +37,8 @@ if [ "$1" = "--no-rm" ] ; then
   shift
 fi
 
-${DOCKER_COMPOSE?} up -d mongodb
+${DOCKER_COMPOSE?} up -d mongodb $EXTRA_INFRASTRUCTURE_SERVICES
 
-if [ -z "$DOCKER_HOST_IP" ] ; then
-  if which docker-machine >/dev/null; then
-    export DOCKER_HOST_IP=$(docker-machine ip default)
-  else
-    export DOCKER_HOST_IP=localhost
- fi
- echo set DOCKER_HOST_IP $DOCKER_HOST_IP
-fi
 
 if [ -z "$SPRING_DATA_MONGODB_URI" ] ; then
   export SPRING_DATA_MONGODB_URI=mongodb://${DOCKER_HOST_IP?}/mydb
@@ -44,21 +47,22 @@ fi
 
 export SERVICE_HOST=$DOCKER_HOST_IP
 
-./gradlew $* build -x :e2e-test:test
+./gradlew $BUILD_AND_TEST_ALL_EXTRA_GRADLE_ARGS $* build -x :e2e-test:test
 
-if [ -z "$EVENTUATE_API_KEY_ID" -o -z "$EVENTUATE_API_KEY_SECRET" ] ; then
+if [ -z "$EVENTUATE_LOCAL" ] && [ -z "$EVENTUATE_API_KEY_ID" -o -z "$EVENTUATE_API_KEY_SECRET" ] ; then
   echo You must set EVENTUATE_API_KEY_ID and  EVENTUATE_API_KEY_SECRET
   exit -1
 fi
 
+${DOCKER_COMPOSE?} build
 
 ${DOCKER_COMPOSE?} up -d
 
-$DIR/wait-for-services.sh $DOCKER_HOST_IP 8080 8081 8082
+$DIR/wait-for-services.sh $DOCKER_HOST_IP 8080 8081 8082 8083 8084
 
 set -e
 
-./gradlew -a $* :e2e-test:cleanTest :e2e-test:test -P ignoreE2EFailures=false
+./gradlew $BUILD_AND_TEST_ALL_EXTRA_GRADLE_ARGS -a $* :e2e-test:cleanTest :e2e-test:test -P ignoreE2EFailures=false
 
 if [ $NO_RM = false ] ; then
   ${DOCKER_COMPOSE?} stop

gradle-all.sh

@@ -1,6 +0,0 @@
-#! /bin/bash -e
-
-for dir in java-spring scala-spring; do
-	(cd $dir ; ./gradlew -b build.gradle $*)
-done
-

java-spring/README.md

@@ -2,34 +2,10 @@ This is the Java/Spring version of the Event Sourcing/CQRS money transfer exampl
 
 # About the application
 
-This application consists of three microservices:
+This application consists of the following microservices:
 
   * Account Service - the command side business logic for Accounts
-  * Money Transfer Service - the command side business logic for Money Transfers
+  * Account View Service - query side implementation of a MongoDB-based, denormalized view of Accounts
-  * Query service - query side implementation of a MongoDB-based, denormalized view of Accounts and MoneyTransfers
+  * Customer Service - the command side business logic for Customers
-
+  * Customer View Service - query side implementation of a MongoDB-based, denormalized view of Customers
-The Account Service consists of the following modules:
+  * Transaction Service - the command side business logic for Money Transfers
-
-  * accounts-command-side-backend - the Account aggregate
-  * accounts-command-side-web - a REST API for creating and retrieving Accounts
-  * accounts-command-side-service - a standalone microservice
-
-The Money Transfer Service consists of the following modules:
-
-  * transactions-command-side-backend - the MoneyTransfer aggregate  
-  * transactions-command-side-web - a REST API for creating and retrieving Money Transfers
-  * transactions-command-side-service - a standalone microservice
-
-The Query Service consists the following modules:
-
-  * accounts-query-side-backend - MongoDB-based, denormalized view of Accounts and MoneyTransfers
-  * accounts-query-side-web - a REST API for querying the denormalized view
-  * accounts-query-side-service - a standalone microservice
-
-# Deploying the application
-
-These services can be deployed either as either separate standalone services using the Event Store server, or they can be deployed as a monolithic application for simplified integration testing.
-
-The three services can also be packaged as a single monolithic web application in order to be used with the embedded Event Store:
-
-  * monolithic-service - all-in-one, monolithic packaging of the application

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

@@ -1,14 +0,0 @@
-apply plugin: 'java'
-
-dependencies {
-
-    compile project(":common-backend")
-    compile "io.eventuate.client.java:eventuate-client-java-spring:$eventuateClientVersion"
-
-    testCompile project(":testutil")
-    testCompile "junit:junit:4.11"
-    testCompile "org.springframework.boot:spring-boot-starter-test:$springBootVersion"
-    testCompile "io.eventuate.client.java:eventuate-client-java-jdbc:$eventuateClientVersion"
-
-
-}

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

@@ -1,7 +0,0 @@
-package net.chrisrichardson.eventstore.javaexamples.banking.backend.commandside.accounts;
-
-
-import io.eventuate.Command;
-
-interface AccountCommand extends Command {
-}

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

@@ -1,20 +0,0 @@
-apply plugin: VerifyMongoDBConfigurationPlugin
-apply plugin: VerifyEventStoreEnvironmentPlugin
-apply plugin: EventuateDependencyPlugin
-
-apply plugin: 'spring-boot'
-
-dependencies {
-    compile project(":accounts-command-side-web")
-    compile project(":common-swagger")
-
-    compile "org.springframework.boot:spring-boot-starter-web"
-    compile "org.springframework.boot:spring-boot-starter-actuator"
-
-    testCompile "org.springframework.boot:spring-boot-starter-test"
-
-}
-
-test {
-    ignoreFailures System.getenv("EVENTUATE_API_KEY_ID") == null
-}

java-spring/accounts-command-side-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/web/main/AccountsCommandSideServiceMain.java

@@ -1,11 +0,0 @@
-package net.chrisrichardson.eventstore.javaexamples.banking.web.main;
-
-import net.chrisrichardson.eventstore.javaexamples.banking.web.AccountsCommandSideServiceConfiguration;
-import org.springframework.boot.SpringApplication;
-
-public class AccountsCommandSideServiceMain {
-
-  public static void main(String[] args) {
-    SpringApplication.run(AccountsCommandSideServiceConfiguration.class, args);
-  }
-}

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

@@ -1,12 +0,0 @@
-
-dependencies {
-    compile project(":accounts-command-side-backend")
-
-    compile "org.springframework.boot:spring-boot-starter-web:$springBootVersion"
-
-    testCompile "org.springframework.boot:spring-boot-starter-test:$springBootVersion"
-    testCompile "io.eventuate.client.java:eventuate-client-java-jdbc:$eventuateClientVersion"
-}
-
-
-

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

@@ -1,16 +0,0 @@
-package net.chrisrichardson.eventstore.javaexamples.banking.web.commandside.accounts;
-
-import net.chrisrichardson.eventstore.javaexamples.banking.backend.commandside.accounts.AccountConfiguration;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-
-@Configuration
-@Import({AccountConfiguration.class})
-@ComponentScan
-@EnableAutoConfiguration
-public class CommandSideWebAccountsConfiguration {
-
-
-}

java-spring/accounts-command-side-web/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/web/commandside/accounts/AccountControllerIntegrationTestConfiguration.java

@@ -1,11 +0,0 @@
-package net.chrisrichardson.eventstore.javaexamples.banking.web.commandside.accounts;
-
-import io.eventuate.javaclient.spring.jdbc.EventuateJdbcEventStoreConfiguration;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-
-@Configuration
-@Import({CommandSideWebAccountsConfiguration.class, EventuateJdbcEventStoreConfiguration.class})
-public class AccountControllerIntegrationTestConfiguration {
-
-}

java-spring/accounts-command-side-web/src/test/resources/logback.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-
-    <!-- [%thread] -->
-
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <layout class="ch.qos.logback.classic.PatternLayout">
-            <Pattern>%d{HH:mm:ss.SSS}  %-5level %logger{36} - %msg%n</Pattern>
-        </layout>
-    </appender>
-
-    <root level="error">
-        <appender-ref ref="STDOUT" />
-    </root>
-
-    <logger name="org.springframework.web" level='debug'>
-    </logger>
-
-</configuration>

java-spring/accounts-query-side-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/web/main/AccountsQuerySideServiceMain.java

@@ -1,11 +0,0 @@
-package net.chrisrichardson.eventstore.javaexamples.banking.web.main;
-
-import net.chrisrichardson.eventstore.javaexamples.banking.web.AccountsQuerySideServiceConfiguration;
-import org.springframework.boot.SpringApplication;
-
-public class AccountsQuerySideServiceMain {
-
-  public static void main(String[] args) {
-    SpringApplication.run(AccountsQuerySideServiceConfiguration.class, args);
-  }
-}

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

@@ -1,10 +0,0 @@
-
-dependencies {
-    compile project(":accounts-query-side-backend")
-
-    compile "org.springframework.boot:spring-boot-starter-web:$springBootVersion"
-    compile "org.springframework.boot:spring-boot-starter-actuator:$springBootVersion"
-}
-
-
-

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

@@ -1,14 +0,0 @@
-package net.chrisrichardson.eventstore.javaexamples.banking.web.queryside;
-
-import net.chrisrichardson.eventstore.javaexamples.banking.backend.queryside.accounts.QuerySideAccountConfiguration;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-
-@Configuration
-@Import({QuerySideAccountConfiguration.class})
-@ComponentScan
-public class QuerySideWebConfiguration  {
-
-
-}

java-spring/accounts-service/Dockerfile

@@ -0,0 +1,4 @@
+FROM java:openjdk-8u91-jdk
+CMD java ${JAVA_OPTS} -jar accounts-service.jar
+EXPOSE 8080
+COPY build/libs/accounts-service.jar .

java-spring/accounts-service/build.gradle

@@ -1,19 +1,19 @@
-apply plugin: VerifyMongoDBConfigurationPlugin
 apply plugin: VerifyEventStoreEnvironmentPlugin
 apply plugin: EventuateDependencyPlugin
 
 apply plugin: 'spring-boot'
 
 dependencies {
-    compile project(":accounts-query-side-web")
+    compile project(":common-backend")
     compile project(":common-swagger")
 
     compile "org.springframework.boot:spring-boot-starter-web"
     compile "org.springframework.boot:spring-boot-starter-actuator"
 
     testCompile project(":testutil")
+    testCompile "junit:junit:4.11"
     testCompile "org.springframework.boot:spring-boot-starter-test"
-
+    testCompile "io.eventuate.client.java:eventuate-client-java-jdbc:$eventuateClientVersion"
 }
 
 test {

java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/AccountsServiceMain.java

@@ -0,0 +1,21 @@
+package net.chrisrichardson.eventstore.javaexamples.banking.accountsservice;
+
+import io.eventuate.javaclient.driver.EventuateDriverConfiguration;
+import net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.web.AccountsWebConfiguration;
+import net.chrisrichardson.eventstore.javaexamples.banking.commonswagger.CommonSwaggerConfiguration;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
+@Configuration
+@Import({AccountsWebConfiguration.class, EventuateDriverConfiguration.class, CommonSwaggerConfiguration.class})
+@EnableAutoConfiguration
+@ComponentScan
+public class AccountsServiceMain {
+
+  public static void main(String[] args) {
+    SpringApplication.run(AccountsServiceMain.class, args);
+  }
+}

java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/backend/Account.java

@@ -1,25 +1,31 @@
-package net.chrisrichardson.eventstore.javaexamples.banking.backend.commandside.accounts;
+package net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.backend;
 
 import io.eventuate.Event;
 import io.eventuate.EventUtil;
 import io.eventuate.ReflectiveMutableCommandProcessingAggregate;
-import net.chrisrichardson.eventstore.javaexamples.banking.backend.common.accounts.AccountCreditedEvent;
+import net.chrisrichardson.eventstore.javaexamples.banking.backend.common.accounts.*;
-import net.chrisrichardson.eventstore.javaexamples.banking.backend.common.accounts.AccountDebitFailedDueToInsufficientFundsEvent;
-import net.chrisrichardson.eventstore.javaexamples.banking.backend.common.accounts.AccountDebitedEvent;
-import net.chrisrichardson.eventstore.javaexamples.banking.backend.common.accounts.AccountOpenedEvent;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
 
 public class Account extends ReflectiveMutableCommandProcessingAggregate<Account, AccountCommand> {
 
   private BigDecimal balance;
+  private boolean deleted;
 
   public List<Event> process(OpenAccountCommand cmd) {
     return EventUtil.events(new AccountOpenedEvent(cmd.getCustomerId(), cmd.getTitle(), cmd.getInitialBalance(), cmd.getDescription()));
   }
 
+  public List<Event> process(DeleteAccountCommand cmd) {
+    return EventUtil.events(new AccountDeletedEvent());
+  }
+
   public List<Event> process(DebitAccountCommand cmd) {
+    if(deleted)
+      return new ArrayList<>();
+
     if (balance.compareTo(cmd.getAmount()) < 0)
       return EventUtil.events(new AccountDebitFailedDueToInsufficientFundsEvent(cmd.getTransactionId()));
     else
@@ -27,6 +33,9 @@ public class Account extends ReflectiveMutableCommandProcessingAggregate<Account
   }
 
   public List<Event> process(CreditAccountCommand cmd) {
+    if(deleted)
+      return new ArrayList<>();
+
     return EventUtil.events(new AccountCreditedEvent(cmd.getAmount(), cmd.getTransactionId()));
   }
 
@@ -34,6 +43,10 @@ public class Account extends ReflectiveMutableCommandProcessingAggregate<Account
     balance = event.getInitialBalance();
   }
 
+  public void apply(AccountDeletedEvent event) {
+    deleted = true;
+  }
+
   public void apply(AccountDebitedEvent event) {
     balance = balance.subtract(event.getAmount());
   }

java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/backend/AccountCommand.java

@@ -0,0 +1,7 @@
+package net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.backend;
+
+
+import io.eventuate.Command;
+
+interface AccountCommand extends Command {
+}

java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/backend/AccountService.java

@@ -1,4 +1,4 @@
-package net.chrisrichardson.eventstore.javaexamples.banking.backend.commandside.accounts;
+package net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.backend;
 
 
 import io.eventuate.AggregateRepository;
@@ -19,4 +19,7 @@ public class AccountService  {
     return accountRepository.save(new OpenAccountCommand(customerId, title, initialBalance, description));
   }
 
+  public CompletableFuture<EntityWithIdAndVersion<Account>> deleteAccount(String accountId) {
+    return accountRepository.update(accountId, new DeleteAccountCommand());
+  }
 }

java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/backend/AccountWorkflow.java

@@ -1,4 +1,4 @@
-package net.chrisrichardson.eventstore.javaexamples.banking.backend.commandside.accounts;
+package net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.backend;
 
 
 import io.eventuate.EntityWithIdAndVersion;
@@ -22,13 +22,7 @@ public class AccountWorkflow {
 
     String fromAccountId = event.getDetails().getFromAccountId();
 
-    return ctx.update(Account.class, fromAccountId, new DebitAccountCommand(amount, transactionId)).handle((x, e) -> {
+    return ctx.update(Account.class, fromAccountId, new DebitAccountCommand(amount, transactionId));
-              if (e != null) {
-                e.printStackTrace();
-              }
-              return x;
-            }
-    );
   }
 
   @EventHandlerMethod
@@ -38,13 +32,6 @@ public class AccountWorkflow {
     String fromAccountId = event.getDetails().getToAccountId();
     String transactionId = ctx.getEntityId();
 
-    return ctx.update(Account.class, fromAccountId, new CreditAccountCommand(amount, transactionId)).handle((x, e) -> {
+    return ctx.update(Account.class, fromAccountId, new CreditAccountCommand(amount, transactionId));
-              if (e != null) {
-                e.printStackTrace();
-              }
-              return x;
-            }
-    );
   }
-
 }

java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/backend/AccountsBackendConfiguration.java

@@ -1,4 +1,4 @@
-package net.chrisrichardson.eventstore.javaexamples.banking.backend.commandside.accounts;
+package net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.backend;
 
 import io.eventuate.AggregateRepository;
 import io.eventuate.EventuateAggregateStore;
@@ -8,7 +8,7 @@ import org.springframework.context.annotation.Configuration;
 
 @Configuration
 @EnableEventHandlers
-public class AccountConfiguration {
+public class AccountsBackendConfiguration {
 
   @Bean
   public AccountWorkflow accountWorkflow() {

java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/backend/CreditAccountCommand.java

@@ -1,7 +1,4 @@
-package net.chrisrichardson.eventstore.javaexamples.banking.backend.commandside.accounts;
+package net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.backend;
-
-import io.eventuate.Aggregate;
-
 
 import java.math.BigDecimal;
 

java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/backend/DebitAccountCommand.java

@@ -1,4 +1,4 @@
-package net.chrisrichardson.eventstore.javaexamples.banking.backend.commandside.accounts;
+package net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.backend;
 
 import java.math.BigDecimal;
 

java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/backend/DeleteAccountCommand.java

@@ -0,0 +1,4 @@
+package net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.backend;
+
+public class DeleteAccountCommand implements AccountCommand {
+}

java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/backend/OpenAccountCommand.java

@@ -1,4 +1,4 @@
-package net.chrisrichardson.eventstore.javaexamples.banking.backend.commandside.accounts;
+package net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.backend;
 
 
 import java.math.BigDecimal;

java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/web/AccountController.java

@@ -1,14 +1,12 @@
-package net.chrisrichardson.eventstore.javaexamples.banking.web.commandside.accounts;
+package net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.web;
 
-import net.chrisrichardson.eventstore.javaexamples.banking.backend.commandside.accounts.AccountService;
+import net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.backend.AccountService;
 import net.chrisrichardson.eventstore.javaexamples.banking.common.accounts.CreateAccountRequest;
 import net.chrisrichardson.eventstore.javaexamples.banking.common.accounts.CreateAccountResponse;
+import net.chrisrichardson.eventstore.javaexamples.banking.common.accounts.DeleteAccountResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
 
 import java.util.concurrent.CompletableFuture;
 
@@ -26,6 +24,12 @@ public class AccountController {
   @RequestMapping(method = RequestMethod.POST)
   public CompletableFuture<CreateAccountResponse> createAccount(@Validated @RequestBody CreateAccountRequest request) {
     return accountService.openAccount(request.getCustomerId(), request.getTitle(), request.getInitialBalance(), request.getDescription())
-    .thenApply(entityAndEventInfo -> new CreateAccountResponse(entityAndEventInfo.getEntityId()));
+            .thenApply(entityAndEventInfo -> new CreateAccountResponse(entityAndEventInfo.getEntityId()));
+  }
+
+  @RequestMapping(value = "{accountId}", method = RequestMethod.DELETE)
+  public CompletableFuture<DeleteAccountResponse> deleteAccount(@PathVariable String accountId) {
+    return accountService.deleteAccount(accountId)
+            .thenApply(entityAndEventInfo -> new DeleteAccountResponse(accountId));
   }
 }

java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/web/AccountsWebConfiguration.java

@@ -0,0 +1,15 @@
+package net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.web;
+
+import net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.backend.AccountsBackendConfiguration;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
+@Configuration
+@Import({AccountsBackendConfiguration.class})
+@ComponentScan
+public class AccountsWebConfiguration {
+
+
+}

java-spring/accounts-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/AccountsCommandSideServiceIntegrationTest.java

@@ -1,4 +1,4 @@
-package net.chrisrichardson.eventstore.javaexamples.banking.web;
+package net.chrisrichardson.eventstore.javaexamples.banking.accountsservice;
 
 import net.chrisrichardson.eventstore.javaexamples.banking.common.accounts.CreateAccountRequest;
 import net.chrisrichardson.eventstore.javaexamples.banking.common.accounts.CreateAccountResponse;
@@ -33,10 +33,9 @@ public class AccountsCommandSideServiceIntegrationTest {
 
 
   @Test
-  public void shouldCreateAccountsAndTransferMoney() {
+  public void shouldCreateAccounts() {
     BigDecimal initialFromAccountBalance = new BigDecimal(500);
     BigDecimal initialToAccountBalance = new BigDecimal(100);
-    BigDecimal amountToTransfer = new BigDecimal(150);
     String customerId = "00000000-00000000";
     String title = "My Account";
 
@@ -48,8 +47,6 @@ public class AccountsCommandSideServiceIntegrationTest {
 
     Assert.assertNotNull(fromAccountId);
     Assert.assertNotNull(toAccountId);
-
-
   }
 
 

java-spring/accounts-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/AccountsCommandSideServiceTestConfiguration.java

@@ -1,5 +1,6 @@
-package net.chrisrichardson.eventstore.javaexamples.banking.web;
+package net.chrisrichardson.eventstore.javaexamples.banking.accountsservice;
 
+import net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.web.AccountsWebConfiguration;
 import net.chrisrichardson.eventstore.javaexamples.banking.commonauth.AuthConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.web.HttpMessageConverters;
@@ -14,9 +15,9 @@ import java.util.Arrays;
 import java.util.List;
 
 @Configuration
-@Import({CustomersCommandSideServiceConfiguration.class, CustomersQuerySideServiceConfiguration.class, AuthConfiguration.class})
+@Import({AccountsWebConfiguration.class, AuthConfiguration.class})
 @EnableAutoConfiguration
-public class CustomersQuerySideServiceTestConfiguration {
+public class AccountsCommandSideServiceTestConfiguration {
 
   @Bean
   public RestTemplate restTemplate(HttpMessageConverters converters) {

java-spring/accounts-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/backend/AccountEventTest.java

@@ -1,4 +1,4 @@
-package net.chrisrichardson.eventstore.javaexamples.banking.backend.commandside.accounts;
+package net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.backend;
 
 
 import net.chrisrichardson.eventstorestore.javaexamples.testutil.AbstractEntityEventTest;

java-spring/accounts-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/backend/AccountTest.java

@@ -1,4 +1,4 @@
-package net.chrisrichardson.eventstore.javaexamples.banking.backend.commandside.accounts;
+package net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.backend;
 
 import io.eventuate.Event;
 import net.chrisrichardson.eventstore.javaexamples.banking.backend.common.accounts.AccountOpenedEvent;

java-spring/accounts-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/web/AccountControllerIntegrationTest.java

@@ -1,4 +1,4 @@
-package net.chrisrichardson.eventstore.javaexamples.banking.web.commandside.accounts;
+package net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.web;
 
 import org.junit.Before;
 import org.junit.Test;

java-spring/accounts-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/web/AccountControllerIntegrationTestConfiguration.java

@@ -0,0 +1,13 @@
+package net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.web;
+
+import io.eventuate.javaclient.spring.jdbc.EmbeddedTestAggregateStoreConfiguration;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
+@Configuration
+@Import({AccountsWebConfiguration.class, EmbeddedTestAggregateStoreConfiguration.class})
+@EnableAutoConfiguration
+public class AccountControllerIntegrationTestConfiguration {
+
+}

java-spring/accounts-view-service/Dockerfile

@@ -0,0 +1,4 @@
+FROM java:openjdk-8u91-jdk
+CMD java ${JAVA_OPTS} -jar accounts-view-service.jar
+EXPOSE 8080
+COPY build/libs/accounts-view-service.jar .

java-spring/accounts-view-service/build.gradle

@@ -1,8 +1,15 @@
-apply plugin: 'java'
+apply plugin: VerifyMongoDBConfigurationPlugin
+apply plugin: VerifyEventStoreEnvironmentPlugin
+apply plugin: EventuateDependencyPlugin
+
+apply plugin: 'spring-boot'
 
 dependencies {
+    compile project(":common-swagger")
     compile project(":common-backend")
 
+    compile "org.springframework.boot:spring-boot-starter-web:$springBootVersion"
+    compile "org.springframework.boot:spring-boot-starter-actuator:$springBootVersion"
     compile "io.eventuate.client.java:eventuate-client-java-spring:$eventuateClientVersion"
     compile "org.springframework.boot:spring-boot-starter-data-mongodb:$springBootVersion"
 
@@ -10,6 +17,8 @@ dependencies {
     testCompile "junit:junit:4.11"
     testCompile "org.springframework.boot:spring-boot-starter-test:$springBootVersion"
     testCompile "io.eventuate.client.java:eventuate-client-java-jdbc:$eventuateClientVersion"
-
+}
-
+
+test {
+    ignoreFailures System.getenv("EVENTUATE_API_KEY_ID") == null
 }

java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/AccountsViewServiceMain.java

@@ -0,0 +1,21 @@
+package net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice;
+
+import io.eventuate.javaclient.driver.EventuateDriverConfiguration;
+import net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice.web.AccountViewWebConfiguration;
+import net.chrisrichardson.eventstore.javaexamples.banking.commonswagger.CommonSwaggerConfiguration;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
+@Configuration
+@Import({AccountViewWebConfiguration.class, EventuateDriverConfiguration.class, CommonSwaggerConfiguration.class})
+@EnableAutoConfiguration
+@ComponentScan
+public class AccountsViewServiceMain {
+
+  public static void main(String[] args) {
+    SpringApplication.run(AccountsViewServiceMain.class, args);
+  }
+}

java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/backend/AccountInfo.java

@@ -1,8 +1,8 @@
-package net.chrisrichardson.eventstore.javaexamples.banking.backend.queryside.accounts;
+package net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice.backend;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import net.chrisrichardson.eventstore.javaexamples.banking.common.accounts.AccountChangeInfo;
 import net.chrisrichardson.eventstore.javaexamples.banking.common.accounts.AccountTransactionInfo;
-import net.chrisrichardson.eventstore.javaexamples.banking.common.transactions.TransferState;
 
 import java.util.*;
 
@@ -18,9 +18,9 @@ public class AccountInfo {
   private long balance;
   private List<AccountChangeInfo> changes;
   private Map<String, AccountTransactionInfo> transactions;
-  private Map<String, TransferState> transferStates;
   private String version;
-  private Date date;
+  @JsonProperty("date")
+  private Date creationDate;
 
   private AccountInfo() {
   }
@@ -29,7 +29,7 @@ public class AccountInfo {
     this(id, customerId, title, description, balance, changes, transactions, version, new Date());
   }
 
-  public AccountInfo(String id, String customerId, String title, String description, long balance, List<AccountChangeInfo> changes, Map<String, AccountTransactionInfo> transactions, String version, Date date) {
+  public AccountInfo(String id, String customerId, String title, String description, long balance, List<AccountChangeInfo> changes, Map<String, AccountTransactionInfo> transactions, String version, Date creationDate) {
 
     this.id = id;
     this.customerId = customerId;
@@ -39,7 +39,7 @@ public class AccountInfo {
     this.changes = changes;
     this.transactions = transactions;
     this.version = version;
-    this.date = date;
+    this.creationDate = creationDate;
   }
 
   public String getId() {
@@ -74,15 +74,7 @@ public class AccountInfo {
     return version;
   }
 
-  public Date getDate() {
+  public Date getCreationDate() {
-    return date;
+    return creationDate;
-  }
-
-  public Map<String, TransferState> getTransferStates() {
-    return transferStates;
-  }
-
-  public void setTransferStates(Map<String, TransferState> transferStates) {
-    this.transferStates = transferStates;
   }
 }

java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/backend/AccountInfoRepository.java

@@ -1,4 +1,4 @@
-package net.chrisrichardson.eventstore.javaexamples.banking.backend.queryside.accounts;
+package net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice.backend;
 
 import org.springframework.data.mongodb.repository.MongoRepository;
 

java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/backend/AccountInfoUpdateService.java

@@ -1,6 +1,7 @@
-package net.chrisrichardson.eventstore.javaexamples.banking.backend.queryside.accounts;
+package net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice.backend;
 
 import com.mongodb.WriteResult;
+import io.eventuate.Int128;
 import net.chrisrichardson.eventstore.javaexamples.banking.common.accounts.AccountChangeInfo;
 import net.chrisrichardson.eventstore.javaexamples.banking.common.accounts.AccountTransactionInfo;
 import net.chrisrichardson.eventstore.javaexamples.banking.common.transactions.TransferState;
@@ -14,7 +15,7 @@ import org.springframework.data.mongodb.core.query.Update;
 import java.math.BigDecimal;
 import java.util.Date;
 
-import static net.chrisrichardson.eventstore.javaexamples.banking.backend.queryside.accounts.MoneyUtil.toIntegerRepr;
+import static net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice.backend.MoneyUtil.toIntegerRepr;
 import static org.springframework.data.mongodb.core.query.Criteria.where;
 
 public class AccountInfoUpdateService {
@@ -29,7 +30,7 @@ public class AccountInfoUpdateService {
   }
 
 
-  public void create(String accountId, String customerId, String title, BigDecimal initialBalance, String description, String version) {
+  public void create(String accountId, String customerId, String title, BigDecimal initialBalance, String description, Int128 version) {
     try {
       AccountChangeInfo ci = new AccountChangeInfo();
       ci.setAmount(toIntegerRepr(initialBalance));
@@ -40,8 +41,8 @@ public class AccountInfoUpdateService {
                       .set("description", description)
                       .set("balance", toIntegerRepr(initialBalance))
                       .push("changes", ci)
-                      .set("date", new Date())
+                      .set("creationDate", new Date(version.getHi()))
-                      .set("version", version),
+                      .set("version", version.asString()),
               AccountInfo.class);
       logger.info("Saved in mongo");
 
@@ -53,6 +54,10 @@ public class AccountInfoUpdateService {
     }
   }
 
+  public void delete(String accountId) {
+    accountInfoRepository.delete(accountId);
+  }
+
 
   public void addTransaction(String accountId, AccountTransactionInfo ti) {
     mongoTemplate.upsert(new Query(where("id").is(accountId)),
@@ -74,7 +79,7 @@ public class AccountInfoUpdateService {
   public void updateTransactionStatus(String accountId, String transactionId, TransferState status) {
       mongoTemplate.upsert(new Query(where("id").is(accountId)),
               new Update().
-                      set("transferStates." + transactionId, status),
+                      set("transactions." + transactionId + ".status", status),
               AccountInfo.class);
   }
 }

java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/backend/AccountNotFoundException.java

@@ -1,4 +1,4 @@
-package net.chrisrichardson.eventstore.javaexamples.banking.backend.queryside.accounts;
+package net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice.backend;
 
 public class AccountNotFoundException extends RuntimeException {
 

java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/backend/AccountQueryService.java

@@ -1,4 +1,4 @@
-package net.chrisrichardson.eventstore.javaexamples.banking.backend.queryside.accounts;
+package net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice.backend;
 
 import java.util.List;
 
@@ -15,8 +15,6 @@ public class AccountQueryService {
     if (account == null)
       throw new AccountNotFoundException(accountId);
     else
-      if(account.getTransferStates()!=null)
-        account.getTransactions().stream().forEach(ati -> ati.setStatus(account.getTransferStates().get(ati.getTransactionId())));
       return account;
   }
 

java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/backend/AccountQueryWorkflow.java

@@ -1,8 +1,9 @@
-package net.chrisrichardson.eventstore.javaexamples.banking.backend.queryside.accounts;
+package net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice.backend;
 
 import io.eventuate.DispatchedEvent;
 import io.eventuate.EventHandlerMethod;
 import io.eventuate.EventSubscriber;
+import io.eventuate.Int128;
 import net.chrisrichardson.eventstore.javaexamples.banking.backend.common.accounts.*;
 import net.chrisrichardson.eventstore.javaexamples.banking.backend.common.transactions.CreditRecordedEvent;
 import net.chrisrichardson.eventstore.javaexamples.banking.backend.common.transactions.DebitRecordedEvent;
@@ -16,8 +17,7 @@ import org.slf4j.LoggerFactory;
 
 import java.math.BigDecimal;
 
-import static net.chrisrichardson.eventstore.javaexamples.banking.backend.queryside.accounts.MoneyUtil.toIntegerRepr;
+import static net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice.backend.MoneyUtil.toIntegerRepr;
-
 
 @EventSubscriber(id="querySideEventHandlers")
 public class AccountQueryWorkflow {
@@ -33,24 +33,31 @@ public class AccountQueryWorkflow {
   public void create(DispatchedEvent<AccountOpenedEvent> de) {
     AccountOpenedEvent event = de.getEvent();
     String id = de.getEntityId();
-    String eventId = de.getEventId().asString();
+    Int128 eventId = de.getEventId();
-    logger.info("**************** account version=" + id + ", " + eventId);
+    logger.info("**************** account version={}, {}", id, eventId);
     BigDecimal initialBalance = event.getInitialBalance();
 
     String customerId =  event.getCustomerId();
     String title =  event.getTitle();
     String description =  event.getDescription();
+
     accountInfoUpdateService.create(id, customerId, title, initialBalance, description, eventId);
   }
 
+  @EventHandlerMethod
+  public void delete(DispatchedEvent<AccountDeletedEvent> de) {
+    String id = de.getEntityId();
+    accountInfoUpdateService.delete(id);
+  }
+
   @EventHandlerMethod
   public void recordTransfer(DispatchedEvent<MoneyTransferCreatedEvent> de) {
     String eventId = de.getEventId().asString();
     String moneyTransferId = de.getEntityId();
     String fromAccountId = de.getEvent().getDetails().getFromAccountId();
     String toAccountId = de.getEvent().getDetails().getToAccountId();
-    logger.info("**************** account version=" + fromAccountId + ", " + de.getEventId().asString());
+    logger.info("**************** account version={}, {}", fromAccountId, eventId);
-    logger.info("**************** account version=" + toAccountId + ", " + de.getEventId().asString());
+    logger.info("**************** account version={}, {}", toAccountId, eventId);
 
     AccountTransactionInfo ti = new AccountTransactionInfo(moneyTransferId,
             fromAccountId,
@@ -65,28 +72,42 @@ public class AccountQueryWorkflow {
 
   @EventHandlerMethod
   public void recordDebit(DispatchedEvent<AccountDebitedEvent> de) {
-    String accountId = de.getEntityId();
-    String transactionId = de.getEvent().getTransactionId();
-
-    accountInfoUpdateService.updateTransactionStatus(accountId, transactionId, TransferState.DEBITED);
     saveChange(de, -1);
   }
 
   @EventHandlerMethod
   public void recordCredit(DispatchedEvent<AccountCreditedEvent> de) {
-    String accountId = de.getEntityId();
-    String transactionId = de.getEvent().getTransactionId();
-
-    accountInfoUpdateService.updateTransactionStatus(accountId, transactionId, TransferState.COMPLETED);
     saveChange(de, +1);
   }
 
   @EventHandlerMethod
-  public void recordFailed(DispatchedEvent<AccountDebitFailedDueToInsufficientFundsEvent> de) {
+  public void updateDebitTransactionState(DispatchedEvent<DebitRecordedEvent> de) {
-    String accountId = de.getEntityId();
+    String transactionId = de.getEntityId();
-    String transactionId = de.getEvent().getTransactionId();
+    String fromAccountId = de.getEvent().getDetails().getFromAccountId();
+    String toAccountId = de.getEvent().getDetails().getToAccountId();
 
-    accountInfoUpdateService.updateTransactionStatus(accountId, transactionId, TransferState.FAILED_DUE_TO_INSUFFICIENT_FUNDS);
+    accountInfoUpdateService.updateTransactionStatus(fromAccountId, transactionId, TransferState.DEBITED);
+    accountInfoUpdateService.updateTransactionStatus(toAccountId, transactionId, TransferState.DEBITED);
+  }
+
+  @EventHandlerMethod
+  public void updateCreditTransactionState(DispatchedEvent<CreditRecordedEvent> de) {
+    String transactionId = de.getEntityId();
+    String fromAccountId = de.getEvent().getDetails().getFromAccountId();
+    String toAccountId = de.getEvent().getDetails().getToAccountId();
+
+    accountInfoUpdateService.updateTransactionStatus(fromAccountId, transactionId, TransferState.COMPLETED);
+    accountInfoUpdateService.updateTransactionStatus(toAccountId, transactionId, TransferState.COMPLETED);
+  }
+
+  @EventHandlerMethod
+  public void recordFailed(DispatchedEvent<FailedDebitRecordedEvent> de) {
+    String transactionId = de.getEntityId();
+    String fromAccountId = de.getEvent().getDetails().getFromAccountId();
+    String toAccountId = de.getEvent().getDetails().getToAccountId();
+
+    accountInfoUpdateService.updateTransactionStatus(fromAccountId, transactionId, TransferState.FAILED_DUE_TO_INSUFFICIENT_FUNDS);
+    accountInfoUpdateService.updateTransactionStatus(toAccountId, transactionId, TransferState.FAILED_DUE_TO_INSUFFICIENT_FUNDS);
   }
 
   public <T extends AccountChangedEvent> void saveChange(DispatchedEvent<T> de, int delta) {
@@ -97,9 +118,8 @@ public class AccountQueryWorkflow {
     long balanceDelta = amount * delta;
     AccountChangeInfo ci = new AccountChangeInfo(changeId, transactionId, de.getEvent().getClass().getSimpleName(), amount, balanceDelta);
     String accountId = de.getEntityId();
-    logger.info("**************** account version=" + accountId + ", " + de.getEventId().asString());
+    logger.info("**************** account version={}, {}", accountId, de.getEventId().asString());
 
     accountInfoUpdateService.updateBalance(accountId, changeId, balanceDelta, ci);
   }
-
 }

java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/backend/AccountViewBackendConfiguration.java

@@ -1,4 +1,4 @@
-package net.chrisrichardson.eventstore.javaexamples.banking.backend.queryside.accounts;
+package net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice.backend;
 
 
 import io.eventuate.javaclient.spring.EnableEventHandlers;
@@ -10,7 +10,7 @@ import org.springframework.data.mongodb.repository.config.EnableMongoRepositorie
 @Configuration
 @EnableMongoRepositories
 @EnableEventHandlers
-public class QuerySideAccountConfiguration {
+public class AccountViewBackendConfiguration {
 
   @Bean
   public AccountQueryWorkflow accountQueryWorkflow(AccountInfoUpdateService accountInfoUpdateService) {

java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/backend/MoneyUtil.java

@@ -1,4 +1,4 @@
-package net.chrisrichardson.eventstore.javaexamples.banking.backend.queryside.accounts;
+package net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice.backend;
 
 import java.math.BigDecimal;
 

java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/backend/QuerySideDependencyChecker.java

@@ -1,11 +1,10 @@
-package net.chrisrichardson.eventstore.javaexamples.banking.backend.queryside.accounts;
+package net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice.backend;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.data.mongodb.core.MongoTemplate;
 
 import javax.annotation.PostConstruct;
-import java.util.concurrent.TimeUnit;
 
 public class QuerySideDependencyChecker {
   private Logger logger = LoggerFactory.getLogger(getClass());

java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/web/AccountQueryController.java

@@ -1,9 +1,8 @@
-package net.chrisrichardson.eventstore.javaexamples.banking.web.queryside.accounts;
+package net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice.web;
 
-import net.chrisrichardson.eventstore.javaexamples.banking.backend.queryside.accounts.AccountInfo;
+import net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice.backend.AccountInfo;
-
+import net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice.backend.AccountNotFoundException;
-import net.chrisrichardson.eventstore.javaexamples.banking.backend.queryside.accounts.AccountNotFoundException;
+import net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice.backend.AccountQueryService;
-import net.chrisrichardson.eventstore.javaexamples.banking.backend.queryside.accounts.AccountQueryService;
 import net.chrisrichardson.eventstore.javaexamples.banking.common.accounts.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
@@ -52,13 +51,13 @@ public class AccountQueryController {
   public ResponseEntity<AccountHistoryResponse> getTransactionsHistory(@PathVariable String accountId) {
     AccountInfo accountInfo = accountInfoQueryService.findByAccountId(accountId);
     List<AccountHistoryEntry> historyEntries = new ArrayList<>();
-    historyEntries.add(new AccountOpenInfo(accountInfo.getDate(), AccountHistoryEntry.EntryType.account, accountInfo.getChanges().get(0).getAmount()));
+    historyEntries.add(new AccountOpenInfo(accountInfo.getCreationDate(), AccountHistoryEntry.EntryType.account, accountInfo.getChanges().get(0).getAmount()));
     accountInfo.getTransactions().forEach(historyEntries::add);
 
     return ResponseEntity.ok().body(new AccountHistoryResponse(historyEntries));
   }
 
-  @ResponseStatus(value= HttpStatus.NOT_FOUND, reason="account not found")
+  @ResponseStatus(value = HttpStatus.NOT_FOUND, reason = "account not found")
   @ExceptionHandler(AccountNotFoundException.class)
   public void accountNotFound() {
   }

java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/web/AccountViewWebConfiguration.java

@@ -1,9 +1,6 @@
-package net.chrisrichardson.eventstore.javaexamples.banking.web;
+package net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice.web;
 
-import io.eventuate.javaclient.spring.httpstomp.EventuateHttpStompClientConfiguration;
+import net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice.backend.AccountViewBackendConfiguration;
-import net.chrisrichardson.eventstore.javaexamples.banking.commonswagger.CommonSwaggerConfiguration;
-import net.chrisrichardson.eventstore.javaexamples.banking.web.queryside.QuerySideWebConfiguration;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.web.HttpMessageConverters;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
@@ -13,11 +10,9 @@ import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 
 @Configuration
-@Import({QuerySideWebConfiguration.class, EventuateHttpStompClientConfiguration.class, CommonSwaggerConfiguration.class})
+@Import({AccountViewBackendConfiguration.class})
-@EnableAutoConfiguration
 @ComponentScan
-public class AccountsQuerySideServiceConfiguration {
+public class AccountViewWebConfiguration {
-
 
   @Bean
   public HttpMessageConverters customConverters() {

java-spring/accounts-view-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/web/AccountInfoUpdateServiceTest.java

@@ -1,8 +1,13 @@
-package net.chrisrichardson.eventstore.javaexamples.banking.backend.queryside.accounts;
+package net.chrisrichardson.eventstore.javaexamples.banking.web;
 
+import io.eventuate.Int128;
 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.accountsviewservice.backend.AccountInfo;
+import net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice.backend.AccountInfoUpdateService;
+import net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice.backend.AccountQueryService;
+import net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice.backend.AccountViewBackendConfiguration;
 import net.chrisrichardson.eventstore.javaexamples.banking.backend.common.accounts.AccountCreditedEvent;
 import net.chrisrichardson.eventstore.javaexamples.banking.common.accounts.AccountChangeInfo;
 import net.chrisrichardson.eventstore.javaexamples.banking.common.accounts.AccountTransactionInfo;
@@ -30,7 +35,7 @@ public class AccountInfoUpdateServiceTest {
 
   @Configuration
   @EnableAutoConfiguration
-  @Import({QuerySideAccountConfiguration.class, EventuateJdbcEventStoreConfiguration.class})
+  @Import({AccountViewBackendConfiguration.class, EventuateJdbcEventStoreConfiguration.class})
   public static class AccountInfoUpdateServiceTestConfiguration {
 
   }
@@ -46,7 +51,7 @@ public class AccountInfoUpdateServiceTest {
     IdGenerator x = new IdGeneratorImpl();
     String accountId = x.genId().asString();
     String customerId = x.genId().asString();
-    String version = x.genId().asString();
+    Int128 version = x.genId();
 
     String title = "Checking account";
     BigDecimal initialBalance = new BigDecimal("1345");
@@ -63,7 +68,7 @@ public class AccountInfoUpdateServiceTest {
     assertEquals(initialBalance.longValue() * 100, accountInfo.getBalance());
     assertEquals(1, accountInfo.getChanges().size());
     assertTrue(accountInfo.getTransactions().isEmpty());
-    assertEquals(version, accountInfo.getVersion());
+    assertEquals(version.asString(), accountInfo.getVersion());
 
 
     String changeId = x.genId().asString();
@@ -99,7 +104,7 @@ public class AccountInfoUpdateServiceTest {
     IdGenerator x = new IdGeneratorImpl();
     String accountId = x.genId().asString();
     String customerId = x.genId().asString();
-    String version = x.genId().asString();
+    Int128 version = x.genId();
 
     String title = "Checking account";
     BigDecimal initialBalance = new BigDecimal("1345");
@@ -114,7 +119,7 @@ public class AccountInfoUpdateServiceTest {
     IdGenerator x = new IdGeneratorImpl();
     String accountId = x.genId().asString();
     String customerId = x.genId().asString();
-    String version = x.genId().asString();
+    Int128 version = x.genId();
 
     String title = "Checking account";
     BigDecimal initialBalance = new BigDecimal("1345");

java-spring/accounts-view-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/web/AccountsQuerySideServiceTestConfiguration.java

@@ -1,7 +1,12 @@
 package net.chrisrichardson.eventstore.javaexamples.banking.web;
 
+import io.eventuate.javaclient.spring.jdbc.EmbeddedTestAggregateStoreConfiguration;
+import net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice.web.AccountViewWebConfiguration;
+import net.chrisrichardson.eventstore.javaexamples.banking.commonswagger.CommonSwaggerConfiguration;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.web.HttpMessageConverters;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.http.converter.HttpMessageConverter;
@@ -12,7 +17,9 @@ import java.util.Arrays;
 import java.util.List;
 
 @Configuration
-@Import(AccountsQuerySideServiceConfiguration.class)
+@Import({AccountViewWebConfiguration.class, EmbeddedTestAggregateStoreConfiguration.class, CommonSwaggerConfiguration.class})
+@EnableAutoConfiguration
+@ComponentScan
 public class AccountsQuerySideServiceTestConfiguration {
 
   @Bean

java-spring/api-gateway-service/Dockerfile

@@ -0,0 +1,4 @@
+FROM java:openjdk-8u91-jdk
+CMD java ${JAVA_OPTS} -jar api-gateway-service.jar
+EXPOSE 8080
+COPY build/libs/api-gateway-service.jar .

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

@@ -1,6 +1,5 @@
 apply plugin: 'java'
 apply plugin: 'spring-boot'
-apply plugin: EventuateDependencyPlugin
 
 dependencies {
     compile project(":common-auth-web")

java-spring/api-gateway-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/apigateway/ApiGatewayProperties.java

@@ -5,9 +5,6 @@ import org.springframework.web.bind.annotation.RequestMethod;
 
 import java.util.List;
 
-/**
- * Created by popikyardo on 15.01.16.
- */
 @ConfigurationProperties(prefix = "api.gateway")
 public class ApiGatewayProperties {
 

java-spring/api-gateway-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/apigateway/ApiGatewayServiceConfiguration.java

@@ -20,9 +20,6 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter
 
 import java.util.Collections;
 
-/**
- * Created by popikyardo on 15.01.16.
- */
 @Configuration
 @ComponentScan
 @EnableAutoConfiguration

java-spring/api-gateway-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/apigateway/RestUtil.java

@@ -2,9 +2,6 @@ package net.chrisrichardson.eventstore.javaexamples.banking.apigateway;
 
 import org.springframework.http.HttpStatus;
 
-/**
- * Created by popikyardo on 07.12.15.
- */
 public class RestUtil {
 
   public static boolean isError(HttpStatus status) {

java-spring/api-gateway-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/apigateway/controller/GatewayController.java

@@ -16,7 +16,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.util.MultiValueMap;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
@@ -30,14 +29,9 @@ 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.GET;
+import static org.springframework.web.bind.annotation.RequestMethod.*;
-import static org.springframework.web.bind.annotation.RequestMethod.POST;
 
-/**
- * Created by popikyardo on 15.01.16.
- */
 @RestController
 public class GatewayController {
 
@@ -57,19 +51,20 @@ public class GatewayController {
             .build();
   }
 
-  @RequestMapping(value = "/api/**", method = {GET, POST})
+  @RequestMapping(value = "/api/**", method = {GET, POST, DELETE})
   @ResponseBody
   public ResponseEntity<String> proxyRequest(HttpServletRequest request) throws NoSuchRequestHandlingMethodException, IOException, URISyntaxException {
     HttpUriRequest proxiedRequest = createHttpUriRequest(request);
     logger.info("request: {}", proxiedRequest);
     HttpResponse proxiedResponse = httpClient.execute(proxiedRequest);
     logger.info("Response {}", proxiedResponse.getStatusLine().getStatusCode());
-    return new ResponseEntity<>(read(proxiedResponse.getEntity().getContent()), processHeaders(proxiedResponse.getAllHeaders()), HttpStatus.valueOf(proxiedResponse.getStatusLine().getStatusCode()));
+    return new ResponseEntity<>(read(proxiedResponse.getEntity().getContent()), makeResponseHeaders(proxiedResponse), HttpStatus.valueOf(proxiedResponse.getStatusLine().getStatusCode()));
   }
 
-  private HttpHeaders processHeaders(Header[] headers) {
+  private HttpHeaders makeResponseHeaders(HttpResponse response) {
     HttpHeaders result = new HttpHeaders();
-    Stream.of(headers).filter(h -> h.getName().equalsIgnoreCase("Content-Type")).forEach( h ->  result.set(h.getName(), h.getValue()));
+    Header h = response.getFirstHeader("Content-Type");
+    result.set(h.getName(), h.getValue());
     return result;
   }
 

java-spring/api-gateway-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/apigateway/utils/ContentRequestTransformer.java

@@ -10,9 +10,6 @@ import java.io.IOException;
 import java.net.URISyntaxException;
 import java.util.stream.Collectors;
 
-/**
- * Created by popikyardo on 21.01.16.
- */
 public class ContentRequestTransformer extends ProxyRequestTransformer {
 
   @Override

java-spring/api-gateway-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/apigateway/utils/HeadersRequestTransformer.java

@@ -8,9 +8,6 @@ import java.io.IOException;
 import java.net.URISyntaxException;
 import java.util.Enumeration;
 
-/**
- * Created by popikyardo on 21.01.16.
- */
 public class HeadersRequestTransformer extends ProxyRequestTransformer {
 
   @Override

java-spring/api-gateway-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/apigateway/utils/ProxyRequestTransformer.java

@@ -7,9 +7,6 @@ import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.net.URISyntaxException;
 
-/**
- * Created by popikyardo on 21.01.16.
- */
 public abstract class ProxyRequestTransformer {
 
   protected ProxyRequestTransformer predecessor;

java-spring/api-gateway-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/apigateway/utils/URLRequestTransformer.java

@@ -9,9 +9,6 @@ import javax.servlet.http.HttpServletRequest;
 import java.net.URI;
 import java.net.URISyntaxException;
 
-/**
- * Created by popikyardo on 21.01.16.
- */
 public class URLRequestTransformer extends ProxyRequestTransformer {
 
   private ApiGatewayProperties apiGatewayProperties;

java-spring/api-gateway-service/src/main/resources/application.properties

@@ -22,4 +22,10 @@ api.gateway.endpoints[4].method=POST
 api.gateway.endpoints[4].location=http://${customers.commandside.service.host}:8080
 api.gateway.endpoints[5].path=[/]*api/transfers.*
 api.gateway.endpoints[5].method=POST
-api.gateway.endpoints[5].location=http://${transfers.commandside.service.host}:8080
+api.gateway.endpoints[5].location=http://${transfers.commandside.service.host}:8080
+api.gateway.endpoints[6].path=[/]*api/customers.*
+api.gateway.endpoints[6].method=DELETE
+api.gateway.endpoints[6].location=http://${customers.commandside.service.host}:8080
+api.gateway.endpoints[7].path=[/]*api/accounts.*
+api.gateway.endpoints[7].method=DELETE
+api.gateway.endpoints[7].location=http://${accounts.commandside.service.host}:8080

java-spring/api-gateway-service/src/main/resources/logback.xml

@@ -18,7 +18,7 @@
     <logger name="net.chrisrichardson.eventstore.javaexamples.banking" level='info'>
     </logger>
 
-    <logger name="io.eventuate" level='debug'>
+    <logger name="io.eventuate.activity" level='debug'>
     </logger>
 
 </configuration>

java-spring/backend-integration-tests/build.gradle

@@ -2,11 +2,11 @@ apply plugin: VerifyMongoDBConfigurationPlugin
 
 dependencies {
 
-    testCompile project(":accounts-command-side-backend")
+    testCompile project(":transactions-service")
-    testCompile project(":transactions-command-side-backend")
+    testCompile project(":accounts-service")
-    testCompile project(":accounts-query-side-backend")
+    testCompile project(":accounts-view-service")
-    testCompile project(":customers-command-side-backend")
+    testCompile project(":customers-service")
-    testCompile project(":customers-query-side-backend")
+    testCompile project(":customers-view-service")
     testCompile project(":testutil")
     testCompile "junit:junit:4.11"
     testCompile "org.springframework.boot:spring-boot-starter-test:$springBootVersion"

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

@@ -1,15 +1,14 @@
 package net.chrisrichardson.eventstore.javaexamples.banking.backend;
 
-import io.eventuate.javaclient.spring.jdbc.EventuateJdbcEventStoreConfiguration;
+import io.eventuate.javaclient.spring.jdbc.EmbeddedTestAggregateStoreConfiguration;
-import net.chrisrichardson.eventstore.javaexamples.banking.backend.commandside.accounts.AccountConfiguration;
+import net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.backend.AccountsBackendConfiguration;
-import net.chrisrichardson.eventstore.javaexamples.banking.backend.commandside.transactions.MoneyTransferConfiguration;
+import net.chrisrichardson.eventstore.javaexamples.banking.transactionsservice.backend.MoneyTransferBackendConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 
 @Configuration
-@Import({AccountConfiguration.class, MoneyTransferConfiguration.class, EventuateJdbcEventStoreConfiguration.class})
+@Import({AccountsBackendConfiguration.class, MoneyTransferBackendConfiguration.class, EmbeddedTestAggregateStoreConfiguration.class})
 @EnableAutoConfiguration
 public class BankingTestConfiguration {
 

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

@@ -2,12 +2,12 @@ package net.chrisrichardson.eventstore.javaexamples.banking.backend;
 
 import io.eventuate.EntityWithIdAndVersion;
 import io.eventuate.EventuateAggregateStore;
-import net.chrisrichardson.eventstore.javaexamples.banking.backend.commandside.accounts.Account;
+import net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.backend.Account;
-import net.chrisrichardson.eventstore.javaexamples.banking.backend.commandside.accounts.AccountService;
+import net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.backend.AccountService;
-import net.chrisrichardson.eventstore.javaexamples.banking.backend.commandside.transactions.MoneyTransfer;
-import net.chrisrichardson.eventstore.javaexamples.banking.backend.commandside.transactions.MoneyTransferService;
 import net.chrisrichardson.eventstore.javaexamples.banking.common.transactions.TransferState;
 import net.chrisrichardson.eventstore.javaexamples.banking.backend.common.transactions.TransferDetails;
+import net.chrisrichardson.eventstore.javaexamples.banking.transactionsservice.backend.MoneyTransfer;
+import net.chrisrichardson.eventstore.javaexamples.banking.transactionsservice.backend.MoneyTransferService;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;

java-spring/backend-integration-tests/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/queryside/accounts/AccountQuerySideIntegrationTest.java

@@ -2,12 +2,13 @@ package net.chrisrichardson.eventstore.javaexamples.banking.backend.queryside.ac
 
 import io.eventuate.EntityWithIdAndVersion;
 import io.eventuate.EventuateAggregateStore;
-import net.chrisrichardson.eventstore.javaexamples.banking.backend.commandside.accounts.Account;
+import net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.backend.Account;
-import net.chrisrichardson.eventstore.javaexamples.banking.backend.commandside.accounts.AccountService;
+import net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.backend.AccountService;
-import net.chrisrichardson.eventstore.javaexamples.banking.backend.commandside.transactions.MoneyTransfer;
+import net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice.backend.AccountQueryService;
-import net.chrisrichardson.eventstore.javaexamples.banking.backend.commandside.transactions.MoneyTransferService;
 import net.chrisrichardson.eventstore.javaexamples.banking.common.transactions.TransferState;
 import net.chrisrichardson.eventstore.javaexamples.banking.backend.common.transactions.TransferDetails;
+import net.chrisrichardson.eventstore.javaexamples.banking.transactionsservice.backend.MoneyTransfer;
+import net.chrisrichardson.eventstore.javaexamples.banking.transactionsservice.backend.MoneyTransferService;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;

java-spring/backend-integration-tests/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/queryside/accounts/AccountQuerySideTestConfiguration.java

@@ -1,15 +1,16 @@
 package net.chrisrichardson.eventstore.javaexamples.banking.backend.queryside.accounts;
 
-import io.eventuate.javaclient.spring.jdbc.EventuateJdbcEventStoreConfiguration;
+import io.eventuate.javaclient.spring.jdbc.EmbeddedTestAggregateStoreConfiguration;
-import net.chrisrichardson.eventstore.javaexamples.banking.backend.commandside.accounts.AccountConfiguration;
+import net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.backend.AccountsBackendConfiguration;
-import net.chrisrichardson.eventstore.javaexamples.banking.backend.commandside.transactions.MoneyTransferConfiguration;
+import net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice.backend.AccountViewBackendConfiguration;
+import net.chrisrichardson.eventstore.javaexamples.banking.transactionsservice.backend.MoneyTransferBackendConfiguration;
 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,
+@Import({AccountsBackendConfiguration.class, MoneyTransferBackendConfiguration.class, EmbeddedTestAggregateStoreConfiguration.class,
-        QuerySideAccountConfiguration.class})
+        AccountViewBackendConfiguration.class})
 @EnableAutoConfiguration
 public class AccountQuerySideTestConfiguration {
 }

java-spring/backend-integration-tests/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/queryside/customers/CustomerQuerySideIntegrationTest.java

@@ -2,10 +2,11 @@ package net.chrisrichardson.eventstore.javaexamples.banking.backend.queryside.cu
 
 import io.eventuate.EntityWithIdAndVersion;
 import io.eventuate.EventuateAggregateStore;
-import net.chrisrichardson.eventstore.javaexamples.banking.backend.commandside.customers.Customer;
-import net.chrisrichardson.eventstore.javaexamples.banking.backend.commandside.customers.CustomerService;
 import net.chrisrichardson.eventstore.javaexamples.banking.common.customers.CustomerInfo;
-import net.chrisrichardson.eventstore.javaexamples.banking.common.customers.QuerySideCustomer;
+import net.chrisrichardson.eventstore.javaexamples.banking.customersservice.backend.Customer;
+import net.chrisrichardson.eventstore.javaexamples.banking.customersservice.backend.CustomerService;
+import net.chrisrichardson.eventstore.javaexamples.banking.customersviewservice.backend.CustomerQueryService;
+import net.chrisrichardson.eventstore.javaexamples.banking.web.customers.queryside.common.QuerySideCustomer;
 import net.chrisrichardson.eventstore.javaexamples.banking.common.customers.ToAccountInfo;
 import net.chrisrichardson.eventstorestore.javaexamples.testutil.Producer;
 import net.chrisrichardson.eventstorestore.javaexamples.testutil.Verifier;
@@ -61,7 +62,7 @@ public class CustomerQuerySideIntegrationTest {
               public void verify(QuerySideCustomer querySideCustomer) {
                 Assert.assertEquals(customerInfo.getName(), querySideCustomer.getName());
                 Assert.assertEquals(customerInfo.getSsn(), querySideCustomer.getSsn());
-                Assert.assertEquals(customerInfo.getEmail(), querySideCustomer.getEmail());
+                Assert.assertEquals(customerInfo.getUserCredentials().getEmail(), querySideCustomer.getEmail());
                 Assert.assertEquals(customerInfo.getPhoneNumber(), querySideCustomer.getPhoneNumber());
                 Assert.assertEquals(customerInfo.getAddress(), querySideCustomer.getAddress());
 

java-spring/backend-integration-tests/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/queryside/customers/CustomerQuerySideTestConfiguration.java

@@ -1,14 +1,14 @@
 package net.chrisrichardson.eventstore.javaexamples.banking.backend.queryside.customers;
 
-import io.eventuate.javaclient.spring.jdbc.EventuateJdbcEventStoreConfiguration;
+import io.eventuate.javaclient.spring.jdbc.EmbeddedTestAggregateStoreConfiguration;
-import net.chrisrichardson.eventstore.javaexamples.banking.backend.commandside.customers.CustomerConfiguration;
+import net.chrisrichardson.eventstore.javaexamples.banking.customersservice.backend.CustomerBackendConfiguration;
-
+import net.chrisrichardson.eventstore.javaexamples.banking.customersviewservice.backend.CustomerViewBackendConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 
 @Configuration
-@Import({CustomerConfiguration.class, EventuateJdbcEventStoreConfiguration.class, QuerySideCustomerConfiguration.class})
+@Import({CustomerBackendConfiguration.class, EmbeddedTestAggregateStoreConfiguration.class, CustomerViewBackendConfiguration.class})
 @EnableAutoConfiguration
 public class CustomerQuerySideTestConfiguration {
 }

java-spring/build-and-test-all-eventuate-local.sh

@@ -0,0 +1,6 @@
+#! /bin/bash
+
+export JAVA_OPTS="-Xmx128m -Xms128m"
+export EXTRA_INFRASTRUCTURE_SERVICES=cdcservice
+export EVENTUATE_LOCAL=yes
+../_build-and-test-all.sh -f docker-compose-eventuate-local.yml $* -P eventuateDriver=local

java-spring/build-and-test-all.sh

@@ -1,3 +1,4 @@
 #! /bin/bash
 
+export JAVA_OPTS="-Xmx128m -Xms128m"
 ../_build-and-test-all.sh $*

java-spring/build.gradle

@@ -23,6 +23,7 @@ subprojects {
 
     repositories {
         mavenCentral()
+        jcenter()
         eventuateMavenRepoUrl.split(',').each { repoUrl -> maven { url repoUrl } }
     }
 }

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

@@ -6,7 +6,7 @@ class EventuateDependencyPlugin implements Plugin<Project> {
     @Override
     void apply(Project project) {
         project.dependencies {
-            if (project.hasProperty("eventuateLocal")) {
+            if (project.hasProperty("eventuateDriver") && project.property("eventuateDriver").equals("local")) {
                 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

java-spring/common-auth-web/build.gradle

@@ -8,4 +8,5 @@ dependencies {
     compile "org.springframework.boot:spring-boot-starter-security:$springBootVersion"
 
     testCompile "junit:junit:4.11"
+    testCompile "org.springframework.boot:spring-boot-starter-test:$springBootVersion"
 }

java-spring/common-auth-web/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/commonauth/controller/AuthController.java

@@ -1,12 +1,13 @@
 package net.chrisrichardson.eventstore.javaexamples.banking.commonauth.controller;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import net.chrisrichardson.eventstore.javaexamples.banking.common.customers.QuerySideCustomer;
+import net.chrisrichardson.eventstore.javaexamples.banking.common.customers.UserCredentials;
 import net.chrisrichardson.eventstore.javaexamples.banking.commonauth.CustomerAuthService;
-import net.chrisrichardson.eventstore.javaexamples.banking.commonauth.model.AuthRequest;
 import net.chrisrichardson.eventstore.javaexamples.banking.commonauth.model.ErrorResponse;
 import net.chrisrichardson.eventstore.javaexamples.banking.commonauth.model.User;
+import net.chrisrichardson.eventstore.javaexamples.banking.web.customers.queryside.common.QuerySideCustomer;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.dao.IncorrectResultSizeDataAccessException;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -23,9 +24,6 @@ import java.io.IOException;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
 import static org.springframework.web.bind.annotation.RequestMethod.POST;
 
-/**
- * Created by popikyardo on 21.09.15.
- */
 @RestController
 @Validated
 @RequestMapping("/api")
@@ -40,8 +38,8 @@ public class AuthController {
   private static ObjectMapper objectMapper = new ObjectMapper();
 
   @RequestMapping(value = "/login", method = POST)
-  public ResponseEntity<QuerySideCustomer> doAuth(@RequestBody @Valid AuthRequest request) throws IOException {
+  public ResponseEntity<QuerySideCustomer> doAuth(@RequestBody @Valid UserCredentials request) throws IOException {
-    QuerySideCustomer customer = customerAuthService.findByEmail(request.getEmail());
+    QuerySideCustomer customer = customerAuthService.findByEmailAndPassword(request.getEmail(), request.getPassword());
 
     Token token = tokenService.allocateToken(objectMapper.writeValueAsString(new User(request.getEmail())));
     return ResponseEntity.status(HttpStatus.OK).header("access-token", token.getKey())
@@ -49,7 +47,7 @@ public class AuthController {
   }
 
   @ResponseStatus(value = HttpStatus.NOT_FOUND)
-  @ExceptionHandler(IncorrectResultSizeDataAccessException.class)
+  @ExceptionHandler({EmptyResultDataAccessException.class, IncorrectResultSizeDataAccessException.class})
   public ErrorResponse customersNotFound() {
     return new ErrorResponse("Customer not found");
   }

java-spring/common-auth-web/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/commonauth/model/AuthRequest.java

@@ -3,20 +3,21 @@ package net.chrisrichardson.eventstore.javaexamples.banking.commonauth.model;
 import org.hibernate.validator.constraints.Email;
 import org.hibernate.validator.constraints.NotBlank;
 
-/**
- * Created by popikyardo on 19.10.15.
- */
 public class AuthRequest {
 
   @NotBlank
   @Email
   private String email;
 
+  @NotBlank
+  private String password;
+
   public AuthRequest() {
   }
 
-  public AuthRequest(String email) {
+  public AuthRequest(String email, String password) {
     this.email = email;
+    this.password = password;
   }
 
   public String getEmail() {
@@ -26,4 +27,12 @@ public class AuthRequest {
   public void setEmail(String email) {
     this.email = email;
   }
+
+  public String getPassword() {
+    return password;
+  }
+
+  public void setPassword(String password) {
+    this.password = password;
+  }
 }

java-spring/common-auth-web/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/commonauth/controller/AuthControllerIntegrationTest.java

@@ -0,0 +1,80 @@
+package net.chrisrichardson.eventstore.javaexamples.banking.commonauth.controller;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import net.chrisrichardson.eventstore.javaexamples.banking.common.customers.Address;
+import net.chrisrichardson.eventstore.javaexamples.banking.common.customers.Name;
+import net.chrisrichardson.eventstore.javaexamples.banking.commonauth.CustomerAuthService;
+import net.chrisrichardson.eventstore.javaexamples.banking.commonauth.model.User;
+import net.chrisrichardson.eventstore.javaexamples.banking.web.customers.queryside.common.QuerySideCustomer;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.springframework.boot.test.IntegrationTest;
+import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.dao.EmptyResultDataAccessException;
+import org.springframework.http.MediaType;
+import org.springframework.security.core.token.DefaultToken;
+import org.springframework.security.core.token.TokenService;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.when;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringApplicationConfiguration(classes = AuthControllerIntegrationTestConfiguration.class)
+@IntegrationTest
+@WebAppConfiguration
+public class AuthControllerIntegrationTest {
+
+  private MockMvc mockMvc;
+
+  @Mock
+  TokenService tokenService;
+
+  @Mock
+  CustomerAuthService customerAuthService;
+
+  @InjectMocks
+  AuthController authController;
+
+  private static ObjectMapper om = new ObjectMapper();
+
+  @Before
+  public void setup() {
+    MockitoAnnotations.initMocks(this);
+    this.mockMvc = MockMvcBuilders.standaloneSetup(authController).build();
+  }
+
+  @Test
+  public void shouldLogin() throws Exception {
+    when(customerAuthService.findByEmailAndPassword("my@email.com", "my_password")).thenReturn(new QuerySideCustomer("id", new Name("test", "test"), "my@email.com", "my_password", "ssn", "", new Address(), null));
+    when(customerAuthService.findByEmailAndPassword("not_my@email.com", "not_my_password")).thenThrow(new EmptyResultDataAccessException(1));
+
+    when(tokenService.allocateToken(om.writeValueAsString(new User("my@email.com")))).thenReturn(new DefaultToken("key", System.currentTimeMillis(), ""));
+
+    mockMvc.perform(post("/api/login")
+            .contentType(MediaType.APPLICATION_JSON)
+            .content("{\"email\" : \"my@email.com\", \"password\" : \"my_password\"}")
+            .accept(MediaType.APPLICATION_JSON))
+            .andExpect(status().isOk())
+            .andExpect(result -> {
+              assertTrue(result.getResponse().getContentAsString().contains("id"));
+              assertTrue(result.getResponse().getContentAsString().contains("my@email.com"));
+              assertTrue(result.getResponse().getContentAsString().contains("my_password"));
+            });
+
+    mockMvc.perform(post("/api/login")
+            .contentType(MediaType.APPLICATION_JSON)
+            .content("{\"email\" : \"not_my@email.com\", \"password\" : \"not_my_password\"}")
+            .accept(MediaType.APPLICATION_JSON))
+            .andExpect(status().isNotFound());
+  }
+}

java-spring/common-auth-web/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/commonauth/controller/AuthControllerIntegrationTestConfiguration.java

@@ -0,0 +1,12 @@
+package net.chrisrichardson.eventstore.javaexamples.banking.commonauth.controller;
+
+import net.chrisrichardson.eventstore.javaexamples.banking.commonauth.AuthConfiguration;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
+@Configuration
+@Import(AuthConfiguration.class)
+@EnableAutoConfiguration
+public class AuthControllerIntegrationTestConfiguration {
+}

java-spring/common-auth/build.gradle

@@ -2,6 +2,7 @@ apply plugin: 'java'
 
 dependencies {
     compile project(":common")
+    compile project(":customers-query-side-common")
 
     compile "org.springframework.boot:spring-boot-starter-web:$springBootVersion"
     compile "org.springframework.boot:spring-boot-starter-data-mongodb:$springBootVersion"

java-spring/common-auth/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/commonauth/AuthConfiguration.java

@@ -1,5 +1,6 @@
 package net.chrisrichardson.eventstore.javaexamples.banking.commonauth;
 
+import net.chrisrichardson.eventstore.javaexamples.banking.web.customers.queryside.common.QuerySideCustomer;
 import net.chrisrichardson.eventstore.javaexamples.banking.commonauth.filter.StatelessAuthenticationFilter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -22,9 +23,6 @@ import org.springframework.security.web.authentication.www.BasicAuthenticationFi
 
 import java.security.SecureRandom;
 
-/**
- * Created by popikyardo on 21.09.15.
- */
 @Configuration
 @ComponentScan
 @EnableWebSecurity
@@ -43,21 +41,14 @@ public class AuthConfiguration extends WebSecurityConfigurerAdapter {
 
   @Override
   protected void configure(AuthenticationManagerBuilder auth) throws Exception {
-    //auth.inMemoryAuthentication();
     auth.userDetailsService(userDetailsServiceBean());
   }
 
   @Override
   public UserDetailsService userDetailsServiceBean() {
     return email -> {
-/*            QuerySideCustomer customer = customerAuthService.findByEmail(email);
+      QuerySideCustomer customer = customerAuthService.findByEmail(email);
-            if (customer != null) {
+      return new User(email, customer.getPassword(), true, true, true, true,
-                return new User(email);
-            } else {
-                throw new UsernameNotFoundException(String.format("could not find the customer '%s'", email));
-            }*/
-      //authorize everyone with basic authentication
-      return new User(email, "", true, true, true, true,
               AuthorityUtils.createAuthorityList("USER"));
     };
   }
@@ -75,13 +66,16 @@ public class AuthConfiguration extends WebSecurityConfigurerAdapter {
 
   @Override
   protected void configure(HttpSecurity http) throws Exception {
-    http.csrf().disable()
+    http
-            .httpBasic().and()
+            .csrf()
+              .disable()
+            .httpBasic()
+              .and()
             .authorizeRequests()
-            .antMatchers("/index.html", "/", "/**.js", "/**.css").permitAll()
+              .antMatchers(HttpMethod.POST, "/api/customers", "/api/login").permitAll()
-            .antMatchers("/swagger-ui.html", "/v2/api-docs").permitAll()
+              .antMatchers("/api/**").permitAll()
-            .antMatchers(HttpMethod.POST, "/api/customers", "/api/login").permitAll()
+              .anyRequest().permitAll()
-            .anyRequest().authenticated().and()
+              .and()
             .addFilterAfter(new StatelessAuthenticationFilter(tokenAuthenticationService), BasicAuthenticationFilter.class);
   }
 

java-spring/common-auth/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/commonauth/AuthProperties.java

@@ -2,9 +2,6 @@ package net.chrisrichardson.eventstore.javaexamples.banking.commonauth;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
-/**
- * Created by popikyardo on 21.09.15.
- */
 @ConfigurationProperties(locations = "classpath:auth.properties", ignoreUnknownFields = false, prefix = "auth")
 public class AuthProperties {
   private String serverSecret;

java-spring/common-auth/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/commonauth/CustomerAuthRepository.java

@@ -1,6 +1,6 @@
 package net.chrisrichardson.eventstore.javaexamples.banking.commonauth;
 
-import net.chrisrichardson.eventstore.javaexamples.banking.common.customers.QuerySideCustomer;
+import net.chrisrichardson.eventstore.javaexamples.banking.web.customers.queryside.common.QuerySideCustomer;
 import org.springframework.data.mongodb.repository.MongoRepository;
 
 import java.util.List;
@@ -8,4 +8,6 @@ import java.util.List;
 interface CustomerAuthRepository extends MongoRepository<QuerySideCustomer, String> {
 
   List<QuerySideCustomer> findByEmail(String email);
+
+  List<QuerySideCustomer> findByEmailAndPassword(String email, String password);
 }

java-spring/common-auth/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/commonauth/CustomerAuthService.java

@@ -1,9 +1,8 @@
 package net.chrisrichardson.eventstore.javaexamples.banking.commonauth;
 
-import net.chrisrichardson.eventstore.javaexamples.banking.common.customers.QuerySideCustomer;
+import net.chrisrichardson.eventstore.javaexamples.banking.web.customers.queryside.common.QuerySideCustomer;
 import org.springframework.dao.EmptyResultDataAccessException;
-
+import org.springframework.dao.support.DataAccessUtils;
-import java.util.List;
 
 /**
  * Created by Main on 15.02.2016.
@@ -16,13 +15,18 @@ public class CustomerAuthService {
   }
 
   public QuerySideCustomer findByEmail(String email) {
-    List<QuerySideCustomer> customers = customerAuthRepository.findByEmail(email);
+    QuerySideCustomer result = DataAccessUtils.uniqueResult(customerAuthRepository.findByEmail(email));
-    if (customers.isEmpty())
+    if (result==null)
       throw new EmptyResultDataAccessException(1);
-      //TODO: add unique email constraint
+
-/*        else if(customers.size()>1)
+    return result;
-            throw new IncorrectResultSizeDataAccessException(1, customers.size());*/
+  }
-    else
+
-      return customers.get(0);
+  public QuerySideCustomer findByEmailAndPassword(String email, String password) {
+    QuerySideCustomer result =  DataAccessUtils.uniqueResult(customerAuthRepository.findByEmailAndPassword(email, password));
+    if (result==null)
+      throw new EmptyResultDataAccessException(1);
+
+    return result;
   }
 }

java-spring/common-auth/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/commonauth/TokenAuthenticationService.java

@@ -12,9 +12,6 @@ import org.springframework.stereotype.Service;
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 
-/**
- * Created by popikyardo on 23.09.15.
- */
 @Service
 public class TokenAuthenticationService {
 

java-spring/common-auth/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/commonauth/filter/StatelessAuthenticationFilter.java

@@ -11,9 +11,6 @@ import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 
-/**
- * Created by popikyardo on 23.09.15.
- */
 public class StatelessAuthenticationFilter extends GenericFilterBean {
 
   private final TokenAuthenticationService tokenAuthenticationService;

java-spring/common-auth/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/commonauth/model/User.java

@@ -10,9 +10,6 @@ import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
 
-/**
- * Created by popikyardo on 23.09.15.
- */
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class User implements UserDetails {
 

java-spring/common-auth/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/commonauth/model/UserAuthentication.java

@@ -5,9 +5,6 @@ import org.springframework.security.core.GrantedAuthority;
 
 import java.util.Collection;
 
-/**
- * Created by popikyardo on 23.09.15.
- */
 public class UserAuthentication implements Authentication {
 
   private final User user;

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 extends AccountEvent {
-
-public class AccountDebitFailedDueToInsufficientFundsEvent implements Event {
   private String transactionId;
 
   private AccountDebitFailedDueToInsufficientFundsEvent() {

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

@@ -0,0 +1,4 @@
+package net.chrisrichardson.eventstore.javaexamples.banking.backend.common.accounts;
+
+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.accountsservice.backend.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/customers/CustomerCreatedEvent.java

@@ -2,9 +2,6 @@ package net.chrisrichardson.eventstore.javaexamples.banking.backend.common.custo
 
 import net.chrisrichardson.eventstore.javaexamples.banking.common.customers.CustomerInfo;
 
-/**
- * Created by popikyardo on 02.02.16.
- */
 public class CustomerCreatedEvent extends CustomerEvent {
 
   private CustomerInfo customerInfo;

java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/customers/CustomerEvent.java

@@ -7,6 +7,6 @@ import io.eventuate.EventEntity;
 /**
  * Created by Main on 11.02.2016.
  */
-@EventEntity(entity = "net.chrisrichardson.eventstore.javaexamples.banking.backend.commandside.customers.Customer")
+@EventEntity(entity = "net.chrisrichardson.eventstore.javaexamples.banking.customersservice.backend.Customer")
 public abstract class CustomerEvent implements Event {
 }

java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/customers/CustomerToAccountDeleted.java

@@ -0,0 +1,21 @@
+package net.chrisrichardson.eventstore.javaexamples.banking.backend.common.customers;
+
+public class CustomerToAccountDeleted extends CustomerEvent {
+
+  private String accountId;
+
+  public CustomerToAccountDeleted() {
+  }
+
+  public CustomerToAccountDeleted(String accountId) {
+    this.accountId = accountId;
+  }
+
+  public String getAccountId() {
+    return accountId;
+  }
+
+  public void setAccountId(String accountId) {
+    this.accountId = accountId;
+  }
+}

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