Merge pull request #22 from dartpopikyardo/wip-customer

refactored the tests

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

@@ -11,8 +11,8 @@ import net.chrisrichardson.eventstore.javaexamples.banking.backend.common.transa
 import java.math.BigDecimal;
 import java.util.concurrent.CompletableFuture;
 
-@EventSubscriber(id="accountEventHandlers")
+@EventSubscriber(id = "accountEventHandlers")
-public class AccountWorkflow  {
+public class AccountWorkflow {
 
   @EventHandlerMethod
   public CompletableFuture<?> debitAccount(EventHandlerContext<MoneyTransferCreatedEvent> ctx) {
@@ -22,7 +22,13 @@ public class AccountWorkflow  {
 
     String fromAccountId = event.getDetails().getFromAccountId();
 
-    return ctx.update(Account.class, fromAccountId, new DebitAccountCommand(amount, transactionId));
+    return ctx.update(Account.class, fromAccountId, new DebitAccountCommand(amount, transactionId)).handle((x, e) -> {
+              if (e != null) {
+                e.printStackTrace();
+              }
+              return x;
+            }
+    );
   }
 
   @EventHandlerMethod
@@ -32,7 +38,13 @@ public class AccountWorkflow  {
     String fromAccountId = event.getDetails().getToAccountId();
     String transactionId = ctx.getEntityId();
 
-    return ctx.update(Account.class, fromAccountId, new CreditAccountCommand(amount, transactionId));
+    return ctx.update(Account.class, fromAccountId, new CreditAccountCommand(amount, transactionId)).handle((x, e) -> {
+              if (e != null) {
+                e.printStackTrace();
+              }
+              return x;
+            }
+    );
   }
 
 }

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

@@ -1,7 +1,7 @@
 package net.chrisrichardson.eventstore.javaexamples.banking.web;
 
-import net.chrisrichardson.eventstore.javaexamples.banking.web.commandside.accounts.CreateAccountRequest;
+import net.chrisrichardson.eventstore.javaexamples.banking.common.accounts.CreateAccountRequest;
-import net.chrisrichardson.eventstore.javaexamples.banking.web.commandside.accounts.CreateAccountResponse;
+import net.chrisrichardson.eventstore.javaexamples.banking.common.accounts.CreateAccountResponse;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;

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

@@ -1,6 +1,8 @@
 package net.chrisrichardson.eventstore.javaexamples.banking.web.commandside.accounts;
 
 import net.chrisrichardson.eventstore.javaexamples.banking.backend.commandside.accounts.AccountService;
+import net.chrisrichardson.eventstore.javaexamples.banking.common.accounts.CreateAccountRequest;
+import net.chrisrichardson.eventstore.javaexamples.banking.common.accounts.CreateAccountResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestBody;

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

@@ -1,5 +1,7 @@
 package net.chrisrichardson.eventstore.javaexamples.banking.backend.queryside.accounts;
 
+import net.chrisrichardson.eventstore.javaexamples.banking.common.accounts.AccountTransactionInfo;
+
 import java.util.List;
 
 /**

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

@@ -1,6 +1,7 @@
 package net.chrisrichardson.eventstore.javaexamples.banking.backend.queryside.accounts;
 
 import com.mongodb.WriteResult;
+import net.chrisrichardson.eventstore.javaexamples.banking.common.accounts.AccountTransactionInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.data.mongodb.core.MongoTemplate;
@@ -13,7 +14,7 @@ import java.util.Collections;
 import static net.chrisrichardson.eventstore.javaexamples.banking.backend.queryside.accounts.MoneyUtil.toIntegerRepr;
 import static org.springframework.data.mongodb.core.query.Criteria.where;
 
-public class AccountInfoUpdateService  {
+public class AccountInfoUpdateService {
   private Logger logger = LoggerFactory.getLogger(getClass());
 
   private AccountInfoRepository accountInfoRepository;
@@ -25,8 +26,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, String version) {
     try {
       accountInfoRepository.save(new AccountInfo(
               accountId,

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

@@ -8,6 +8,7 @@ import net.chrisrichardson.eventstore.javaexamples.banking.backend.common.accoun
 import net.chrisrichardson.eventstore.javaexamples.banking.backend.common.accounts.AccountDebitedEvent;
 import net.chrisrichardson.eventstore.javaexamples.banking.backend.common.accounts.AccountOpenedEvent;
 import net.chrisrichardson.eventstore.javaexamples.banking.backend.common.transactions.MoneyTransferCreatedEvent;
+import net.chrisrichardson.eventstore.javaexamples.banking.common.accounts.AccountTransactionInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

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

@@ -1,6 +1,6 @@
 package net.chrisrichardson.eventstore.javaexamples.banking.web;
 
-import net.chrisrichardson.eventstore.javaexamples.banking.web.queryside.accounts.GetAccountResponse;
+import net.chrisrichardson.eventstore.javaexamples.banking.common.accounts.GetAccountResponse;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;

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

@@ -4,7 +4,8 @@ import net.chrisrichardson.eventstore.javaexamples.banking.backend.queryside.acc
 
 import net.chrisrichardson.eventstore.javaexamples.banking.backend.queryside.accounts.AccountNotFoundException;
 import net.chrisrichardson.eventstore.javaexamples.banking.backend.queryside.accounts.AccountQueryService;
-import net.chrisrichardson.eventstore.javaexamples.banking.backend.queryside.accounts.AccountTransactionInfo;
+import net.chrisrichardson.eventstore.javaexamples.banking.common.accounts.AccountTransactionInfo;
+import net.chrisrichardson.eventstore.javaexamples.banking.common.accounts.GetAccountResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;

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

@@ -1,53 +0,0 @@
-package net.chrisrichardson.eventstore.javaexamples.banking.web.queryside.accounts;
-
-import java.math.BigDecimal;
-
-
-public class GetAccountResponse {
-    private String accountId;
-    private BigDecimal balance;
-    private String title;
-    private String description;
-
-    public GetAccountResponse() {
-    }
-
-    public GetAccountResponse(String accountId, BigDecimal balance, String title, String description) {
-        this.accountId = accountId;
-        this.balance = balance;
-        this.title = title;
-        this.description = description;
-    }
-
-    public void setBalance(BigDecimal balance) {
-        this.balance = balance;
-    }
-
-    public void setAccountId(String accountId) {
-        this.accountId = accountId;
-    }
-
-    public String getAccountId() {
-        return accountId;
-    }
-
-    public BigDecimal getBalance() {
-        return balance;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-}

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

@@ -7,9 +7,6 @@ dependencies {
     compile "org.apache.httpcomponents:httpclient:4.5"
     compile "org.apache.httpcomponents:fluent-hc:4.5.1"
 
-    compile "io.eventuate.client.java:eventuate-client-java-spring:$eventuateClientVersion"
-    compile "io.eventuate.client.java:eventuate-client-java-http-stomp-spring:$eventuateClientVersion"
-
     compile "org.springframework.boot:spring-boot-starter-web:$springBootVersion"
     compile "org.springframework.boot:spring-boot-starter-actuator:$springBootVersion"
 

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

@@ -11,50 +11,50 @@ import java.util.List;
 @ConfigurationProperties(prefix = "api.gateway")
 public class ApiGatewayProperties {
 
-    private List<Endpoint> endpoints;
+  private List<Endpoint> endpoints;
 
-    public static class Endpoint {
+  public static class Endpoint {
-        private String path;
+    private String path;
-        private RequestMethod method;
+    private RequestMethod method;
-        private String location;
+    private String location;
 
-        public Endpoint() {
+    public Endpoint() {
-        }
-
-        public Endpoint(String location) {
-            this.location = location;
-        }
-
-        public String getPath() {
-            return path;
-        }
-
-        public void setPath(String path) {
-            this.path = path;
-        }
-
-        public RequestMethod getMethod() {
-            return method;
-        }
-
-        public void setMethod(RequestMethod method) {
-            this.method = method;
-        }
-
-        public String getLocation() {
-            return location;
-        }
-
-        public void setLocation(String location) {
-            this.location = location;
-        }
     }
 
-    public List<Endpoint> getEndpoints() {
+    public Endpoint(String location) {
-        return endpoints;
+      this.location = location;
     }
 
-    public void setEndpoints(List<Endpoint> endpoints) {
+    public String getPath() {
-        this.endpoints = endpoints;
+      return path;
     }
+
+    public void setPath(String path) {
+      this.path = path;
+    }
+
+    public RequestMethod getMethod() {
+      return method;
+    }
+
+    public void setMethod(RequestMethod method) {
+      this.method = method;
+    }
+
+    public String getLocation() {
+      return location;
+    }
+
+    public void setLocation(String location) {
+      this.location = location;
+    }
+  }
+
+  public List<Endpoint> getEndpoints() {
+    return endpoints;
+  }
+
+  public void setEndpoints(List<Endpoint> endpoints) {
+    this.endpoints = endpoints;
+  }
 }

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

@@ -1,7 +1,6 @@
 package net.chrisrichardson.eventstore.javaexamples.banking.apigateway;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import io.eventuate.javaclient.spring.httpstomp.EventuateHttpStompClientConfiguration;
 import net.chrisrichardson.eventstore.javaexamples.banking.commonauth.AuthConfiguration;
 import org.apache.http.client.HttpClient;
 import org.apache.http.impl.client.HttpClients;
@@ -27,24 +26,24 @@ import java.util.Collections;
 @Configuration
 @ComponentScan
 @EnableAutoConfiguration
-@Import({EventuateHttpStompClientConfiguration.class, AuthConfiguration.class})
+@Import({AuthConfiguration.class})
 @EnableConfigurationProperties({ApiGatewayProperties.class})
 public class ApiGatewayServiceConfiguration extends WebMvcConfigurerAdapter {
 
-    @Bean
+  @Bean
-    public RestTemplate restTemplate(HttpMessageConverters converters) {
+  public RestTemplate restTemplate(HttpMessageConverters converters) {
 
-        // we have to define Apache HTTP client to use the PATCH verb
+    // we have to define Apache HTTP client to use the PATCH verb
-        MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter();
+    MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter();
-        converter.setSupportedMediaTypes(MediaType.parseMediaTypes("application/json"));
+    converter.setSupportedMediaTypes(MediaType.parseMediaTypes("application/json"));
-        converter.setObjectMapper(new ObjectMapper());
+    converter.setObjectMapper(new ObjectMapper());
 
-        HttpClient httpClient = HttpClients.createDefault();
+    HttpClient httpClient = HttpClients.createDefault();
-        RestTemplate restTemplate = new RestTemplate(Collections.<HttpMessageConverter<?>>singletonList(converter));
+    RestTemplate restTemplate = new RestTemplate(Collections.<HttpMessageConverter<?>>singletonList(converter));
-        restTemplate.setRequestFactory(new HttpComponentsClientHttpRequestFactory(httpClient));
+    restTemplate.setRequestFactory(new HttpComponentsClientHttpRequestFactory(httpClient));
 
-        restTemplate.setErrorHandler(new RestTemplateErrorHandler());
+    restTemplate.setErrorHandler(new RestTemplateErrorHandler());
 
-        return restTemplate;
+    return restTemplate;
-    }
+  }
 }

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

@@ -10,15 +10,15 @@ import java.io.IOException;
 
 public class RestTemplateErrorHandler implements ResponseErrorHandler {
 
-    private static final Logger log = LoggerFactory.getLogger(RestTemplateErrorHandler.class);
+  private static final Logger log = LoggerFactory.getLogger(RestTemplateErrorHandler.class);
 
-    @Override
+  @Override
-    public void handleError(ClientHttpResponse response) throws IOException {
+  public void handleError(ClientHttpResponse response) throws IOException {
-        log.error("Response error: {} {}", response.getStatusCode(), response.getStatusText());
+    log.error("Response error: {} {}", response.getStatusCode(), response.getStatusText());
-    }
+  }
 
-    @Override
+  @Override
-    public boolean hasError(ClientHttpResponse response) throws IOException {
+  public boolean hasError(ClientHttpResponse response) throws IOException {
-        return RestUtil.isError(response.getStatusCode());
+    return RestUtil.isError(response.getStatusCode());
-    }
+  }
 }

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

@@ -7,9 +7,9 @@ import org.springframework.http.HttpStatus;
  */
 public class RestUtil {
 
-    public static boolean isError(HttpStatus status) {
+  public static boolean isError(HttpStatus status) {
-        HttpStatus.Series series = status.series();
+    HttpStatus.Series series = status.series();
-        return (HttpStatus.Series.CLIENT_ERROR.equals(series)
+    return (HttpStatus.Series.CLIENT_ERROR.equals(series)
-                || HttpStatus.Series.SERVER_ERROR.equals(series));
+            || HttpStatus.Series.SERVER_ERROR.equals(series));
-    }
+  }
 }

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

@@ -25,7 +25,8 @@ import java.io.InputStreamReader;
 import java.net.URISyntaxException;
 import java.util.stream.Collectors;
 
-import static org.springframework.web.bind.annotation.RequestMethod.*;
+import static org.springframework.web.bind.annotation.RequestMethod.GET;
+import static org.springframework.web.bind.annotation.RequestMethod.POST;
 
 /**
  * Created by popikyardo on 15.01.16.
@@ -33,43 +34,43 @@ import static org.springframework.web.bind.annotation.RequestMethod.*;
 @RestController
 public class GatewayController {
 
-    Logger log = LoggerFactory.getLogger(this.getClass());
+  Logger log = LoggerFactory.getLogger(this.getClass());
 
-    @Autowired
+  @Autowired
-    private ApiGatewayProperties apiGatewayProperties;
+  private ApiGatewayProperties apiGatewayProperties;
 
-    private HttpClient httpClient;
+  private HttpClient httpClient;
 
-    @PostConstruct
+  @PostConstruct
-    public void init() {
+  public void init() {
-        PoolingHttpClientConnectionManager cm = new PoolingHttpClientConnectionManager();
+    PoolingHttpClientConnectionManager cm = new PoolingHttpClientConnectionManager();
 
-        httpClient = HttpClients.custom()
+    httpClient = HttpClients.custom()
-                .setConnectionManager(cm)
+            .setConnectionManager(cm)
-                .build();
+            .build();
-    }
+  }
-
+
-    @RequestMapping(value = "/**", method = {GET, POST})
+  @RequestMapping(value = "/**", method = {GET, POST})
-    public String proxyRequest(HttpServletRequest request) throws NoSuchRequestHandlingMethodException, IOException, URISyntaxException {
+  public String proxyRequest(HttpServletRequest request) throws NoSuchRequestHandlingMethodException, IOException, URISyntaxException {
-        HttpUriRequest proxiedRequest = createHttpUriRequest(request);
+    HttpUriRequest proxiedRequest = createHttpUriRequest(request);
-        log.info("request: {}", proxiedRequest);
+    log.info("request: {}", proxiedRequest);
-        HttpResponse proxiedResponse = httpClient.execute(proxiedRequest);
+    HttpResponse proxiedResponse = httpClient.execute(proxiedRequest);
-        return read(proxiedResponse.getEntity().getContent());
+    return read(proxiedResponse.getEntity().getContent());
-    }
+  }
-
+
-    private HttpUriRequest createHttpUriRequest(HttpServletRequest request) throws URISyntaxException, NoSuchRequestHandlingMethodException, IOException {
+  private HttpUriRequest createHttpUriRequest(HttpServletRequest request) throws URISyntaxException, NoSuchRequestHandlingMethodException, IOException {
-        URLRequestTransformer urlRequestTransformer = new URLRequestTransformer(apiGatewayProperties);
+    URLRequestTransformer urlRequestTransformer = new URLRequestTransformer(apiGatewayProperties);
-        ContentRequestTransformer contentRequestTransformer = new ContentRequestTransformer();
+    ContentRequestTransformer contentRequestTransformer = new ContentRequestTransformer();
-        HeadersRequestTransformer headersRequestTransformer = new HeadersRequestTransformer();
+    HeadersRequestTransformer headersRequestTransformer = new HeadersRequestTransformer();
-        headersRequestTransformer.setPredecessor(contentRequestTransformer);
+    headersRequestTransformer.setPredecessor(contentRequestTransformer);
-        contentRequestTransformer.setPredecessor(urlRequestTransformer);
+    contentRequestTransformer.setPredecessor(urlRequestTransformer);
-
+
-        return headersRequestTransformer.transform(request).build();
+    return headersRequestTransformer.transform(request).build();
-    }
+  }
-
+
-    private String read(InputStream input) throws IOException {
+  private String read(InputStream input) throws IOException {
-        try (BufferedReader buffer = new BufferedReader(new InputStreamReader(input))) {
+    try (BufferedReader buffer = new BufferedReader(new InputStreamReader(input))) {
-            return buffer.lines().collect(Collectors.joining("\n"));
+      return buffer.lines().collect(Collectors.joining("\n"));
-        }
     }
+  }
 }

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

@@ -7,7 +7,7 @@ import org.springframework.boot.SpringApplication;
  * Created by Main on 19.01.2016.
  */
 public class ApiGatewayServiceMain {
-    public static void main(String[] args) {
+  public static void main(String[] args) {
-        SpringApplication.run(ApiGatewayServiceConfiguration.class, args);
+    SpringApplication.run(ApiGatewayServiceConfiguration.class, args);
-    }
+  }
 }

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

@@ -15,16 +15,16 @@ import java.util.stream.Collectors;
  */
 public class ContentRequestTransformer extends ProxyRequestTransformer {
 
-    @Override
+  @Override
-    public RequestBuilder transform(HttpServletRequest request) throws NoSuchRequestHandlingMethodException, URISyntaxException, IOException {
+  public RequestBuilder transform(HttpServletRequest request) throws NoSuchRequestHandlingMethodException, URISyntaxException, IOException {
-        RequestBuilder requestBuilder = predecessor.transform(request);
+    RequestBuilder requestBuilder = predecessor.transform(request);
 
-        String requestContent = request.getReader().lines().collect(Collectors.joining(""));
+    String requestContent = request.getReader().lines().collect(Collectors.joining(""));
-        if(!requestContent.isEmpty()) {
+    if (!requestContent.isEmpty()) {
-            StringEntity entity = new StringEntity(requestContent, ContentType.APPLICATION_JSON);
+      StringEntity entity = new StringEntity(requestContent, ContentType.APPLICATION_JSON);
-            requestBuilder.setEntity(entity);
+      requestBuilder.setEntity(entity);
-        }
-
-        return requestBuilder;
     }
+
+    return requestBuilder;
+  }
 }

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

@@ -13,20 +13,19 @@ import java.util.Enumeration;
  */
 public class HeadersRequestTransformer extends ProxyRequestTransformer {
 
+  @Override
+  public RequestBuilder transform(HttpServletRequest request) throws NoSuchRequestHandlingMethodException, URISyntaxException, IOException {
+    RequestBuilder requestBuilder = predecessor.transform(request);
 
-    @Override
+    Enumeration<String> headerNames = request.getHeaderNames();
-    public RequestBuilder transform(HttpServletRequest request) throws NoSuchRequestHandlingMethodException, URISyntaxException, IOException {
+    while (headerNames.hasMoreElements()) {
-        RequestBuilder requestBuilder = predecessor.transform(request);
+      String headerName = headerNames.nextElement();
-
+      String headerValue = request.getHeader(headerName);
-        Enumeration<String> headerNames = request.getHeaderNames();
+      if (headerName.equals("x-access-token")) {
-        while (headerNames.hasMoreElements()) {
+        requestBuilder.addHeader(headerName, headerValue);
-            String headerName = headerNames.nextElement();
+      }
-            String headerValue = request.getHeader(headerName);
-            if(headerName.equals("x-access-token")) {
-                requestBuilder.addHeader(headerName, headerValue);
-            }
-        }
-
-        return requestBuilder;
     }
+
+    return requestBuilder;
+  }
 }

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

@@ -12,11 +12,11 @@ import java.net.URISyntaxException;
  */
 public abstract class ProxyRequestTransformer {
 
-    protected ProxyRequestTransformer predecessor;
+  protected ProxyRequestTransformer predecessor;
 
-    public abstract RequestBuilder transform(HttpServletRequest request) throws NoSuchRequestHandlingMethodException, URISyntaxException, IOException;
+  public abstract RequestBuilder transform(HttpServletRequest request) throws NoSuchRequestHandlingMethodException, URISyntaxException, IOException;
 
-    public void setPredecessor(ProxyRequestTransformer transformer) {
+  public void setPredecessor(ProxyRequestTransformer transformer) {
-        this.predecessor = transformer;
+    this.predecessor = transformer;
-    };
+  }
 }

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

@@ -14,35 +14,35 @@ import java.net.URISyntaxException;
  */
 public class URLRequestTransformer extends ProxyRequestTransformer {
 
-    private ApiGatewayProperties apiGatewayProperties;
+  private ApiGatewayProperties apiGatewayProperties;
 
-    public URLRequestTransformer(ApiGatewayProperties apiGatewayProperties) {
+  public URLRequestTransformer(ApiGatewayProperties apiGatewayProperties) {
-        this.apiGatewayProperties = apiGatewayProperties;
+    this.apiGatewayProperties = apiGatewayProperties;
+  }
+
+  @Override
+  public RequestBuilder transform(HttpServletRequest request) throws NoSuchRequestHandlingMethodException, URISyntaxException {
+    String requestURI = request.getRequestURI();
+    URI uri;
+    if (request.getQueryString() != null && !request.getQueryString().isEmpty()) {
+      uri = new URI(getServiceUrl(requestURI, request) + "?" + request.getQueryString());
+    } else {
+      uri = new URI(getServiceUrl(requestURI, request));
     }
 
-    @Override
+    RequestBuilder rb = RequestBuilder.create(request.getMethod());
-    public RequestBuilder transform(HttpServletRequest request) throws NoSuchRequestHandlingMethodException, URISyntaxException {
+    rb.setUri(uri);
-        String requestURI = request.getRequestURI();
+    return rb;
-        URI uri;
+  }
-        if (request.getQueryString() != null && !request.getQueryString().isEmpty()) {
-            uri = new URI(getServiceUrl(requestURI, request) + "?" + request.getQueryString());
-        } else {
-            uri = new URI(getServiceUrl(requestURI, request));
-        }
 
-        RequestBuilder rb = RequestBuilder.create(request.getMethod());
+  private String getServiceUrl(String requestURI, HttpServletRequest httpServletRequest) throws NoSuchRequestHandlingMethodException {
-        rb.setUri(uri);
-        return rb;
-    }
 
-    private String getServiceUrl(String requestURI, HttpServletRequest httpServletRequest) throws NoSuchRequestHandlingMethodException {
+    ApiGatewayProperties.Endpoint endpoint =
-
+            apiGatewayProperties.getEndpoints().stream()
-        ApiGatewayProperties.Endpoint endpoint =
+                    .filter(e ->
-                apiGatewayProperties.getEndpoints().stream()
+                                    requestURI.matches(e.getPath()) && e.getMethod() == RequestMethod.valueOf(httpServletRequest.getMethod())
-                        .filter(e ->
+                    )
-                                        requestURI.matches(e.getPath()) && e.getMethod() == RequestMethod.valueOf(httpServletRequest.getMethod())
+                    .findFirst().orElseThrow(() -> new NoSuchRequestHandlingMethodException(httpServletRequest));
-                        )
+    return endpoint.getLocation() + requestURI;
-                        .findFirst().orElseThrow(() -> new NoSuchRequestHandlingMethodException(httpServletRequest));
+  }
-        return endpoint.getLocation() + requestURI;
-    }
 }

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

@@ -7,7 +7,7 @@ dependencies {
     testCompile project(":accounts-query-side-backend")
     testCompile project(":customers-command-side-backend")
     testCompile project(":customers-query-side-backend")
-    testCompile project(":testutil-customers")
+    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/backend-integration-tests/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/MoneyTransferIntegrationTest.java

@@ -23,7 +23,7 @@ import static net.chrisrichardson.eventstorestore.javaexamples.testutil.TestUtil
 
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes=BankingTestConfiguration.class)
+@SpringApplicationConfiguration(classes = BankingTestConfiguration.class)
 @IntegrationTest
 public class MoneyTransferIntegrationTest {
 
@@ -35,11 +35,11 @@ public class MoneyTransferIntegrationTest {
 
   @Autowired
   private EventuateAggregateStore eventStore;
-  
+
 
   @Test
   public void shouldTransferMoney() {
-    final EntityWithIdAndVersion<Account> fromAccount= await(accountService.openAccount("00000000-00000000", "My Account", new BigDecimal(150), ""));
+    final EntityWithIdAndVersion<Account> fromAccount = await(accountService.openAccount("00000000-00000000", "My Account", new BigDecimal(150), ""));
 
     final EntityWithIdAndVersion<Account> toAccount = await(accountService.openAccount("00000000-00000000", "My Account", new BigDecimal(300), ""));
 
@@ -49,22 +49,22 @@ public class MoneyTransferIntegrationTest {
                     new BigDecimal(80))));
 
 
-    eventually (
+    eventually(
             () -> eventStore.find(Account.class, fromAccount.getEntityId()),
             account -> Assert.assertEquals(new BigDecimal(70), account.getEntity().getBalance()));
 
-    eventually (
+    eventually(
             () -> eventStore.find(Account.class, toAccount.getEntityId()),
             account -> Assert.assertEquals(new BigDecimal(380), account.getEntity().getBalance()));
 
-    eventually (
+    eventually(
             () -> eventStore.find(MoneyTransfer.class, transaction.getEntityId()),
             updatedTransaction -> Assert.assertEquals(TransferState.COMPLETED, updatedTransaction.getEntity().getState()));
   }
 
   @Test
   public void shouldFailDueToInsufficientFunds() {
-    final EntityWithIdAndVersion<Account> fromAccount= await(accountService.openAccount("00000000-00000000", "My Account",  new BigDecimal(150), ""));
+    final EntityWithIdAndVersion<Account> fromAccount = await(accountService.openAccount("00000000-00000000", "My Account", new BigDecimal(150), ""));
 
     final EntityWithIdAndVersion<Account> toAccount = await(accountService.openAccount("00000000-00000000", "My Account", new BigDecimal(300), ""));
 
@@ -74,15 +74,15 @@ public class MoneyTransferIntegrationTest {
                     new BigDecimal(200))));
 
 
-    eventually (
+    eventually(
             () -> eventStore.find(MoneyTransfer.class, transaction.getEntityId()),
             updatedTransaction -> Assert.assertEquals(TransferState.FAILED_DUE_TO_INSUFFICIENT_FUNDS, updatedTransaction.getEntity().getState()));
 
-    eventually (
+    eventually(
             () -> eventStore.find(Account.class, fromAccount.getEntityId()),
             account -> Assert.assertEquals(new BigDecimal(150), account.getEntity().getBalance()));
 
-    eventually (
+    eventually(
             () -> eventStore.find(Account.class, toAccount.getEntityId()),
             account -> Assert.assertEquals(new BigDecimal(300), account.getEntity().getBalance()));
 

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

@@ -1,7 +1,6 @@
 package net.chrisrichardson.eventstore.javaexamples.banking.backend.queryside.accounts;
 
 import io.eventuate.EntityWithIdAndVersion;
-import io.eventuate.EntityWithMetadata;
 import io.eventuate.EventuateAggregateStore;
 import net.chrisrichardson.eventstore.javaexamples.banking.backend.commandside.accounts.Account;
 import net.chrisrichardson.eventstore.javaexamples.banking.backend.commandside.accounts.AccountService;
@@ -9,8 +8,6 @@ import net.chrisrichardson.eventstore.javaexamples.banking.backend.commandside.t
 import net.chrisrichardson.eventstore.javaexamples.banking.backend.commandside.transactions.MoneyTransferService;
 import net.chrisrichardson.eventstore.javaexamples.banking.backend.commandside.transactions.TransferState;
 import net.chrisrichardson.eventstore.javaexamples.banking.backend.common.transactions.TransferDetails;
-import net.chrisrichardson.eventstorestore.javaexamples.testutil.Producer;
-import net.chrisrichardson.eventstorestore.javaexamples.testutil.Verifier;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -18,7 +15,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.IntegrationTest;
 import org.springframework.boot.test.SpringApplicationConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import rx.Observable;
 
 import java.math.BigDecimal;
 
@@ -60,9 +56,9 @@ public class AccountQuerySideIntegrationTest {
 
     eventually(
             () -> accountQueryService.findByAccountId(fromAccount.getEntityId()),
-            accountInfo -> Assert.assertEquals(70*100, accountInfo.getBalance()));
+            accountInfo -> Assert.assertEquals(70 * 100, accountInfo.getBalance()));
     eventually(
             () -> accountQueryService.findByAccountId(toAccount.getEntityId()),
-            accountInfo -> Assert.assertEquals(380*100, accountInfo.getBalance()));
+            accountInfo -> Assert.assertEquals(380 * 100, accountInfo.getBalance()));
   }
 }

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

@@ -19,10 +19,10 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 import java.util.concurrent.CompletableFuture;
 
+import static net.chrisrichardson.eventstorestore.javaexamples.testutil.CustomersTestUtils.generateCustomerInfo;
+import static net.chrisrichardson.eventstorestore.javaexamples.testutil.CustomersTestUtils.generateToAccountInfo;
 import static net.chrisrichardson.eventstorestore.javaexamples.testutil.TestUtil.await;
 import static net.chrisrichardson.eventstorestore.javaexamples.testutil.TestUtil.eventually;
-import static net.chrisrichardson.eventstorestore.javaexamples.testutil.customers.CustomersTestUtils.generateCustomerInfo;
-import static net.chrisrichardson.eventstorestore.javaexamples.testutil.customers.CustomersTestUtils.generateToAccountInfo;
 
 /**
  * Created by Main on 10.02.2016.
@@ -32,43 +32,43 @@ import static net.chrisrichardson.eventstorestore.javaexamples.testutil.customer
 @IntegrationTest
 public class CustomerQuerySideIntegrationTest {
 
-    @Autowired
+  @Autowired
-    private CustomerService customerService;
+  private CustomerService customerService;
 
-    @Autowired
+  @Autowired
-    private CustomerQueryService customerQueryService;
+  private CustomerQueryService customerQueryService;
 
-    @Autowired
+  @Autowired
   private EventuateAggregateStore eventStore;
 
-    @Test
+  @Test
-    public void shouldCreateCustomerAndAddToAccount() throws Exception {
+  public void shouldCreateCustomerAndAddToAccount() throws Exception {
-        CustomerInfo customerInfo = generateCustomerInfo();
+    CustomerInfo customerInfo = generateCustomerInfo();
-        EntityWithIdAndVersion<Customer> customer = await(customerService.createCustomer(customerInfo));
+    EntityWithIdAndVersion<Customer> customer = await(customerService.createCustomer(customerInfo));
 
-        ToAccountInfo toAccountInfo = generateToAccountInfo();
+    ToAccountInfo toAccountInfo = generateToAccountInfo();
-        EntityWithIdAndVersion<Customer> customerWithNewAccount = await(customerService.addToAccount(customer.getEntityId(), toAccountInfo));
+    EntityWithIdAndVersion<Customer> customerWithNewAccount = await(customerService.addToAccount(customer.getEntityId(), toAccountInfo));
 
-        eventually(
+    eventually(
-                new Producer<QuerySideCustomer>() {
+            new Producer<QuerySideCustomer>() {
-                    @Override
+              @Override
-                    public CompletableFuture<QuerySideCustomer> produce() {
+              public CompletableFuture<QuerySideCustomer> produce() {
-                        return customerQueryService.findByCustomerId(customer.getEntityId());
+                return customerQueryService.findByCustomerId(customer.getEntityId());
-                    }
+              }
-                },
+            },
-                new Verifier<QuerySideCustomer>() {
+            new Verifier<QuerySideCustomer>() {
-                    @Override
+              @Override
-                    public void verify(QuerySideCustomer querySideCustomer) {
+              public void verify(QuerySideCustomer querySideCustomer) {
-                        Assert.assertEquals(customerInfo.getName(), querySideCustomer.getName());
+                Assert.assertEquals(customerInfo.getName(), querySideCustomer.getName());
-                        Assert.assertEquals(customerInfo.getSsn(), querySideCustomer.getSsn());
+                Assert.assertEquals(customerInfo.getSsn(), querySideCustomer.getSsn());
-                        Assert.assertEquals(customerInfo.getEmail(), querySideCustomer.getEmail());
+                Assert.assertEquals(customerInfo.getEmail(), querySideCustomer.getEmail());
-                        Assert.assertEquals(customerInfo.getPhoneNumber(), querySideCustomer.getPhoneNumber());
+                Assert.assertEquals(customerInfo.getPhoneNumber(), querySideCustomer.getPhoneNumber());
-                        Assert.assertEquals(customerInfo.getAddress(), querySideCustomer.getAddress());
+                Assert.assertEquals(customerInfo.getAddress(), querySideCustomer.getAddress());
 
-                        Assert.assertNotNull(querySideCustomer.getToAccounts());
+                Assert.assertNotNull(querySideCustomer.getToAccounts());
-                        Assert.assertFalse(querySideCustomer.getToAccounts().isEmpty());
+                Assert.assertFalse(querySideCustomer.getToAccounts().isEmpty());
-                        Assert.assertEquals(querySideCustomer.getToAccounts().get("11111111-11111111"), toAccountInfo);
+                Assert.assertEquals(querySideCustomer.getToAccounts().get("11111111-11111111"), toAccountInfo);
-                    }
+              }
-                });
+            });
-    }
+  }
 }

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

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

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

@@ -30,35 +30,35 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @Validated
 public class AuthController {
 
-    @Autowired
+  @Autowired
-    private TokenService tokenService;
+  private TokenService tokenService;
 
-    @Autowired
+  @Autowired
-    private CustomerAuthService customerAuthService;
+  private CustomerAuthService customerAuthService;
 
-    private static ObjectMapper objectMapper = new ObjectMapper();
+  private static ObjectMapper objectMapper = new ObjectMapper();
 
-    @RequestMapping(value = "/login", method = POST)
+  @RequestMapping(value = "/login", method = POST)
-    public ResponseEntity<QuerySideCustomer> doAuth(@RequestBody @Valid AuthRequest request) throws IOException {
+  public ResponseEntity<QuerySideCustomer> doAuth(@RequestBody @Valid AuthRequest request) throws IOException {
-        QuerySideCustomer customer = customerAuthService.findByEmail(request.getEmail());
+    QuerySideCustomer customer = customerAuthService.findByEmail(request.getEmail());
 
-        Token token = tokenService.allocateToken(objectMapper.writeValueAsString(new User(request.getEmail())));
+    Token token = tokenService.allocateToken(objectMapper.writeValueAsString(new User(request.getEmail())));
-        return ResponseEntity.status(HttpStatus.OK).header("access-token", token.getKey())
+    return ResponseEntity.status(HttpStatus.OK).header("access-token", token.getKey())
-                .body(customer);
+            .body(customer);
-    }
+  }
 
-    @ResponseStatus(value = HttpStatus.NOT_FOUND)
+  @ResponseStatus(value = HttpStatus.NOT_FOUND)
-    @ExceptionHandler(IncorrectResultSizeDataAccessException.class)
+  @ExceptionHandler(IncorrectResultSizeDataAccessException.class)
-    public ErrorResponse customersNotFound() {
+  public ErrorResponse customersNotFound() {
-        return new ErrorResponse("Customer not found");
+    return new ErrorResponse("Customer not found");
-    }
+  }
 
-    @RequestMapping(value = "/user", method = GET)
+  @RequestMapping(value = "/user", method = GET)
-    public ResponseEntity<QuerySideCustomer> getCurrentUser() {
+  public ResponseEntity<QuerySideCustomer> getCurrentUser() {
-        Authentication auth = SecurityContextHolder.getContext().getAuthentication();
+    Authentication auth = SecurityContextHolder.getContext().getAuthentication();
 
-        return ResponseEntity.status(HttpStatus.OK).body(customerAuthService.findByEmail(auth.getName()));
+    return ResponseEntity.status(HttpStatus.OK).body(customerAuthService.findByEmail(auth.getName()));
-    }
+  }
 
 
 }

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

@@ -8,22 +8,22 @@ import org.hibernate.validator.constraints.NotBlank;
  */
 public class AuthRequest {
 
-    @NotBlank
+  @NotBlank
-    @Email
+  @Email
-    private String email;
+  private String email;
 
-    public AuthRequest() {
+  public AuthRequest() {
-    }
+  }
 
-    public AuthRequest(String email) {
+  public AuthRequest(String email) {
-        this.email = email;
+    this.email = email;
-    }
+  }
 
-    public String getEmail() {
+  public String getEmail() {
-        return email;
+    return email;
-    }
+  }
 
-    public void setEmail(String email) {
+  public void setEmail(String email) {
-        this.email = email;
+    this.email = email;
-    }
+  }
 }

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

@@ -5,20 +5,20 @@ package net.chrisrichardson.eventstore.javaexamples.banking.commonauth.model;
  */
 public class ErrorResponse {
 
-    private String message;
+  private String message;
 
-    public ErrorResponse() {
+  public ErrorResponse() {
-    }
+  }
 
-    public ErrorResponse(String message) {
+  public ErrorResponse(String message) {
-        this.message = message;
+    this.message = message;
-    }
+  }
 
-    public String getMessage() {
+  public String getMessage() {
-        return message;
+    return message;
-    }
+  }
 
-    public void setMessage(String message) {
+  public void setMessage(String message) {
-        this.message = message;
+    this.message = message;
-    }
+  }
 }

java-spring/common-auth/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'java'
 
 dependencies {
-    compile project(":common-customers")
+    compile project(":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

@@ -32,66 +32,66 @@ import java.security.SecureRandom;
 @EnableConfigurationProperties({AuthProperties.class})
 public class AuthConfiguration extends WebSecurityConfigurerAdapter {
 
-    @Autowired
+  @Autowired
-    private AuthProperties securityProperties;
+  private AuthProperties securityProperties;
 
-    @Autowired
+  @Autowired
-    private TokenAuthenticationService tokenAuthenticationService;
+  private TokenAuthenticationService tokenAuthenticationService;
 
-    @Autowired
+  @Autowired
-    CustomerAuthService customerAuthService;
+  CustomerAuthService customerAuthService;
 
-    @Override
+  @Override
-    protected void configure(AuthenticationManagerBuilder auth) throws Exception {
+  protected void configure(AuthenticationManagerBuilder auth) throws Exception {
-        //auth.inMemoryAuthentication();
+    //auth.inMemoryAuthentication();
-        auth.userDetailsService(userDetailsServiceBean());
+    auth.userDetailsService(userDetailsServiceBean());
-    }
+  }
 
-    @Override
+  @Override
-    public UserDetailsService userDetailsServiceBean() {
+  public UserDetailsService userDetailsServiceBean() {
-        return email -> {
+    return email -> {
 /*            QuerySideCustomer customer = customerAuthService.findByEmail(email);
             if (customer != null) {
                 return new User(email);
             } else {
                 throw new UsernameNotFoundException(String.format("could not find the customer '%s'", email));
             }*/
-            //authorize everyone with basic authentication
+      //authorize everyone with basic authentication
-            return  new User(email, "", true, true, true, true,
+      return new User(email, "", true, true, true, true,
-                    AuthorityUtils.createAuthorityList("USER"));
+              AuthorityUtils.createAuthorityList("USER"));
     };
-    }
+  }
 
-    @Bean
+  @Bean
-    public CustomerAuthService customerAuthService(CustomerAuthRepository customerAuthRepository) {
+  public CustomerAuthService customerAuthService(CustomerAuthRepository customerAuthRepository) {
-        return new CustomerAuthService(customerAuthRepository);
+    return new CustomerAuthService(customerAuthRepository);
-    }
+  }
 
-    @Bean
+  @Bean
-    @Override
+  @Override
-    public AuthenticationManager authenticationManagerBean() throws Exception {
+  public AuthenticationManager authenticationManagerBean() throws Exception {
-        return super.authenticationManagerBean();
+    return super.authenticationManagerBean();
-    }
+  }
 
-    @Override
+  @Override
-    protected void configure(HttpSecurity http) throws Exception {
+  protected void configure(HttpSecurity http) throws Exception {
-        http.csrf().disable()
+    http.csrf().disable()
-                .httpBasic().and()
+            .httpBasic().and()
-                .authorizeRequests()
+            .authorizeRequests()
-                .antMatchers("/index.html", "/", "/**.js", "/**.css").permitAll()
+            .antMatchers("/index.html", "/", "/**.js", "/**.css").permitAll()
-                .antMatchers("/swagger-ui.html", "/v2/api-docs").permitAll()
+            .antMatchers("/swagger-ui.html", "/v2/api-docs").permitAll()
-                .antMatchers(HttpMethod.POST, "/customers", "/login").permitAll()
+            .antMatchers(HttpMethod.POST, "/customers", "/login").permitAll()
-                .anyRequest().authenticated().and()
+            .anyRequest().authenticated().and()
-                .addFilterAfter(new StatelessAuthenticationFilter(tokenAuthenticationService), BasicAuthenticationFilter.class);
+            .addFilterAfter(new StatelessAuthenticationFilter(tokenAuthenticationService), BasicAuthenticationFilter.class);
-    }
+  }
 
-    @Bean
+  @Bean
-    public TokenService tokenService() {
+  public TokenService tokenService() {
-        KeyBasedPersistenceTokenService res = new KeyBasedPersistenceTokenService();
+    KeyBasedPersistenceTokenService res = new KeyBasedPersistenceTokenService();
-        res.setSecureRandom(new SecureRandom());
+    res.setSecureRandom(new SecureRandom());
-        res.setServerSecret(securityProperties.getServerSecret());
+    res.setServerSecret(securityProperties.getServerSecret());
-        res.setServerInteger(securityProperties.getServerInteger());
+    res.setServerInteger(securityProperties.getServerInteger());
 
-        return res;
+    return res;
-    }
+  }
 }

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

@@ -7,22 +7,22 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
  */
 @ConfigurationProperties(locations = "classpath:auth.properties", ignoreUnknownFields = false, prefix = "auth")
 public class AuthProperties {
-    private String serverSecret;
+  private String serverSecret;
-    private Integer serverInteger;
+  private Integer serverInteger;
 
-    public String getServerSecret() {
+  public String getServerSecret() {
-        return serverSecret;
+    return serverSecret;
-    }
+  }
 
-    public void setServerSecret(String serverSecret) {
+  public void setServerSecret(String serverSecret) {
-        this.serverSecret = serverSecret;
+    this.serverSecret = serverSecret;
-    }
+  }
 
-    public Integer getServerInteger() {
+  public Integer getServerInteger() {
-        return serverInteger;
+    return serverInteger;
-    }
+  }
 
-    public void setServerInteger(Integer serverInteger) {
+  public void setServerInteger(Integer serverInteger) {
-        this.serverInteger = serverInteger;
+    this.serverInteger = serverInteger;
-    }
+  }
 }

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

@@ -7,5 +7,5 @@ import java.util.List;
 
 interface CustomerAuthRepository extends MongoRepository<QuerySideCustomer, String> {
 
-    List<QuerySideCustomer> findByEmail(String email);
+  List<QuerySideCustomer> findByEmail(String email);
-}
+}

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

@@ -2,7 +2,6 @@ package net.chrisrichardson.eventstore.javaexamples.banking.commonauth;
 
 import net.chrisrichardson.eventstore.javaexamples.banking.common.customers.QuerySideCustomer;
 import org.springframework.dao.EmptyResultDataAccessException;
-import org.springframework.dao.IncorrectResultSizeDataAccessException;
 
 import java.util.List;
 
@@ -10,20 +9,20 @@ import java.util.List;
  * Created by Main on 15.02.2016.
  */
 public class CustomerAuthService {
-    private CustomerAuthRepository customerAuthRepository;
+  private CustomerAuthRepository customerAuthRepository;
 
-    public CustomerAuthService(CustomerAuthRepository customerAuthRepository) {
+  public CustomerAuthService(CustomerAuthRepository customerAuthRepository) {
-        this.customerAuthRepository = customerAuthRepository;
+    this.customerAuthRepository = customerAuthRepository;
-    }
+  }
 
-    public QuerySideCustomer findByEmail(String email){
+  public QuerySideCustomer findByEmail(String email) {
-        List<QuerySideCustomer> customers = customerAuthRepository.findByEmail(email);
+    List<QuerySideCustomer> customers = customerAuthRepository.findByEmail(email);
-        if (customers.isEmpty())
+    if (customers.isEmpty())
-            throw new EmptyResultDataAccessException(1);
+      throw new EmptyResultDataAccessException(1);
-        //TODO: add unique email constraint
+      //TODO: add unique email constraint
 /*        else if(customers.size()>1)
             throw new IncorrectResultSizeDataAccessException(1, customers.size());*/
-        else
+    else
-            return customers.get(0);
+      return customers.get(0);
-    }
+  }
 }

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

@@ -18,26 +18,26 @@ import java.io.IOException;
 @Service
 public class TokenAuthenticationService {
 
-    @Autowired
+  @Autowired
-    private TokenService tokenService;
+  private TokenService tokenService;
 
-    private static final String AUTH_HEADER_NAME = "access-token";
+  private static final String AUTH_HEADER_NAME = "access-token";
-    private static final long DAY = 1000 * 60 * 60 * 24;
+  private static final long DAY = 1000 * 60 * 60 * 24;
 
-    private ObjectMapper mapper = new ObjectMapper();
+  private ObjectMapper mapper = new ObjectMapper();
 
-    public Authentication getAuthentication(HttpServletRequest request) throws IOException {
+  public Authentication getAuthentication(HttpServletRequest request) throws IOException {
-        final String tokenString = request.getHeader(AUTH_HEADER_NAME);
+    final String tokenString = request.getHeader(AUTH_HEADER_NAME);
 
-        if (tokenString != null) {
+    if (tokenString != null) {
-            Token token = tokenService.verifyToken(tokenString);
+      Token token = tokenService.verifyToken(tokenString);
-            final User user = mapper.readValue(token.getExtendedInformation(), User.class);
+      final User user = mapper.readValue(token.getExtendedInformation(), User.class);
 
-            if (user != null && (System.currentTimeMillis() - token.getKeyCreationTime()) < DAY) {
+      if (user != null && (System.currentTimeMillis() - token.getKeyCreationTime()) < DAY) {
-                return new UserAuthentication(user);
+        return new UserAuthentication(user);
-            }
+      }
-        }
-        return null;
     }
+    return null;
+  }
 
 }

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

@@ -16,18 +16,18 @@ import java.io.IOException;
  */
 public class StatelessAuthenticationFilter extends GenericFilterBean {
 
-    private final TokenAuthenticationService tokenAuthenticationService;
+  private final TokenAuthenticationService tokenAuthenticationService;
 
-    public StatelessAuthenticationFilter(TokenAuthenticationService taService) {
+  public StatelessAuthenticationFilter(TokenAuthenticationService taService) {
-        this.tokenAuthenticationService = taService;
+    this.tokenAuthenticationService = taService;
-    }
+  }
 
-    @Override
+  @Override
-    public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain) throws IOException, ServletException {
+  public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain) throws IOException, ServletException {
-        if (SecurityContextHolder.getContext().getAuthentication()==null) {
+    if (SecurityContextHolder.getContext().getAuthentication() == null) {
-            SecurityContextHolder.getContext().setAuthentication(
+      SecurityContextHolder.getContext().setAuthentication(
-                    tokenAuthenticationService.getAuthentication((HttpServletRequest) req));
+              tokenAuthenticationService.getAuthentication((HttpServletRequest) req));
-        }
-        chain.doFilter(req, res);
     }
+    chain.doFilter(req, res);
+  }
 }

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

@@ -16,63 +16,63 @@ import java.util.Set;
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class User implements UserDetails {
 
-    private String email;
+  private String email;
 
-    public User() {
+  public User() {
-    }
+  }
 
-    public User(String email) {
+  public User(String email) {
-        this.email = email;
+    this.email = email;
-    }
+  }
 
-    public void setUsername(String username) {
+  public void setUsername(String username) {
-        this.email = username;
+    this.email = username;
-    }
+  }
 
-    @Override
+  @Override
-    @JsonIgnore
+  @JsonIgnore
-    public Collection<? extends GrantedAuthority> getAuthorities() {
+  public Collection<? extends GrantedAuthority> getAuthorities() {
-        SimpleGrantedAuthority authority = new SimpleGrantedAuthority("USER");
+    SimpleGrantedAuthority authority = new SimpleGrantedAuthority("USER");
-        Set<GrantedAuthority> res = new HashSet<GrantedAuthority>();
+    Set<GrantedAuthority> res = new HashSet<GrantedAuthority>();
-        res.add(authority);
+    res.add(authority);
-        return res;
+    return res;
-    }
+  }
 
-    @Override
+  @Override
-    public String getPassword() {
+  public String getPassword() {
-        return "";
+    return "";
-    }
+  }
 
-    @Override
+  @Override
-    public String getUsername() {
+  public String getUsername() {
-        return this.email;
+    return this.email;
-    }
+  }
 
-    @Override
+  @Override
-    public boolean isAccountNonExpired() {
+  public boolean isAccountNonExpired() {
-        return false;
+    return false;
-    }
+  }
 
-    @Override
+  @Override
-    public boolean isAccountNonLocked() {
+  public boolean isAccountNonLocked() {
-        return false;
+    return false;
-    }
+  }
 
-    @Override
+  @Override
-    public boolean isCredentialsNonExpired() {
+  public boolean isCredentialsNonExpired() {
-        return false;
+    return false;
-    }
+  }
 
-    @Override
+  @Override
-    public boolean isEnabled() {
+  public boolean isEnabled() {
-        return false;
+    return false;
-    }
+  }
 
-    public String getEmail() {
+  public String getEmail() {
-        return email;
+    return email;
-    }
+  }
 
-    public void setEmail(String email) {
+  public void setEmail(String email) {
-        this.email = email;
+    this.email = email;
-    }
+  }
 }

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

@@ -10,45 +10,45 @@ import java.util.Collection;
  */
 public class UserAuthentication implements Authentication {
 
-    private final User user;
+  private final User user;
-    private boolean authenticated = true;
+  private boolean authenticated = true;
 
-    public UserAuthentication(User user) {
+  public UserAuthentication(User user) {
-        this.user = user;
+    this.user = user;
-    }
+  }
 
-    @Override
+  @Override
-    public String getName() {
+  public String getName() {
-        return user.getUsername();
+    return user.getUsername();
-    }
+  }
 
-    @Override
+  @Override
-    public Collection<? extends GrantedAuthority> getAuthorities() {
+  public Collection<? extends GrantedAuthority> getAuthorities() {
-        return user.getAuthorities();
+    return user.getAuthorities();
-    }
+  }
 
-    @Override
+  @Override
-    public Object getCredentials() {
+  public Object getCredentials() {
-        return user.getPassword();
+    return user.getPassword();
-    }
+  }
 
-    @Override
+  @Override
-    public User getDetails() {
+  public User getDetails() {
-        return user;
+    return user;
-    }
+  }
 
-    @Override
+  @Override
-    public Object getPrincipal() {
+  public Object getPrincipal() {
-        return user.getUsername();
+    return user.getUsername();
-    }
+  }
 
-    @Override
+  @Override
-    public boolean isAuthenticated() {
+  public boolean isAuthenticated() {
-        return authenticated;
+    return authenticated;
-    }
+  }
 
-    @Override
+  @Override
-    public void setAuthenticated(boolean authenticated) {
+  public void setAuthenticated(boolean authenticated) {
-        this.authenticated = authenticated;
+    this.authenticated = authenticated;
-    }
+  }
 }

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

@@ -13,33 +13,33 @@ import java.nio.charset.Charset;
  */
 public class BasicAuthUtils {
 
-    public static HttpHeaders basicAuthHeaders(String username) {
+  public static HttpHeaders basicAuthHeaders(String username) {
-        return new HttpHeaders() {
+    return new HttpHeaders() {
-            {
+      {
-                String auth = username + ":";
+        String auth = username + ":";
-                byte[] encodedAuth = Base64.encodeBase64(
+        byte[] encodedAuth = Base64.encodeBase64(
-                        auth.getBytes(Charset.forName("US-ASCII")));
+                auth.getBytes(Charset.forName("US-ASCII")));
-                String authHeader = "Basic " + new String(encodedAuth);
+        String authHeader = "Basic " + new String(encodedAuth);
-                set("Authorization", authHeader);
+        set("Authorization", authHeader);
-            }
+      }
-        };
+    };
+  }
+
+  public static <T> T doBasicAuthenticatedRequest(RestTemplate restTemplate, String url, HttpMethod httpMethod, Class<T> responseType) {
+    return doBasicAuthenticatedRequest(restTemplate, url, httpMethod, responseType, null);
+  }
+
+  public static <T> T doBasicAuthenticatedRequest(RestTemplate restTemplate, String url, HttpMethod httpMethod, Class<T> responseType, Object requestObject) {
+    HttpEntity httpEntity;
+    if (requestObject != null) {
+      httpEntity = new HttpEntity(requestObject, BasicAuthUtils.basicAuthHeaders("test_user@mail.com"));
+    } else {
+      httpEntity = new HttpEntity(BasicAuthUtils.basicAuthHeaders("test_user@mail.com"));
     }
 
-    public static <T> T doBasicAuthenticatedRequest(RestTemplate restTemplate, String url, HttpMethod httpMethod, Class<T> responseType) {
+    return restTemplate.exchange(url,
-        return doBasicAuthenticatedRequest(restTemplate, url, httpMethod, responseType, null);
+            httpMethod,
-    }
+            httpEntity,
-
+            responseType).getBody();
-    public static <T> T doBasicAuthenticatedRequest(RestTemplate restTemplate, String url, HttpMethod httpMethod, Class<T> responseType, Object requestObject) {
+  }
-        HttpEntity httpEntity;
-        if(requestObject!=null) {
-            httpEntity = new HttpEntity(requestObject, BasicAuthUtils.basicAuthHeaders("test_user@mail.com"));
-        } else {
-            httpEntity = new HttpEntity(BasicAuthUtils.basicAuthHeaders("test_user@mail.com"));
-        }
-
-        return restTemplate.exchange(url,
-                httpMethod,
-                httpEntity,
-                responseType).getBody();
-    }
 }

java-spring/common-backend/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'java'
 
 dependencies {
-    compile project(":common-customers")
+    compile project(":common")
 
     compile "io.eventuate.client.java:eventuate-client-java-spring:$eventuateClientVersion"
 

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

@@ -1,7 +1,5 @@
 package net.chrisrichardson.eventstore.javaexamples.banking.backend.common.accounts;
 
-import io.eventuate.Aggregate;
-
 import io.eventuate.Event;
 
 import java.math.BigDecimal;

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

@@ -1,8 +1,5 @@
 package net.chrisrichardson.eventstore.javaexamples.banking.backend.common.accounts;
 
-import io.eventuate.Aggregate;
-
-
 import java.math.BigDecimal;
 
 public class AccountCreditedEvent extends AccountChangedEvent {

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

@@ -1,7 +1,5 @@
 package net.chrisrichardson.eventstore.javaexamples.banking.backend.common.accounts;
 
-import io.eventuate.Aggregate;
-
 import io.eventuate.Event;
 
 public class AccountDebitFailedDueToInsufficientFundsEvent implements Event {

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

@@ -1,8 +1,5 @@
 package net.chrisrichardson.eventstore.javaexamples.banking.backend.common.accounts;
 
-import io.eventuate.Aggregate;
-
-
 import java.math.BigDecimal;
 
 public class AccountDebitedEvent extends AccountChangedEvent {

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

@@ -7,20 +7,20 @@ import net.chrisrichardson.eventstore.javaexamples.banking.common.customers.ToAc
  */
 public class CustomerAddedToAccount extends CustomerEvent {
 
-    private ToAccountInfo toAccountInfo;
+  private ToAccountInfo toAccountInfo;
 
-    public CustomerAddedToAccount() {
+  public CustomerAddedToAccount() {
-    }
+  }
 
-    public CustomerAddedToAccount(ToAccountInfo toAccountInfo) {
+  public CustomerAddedToAccount(ToAccountInfo toAccountInfo) {
-        this.toAccountInfo = toAccountInfo;
+    this.toAccountInfo = toAccountInfo;
-    }
+  }
 
-    public ToAccountInfo getToAccountInfo() {
+  public ToAccountInfo getToAccountInfo() {
-        return toAccountInfo;
+    return toAccountInfo;
-    }
+  }
 
-    public void setToAccountInfo(ToAccountInfo toAccountInfo) {
+  public void setToAccountInfo(ToAccountInfo toAccountInfo) {
-        this.toAccountInfo = toAccountInfo;
+    this.toAccountInfo = toAccountInfo;
-    }
+  }
 }

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

@@ -7,20 +7,20 @@ import net.chrisrichardson.eventstore.javaexamples.banking.common.customers.Cust
  */
 public class CustomerCreatedEvent extends CustomerEvent {
 
-    private CustomerInfo customerInfo;
+  private CustomerInfo customerInfo;
 
-    public CustomerCreatedEvent() {
+  public CustomerCreatedEvent() {
-    }
+  }
 
-    public CustomerCreatedEvent(CustomerInfo customerInfo) {
+  public CustomerCreatedEvent(CustomerInfo customerInfo) {
-        this.customerInfo = customerInfo;
+    this.customerInfo = customerInfo;
-    }
+  }
 
-    public CustomerInfo getCustomerInfo() {
+  public CustomerInfo getCustomerInfo() {
-        return customerInfo;
+    return customerInfo;
-    }
+  }
 
-    public void setCustomerInfo(CustomerInfo customerInfo) {
+  public void setCustomerInfo(CustomerInfo customerInfo) {
-        this.customerInfo = customerInfo;
+    this.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.backend.commandside.customers.Customer")
-public abstract  class CustomerEvent implements Event {
+public abstract class CustomerEvent implements Event {
 }

java-spring/common-backend/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/common/accounts/AccountOpenEventSerializationTest.java

@@ -6,6 +6,7 @@ import org.junit.Assert;
 import org.junit.Test;
 
 import java.math.BigDecimal;
+
 public class AccountOpenEventSerializationTest {
 
   @Test

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

@@ -1,24 +0,0 @@
-package net.chrisrichardson.eventstore.javaexamples.banking.common.customers;
-
-/**
- * Created by popikyardo on 24.03.16.
- */
-public class AddToAccountResponse {
-
-    private String version;
-
-    public AddToAccountResponse() {
-    }
-
-    public AddToAccountResponse(String version) {
-        this.version = version;
-    }
-
-    public String getVersion() {
-        return version;
-    }
-
-    public void setVersion(String version) {
-        this.version = version;
-    }
-}

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

@@ -1,82 +0,0 @@
-package net.chrisrichardson.eventstore.javaexamples.banking.common.customers;
-
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-
-import javax.validation.constraints.NotNull;
-
-/**
- * Created by popikyardo on 02.02.16.
- */
-public class Address {
-    @NotNull
-    private String street1;
-    private String street2;
-    @NotNull
-    private String city;
-    @NotNull
-    private String state;
-    @NotNull
-    private String zipCode;
-
-    public Address() {
-    }
-
-    public Address(String street1, String street2, String city, String state, String zipCode) {
-        this.street1 = street1;
-        this.street2 = street2;
-        this.city = city;
-        this.state = state;
-        this.zipCode = zipCode;
-    }
-
-    public String getStreet1() {
-        return street1;
-    }
-
-    public void setStreet1(String street1) {
-        this.street1 = street1;
-    }
-
-    public String getStreet2() {
-        return street2;
-    }
-
-    public void setStreet2(String street2) {
-        this.street2 = street2;
-    }
-
-    public String getCity() {
-        return city;
-    }
-
-    public void setCity(String city) {
-        this.city = city;
-    }
-
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    public String getZipCode() {
-        return zipCode;
-    }
-
-    public void setZipCode(String zipCode) {
-        this.zipCode = zipCode;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
-}

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

@@ -1,61 +0,0 @@
-package net.chrisrichardson.eventstore.javaexamples.banking.common.customers;
-
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-
-import javax.validation.constraints.NotNull;
-
-/**
- * Created by popikyardo on 03.02.16.
- */
-public class CustomerInfo {
-    private Name name;
-    @NotNull
-    protected String email;
-    @NotNull
-    protected String ssn;
-    @NotNull
-    protected String phoneNumber;
-    protected Address address;
-
-    public CustomerInfo() {
-    }
-
-    public CustomerInfo(Name name, String email, String ssn, String phoneNumber, Address address) {
-        this.name = name;
-        this.email = email;
-        this.ssn = ssn;
-        this.phoneNumber = phoneNumber;
-        this.address = address;
-    }
-
-    public Name getName() {
-        return name;
-    }
-
-    public String getEmail() {
-        return email;
-    }
-
-    public String getSsn() {
-        return ssn;
-    }
-
-    public String getPhoneNumber() {
-        return phoneNumber;
-    }
-
-    public Address getAddress() {
-        return address;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
-}

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

@@ -1,47 +0,0 @@
-package net.chrisrichardson.eventstore.javaexamples.banking.common.customers;
-
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-
-/**
- * Created by popikyardo on 03.02.16.
- */
-public class CustomerResponse {
-
-    private String id;
-    private CustomerInfo customerInfo;
-
-    public CustomerResponse() {
-    }
-
-    public CustomerResponse(String id, CustomerInfo customerInfo) {
-        this.id = id;
-        this.customerInfo = customerInfo;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public CustomerInfo getCustomerInfo() {
-        return customerInfo;
-    }
-
-    public void setCustomerInfo(CustomerInfo customerInfo) {
-        this.customerInfo = customerInfo;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
-}

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

@@ -1,50 +0,0 @@
-package net.chrisrichardson.eventstore.javaexamples.banking.common.customers;
-
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-
-import javax.validation.constraints.NotNull;
-
-/**
- * Created by Main on 10.02.2016.
- */
-public class Name {
-    @NotNull
-    private String firstName;
-    @NotNull
-    private String lastName;
-
-    public Name() {
-    }
-
-    public Name(String firstName, String lastName) {
-        this.firstName = firstName;
-        this.lastName = lastName;
-    }
-
-    public String getFirstName() {
-        return firstName;
-    }
-
-    public void setFirstName(String firstName) {
-        this.firstName = firstName;
-    }
-
-    public String getLastName() {
-        return lastName;
-    }
-
-    public void setLastName(String lastName) {
-        this.lastName = lastName;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
-}

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

@@ -1,85 +0,0 @@
-package net.chrisrichardson.eventstore.javaexamples.banking.common.customers;
-
-import java.util.Map;
-
-/**
- * Created by Main on 05.02.2016.
- */
-public class QuerySideCustomer{
-    private String id;
-    private Name name;
-    private String email;
-    private String ssn;
-    private String phoneNumber;
-    private Address address;
-    private Map<String, ToAccountInfo> toAccounts;
-
-    public QuerySideCustomer() {
-    }
-
-    public QuerySideCustomer(String id, Name name, String email, String ssn, String phoneNumber, Address address, Map<String, ToAccountInfo> toAccounts) {
-        this.id = id;
-        this.name = name;
-        this.email = email;
-        this.ssn = ssn;
-        this.phoneNumber = phoneNumber;
-        this.address = address;
-        this.toAccounts = toAccounts;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public Name getName() {
-        return name;
-    }
-
-    public void setName(Name name) {
-        this.name = name;
-    }
-
-    public String getEmail() {
-        return email;
-    }
-
-    public void setEmail(String email) {
-        this.email = email;
-    }
-
-    public String getSsn() {
-        return ssn;
-    }
-
-    public void setSsn(String ssn) {
-        this.ssn = ssn;
-    }
-
-    public String getPhoneNumber() {
-        return phoneNumber;
-    }
-
-    public void setPhoneNumber(String phoneNumber) {
-        this.phoneNumber = phoneNumber;
-    }
-
-    public Address getAddress() {
-        return address;
-    }
-
-    public void setAddress(Address address) {
-        this.address = address;
-    }
-
-    public Map<String, ToAccountInfo> getToAccounts() {
-        return toAccounts;
-    }
-
-    public void setToAccounts(Map<String, ToAccountInfo> toAccounts) {
-        this.toAccounts = toAccounts;
-    }
-}

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

@@ -1,67 +0,0 @@
-package net.chrisrichardson.eventstore.javaexamples.banking.common.customers;
-
-
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-
-/**
- * Created by Main on 08.02.2016.
- */
-public class ToAccountInfo {
-    private String id;
-    private String title;
-    private String owner;
-    private String description;
-
-    public ToAccountInfo() {
-    }
-
-    public ToAccountInfo(String id, String title, String owner, String description) {
-        this.id = id;
-        this.title = title;
-        this.owner = owner;
-        this.description = description;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public String getOwner() {
-        return owner;
-    }
-
-    public void setOwner(String owner) {
-        this.owner = owner;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
-}

java-spring/common/build.gradle

@@ -1,8 +1,8 @@
 apply plugin: 'java'
 
 dependencies {
+    compile "commons-lang:commons-lang:2.6"
     compile "org.springframework.boot:spring-boot-starter-web:$springBootVersion"
-    compile "io.eventuate.client.java:eventuate-client-java-spring:$eventuateClientVersion"
 
     testCompile group: 'junit', name: 'junit', version: '4.11'
 }

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

@@ -1,4 +1,4 @@
-package net.chrisrichardson.eventstore.javaexamples.banking.backend.queryside.accounts;
+package net.chrisrichardson.eventstore.javaexamples.banking.common.accounts;
 
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
@@ -18,7 +18,7 @@ public class AccountTransactionInfo {
   }
 
   public AccountTransactionInfo(String transactionId, String fromAccountId, String toAccountId, long amount) {
-    this(transactionId, fromAccountId, toAccountId, amount, new Date(),  "");
+    this(transactionId, fromAccountId, toAccountId, amount, new Date(), "");
   }
 
   public AccountTransactionInfo(String transactionId, String fromAccountId, String toAccountId, long amount, Date date, String description) {

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

@@ -1,8 +1,7 @@
-package net.chrisrichardson.eventstore.javaexamples.banking.web.commandside.accounts;
+package net.chrisrichardson.eventstore.javaexamples.banking.common.accounts;
 
-import javax.validation.constraints.NotNull;
 import javax.validation.constraints.DecimalMin;
-
+import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 
 public class CreateAccountRequest {

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

@@ -1,4 +1,4 @@
-package net.chrisrichardson.eventstore.javaexamples.banking.web.commandside.accounts;
+package net.chrisrichardson.eventstore.javaexamples.banking.common.accounts;
 
 
 public class CreateAccountResponse {

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

@@ -0,0 +1,53 @@
+package net.chrisrichardson.eventstore.javaexamples.banking.common.accounts;
+
+import java.math.BigDecimal;
+
+
+public class GetAccountResponse {
+  private String accountId;
+  private BigDecimal balance;
+  private String title;
+  private String description;
+
+  public GetAccountResponse() {
+  }
+
+  public GetAccountResponse(String accountId, BigDecimal balance, String title, String description) {
+    this.accountId = accountId;
+    this.balance = balance;
+    this.title = title;
+    this.description = description;
+  }
+
+  public void setBalance(BigDecimal balance) {
+    this.balance = balance;
+  }
+
+  public void setAccountId(String accountId) {
+    this.accountId = accountId;
+  }
+
+  public String getAccountId() {
+    return accountId;
+  }
+
+  public BigDecimal getBalance() {
+    return balance;
+  }
+
+  public String getTitle() {
+    return title;
+  }
+
+  public void setTitle(String title) {
+    this.title = title;
+  }
+
+  public String getDescription() {
+    return description;
+  }
+
+  public void setDescription(String description) {
+    this.description = description;
+  }
+}

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

@@ -0,0 +1,24 @@
+package net.chrisrichardson.eventstore.javaexamples.banking.common.customers;
+
+/**
+ * Created by popikyardo on 24.03.16.
+ */
+public class AddToAccountResponse {
+
+  private String version;
+
+  public AddToAccountResponse() {
+  }
+
+  public AddToAccountResponse(String version) {
+    this.version = version;
+  }
+
+  public String getVersion() {
+    return version;
+  }
+
+  public void setVersion(String version) {
+    this.version = version;
+  }
+}

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

@@ -0,0 +1,82 @@
+package net.chrisrichardson.eventstore.javaexamples.banking.common.customers;
+
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * Created by popikyardo on 02.02.16.
+ */
+public class Address {
+  @NotNull
+  private String street1;
+  private String street2;
+  @NotNull
+  private String city;
+  @NotNull
+  private String state;
+  @NotNull
+  private String zipCode;
+
+  public Address() {
+  }
+
+  public Address(String street1, String street2, String city, String state, String zipCode) {
+    this.street1 = street1;
+    this.street2 = street2;
+    this.city = city;
+    this.state = state;
+    this.zipCode = zipCode;
+  }
+
+  public String getStreet1() {
+    return street1;
+  }
+
+  public void setStreet1(String street1) {
+    this.street1 = street1;
+  }
+
+  public String getStreet2() {
+    return street2;
+  }
+
+  public void setStreet2(String street2) {
+    this.street2 = street2;
+  }
+
+  public String getCity() {
+    return city;
+  }
+
+  public void setCity(String city) {
+    this.city = city;
+  }
+
+  public String getState() {
+    return state;
+  }
+
+  public void setState(String state) {
+    this.state = state;
+  }
+
+  public String getZipCode() {
+    return zipCode;
+  }
+
+  public void setZipCode(String zipCode) {
+    this.zipCode = zipCode;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    return EqualsBuilder.reflectionEquals(this, o);
+  }
+
+  @Override
+  public int hashCode() {
+    return HashCodeBuilder.reflectionHashCode(this);
+  }
+}

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

@@ -0,0 +1,61 @@
+package net.chrisrichardson.eventstore.javaexamples.banking.common.customers;
+
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * Created by popikyardo on 03.02.16.
+ */
+public class CustomerInfo {
+  private Name name;
+  @NotNull
+  protected String email;
+  @NotNull
+  protected String ssn;
+  @NotNull
+  protected String phoneNumber;
+  protected Address address;
+
+  public CustomerInfo() {
+  }
+
+  public CustomerInfo(Name name, String email, String ssn, String phoneNumber, Address address) {
+    this.name = name;
+    this.email = email;
+    this.ssn = ssn;
+    this.phoneNumber = phoneNumber;
+    this.address = address;
+  }
+
+  public Name getName() {
+    return name;
+  }
+
+  public String getEmail() {
+    return email;
+  }
+
+  public String getSsn() {
+    return ssn;
+  }
+
+  public String getPhoneNumber() {
+    return phoneNumber;
+  }
+
+  public Address getAddress() {
+    return address;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    return EqualsBuilder.reflectionEquals(this, o);
+  }
+
+  @Override
+  public int hashCode() {
+    return HashCodeBuilder.reflectionHashCode(this);
+  }
+}

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

@@ -0,0 +1,47 @@
+package net.chrisrichardson.eventstore.javaexamples.banking.common.customers;
+
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+
+/**
+ * Created by popikyardo on 03.02.16.
+ */
+public class CustomerResponse {
+
+  private String id;
+  private CustomerInfo customerInfo;
+
+  public CustomerResponse() {
+  }
+
+  public CustomerResponse(String id, CustomerInfo customerInfo) {
+    this.id = id;
+    this.customerInfo = customerInfo;
+  }
+
+  public String getId() {
+    return id;
+  }
+
+  public void setId(String id) {
+    this.id = id;
+  }
+
+  public CustomerInfo getCustomerInfo() {
+    return customerInfo;
+  }
+
+  public void setCustomerInfo(CustomerInfo customerInfo) {
+    this.customerInfo = customerInfo;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    return EqualsBuilder.reflectionEquals(this, o);
+  }
+
+  @Override
+  public int hashCode() {
+    return HashCodeBuilder.reflectionHashCode(this);
+  }
+}

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

@@ -0,0 +1,50 @@
+package net.chrisrichardson.eventstore.javaexamples.banking.common.customers;
+
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * Created by Main on 10.02.2016.
+ */
+public class Name {
+  @NotNull
+  private String firstName;
+  @NotNull
+  private String lastName;
+
+  public Name() {
+  }
+
+  public Name(String firstName, String lastName) {
+    this.firstName = firstName;
+    this.lastName = lastName;
+  }
+
+  public String getFirstName() {
+    return firstName;
+  }
+
+  public void setFirstName(String firstName) {
+    this.firstName = firstName;
+  }
+
+  public String getLastName() {
+    return lastName;
+  }
+
+  public void setLastName(String lastName) {
+    this.lastName = lastName;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    return EqualsBuilder.reflectionEquals(this, o);
+  }
+
+  @Override
+  public int hashCode() {
+    return HashCodeBuilder.reflectionHashCode(this);
+  }
+}

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

@@ -0,0 +1,85 @@
+package net.chrisrichardson.eventstore.javaexamples.banking.common.customers;
+
+import java.util.Map;
+
+/**
+ * Created by Main on 05.02.2016.
+ */
+public class QuerySideCustomer {
+  private String id;
+  private Name name;
+  private String email;
+  private String ssn;
+  private String phoneNumber;
+  private Address address;
+  private Map<String, ToAccountInfo> toAccounts;
+
+  public QuerySideCustomer() {
+  }
+
+  public QuerySideCustomer(String id, Name name, String email, String ssn, String phoneNumber, Address address, Map<String, ToAccountInfo> toAccounts) {
+    this.id = id;
+    this.name = name;
+    this.email = email;
+    this.ssn = ssn;
+    this.phoneNumber = phoneNumber;
+    this.address = address;
+    this.toAccounts = toAccounts;
+  }
+
+  public String getId() {
+    return id;
+  }
+
+  public void setId(String id) {
+    this.id = id;
+  }
+
+  public Name getName() {
+    return name;
+  }
+
+  public void setName(Name name) {
+    this.name = name;
+  }
+
+  public String getEmail() {
+    return email;
+  }
+
+  public void setEmail(String email) {
+    this.email = email;
+  }
+
+  public String getSsn() {
+    return ssn;
+  }
+
+  public void setSsn(String ssn) {
+    this.ssn = ssn;
+  }
+
+  public String getPhoneNumber() {
+    return phoneNumber;
+  }
+
+  public void setPhoneNumber(String phoneNumber) {
+    this.phoneNumber = phoneNumber;
+  }
+
+  public Address getAddress() {
+    return address;
+  }
+
+  public void setAddress(Address address) {
+    this.address = address;
+  }
+
+  public Map<String, ToAccountInfo> getToAccounts() {
+    return toAccounts;
+  }
+
+  public void setToAccounts(Map<String, ToAccountInfo> toAccounts) {
+    this.toAccounts = toAccounts;
+  }
+}

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

@@ -0,0 +1,67 @@
+package net.chrisrichardson.eventstore.javaexamples.banking.common.customers;
+
+
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+
+/**
+ * Created by Main on 08.02.2016.
+ */
+public class ToAccountInfo {
+  private String id;
+  private String title;
+  private String owner;
+  private String description;
+
+  public ToAccountInfo() {
+  }
+
+  public ToAccountInfo(String id, String title, String owner, String description) {
+    this.id = id;
+    this.title = title;
+    this.owner = owner;
+    this.description = description;
+  }
+
+  public String getId() {
+    return id;
+  }
+
+  public void setId(String id) {
+    this.id = id;
+  }
+
+  public String getTitle() {
+    return title;
+  }
+
+  public void setTitle(String title) {
+    this.title = title;
+  }
+
+  public String getOwner() {
+    return owner;
+  }
+
+  public void setOwner(String owner) {
+    this.owner = owner;
+  }
+
+  public String getDescription() {
+    return description;
+  }
+
+  public void setDescription(String description) {
+    this.description = description;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    return EqualsBuilder.reflectionEquals(this, o);
+  }
+
+  @Override
+  public int hashCode() {
+    return HashCodeBuilder.reflectionHashCode(this);
+  }
+}

java-spring/common/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/common/transactions/CreateMoneyTransferRequest.java

@@ -1,8 +1,8 @@
-package net.chrisrichardson.eventstore.javaexamples.banking.web.commandside.transactions;
+package net.chrisrichardson.eventstore.javaexamples.banking.common.transactions;
 
-import java.math.BigDecimal;
-import javax.validation.constraints.NotNull;
 import javax.validation.constraints.DecimalMin;
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
 
 public class CreateMoneyTransferRequest {
 

java-spring/common/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/common/transactions/CreateMoneyTransferResponse.java

@@ -1,4 +1,4 @@
-package net.chrisrichardson.eventstore.javaexamples.banking.web.commandside.transactions;
+package net.chrisrichardson.eventstore.javaexamples.banking.common.transactions;
 
 
 public class CreateMoneyTransferResponse {

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

@@ -1,11 +1,11 @@
 apply plugin: 'java'
 
 dependencies {
-    compile project(":common-customers")
+    compile project(":common")
     compile project(":common-backend")
     compile "io.eventuate.client.java:eventuate-client-java-spring:$eventuateClientVersion"
 
-    testCompile project(":testutil-customers")
+    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/customers-command-side-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/commandside/customers/AddToAccountCommand.java

@@ -7,13 +7,13 @@ import net.chrisrichardson.eventstore.javaexamples.banking.common.customers.ToAc
  */
 public class AddToAccountCommand implements CustomerCommand {
 
-    private ToAccountInfo toAccountInfo;
+  private ToAccountInfo toAccountInfo;
 
-    public AddToAccountCommand(ToAccountInfo toAccountInfo) {
+  public AddToAccountCommand(ToAccountInfo toAccountInfo) {
-        this.toAccountInfo = toAccountInfo;
+    this.toAccountInfo = toAccountInfo;
-    }
+  }
 
-    public ToAccountInfo getToAccountInfo() {
+  public ToAccountInfo getToAccountInfo() {
-        return toAccountInfo;
+    return toAccountInfo;
-    }
+  }
 }

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

@@ -6,13 +6,13 @@ import net.chrisrichardson.eventstore.javaexamples.banking.common.customers.Cust
  * Created by popikyardo on 02.02.16.
  */
 public class CreateCustomerCommand implements CustomerCommand {
-    private CustomerInfo customerInfo;
+  private CustomerInfo customerInfo;
 
-    public CreateCustomerCommand(CustomerInfo customerInfo) {
+  public CreateCustomerCommand(CustomerInfo customerInfo) {
-        this.customerInfo = customerInfo;
+    this.customerInfo = customerInfo;
-    }
+  }
 
-    public CustomerInfo getCustomerInfo() {
+  public CustomerInfo getCustomerInfo() {
-        return customerInfo;
+    return customerInfo;
-    }
+  }
 }

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

@@ -14,24 +14,24 @@ import java.util.List;
  */
 public class Customer extends ReflectiveMutableCommandProcessingAggregate<Customer, CustomerCommand> {
 
-    private CustomerInfo customerInfo;
+  private CustomerInfo customerInfo;
 
-    public List<Event> process(CreateCustomerCommand cmd) {
+  public List<Event> process(CreateCustomerCommand cmd) {
-        return EventUtil.events(new CustomerCreatedEvent(cmd.getCustomerInfo()));
+    return EventUtil.events(new CustomerCreatedEvent(cmd.getCustomerInfo()));
-    }
+  }
 
-    public List<Event> process(AddToAccountCommand cmd) {
+  public List<Event> process(AddToAccountCommand cmd) {
-        return EventUtil.events(new CustomerAddedToAccount(cmd.getToAccountInfo()));
+    return EventUtil.events(new CustomerAddedToAccount(cmd.getToAccountInfo()));
-    }
+  }
 
-    public void apply(CustomerCreatedEvent event) {
+  public void apply(CustomerCreatedEvent event) {
-        customerInfo = event.getCustomerInfo();
+    customerInfo = event.getCustomerInfo();
-    }
+  }
 
-    public void apply(CustomerAddedToAccount event) {
+  public void apply(CustomerAddedToAccount event) {
-    }
+  }
 
-    public CustomerInfo getCustomerInfo() {
+  public CustomerInfo getCustomerInfo() {
-        return customerInfo;
+    return customerInfo;
-    }
+  }
 }

java-spring/customers-command-side-backend/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/commandside/customers/CustomerTest.java

@@ -8,22 +8,24 @@ import org.junit.Test;
 
 import java.util.List;
 
-import static net.chrisrichardson.eventstorestore.javaexamples.testutil.customers.CustomersTestUtils.generateCustomerInfo;
+import static net.chrisrichardson.eventstorestore.javaexamples.testutil.CustomersTestUtils.generateCustomerInfo;
 
 public class CustomerTest {
 
-    @Test
+  @Test
-    public void testSomething() {
+  public void testSomething() {
-        Customer customer = new Customer();
+    Customer customer = new Customer();
 
-        CustomerInfo customerInfo = generateCustomerInfo();
+    CustomerInfo customerInfo = generateCustomerInfo();
 
-        List<Event> events = customer.process(new CreateCustomerCommand(customerInfo));
+    List<Event> events = customer.process(new CreateCustomerCommand(customerInfo));
+
+    Assert.assertEquals(1, events.size());
+    Assert.assertEquals(CustomerCreatedEvent.class, events.get(0).getClass());
+
+    customer.applyEvent(events.get(0));
+    Assert.assertEquals(customerInfo, customer.getCustomerInfo());
+  }
 
-        Assert.assertEquals(1, events.size());
-        Assert.assertEquals(CustomerCreatedEvent.class, events.get(0).getClass());
 
-        customer.applyEvent(events.get(0));
-        Assert.assertEquals(customerInfo, customer.getCustomerInfo());
-    }
 }

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

@@ -12,6 +12,6 @@ dependencies {
 
     compile "io.eventuate.client.java:eventuate-client-java-http-stomp-spring:$eventuateClientVersion"
 
-    testCompile project(":testutil-customers")
+    testCompile project(":testutil")
     testCompile "org.springframework.boot:spring-boot-starter-test"
 }

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

@@ -24,6 +24,4 @@ public class CustomersCommandSideServiceConfiguration {
     HttpMessageConverter<?> additional = new MappingJackson2HttpMessageConverter();
     return new HttpMessageConverters(additional);
   }
-
-
 }

java-spring/customers-command-side-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/web/CustomersCommandSideServiceIntegrationTest.java

@@ -13,7 +13,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
 import org.springframework.web.client.RestTemplate;
 
-import static net.chrisrichardson.eventstorestore.javaexamples.testutil.customers.CustomersTestUtils.generateCustomerInfo;
+import static net.chrisrichardson.eventstorestore.javaexamples.testutil.CustomersTestUtils.generateCustomerInfo;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringApplicationConfiguration(classes = CustomersCommandSideServiceTestConfiguration.class)

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

@@ -1,7 +1,7 @@
 apply plugin: 'java'
 
 dependencies {
-    compile project(":common-customers")
+    compile project(":common")
     compile project(":customers-command-side-backend")
 
     compile "org.springframework.boot:spring-boot-starter-web:$springBootVersion"

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

@@ -18,23 +18,23 @@ import java.util.concurrent.CompletableFuture;
 @RequestMapping("/customers")
 public class CustomerController {
 
-    private CustomerService customerService;
+  private CustomerService customerService;
 
-    @Autowired
+  @Autowired
-    public CustomerController(CustomerService customerService) {
+  public CustomerController(CustomerService customerService) {
-        this.customerService = customerService;
+    this.customerService = customerService;
-    }
+  }
 
-    @RequestMapping(method = RequestMethod.POST)
+  @RequestMapping(method = RequestMethod.POST)
-    public CompletableFuture<CustomerResponse> createCustomer(@Validated @RequestBody CustomerInfo customer) {
+  public CompletableFuture<CustomerResponse> createCustomer(@Validated @RequestBody CustomerInfo customer) {
-        return customerService.createCustomer(customer)
+    return customerService.createCustomer(customer)
-                .thenApply(entityAndEventInfo -> new CustomerResponse(entityAndEventInfo.getEntityId(), customer));
+            .thenApply(entityAndEventInfo -> new CustomerResponse(entityAndEventInfo.getEntityId(), customer));
-    }
+  }
 
-    @RequestMapping(value = "/{id}/toaccounts", method = RequestMethod.POST)
+  @RequestMapping(value = "/{id}/toaccounts", method = RequestMethod.POST)
-    public CompletableFuture<AddToAccountResponse> addToAccount(@PathVariable String id, @Validated @RequestBody ToAccountInfo request) {
+  public CompletableFuture<AddToAccountResponse> addToAccount(@PathVariable String id, @Validated @RequestBody ToAccountInfo request) {
-        return customerService.addToAccount(id, request)
+    return customerService.addToAccount(id, request)
-                .thenApply(entityAndEventInfo -> new AddToAccountResponse(entityAndEventInfo.getEntityVersion().toString()));
+            .thenApply(entityAndEventInfo -> new AddToAccountResponse(entityAndEventInfo.getEntityVersion().toString()));
-    }
+  }
 
 }

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

@@ -13,36 +13,36 @@ import java.util.Collections;
  */
 public class CustomerInfoUpdateService {
 
-    private Logger logger = LoggerFactory.getLogger(getClass());
+  private Logger logger = LoggerFactory.getLogger(getClass());
 
-    private QuerySideCustomerRepository accountInfoRepository;
+  private QuerySideCustomerRepository accountInfoRepository;
 
-    public CustomerInfoUpdateService(QuerySideCustomerRepository accountInfoRepository) {
+  public CustomerInfoUpdateService(QuerySideCustomerRepository accountInfoRepository) {
-        this.accountInfoRepository = accountInfoRepository;
+    this.accountInfoRepository = accountInfoRepository;
+  }
+
+  public void create(String id, CustomerInfo customerInfo) {
+    try {
+      accountInfoRepository.save(new QuerySideCustomer(id,
+                      customerInfo.getName(),
+                      customerInfo.getEmail(),
+                      customerInfo.getSsn(),
+                      customerInfo.getPhoneNumber(),
+                      customerInfo.getAddress(),
+                      Collections.<String, ToAccountInfo>emptyMap()
+              )
+      );
+      logger.info("Saved in mongo");
+    } catch (Throwable t) {
+      logger.error("Error during saving: ", t);
+      throw new RuntimeException(t);
     }
+  }
 
-    public void create(String id, CustomerInfo customerInfo) {
+  public void addToAccount(String id, ToAccountInfo accountInfo) {
-        try {
+    QuerySideCustomer customer = accountInfoRepository.findOne(id);
-            accountInfoRepository.save(new QuerySideCustomer(id,
+    customer.getToAccounts().put(accountInfo.getId(), accountInfo);
-                            customerInfo.getName(),
+    accountInfoRepository.save(customer);
-                            customerInfo.getEmail(),
+  }
-                            customerInfo.getSsn(),
-                            customerInfo.getPhoneNumber(),
-                            customerInfo.getAddress(),
-                            Collections.<String, ToAccountInfo>emptyMap()
-                    )
-            );
-            logger.info("Saved in mongo");
-        } catch (Throwable t) {
-            logger.error("Error during saving: ", t);
-            throw new RuntimeException(t);
-        }
-    }
-
-    public void addToAccount(String id, ToAccountInfo accountInfo) {
-        QuerySideCustomer customer = accountInfoRepository.findOne(id);
-        customer.getToAccounts().put(accountInfo.getId(), accountInfo);
-        accountInfoRepository.save(customer);
-    }
 
 }

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

@@ -23,7 +23,7 @@ public class CustomerQueryService {
       return CompletableFuture.completedFuture(customer);
   }
 
-  public CompletableFuture<List<QuerySideCustomer>> findByEmail(String email){
+  public CompletableFuture<List<QuerySideCustomer>> findByEmail(String email) {
     List<QuerySideCustomer> customers = querySideCustomerRepository.findByEmailLike(email);
     if (customers.isEmpty())
       return CompletableFutureUtil.failedFuture(new EmptyResultDataAccessException(1));

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

@@ -15,31 +15,31 @@ import org.slf4j.LoggerFactory;
 @EventSubscriber(id = "customerQuerySideEventHandlers")
 public class CustomerQueryWorkflow {
 
-    private Logger logger = LoggerFactory.getLogger(getClass());
+  private Logger logger = LoggerFactory.getLogger(getClass());
 
-    private CustomerInfoUpdateService customerInfoUpdateService;
+  private CustomerInfoUpdateService customerInfoUpdateService;
 
 
-    public CustomerQueryWorkflow(CustomerInfoUpdateService customerInfoUpdateService) {
+  public CustomerQueryWorkflow(CustomerInfoUpdateService customerInfoUpdateService) {
-        this.customerInfoUpdateService = customerInfoUpdateService;
+    this.customerInfoUpdateService = customerInfoUpdateService;
-    }
+  }
 
-    @EventHandlerMethod
+  @EventHandlerMethod
-    public void create(DispatchedEvent<CustomerCreatedEvent> de) {
+  public void create(DispatchedEvent<CustomerCreatedEvent> de) {
-        CustomerCreatedEvent event = de.getEvent();
+    CustomerCreatedEvent event = de.getEvent();
-        String id = de.getEntityId();
+    String id = de.getEntityId();
 
-        customerInfoUpdateService.create(id, event.getCustomerInfo());
+    customerInfoUpdateService.create(id, event.getCustomerInfo());
-    }
+  }
 
-    @EventHandlerMethod
+  @EventHandlerMethod
-    public void addToAccount(DispatchedEvent<CustomerAddedToAccount> de) {
+  public void addToAccount(DispatchedEvent<CustomerAddedToAccount> de) {
-        CustomerAddedToAccount event = de.getEvent();
+    CustomerAddedToAccount event = de.getEvent();
-        String id = de.getEntityId();
+    String id = de.getEntityId();
 
-        ToAccountInfo toAccountInfo = event.getToAccountInfo();
+    ToAccountInfo toAccountInfo = event.getToAccountInfo();
 
-        customerInfoUpdateService.addToAccount(id, toAccountInfo);
+    customerInfoUpdateService.addToAccount(id, toAccountInfo);
-    }
+  }
 
 }

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

@@ -13,25 +13,25 @@ import org.springframework.data.mongodb.repository.config.EnableMongoRepositorie
 @EnableMongoRepositories
 @EnableEventHandlers
 public class QuerySideCustomerConfiguration {
-    @Bean
+  @Bean
-    public CustomerQueryWorkflow customerQueryWorkflow(CustomerInfoUpdateService accountInfoUpdateService) {
+  public CustomerQueryWorkflow customerQueryWorkflow(CustomerInfoUpdateService accountInfoUpdateService) {
-        return new CustomerQueryWorkflow(accountInfoUpdateService);
+    return new CustomerQueryWorkflow(accountInfoUpdateService);
-    }
+  }
 
-    @Bean
+  @Bean
-    public CustomerInfoUpdateService customerInfoUpdateService(QuerySideCustomerRepository querySideCustomerRepository) {
+  public CustomerInfoUpdateService customerInfoUpdateService(QuerySideCustomerRepository querySideCustomerRepository) {
-        return new CustomerInfoUpdateService(querySideCustomerRepository);
+    return new CustomerInfoUpdateService(querySideCustomerRepository);
-    }
+  }
 
-    @Bean
+  @Bean
-    public CustomerQueryService customerQueryService(QuerySideCustomerRepository accountInfoRepository) {
+  public CustomerQueryService customerQueryService(QuerySideCustomerRepository accountInfoRepository) {
-        return new CustomerQueryService(accountInfoRepository);
+    return new CustomerQueryService(accountInfoRepository);
-    }
+  }
 
 
-    @Bean
+  @Bean
-    public QuerySideDependencyChecker querysideDependencyChecker(MongoTemplate mongoTemplate) {
+  public QuerySideDependencyChecker querysideDependencyChecker(MongoTemplate mongoTemplate) {
-        return new QuerySideDependencyChecker(mongoTemplate);
+    return new QuerySideDependencyChecker(mongoTemplate);
-    }
+  }
 
 }

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

@@ -7,5 +7,5 @@ import java.util.List;
 
 interface QuerySideCustomerRepository extends MongoRepository<QuerySideCustomer, String> {
 
-    List<QuerySideCustomer> findByEmailLike(String email);
+  List<QuerySideCustomer> findByEmailLike(String email);
 }

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

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

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

@@ -12,7 +12,7 @@ dependencies {
 
     compile "io.eventuate.client.java:eventuate-client-java-http-stomp-spring:$eventuateClientVersion"
 
-    testCompile project(":testutil-customers")
+    testCompile project(":testutil")
     testCompile project(":customers-command-side-service")
     testCompile "org.springframework.boot:spring-boot-starter-test"
 }

java-spring/customers-query-side-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/web/CustomersQuerySideServiceIntegrationTest.java

@@ -1,9 +1,7 @@
 package net.chrisrichardson.eventstore.javaexamples.banking.web;
 
 import net.chrisrichardson.eventstore.javaexamples.banking.common.customers.*;
-import net.chrisrichardson.eventstorestore.javaexamples.testutil.Producer;
+import net.chrisrichardson.eventstorestore.javaexamples.testutil.CustomersTestUtils;
-import net.chrisrichardson.eventstorestore.javaexamples.testutil.Verifier;
-import net.chrisrichardson.eventstorestore.javaexamples.testutil.customers.CustomersTestUtils;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -18,8 +16,7 @@ import rx.Observable;
 
 import javax.annotation.PostConstruct;
 
-import static net.chrisrichardson.eventstorestore.javaexamples.testutil.TestUtil.eventually;
+import static net.chrisrichardson.eventstorestore.javaexamples.testutil.CustomersTestUtils.generateCustomerInfo;
-import static net.chrisrichardson.eventstorestore.javaexamples.testutil.customers.CustomersTestUtils.generateCustomerInfo;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringApplicationConfiguration(classes = CustomersQuerySideServiceTestConfiguration.class)

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

@@ -6,6 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
+
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 
@@ -15,32 +16,32 @@ import java.util.concurrent.CompletableFuture;
 @RestController
 public class CustomerQueryController {
 
-    private CustomerQueryService customerQueryService;
+  private CustomerQueryService customerQueryService;
 
-    @Autowired
+  @Autowired
-    public CustomerQueryController(CustomerQueryService customerQueryService) {
+  public CustomerQueryController(CustomerQueryService customerQueryService) {
-        this.customerQueryService = customerQueryService;
+    this.customerQueryService = customerQueryService;
-    }
+  }
 
-    @RequestMapping(value = "/customers/{customerId}", method = RequestMethod.GET)
+  @RequestMapping(value = "/customers/{customerId}", method = RequestMethod.GET)
-    public CompletableFuture<QuerySideCustomer> getCustomer(@PathVariable String customerId) {
+  public CompletableFuture<QuerySideCustomer> getCustomer(@PathVariable String customerId) {
-        return customerQueryService.findByCustomerId(customerId);
+    return customerQueryService.findByCustomerId(customerId);
-    }
+  }
 
-    @RequestMapping(value = "/customers", method = RequestMethod.GET)
+  @RequestMapping(value = "/customers", method = RequestMethod.GET)
-    public CompletableFuture<CustomersQueryResponse> getCustomersByEmail(@RequestParam String email) {
+  public CompletableFuture<CustomersQueryResponse> getCustomersByEmail(@RequestParam String email) {
-        return customerQueryService.findByEmail(email)
+    return customerQueryService.findByEmail(email)
-                .thenApply(this::getCustomersQueryResponse);
+            .thenApply(this::getCustomersQueryResponse);
-    }
+  }
 
 
-    @ResponseStatus(value = HttpStatus.NOT_FOUND, reason = "customers not found")
+  @ResponseStatus(value = HttpStatus.NOT_FOUND, reason = "customers not found")
-    @ExceptionHandler(EmptyResultDataAccessException.class)
+  @ExceptionHandler(EmptyResultDataAccessException.class)
-    public void customersNotFound() {
+  public void customersNotFound() {
 
-    }
+  }
 
-    private CustomersQueryResponse getCustomersQueryResponse(List<QuerySideCustomer> customersList) {
+  private CustomersQueryResponse getCustomersQueryResponse(List<QuerySideCustomer> customersList) {
-        return new CustomersQueryResponse(customersList);
+    return new CustomersQueryResponse(customersList);
-    }
+  }
 }

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

@@ -9,20 +9,20 @@ import java.util.List;
  */
 public class CustomersQueryResponse {
 
-    private List<QuerySideCustomer> customers;
+  private List<QuerySideCustomer> customers;
 
-    public CustomersQueryResponse() {
+  public CustomersQueryResponse() {
-    }
+  }
 
-    public CustomersQueryResponse(List<QuerySideCustomer> customers) {
+  public CustomersQueryResponse(List<QuerySideCustomer> customers) {
-        this.customers = customers;
+    this.customers = customers;
-    }
+  }
 
-    public List<QuerySideCustomer> getCustomers() {
+  public List<QuerySideCustomer> getCustomers() {
-        return customers;
+    return customers;
-    }
+  }
 
-    public void setCustomers(List<QuerySideCustomer> customers) {
+  public void setCustomers(List<QuerySideCustomer> customers) {
-        this.customers = customers;
+    this.customers = customers;
-    }
+  }
 }

java-spring/e2e-test/build.gradle

@@ -5,7 +5,7 @@ dependencies {
     testCompile project(":transactions-command-side-web")
     testCompile project(":accounts-query-side-web")
 
-    testCompile project(":testutil-customers")
+    testCompile project(":testutil")
     testCompile project(":common-auth")
     testCompile "junit:junit:4.11"
     testCompile "org.springframework.boot:spring-boot-starter-test:$springBootVersion"

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

@@ -1,187 +1,39 @@
 package net.chrisrichardson.eventstore.examples.bank.web;
 
 
-import net.chrisrichardson.eventstore.javaexamples.banking.backend.queryside.accounts.AccountTransactionInfo;
+import net.chrisrichardson.eventstorestore.javaexamples.testutil.AbstractRestAPITest;
-import net.chrisrichardson.eventstore.javaexamples.banking.common.customers.CustomerInfo;
+import net.chrisrichardson.eventstorestore.javaexamples.testutil.AuthenticatedRestTemplate;
-import net.chrisrichardson.eventstore.javaexamples.banking.common.customers.CustomerResponse;
+import net.chrisrichardson.eventstorestore.javaexamples.testutil.CustomersTestUtils;
-import net.chrisrichardson.eventstore.javaexamples.banking.commonauth.utils.BasicAuthUtils;
-import net.chrisrichardson.eventstore.javaexamples.banking.web.commandside.accounts.CreateAccountRequest;
-import net.chrisrichardson.eventstore.javaexamples.banking.web.commandside.accounts.CreateAccountResponse;
-import net.chrisrichardson.eventstore.javaexamples.banking.web.commandside.transactions.CreateMoneyTransferRequest;
-import net.chrisrichardson.eventstore.javaexamples.banking.web.commandside.transactions.CreateMoneyTransferResponse;
-import net.chrisrichardson.eventstore.javaexamples.banking.web.queryside.accounts.GetAccountResponse;
-import net.chrisrichardson.eventstorestore.javaexamples.testutil.Producer;
-import net.chrisrichardson.eventstorestore.javaexamples.testutil.Verifier;
-import net.chrisrichardson.eventstorestore.javaexamples.testutil.customers.CustomersTestUtils;
-import org.junit.Assert;
-import org.junit.Test;
-import org.springframework.core.ParameterizedTypeReference;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpMethod;
-
 import org.springframework.web.client.RestTemplate;
 
-import java.math.BigDecimal;
+public class EndToEndTest extends AbstractRestAPITest {
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
-
-import static net.chrisrichardson.eventstorestore.javaexamples.testutil.TestUtil.eventually;
-import static net.chrisrichardson.eventstorestore.javaexamples.testutil.customers.CustomersTestUtils.generateCustomerInfo;
-import static org.junit.Assert.assertTrue;
-
-public class EndToEndTest {
 
   private String getenv(String name, String defaultValue) {
     String x = System.getenv(name);
     return x == null ? defaultValue : x;
   }
 
-  private String makeBaseUrl(int port, String path) {
-    return "http://" + getenv("SERVICE_HOST", "localhost") + ":" + port + "/" + path;
-  }
-
-  private String accountsCommandSideBaseUrl(String path) {
-    return makeBaseUrl(8080, path);
-  }
-  private String accountsQuerySideBaseUrl(String path) {
-    return makeBaseUrl(8081, path);
-  }
-  private String transactionsCommandSideBaseUrl(String path) {
-    return makeBaseUrl(8082, path);
-  }
-  private String customersCommandSideBaseUrl(String path) {
-    return makeBaseUrl(8083, path);
-  }
-
-  private String customersQuerySideBaseUrl(String path) {
-    return makeBaseUrl(8084, path);
-  }
-
   RestTemplate restTemplate = new RestTemplate();
 
-  CustomersTestUtils customersTestUtils = new CustomersTestUtils(restTemplate, customersQuerySideBaseUrl("/customers/"));
+  CustomersTestUtils customersTestUtils = new CustomersTestUtils(restTemplate, baseUrl("/customers/"));
 
-
+  public String baseUrl(String path) {
-  @Test
+    return "http://" + getenv("SERVICE_HOST", "localhost") + ":" + 8080 + "/" + path;
-  public void shouldCreateCustomerAndAccountsAndTransferMoney() {
-    CustomerInfo customerInfo = generateCustomerInfo();
-
-    BigDecimal initialFromAccountBalance = new BigDecimal(500);
-    BigDecimal initialToAccountBalance = new BigDecimal(100);
-    BigDecimal amountToTransfer = new BigDecimal(150);
-
-    BigDecimal finalFromAccountBalance = initialFromAccountBalance.subtract(amountToTransfer);
-    BigDecimal finalToAccountBalance = initialToAccountBalance.add(amountToTransfer);
-
-    final CustomerResponse customerResponse = restTemplate.postForEntity(customersCommandSideBaseUrl("/customers"),customerInfo, CustomerResponse.class).getBody();
-    final String customerId = customerResponse.getId();
-
-    customersTestUtils.assertCustomerResponse(customerId, customerInfo);
-
-
-    final CreateAccountResponse fromAccount = BasicAuthUtils.doBasicAuthenticatedRequest(restTemplate,
-            accountsCommandSideBaseUrl("/accounts"),
-            HttpMethod.POST,
-            CreateAccountResponse.class,
-            new CreateAccountRequest(customerId, "My #1 Account", "", initialFromAccountBalance)
-    );
-    final String fromAccountId = fromAccount.getAccountId();
-
-    CreateAccountResponse toAccount = BasicAuthUtils.doBasicAuthenticatedRequest(restTemplate,
-            accountsCommandSideBaseUrl("/accounts"),
-            HttpMethod.POST,
-            CreateAccountResponse.class,
-            new CreateAccountRequest(customerId, "My #2 Account", "", initialToAccountBalance)
-    );
-
-    String toAccountId = toAccount.getAccountId();
-
-    Assert.assertNotNull(fromAccountId);
-    Assert.assertNotNull(toAccountId);
-
-    assertAccountBalance(fromAccountId, initialFromAccountBalance);
-    assertAccountBalance(toAccountId, initialToAccountBalance);
-
-
-    final CreateMoneyTransferResponse moneyTransfer =  BasicAuthUtils.doBasicAuthenticatedRequest(restTemplate,
-            transactionsCommandSideBaseUrl("/transfers"),
-            HttpMethod.POST,
-            CreateMoneyTransferResponse.class,
-            new CreateMoneyTransferRequest(fromAccountId, toAccountId, amountToTransfer, "")
-    );
-
-    assertAccountBalance(fromAccountId, finalFromAccountBalance);
-    assertAccountBalance(toAccountId, finalToAccountBalance);
-
-    // TOOD - check state of money transfer
-
-    List<AccountTransactionInfo> transactionInfoList = restTemplate.exchange(accountsQuerySideBaseUrl("/accounts/"+fromAccountId+"/history"),
-            HttpMethod.GET,
-            new HttpEntity(BasicAuthUtils.basicAuthHeaders("test_user@mail.com")),
-            new ParameterizedTypeReference<List<AccountTransactionInfo>>() {}).getBody();
-
-    assertTrue(transactionInfoList.stream().filter(ti -> ti.getTransactionId().equals(moneyTransfer.getMoneyTransferId()) &&
-            ti.getFromAccountId().equals(fromAccountId) &&
-            ti.getToAccountId().equals(toAccountId) &&
-            ti.getAmount() == toCents(amountToTransfer).longValue()).findFirst().isPresent());
   }
 
-  @Test
+  @Override
-  public void shouldCreateAccountsAndGetByCustomer() {
+  public CustomersTestUtils getCustomersTestUtils() {
-    BigDecimal initialFromAccountBalance = new BigDecimal(500);
+    return customersTestUtils;
-    CustomerInfo customerInfo = generateCustomerInfo();
-
-    final CustomerResponse customerResponse = restTemplate.postForEntity(customersCommandSideBaseUrl("/customers"), customerInfo, CustomerResponse.class).getBody();
-    final String customerId = customerResponse.getId();
-
-    Assert.assertNotNull(customerId);
-    Assert.assertEquals(customerInfo, customerResponse.getCustomerInfo());
-
-    customersTestUtils.assertCustomerResponse(customerId, customerInfo);
-
-    final CreateAccountResponse account = BasicAuthUtils.doBasicAuthenticatedRequest(restTemplate,
-            accountsCommandSideBaseUrl("/accounts"),
-            HttpMethod.POST,
-            CreateAccountResponse.class,
-            new CreateAccountRequest(customerId, "My 1 Account", "", initialFromAccountBalance)
-    );
-    final String accountId = account.getAccountId();
-
-    Assert.assertNotNull(accountId);
-
-    assertAccountBalance(accountId, initialFromAccountBalance);
-
-    List<GetAccountResponse> accountResponseList = restTemplate.exchange(accountsQuerySideBaseUrl("/accounts?customerId="+customerId),
-            HttpMethod.GET,
-            new HttpEntity(BasicAuthUtils.basicAuthHeaders("test_user@mail.com")),
-            new ParameterizedTypeReference<List<GetAccountResponse>>() {}).getBody();
-
-    assertTrue(accountResponseList.stream().filter(acc -> acc.getAccountId().equals(accountId)).findFirst().isPresent());
   }
 
-  private BigDecimal toCents(BigDecimal dollarAmount) {
+  @Override
-    return dollarAmount.multiply(new BigDecimal(100));
+  public AuthenticatedRestTemplate getAuthenticatedRestTemplate() {
+    return new AuthenticatedRestTemplate(restTemplate);
   }
 
-  private void assertAccountBalance(final String fromAccountId, final BigDecimal expectedBalanceInDollars) {
+  @Override
-    final BigDecimal inCents = toCents(expectedBalanceInDollars);
+  public RestTemplate getRestTemplate() {
-    eventually(
+    return restTemplate;
-            new Producer<GetAccountResponse>() {
-              @Override
-              public CompletableFuture<GetAccountResponse> produce() {
-                  return CompletableFuture.completedFuture(BasicAuthUtils.doBasicAuthenticatedRequest(restTemplate,
-                          accountsQuerySideBaseUrl("/accounts/" + fromAccountId),
-                          HttpMethod.GET,
-                          GetAccountResponse.class));
-              }
-            },
-            new Verifier<GetAccountResponse>() {
-              @Override
-              public void verify(GetAccountResponse accountInfo) {
-                Assert.assertEquals(fromAccountId, accountInfo.getAccountId());
-                Assert.assertEquals(inCents, accountInfo.getBalance());
-              }
-            });
   }
 
 }

java-spring/gradle.properties

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

java-spring/monolithic-service/build.gradle

@@ -14,11 +14,11 @@ dependencies {
     compile "org.springframework.boot:spring-boot-starter-web"
     compile "org.springframework.boot:spring-boot-starter-actuator"
 
-    compile "io.eventuate.client.java:eventuate-client-java-jdbc:$eventuateClientVersion"
+    compile "io.eventuate.client.java:eventuate-client-java-http-stomp-spring:$eventuateClientVersion"
 
-    testCompile project(":testutil-customers")
+    testCompile project(":testutil")
     testCompile "org.springframework.boot:spring-boot-starter-test"
-
+    testCompile "io.eventuate.client.java:eventuate-client-java-jdbc:$eventuateClientVersion"
 }
 
 task copyWebStatic(type: Copy) {

java-spring/monolithic-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/web/BankingWebConfiguration.java

@@ -1,8 +1,8 @@
 package net.chrisrichardson.eventstore.javaexamples.banking.web;
 
+import io.eventuate.javaclient.spring.httpstomp.EventuateHttpStompClientConfiguration;
 import net.chrisrichardson.eventstore.javaexamples.banking.commonauth.AuthConfiguration;
 import net.chrisrichardson.eventstore.javaexamples.banking.commonswagger.CommonSwaggerConfiguration;
-import io.eventuate.javaclient.spring.jdbc.EventuateJdbcEventStoreConfiguration;
 import net.chrisrichardson.eventstore.javaexamples.banking.web.commandside.accounts.CommandSideWebAccountsConfiguration;
 import net.chrisrichardson.eventstore.javaexamples.banking.web.commandside.customers.CustomersCommandSideWebConfiguration;
 import net.chrisrichardson.eventstore.javaexamples.banking.web.commandside.transactions.CommandSideWebTransactionsConfiguration;
@@ -20,7 +20,7 @@ import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 
 @Configuration
-@Import({CommandSideWebAccountsConfiguration.class, CommandSideWebTransactionsConfiguration.class, EventuateJdbcEventStoreConfiguration.class, QuerySideWebConfiguration.class, CustomersQuerySideWebConfiguration.class, CustomersCommandSideWebConfiguration.class, AuthConfiguration.class, CommonSwaggerConfiguration.class})
+@Import({CommandSideWebAccountsConfiguration.class, CommandSideWebTransactionsConfiguration.class, EventuateHttpStompClientConfiguration.class, QuerySideWebConfiguration.class, CustomersQuerySideWebConfiguration.class, CustomersCommandSideWebConfiguration.class, AuthConfiguration.class, CommonSwaggerConfiguration.class})
 @EnableAutoConfiguration
 @ComponentScan
 public class BankingWebConfiguration extends WebMvcConfigurerAdapter {

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

@@ -4,7 +4,7 @@ import net.chrisrichardson.eventstore.javaexamples.banking.common.customers.Cust
 import net.chrisrichardson.eventstore.javaexamples.banking.common.customers.CustomerResponse;
 import net.chrisrichardson.eventstore.javaexamples.banking.common.customers.QuerySideCustomer;
 import net.chrisrichardson.eventstore.javaexamples.banking.commonauth.model.AuthRequest;
-import net.chrisrichardson.eventstorestore.javaexamples.testutil.customers.CustomersTestUtils;
+import net.chrisrichardson.eventstorestore.javaexamples.testutil.CustomersTestUtils;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -18,7 +18,7 @@ import org.springframework.web.client.RestTemplate;
 
 import javax.annotation.PostConstruct;
 
-import static net.chrisrichardson.eventstorestore.javaexamples.testutil.customers.CustomersTestUtils.generateCustomerInfo;
+import static net.chrisrichardson.eventstorestore.javaexamples.testutil.CustomersTestUtils.generateCustomerInfo;
 
 /**
  * Created by Main on 15.02.2016.
@@ -29,45 +29,45 @@ import static net.chrisrichardson.eventstorestore.javaexamples.testutil.customer
 @IntegrationTest({"server.port=0", "management.port=0"})
 public class BankingAuthTest {
 
-    @Value("${local.server.port}")
+  @Value("${local.server.port}")
-    private int port;
+  private int port;
 
-    @Autowired
+  @Autowired
-    RestTemplate restTemplate;
+  RestTemplate restTemplate;
 
-    CustomersTestUtils customersTestUtils;
+  CustomersTestUtils customersTestUtils;
 
-    @PostConstruct
+  @PostConstruct
-    private void init() {
+  private void init() {
-        customersTestUtils = new CustomersTestUtils(restTemplate, baseUrl("/customers/"));
+    customersTestUtils = new CustomersTestUtils(restTemplate, baseUrl("/customers/"));
-    }
+  }
 
-    private String baseUrl(String path) {
+  private String baseUrl(String path) {
-        return "http://localhost:" + port + "/" + path;
+    return "http://localhost:" + port + "/" + path;
-    }
+  }
 
-    @Test
+  @Test
-    public void shouldCreateCustomerAndLogin() {
+  public void shouldCreateCustomerAndLogin() {
-        String email = uniqueEmail();
+    String email = uniqueEmail();
-        CustomerInfo customerInfo = generateCustomerInfo(email);
+    CustomerInfo customerInfo = generateCustomerInfo(email);
 
-        final CustomerResponse customerResponse = restTemplate.postForEntity(baseUrl("/customers"), customerInfo, CustomerResponse.class).getBody();
+    final CustomerResponse customerResponse = restTemplate.postForEntity(baseUrl("/customers"), customerInfo, CustomerResponse.class).getBody();
-        final String customerId = customerResponse.getId();
+    final String customerId = customerResponse.getId();
 
-        Assert.assertNotNull(customerId);
+    Assert.assertNotNull(customerId);
-        Assert.assertEquals(customerInfo, customerResponse.getCustomerInfo());
+    Assert.assertEquals(customerInfo, customerResponse.getCustomerInfo());
 
-        customersTestUtils.assertCustomerResponse(customerId, customerInfo);
+    customersTestUtils.assertCustomerResponse(customerId, customerInfo);
 
-        AuthRequest authRequest = new AuthRequest(email);
+    AuthRequest authRequest = new AuthRequest(email);
 
-        final QuerySideCustomer loginQuerySideCustomer = restTemplate.postForEntity(baseUrl("/login"), authRequest, QuerySideCustomer.class).getBody();
+    final QuerySideCustomer loginQuerySideCustomer = restTemplate.postForEntity(baseUrl("/login"), authRequest, QuerySideCustomer.class).getBody();
 
-        customersTestUtils.assertQuerySideCustomerEqualscCustomerInfo(loginQuerySideCustomer, customerResponse.getCustomerInfo());
+    customersTestUtils.assertQuerySideCustomerEqualscCustomerInfo(loginQuerySideCustomer, customerResponse.getCustomerInfo());
-    }
+  }
 
 
-    private String uniqueEmail() {
+  private String uniqueEmail() {
-        return System.currentTimeMillis() + "@email.com";
+    return System.currentTimeMillis() + "@email.com";
-    }
+  }
 }

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

@@ -1,226 +1,55 @@
 package net.chrisrichardson.eventstore.javaexamples.banking.web;
 
-import net.chrisrichardson.eventstore.javaexamples.banking.backend.queryside.accounts.AccountTransactionInfo;
+import net.chrisrichardson.eventstorestore.javaexamples.testutil.AbstractRestAPITest;
-import net.chrisrichardson.eventstore.javaexamples.banking.common.customers.*;
+import net.chrisrichardson.eventstorestore.javaexamples.testutil.AuthenticatedRestTemplate;
-import net.chrisrichardson.eventstore.javaexamples.banking.commonauth.utils.BasicAuthUtils;
+import net.chrisrichardson.eventstorestore.javaexamples.testutil.CustomersTestUtils;
-import net.chrisrichardson.eventstore.javaexamples.banking.web.commandside.accounts.CreateAccountRequest;
-import net.chrisrichardson.eventstore.javaexamples.banking.web.commandside.accounts.CreateAccountResponse;
-import net.chrisrichardson.eventstore.javaexamples.banking.web.commandside.transactions.CreateMoneyTransferRequest;
-import net.chrisrichardson.eventstore.javaexamples.banking.web.commandside.transactions.CreateMoneyTransferResponse;
-import net.chrisrichardson.eventstore.javaexamples.banking.web.queryside.accounts.GetAccountResponse;
-import net.chrisrichardson.eventstorestore.javaexamples.testutil.Producer;
-import net.chrisrichardson.eventstorestore.javaexamples.testutil.Verifier;
-import net.chrisrichardson.eventstorestore.javaexamples.testutil.customers.CustomersTestUtils;
-import org.junit.Assert;
-import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.IntegrationTest;
 import org.springframework.boot.test.SpringApplicationConfiguration;
-import org.springframework.core.ParameterizedTypeReference;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpMethod;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
 import org.springframework.web.client.RestTemplate;
-import javax.annotation.PostConstruct;
-import java.math.BigDecimal;
 
-import java.util.List;
+import javax.annotation.PostConstruct;
-import java.util.Optional;
-import java.util.concurrent.CompletableFuture;
-import static net.chrisrichardson.eventstorestore.javaexamples.testutil.TestUtil.eventually;
-import static net.chrisrichardson.eventstorestore.javaexamples.testutil.customers.CustomersTestUtils.generateCustomerInfo;
-import static net.chrisrichardson.eventstorestore.javaexamples.testutil.customers.CustomersTestUtils.generateToAccountInfo;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringApplicationConfiguration(classes = BankingWebTestConfiguration.class)
 @WebAppConfiguration
 @IntegrationTest({"server.port=0", "management.port=0"})
-public class BankingWebIntegrationTest {
+public class BankingWebIntegrationTest extends AbstractRestAPITest {
 
-    @Value("${local.server.port}")
+  @Value("${local.server.port}")
-    private int port;
+  private int port;
 
-    private String baseUrl(String path) {
+  CustomersTestUtils customersTestUtils;
-        return "http://localhost:" + port + "/" + path;
-    }
 
-    @Autowired
+  @PostConstruct
-    RestTemplate restTemplate;
+  private void init() {
+    customersTestUtils = new CustomersTestUtils(restTemplate, baseUrl("/customers/"));
+  }
 
-    CustomersTestUtils customersTestUtils;
+  @Override
+  public String baseUrl(String path) {
+    return "http://localhost:" + port + "/" + path;
+  }
 
-    @PostConstruct
+  @Override
-    private void init() {
+  public CustomersTestUtils getCustomersTestUtils() {
-        customersTestUtils = new CustomersTestUtils(restTemplate, baseUrl("/customers/"));
+    return customersTestUtils;
-    }
+  }
 
+  @Autowired
+  RestTemplate restTemplate;
 
-    @Test
+  @Override
-    public void shouldCreateAccountsAndTransferMoney() {
+  public AuthenticatedRestTemplate getAuthenticatedRestTemplate() {
-        BigDecimal initialFromAccountBalance = new BigDecimal(500);
+    return new AuthenticatedRestTemplate(restTemplate);
-        BigDecimal initialToAccountBalance = new BigDecimal(100);
+  }
-        BigDecimal amountToTransfer = new BigDecimal(150);
 
-        BigDecimal finalFromAccountBalance = initialFromAccountBalance.subtract(amountToTransfer);
+  @Override
-        BigDecimal finalToAccountBalance = initialToAccountBalance.add(amountToTransfer);
+  public RestTemplate getRestTemplate() {
-
+    return restTemplate;
-        final CreateAccountResponse fromAccount = BasicAuthUtils.doBasicAuthenticatedRequest(restTemplate,
+  }
-                baseUrl("/accounts"),
-                HttpMethod.POST,
-                CreateAccountResponse.class,
-                new CreateAccountRequest("00000000-00000000", "My 1 Account", "", initialFromAccountBalance)
-        );
-        final String fromAccountId = fromAccount.getAccountId();
-
-        CreateAccountResponse toAccount = BasicAuthUtils.doBasicAuthenticatedRequest(restTemplate,
-                baseUrl("/accounts"),
-                HttpMethod.POST,
-                CreateAccountResponse.class,
-                new CreateAccountRequest("00000000-00000000", "My 2 Account", "", initialToAccountBalance)
-        );
-
-        String toAccountId = toAccount.getAccountId();
-
-        Assert.assertNotNull(fromAccountId);
-        Assert.assertNotNull(toAccountId);
-
-        assertAccountBalance(fromAccountId, initialFromAccountBalance);
-        assertAccountBalance(toAccountId, initialToAccountBalance);
-
-        final CreateMoneyTransferResponse moneyTransfer = BasicAuthUtils.doBasicAuthenticatedRequest(restTemplate,
-                baseUrl("/transfers"),
-                HttpMethod.POST,
-                CreateMoneyTransferResponse.class,
-                new CreateMoneyTransferRequest(fromAccountId, toAccountId, amountToTransfer, "")
-        );
-
-        assertAccountBalance(fromAccountId, finalFromAccountBalance);
-        assertAccountBalance(toAccountId, finalToAccountBalance);
-
-        List<AccountTransactionInfo> transactionInfoList = restTemplate.exchange(baseUrl("/accounts/"+fromAccountId+"/history"),
-                HttpMethod.GET,
-                new HttpEntity(BasicAuthUtils.basicAuthHeaders("test_user@mail.com")),
-                new ParameterizedTypeReference<List<AccountTransactionInfo>>() {}).getBody();
-
-
-        Optional<AccountTransactionInfo> first = transactionInfoList.stream().filter(ti -> ti.getTransactionId().equals(moneyTransfer.getMoneyTransferId())).findFirst();
-
-        assertTrue(first.isPresent());
-
-        AccountTransactionInfo ti = first.get();
-
-        assertEquals(fromAccountId, ti.getFromAccountId());
-        assertEquals(toAccountId, ti.getToAccountId());
-        assertEquals(toAccountId, ti.getToAccountId());
-        assertEquals(fromAccountId, ti.getFromAccountId());
-        assertEquals(toCents(amountToTransfer).longValue(), ti.getAmount());
-
-    }
-
-    @Test
-    public void shouldCreateAccountsAndGetByCustomer() {
-        BigDecimal initialFromAccountBalance = new BigDecimal(500);
-        CustomerInfo customerInfo = generateCustomerInfo();
-
-        final CustomerResponse customerResponse = restTemplate.postForEntity(baseUrl("/customers"), customerInfo, CustomerResponse.class).getBody();
-        final String customerId = customerResponse.getId();
-
-        Assert.assertNotNull(customerId);
-        assertEquals(customerInfo, customerResponse.getCustomerInfo());
-
-        customersTestUtils.assertCustomerResponse(customerId, customerInfo);
-
-        final CreateAccountResponse account = BasicAuthUtils.doBasicAuthenticatedRequest(restTemplate,
-                baseUrl("/accounts"),
-                HttpMethod.POST,
-                CreateAccountResponse.class,
-                new CreateAccountRequest(customerId, "My 1 Account", "", initialFromAccountBalance)
-        );
-        final String accountId = account.getAccountId();
-
-        Assert.assertNotNull(accountId);
-
-        assertAccountBalance(accountId, initialFromAccountBalance);
-
-        List<GetAccountResponse> accountResponseList = restTemplate.exchange(baseUrl("/accounts?customerId="+customerId),
-                HttpMethod.GET,
-                new HttpEntity(BasicAuthUtils.basicAuthHeaders("test_user@mail.com")),
-                new ParameterizedTypeReference<List<GetAccountResponse>>() {}).getBody();
-
-        assertTrue(accountResponseList.stream().filter(acc -> acc.getAccountId().equals(accountId)).findFirst().isPresent());
-    }
-
-    @Test
-    public void shouldCreateCustomersAndAddToAccount() {
-        CustomerInfo customerInfo = generateCustomerInfo();
-
-        final CustomerResponse customerResponse = restTemplate.postForEntity(baseUrl("/customers"), customerInfo, CustomerResponse.class).getBody();
-        final String customerId = customerResponse.getId();
-
-        Assert.assertNotNull(customerId);
-        assertEquals(customerInfo, customerResponse.getCustomerInfo());
-
-        customersTestUtils.assertCustomerResponse(customerId, customerInfo);
-
-        ToAccountInfo toAccountInfo = generateToAccountInfo();
-
-        BasicAuthUtils.doBasicAuthenticatedRequest(restTemplate,
-                baseUrl("/customers/"+customerId+"/toaccounts"),
-                HttpMethod.POST,
-                null,
-                toAccountInfo
-        );
-
-        assertToAccountsContains(customerId, toAccountInfo);
-    }
-
-    private BigDecimal toCents(BigDecimal dollarAmount) {
-        return dollarAmount.multiply(new BigDecimal(100));
-    }
-
-    private void assertAccountBalance(final String fromAccountId, final BigDecimal expectedBalanceInDollars) {
-        final BigDecimal inCents = toCents(expectedBalanceInDollars);
-        eventually(
-                new Producer<GetAccountResponse>() {
-                    @Override
-                    public CompletableFuture<GetAccountResponse> produce() {
-                        return CompletableFuture.completedFuture(BasicAuthUtils.doBasicAuthenticatedRequest(restTemplate,
-                                baseUrl("/accounts/" + fromAccountId),
-                                HttpMethod.GET,
-                                GetAccountResponse.class));
-                    }
-                },
-                new Verifier<GetAccountResponse>() {
-                    @Override
-                    public void verify(GetAccountResponse accountInfo) {
-                        assertEquals(fromAccountId, accountInfo.getAccountId());
-                        assertEquals(inCents, accountInfo.getBalance());
-                    }
-                });
-    }
-
-    private void assertToAccountsContains(final String customerId, final ToAccountInfo toAccountInfo) {
-        eventually(
-                new Producer<QuerySideCustomer>() {
-                    @Override
-                    public CompletableFuture<QuerySideCustomer> produce() {
-                        return CompletableFuture.completedFuture(BasicAuthUtils.doBasicAuthenticatedRequest(restTemplate,
-                                baseUrl("/customers/" + customerId),
-                                HttpMethod.GET,
-                                QuerySideCustomer.class));
-                    }
-                },
-                new Verifier<QuerySideCustomer>() {
-                    @Override
-                    public void verify(QuerySideCustomer customerResponse) {
-                        assertEquals(customerId, customerResponse.getId());
-                        assertTrue(customerResponse.getToAccounts().values().stream().anyMatch(t -> t.equals(toAccountInfo)));
-                    }
-                });
-    }
 }

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

@@ -1,23 +1,40 @@
 package net.chrisrichardson.eventstore.javaexamples.banking.web;
 
-import org.junit.Test;
+import io.eventuate.javaclient.spring.jdbc.EventuateJdbcEventStoreConfiguration;
-import org.springframework.beans.factory.annotation.Autowired;
+import net.chrisrichardson.eventstore.javaexamples.banking.commonauth.AuthConfiguration;
+import net.chrisrichardson.eventstore.javaexamples.banking.commonswagger.CommonSwaggerConfiguration;
+import net.chrisrichardson.eventstore.javaexamples.banking.web.commandside.accounts.CommandSideWebAccountsConfiguration;
+import net.chrisrichardson.eventstore.javaexamples.banking.web.commandside.customers.CustomersCommandSideWebConfiguration;
+import net.chrisrichardson.eventstore.javaexamples.banking.web.commandside.transactions.CommandSideWebTransactionsConfiguration;
+import net.chrisrichardson.eventstore.javaexamples.banking.web.customers.queryside.CustomersQuerySideWebConfiguration;
+import net.chrisrichardson.eventstore.javaexamples.banking.web.queryside.QuerySideWebConfiguration;
+import net.chrisrichardson.eventstorestore.javaexamples.testutil.RestTemplateErrorHandler;
+
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.web.HttpMessageConverters;
-import org.springframework.boot.context.embedded.EmbeddedServletContainer;
 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;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 import org.springframework.web.client.RestTemplate;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 
-import javax.annotation.PostConstruct;
 import java.util.Arrays;
 import java.util.List;
 
 @Configuration
-@Import(BankingWebConfiguration.class)
+@Import({CommandSideWebAccountsConfiguration.class, CommandSideWebTransactionsConfiguration.class, EventuateJdbcEventStoreConfiguration.class, QuerySideWebConfiguration.class, CustomersQuerySideWebConfiguration.class, CustomersCommandSideWebConfiguration.class, AuthConfiguration.class, CommonSwaggerConfiguration.class})
-public class BankingWebTestConfiguration {
+@EnableAutoConfiguration
+@ComponentScan
+public class BankingWebTestConfiguration extends WebMvcConfigurerAdapter {
+
+  @Bean
+  public HttpMessageConverters customConverters() {
+    HttpMessageConverter<?> additional = new MappingJackson2HttpMessageConverter();
+    return new HttpMessageConverters(additional);
+  }
 
   @Bean
   public RestTemplate restTemplate(HttpMessageConverters converters) {
@@ -25,6 +42,8 @@ public class BankingWebTestConfiguration {
     HttpMessageConverter<?> httpMessageConverter = converters.getConverters().get(0);
     List<? extends HttpMessageConverter<?>> httpMessageConverters = Arrays.asList(new MappingJackson2HttpMessageConverter());
     restTemplate.setMessageConverters((List<HttpMessageConverter<?>>) httpMessageConverters);
+
+    restTemplate.setErrorHandler(new RestTemplateErrorHandler());
     return restTemplate;
   }
 }

java-spring/settings.gradle

@@ -1,37 +1,35 @@
 include 'testutil'
+include 'common'
+include 'common-backend'
+include 'common-auth'
+include 'common-auth-web'
 include 'common-swagger'
 
-include 'common-backend'
-
 include 'accounts-command-side-backend'
-include 'transactions-command-side-backend'
 include 'accounts-command-side-web'
-include 'transactions-command-side-web'
+include 'accounts-command-side-service'
-
 
 include 'accounts-query-side-backend'
 include 'accounts-query-side-web'
+include 'accounts-query-side-service'
 
-include 'backend-integration-tests'
+include 'transactions-command-side-backend'
+include 'transactions-command-side-web'
+include 'transactions-command-side-service'
+
+include 'customers-command-side-backend'
+include 'customers-command-side-web'
+include 'customers-command-side-service'
+
+include 'customers-query-side-backend'
+include 'customers-query-side-web'
+include 'customers-query-side-service'
+
+include 'api-gateway-service'
 
 include 'monolithic-service'
 
-include 'accounts-command-side-service'
+include 'backend-integration-tests'
-include 'accounts-query-side-service'
-include 'transactions-command-side-service'
-
 include 'e2e-test'
 
 rootProject.name = 'java-spring-event-sourcing-example'
-include 'common-auth'
-include 'customers-command-side-backend'
-include 'customers-command-side-web'
-include 'customers-query-side-backend'
-include 'customers-query-side-web'
-include 'common-customers'
-include 'customers-command-side-service'
-include 'customers-query-side-service'
-include 'common-auth-web'
-include 'api-gateway-service'
-include 'testutil-customers'
-

java-spring/testutil-customers/build.gradle

@@ -1,10 +0,0 @@
-apply plugin: 'java'
-
-dependencies {
-    compile project(":testutil")
-    compile project(":common-auth")
-    compile project(":common-customers")
-
-    compile "io.reactivex:rxjava:1.1.5"
-    compile "org.springframework.boot:spring-boot-starter-test:$springBootVersion"
-}

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

@@ -1,77 +0,0 @@
-package net.chrisrichardson.eventstorestore.javaexamples.testutil.customers;
-
-import net.chrisrichardson.eventstore.javaexamples.banking.common.customers.*;
-import net.chrisrichardson.eventstore.javaexamples.banking.commonauth.utils.BasicAuthUtils;
-import net.chrisrichardson.eventstorestore.javaexamples.testutil.Producer;
-import net.chrisrichardson.eventstorestore.javaexamples.testutil.Verifier;
-import org.junit.Assert;
-import org.springframework.http.HttpMethod;
-import org.springframework.web.client.RestTemplate;
-
-import java.util.concurrent.CompletableFuture;
-
-import static net.chrisrichardson.eventstorestore.javaexamples.testutil.TestUtil.eventually;
-
-/**
- * Created by popikyardo on 02.03.16.
- */
-public class CustomersTestUtils {
-
-    private RestTemplate restTemplate;
-    private String customersBaseUrl;
-
-    public CustomersTestUtils(RestTemplate restTemplate, String customersBaseUrl) {
-        this.restTemplate = restTemplate;
-        this.customersBaseUrl = customersBaseUrl;
-    }
-
-    public void assertCustomerResponse(final String customerId, final CustomerInfo customerInfo) {
-        eventually(
-                new Producer<QuerySideCustomer>() {
-                    @Override
-                    public CompletableFuture<QuerySideCustomer> produce() {
-                        return CompletableFuture.completedFuture(BasicAuthUtils.doBasicAuthenticatedRequest(restTemplate,
-                                customersBaseUrl + customerId,
-                                HttpMethod.GET,
-                                QuerySideCustomer.class));
-                    }
-                },
-                new Verifier<QuerySideCustomer>() {
-                    @Override
-                    public void verify(QuerySideCustomer querySideCustomer) {
-                        Assert.assertEquals(customerId, querySideCustomer.getId());
-                        assertQuerySideCustomerEqualscCustomerInfo(querySideCustomer, customerInfo);
-                    }
-                });
-    }
-
-    public void assertQuerySideCustomerEqualscCustomerInfo(QuerySideCustomer querySideCustomer, CustomerInfo customerInfo) {
-        Assert.assertEquals(querySideCustomer.getName(), customerInfo.getName());
-        Assert.assertEquals(querySideCustomer.getEmail(), customerInfo.getEmail());
-        Assert.assertEquals(querySideCustomer.getPhoneNumber(), customerInfo.getPhoneNumber());
-        Assert.assertEquals(querySideCustomer.getSsn(), customerInfo.getSsn());
-        Assert.assertEquals(querySideCustomer.getAddress(), customerInfo.getAddress());
-    }
-
-    public static CustomerInfo generateCustomerInfo() {
-        return generateCustomerInfo("current@email.com");
-    }
-
-    public static CustomerInfo generateCustomerInfo(String email) {
-        return new CustomerInfo(
-                new Name("John", "Doe"),
-                email,
-                "000-00-0000",
-                "1-111-111-1111",
-                new Address("street 1",
-                        "street 2",
-                        "City",
-                        "State",
-                        "1111111")
-        );
-    }
-
-    public static ToAccountInfo generateToAccountInfo() {
-        return new ToAccountInfo("11111111-11111111", "New Account", "John Doe","");
-    }
-}

java-spring/testutil/build.gradle

@@ -1,13 +1,12 @@
 apply plugin: 'java'
 
 dependencies {
+    compile project(":common")
+    compile project(":common-auth")
+
     compile "io.eventuate.client.java:eventuate-client-java-spring:$eventuateClientVersion"
+    compile "org.springframework.boot:spring-boot-starter-web:$springBootVersion"
 
     compile "junit:junit:4.11"
     compile "io.reactivex:rxjava:1.1.5"
-
-    testCompile "org.springframework.boot:spring-boot-starter-test:$springBootVersion"
-    testCompile "io.eventuate.client.java:eventuate-client-java-jdbc:$eventuateClientVersion"
-
-
 }