- refactored the tests

- moved some dto classes into common module

java-spring/common/build.gradle

@@ -0,0 +1,8 @@
+apply plugin: 'java'
+
+dependencies {
+    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

@@ -0,0 +1,90 @@
+package net.chrisrichardson.eventstore.javaexamples.banking.common.accounts;
+
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+
+import java.util.Date;
+
+public class AccountTransactionInfo {
+
+  private String transactionId;
+  private String fromAccountId;
+  private String toAccountId;
+  private long amount;
+  private Date date;
+  private String description;
+
+  public AccountTransactionInfo() {
+  }
+
+  public AccountTransactionInfo(String transactionId, String fromAccountId, String toAccountId, long amount) {
+    this(transactionId, fromAccountId, toAccountId, amount, new Date(),  "");
+  }
+
+  public AccountTransactionInfo(String transactionId, String fromAccountId, String toAccountId, long amount, Date date, String description) {
+    this.transactionId = transactionId;
+    this.fromAccountId = fromAccountId;
+    this.toAccountId = toAccountId;
+    this.amount = amount;
+    this.date = date;
+    this.description = description;
+  }
+
+  public String getTransactionId() {
+    return transactionId;
+  }
+
+  public void setTransactionId(String transactionId) {
+    this.transactionId = transactionId;
+  }
+
+  public String getFromAccountId() {
+    return fromAccountId;
+  }
+
+  public void setFromAccountId(String fromAccountId) {
+    this.fromAccountId = fromAccountId;
+  }
+
+  public String getToAccountId() {
+    return toAccountId;
+  }
+
+  public void setToAccountId(String toAccountId) {
+    this.toAccountId = toAccountId;
+  }
+
+  public long getAmount() {
+    return amount;
+  }
+
+  public void setAmount(long amount) {
+    this.amount = amount;
+  }
+
+  public Date getDate() {
+    return date;
+  }
+
+  public void setDate(Date date) {
+    this.date = date;
+  }
+
+  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/accounts/CreateAccountRequest.java

@@ -0,0 +1,61 @@
+package net.chrisrichardson.eventstore.javaexamples.banking.common.accounts;
+
+import javax.validation.constraints.DecimalMin;
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+
+public class CreateAccountRequest {
+
+  @NotNull
+  private String customerId;
+
+  private String title;
+
+  private String description;
+
+  @NotNull
+  @DecimalMin("0")
+  private BigDecimal initialBalance;
+
+  public CreateAccountRequest() {
+  }
+
+  public CreateAccountRequest(String customerId, String title, String description, BigDecimal initialBalance) {
+    this.customerId = customerId;
+    this.title = title;
+    this.description = description;
+    this.initialBalance = initialBalance;
+  }
+
+  public String getCustomerId() {
+    return customerId;
+  }
+
+  public void setCustomerId(String customerId) {
+    this.customerId = customerId;
+  }
+
+  public BigDecimal getInitialBalance() {
+    return initialBalance;
+  }
+
+  public void setInitialBalance(BigDecimal initialBalance) {
+    this.initialBalance = initialBalance;
+  }
+
+  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/accounts/CreateAccountResponse.java

@@ -0,0 +1,22 @@
+package net.chrisrichardson.eventstore.javaexamples.banking.common.accounts;
+
+
+public class CreateAccountResponse {
+  
+  private String accountId;
+
+  public CreateAccountResponse() {
+  }
+
+  public CreateAccountResponse(String accountId) {
+    this.accountId = accountId;
+  }
+
+  public String getAccountId() {
+    return accountId;
+  }
+
+  public void setAccountId(String accountId) {
+    this.accountId = accountId;
+  }
+}

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

@@ -0,0 +1,61 @@
+package net.chrisrichardson.eventstore.javaexamples.banking.common.transactions;
+
+import javax.validation.constraints.DecimalMin;
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+
+public class CreateMoneyTransferRequest {
+
+  @NotNull
+  private String fromAccountId;
+
+  @NotNull
+  private String toAccountId;
+
+  @DecimalMin("0.01")
+  private BigDecimal amount;
+
+  private String description;
+
+  public CreateMoneyTransferRequest() {
+  }
+
+  public CreateMoneyTransferRequest(String fromAccountId, String toAccountId, BigDecimal amount, String description) {
+    this.fromAccountId = fromAccountId;
+    this.toAccountId = toAccountId;
+    this.amount = amount;
+    this.description = description;
+  }
+
+  public void setFromAccountId(String fromAccountId) {
+    this.fromAccountId = fromAccountId;
+  }
+
+  public void setToAccountId(String toAccountId) {
+    this.toAccountId = toAccountId;
+  }
+
+  public void setAmount(BigDecimal amount) {
+    this.amount = amount;
+  }
+
+  public void setDescription(String description) {
+    this.description = description;
+  }
+
+  public String getFromAccountId() {
+    return fromAccountId;
+  }
+
+  public String getToAccountId() {
+    return toAccountId;
+  }
+
+  public BigDecimal getAmount() {
+    return amount;
+  }
+
+  public String getDescription() {
+    return description;
+  }
+}

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

@@ -0,0 +1,18 @@
+package net.chrisrichardson.eventstore.javaexamples.banking.common.transactions;
+
+
+public class CreateMoneyTransferResponse {
+  private String moneyTransferId;
+
+  public CreateMoneyTransferResponse() {
+  }
+
+  public CreateMoneyTransferResponse(String moneyTransferId) {
+
+    this.moneyTransferId = moneyTransferId;
+  }
+
+  public String getMoneyTransferId() {
+    return moneyTransferId;
+  }
+}