Simplified project structure

tiarebalbi · Jan 11, 2017 · 6c84100 · 6c84100
1 parent cc65f39
commit 6c84100
Show file tree

Hide file tree

Showing 146 changed files with 528 additions and 781 deletions.
diff --git a/java-spring/accounts-command-side-backend/build.gradle b/java-spring/accounts-command-side-backend/build.gradle
diff --git a/...chardson/eventstore/javaexamples/banking/backend/commandside/accounts/AccountCommand.java b/...chardson/eventstore/javaexamples/banking/backend/commandside/accounts/AccountCommand.java
diff --git a/...on/eventstore/javaexamples/banking/backend/commandside/accounts/DeleteAccountCommand.java b/...on/eventstore/javaexamples/banking/backend/commandside/accounts/DeleteAccountCommand.java
diff --git a/java-spring/accounts-command-side-service/Dockerfile b/java-spring/accounts-command-side-service/Dockerfile
diff --git a/java-spring/accounts-command-side-service/build.gradle b/java-spring/accounts-command-side-service/build.gradle
diff --git a/...isrichardson/eventstore/javaexamples/banking/web/main/AccountsCommandSideServiceMain.java b/...isrichardson/eventstore/javaexamples/banking/web/main/AccountsCommandSideServiceMain.java
diff --git a/java-spring/accounts-command-side-web/build.gradle b/java-spring/accounts-command-side-web/build.gradle
diff --git a/...re/javaexamples/banking/web/commandside/accounts/CommandSideWebAccountsConfiguration.java b/...re/javaexamples/banking/web/commandside/accounts/CommandSideWebAccountsConfiguration.java
diff --git a/...mples/banking/web/commandside/accounts/AccountControllerIntegrationTestConfiguration.java b/...mples/banking/web/commandside/accounts/AccountControllerIntegrationTestConfiguration.java
diff --git a/java-spring/accounts-command-side-web/src/test/resources/logback.xml b/java-spring/accounts-command-side-web/src/test/resources/logback.xml
diff --git a/java-spring/accounts-query-side-service/Dockerfile b/java-spring/accounts-query-side-service/Dockerfile
diff --git a/...hrisrichardson/eventstore/javaexamples/banking/web/main/AccountsQuerySideServiceMain.java b/...hrisrichardson/eventstore/javaexamples/banking/web/main/AccountsQuerySideServiceMain.java
diff --git a/java-spring/accounts-query-side-web/build.gradle b/java-spring/accounts-query-side-web/build.gradle
diff --git a/...isrichardson/eventstore/javaexamples/banking/web/queryside/QuerySideWebConfiguration.java b/...isrichardson/eventstore/javaexamples/banking/web/queryside/QuerySideWebConfiguration.java
diff --git a/java-spring/accounts-service/Dockerfile b/java-spring/accounts-service/Dockerfile
@@ -0,0 +1,4 @@
+FROM java:openjdk-8u91-jdk
+CMD java ${JAVA_OPTS} -jar accounts-service.jar
+EXPOSE 8080
+COPY build/libs/accounts-service.jar .
diff --git a/...customers-query-side-service/build.gradle → java-spring/accounts-service/build.gradle b/...customers-query-side-service/build.gradle → java-spring/accounts-service/build.gradle
@@ -1,23 +1,21 @@
-apply plugin: VerifyMongoDBConfigurationPlugin
 apply plugin: VerifyEventStoreEnvironmentPlugin
 apply plugin: EventuateDependencyPlugin
 
 apply plugin: 'spring-boot'
 
 dependencies {
-    compile project(":customers-query-side-web")
+    compile project(":common-backend")
     compile project(":common-swagger")
 
     compile "org.springframework.boot:spring-boot-starter-web"
     compile "org.springframework.boot:spring-boot-starter-actuator"
 
     testCompile project(":testutil")
-    testCompile project(":customers-command-side-service")
+    testCompile "junit:junit:4.11"
     testCompile "org.springframework.boot:spring-boot-starter-test"
     testCompile "io.eventuate.client.java:eventuate-client-java-jdbc:$eventuateClientVersion"
 }
 
 test {
     ignoreFailures System.getenv("EVENTUATE_API_KEY_ID") == null
 }
-
diff --git a/.../chrisrichardson/eventstore/javaexamples/banking/accountsservice/AccountsServiceMain.java b/.../chrisrichardson/eventstore/javaexamples/banking/accountsservice/AccountsServiceMain.java
@@ -0,0 +1,21 @@
+package net.chrisrichardson.eventstore.javaexamples.banking.accountsservice;
+
+import io.eventuate.javaclient.driver.EventuateDriverConfiguration;
+import net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.web.AccountsWebConfiguration;
+import net.chrisrichardson.eventstore.javaexamples.banking.commonswagger.CommonSwaggerConfiguration;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
+@Configuration
+@Import({AccountsWebConfiguration.class, EventuateDriverConfiguration.class, CommonSwaggerConfiguration.class})
+@EnableAutoConfiguration
+@ComponentScan
+public class AccountsServiceMain {
+
+  public static void main(String[] args) {
+    SpringApplication.run(AccountsServiceMain.class, args);
+  }
+}
diff --git a/...backend/commandside/accounts/Account.java → ...king/accountsservice/backend/Account.java b/...backend/commandside/accounts/Account.java → ...king/accountsservice/backend/Account.java
@@ -1,4 +1,4 @@
-package net.chrisrichardson.eventstore.javaexamples.banking.backend.commandside.accounts;
+package net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.backend;
 
 import io.eventuate.Event;
 import io.eventuate.EventUtil;
@@ -7,7 +7,6 @@
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
 public class Account extends ReflectiveMutableCommandProcessingAggregate<Account, AccountCommand> {

diff --git a/...risrichardson/eventstore/javaexamples/banking/accountsservice/backend/AccountCommand.java b/...risrichardson/eventstore/javaexamples/banking/accountsservice/backend/AccountCommand.java
@@ -0,0 +1,7 @@
+package net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.backend;
+
+
+import io.eventuate.Command;
+
+interface AccountCommand extends Command {
+}
diff --git a/.../commandside/accounts/AccountService.java → ...countsservice/backend/AccountService.java b/.../commandside/accounts/AccountService.java → ...countsservice/backend/AccountService.java
@@ -1,4 +1,4 @@
-package net.chrisrichardson.eventstore.javaexamples.banking.backend.commandside.accounts;
+package net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.backend;
 
 
 import io.eventuate.AggregateRepository;

diff --git a/...commandside/accounts/AccountWorkflow.java → ...ountsservice/backend/AccountWorkflow.java b/...commandside/accounts/AccountWorkflow.java → ...ountsservice/backend/AccountWorkflow.java
@@ -1,11 +1,10 @@
-package net.chrisrichardson.eventstore.javaexamples.banking.backend.commandside.accounts;
+package net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.backend;
 
 
 import io.eventuate.EntityWithIdAndVersion;
 import io.eventuate.EventHandlerContext;
 import io.eventuate.EventHandlerMethod;
 import io.eventuate.EventSubscriber;
-import net.chrisrichardson.eventstore.javaexamples.banking.backend.common.customers.CustomerToAccountDeleted;
 import net.chrisrichardson.eventstore.javaexamples.banking.backend.common.transactions.DebitRecordedEvent;
 import net.chrisrichardson.eventstore.javaexamples.banking.backend.common.transactions.MoneyTransferCreatedEvent;
 

diff --git a/...ndside/accounts/AccountConfiguration.java → ...backend/AccountsBackendConfiguration.java b/...ndside/accounts/AccountConfiguration.java → ...backend/AccountsBackendConfiguration.java
@@ -1,4 +1,4 @@
-package net.chrisrichardson.eventstore.javaexamples.banking.backend.commandside.accounts;
+package net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.backend;
 
 import io.eventuate.AggregateRepository;
 import io.eventuate.EventuateAggregateStore;
@@ -8,7 +8,7 @@
 
 @Configuration
 @EnableEventHandlers
-public class AccountConfiguration {
+public class AccountsBackendConfiguration {
 
   @Bean
   public AccountWorkflow accountWorkflow() {

diff --git a/...ndside/accounts/CreditAccountCommand.java → ...service/backend/CreditAccountCommand.java b/...ndside/accounts/CreditAccountCommand.java → ...service/backend/CreditAccountCommand.java
@@ -1,7 +1,4 @@
-package net.chrisrichardson.eventstore.javaexamples.banking.backend.commandside.accounts;
-
-import io.eventuate.Aggregate;
-
+package net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.backend;
 
 import java.math.BigDecimal;
 

diff --git a/...andside/accounts/DebitAccountCommand.java → ...sservice/backend/DebitAccountCommand.java b/...andside/accounts/DebitAccountCommand.java → ...sservice/backend/DebitAccountCommand.java
@@ -1,4 +1,4 @@
-package net.chrisrichardson.eventstore.javaexamples.banking.backend.commandside.accounts;
+package net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.backend;
 
 import java.math.BigDecimal;
 

diff --git a/...hardson/eventstore/javaexamples/banking/accountsservice/backend/DeleteAccountCommand.java b/...hardson/eventstore/javaexamples/banking/accountsservice/backend/DeleteAccountCommand.java
@@ -0,0 +1,4 @@
+package net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.backend;
+
+public class DeleteAccountCommand implements AccountCommand {
+}
diff --git a/...mandside/accounts/OpenAccountCommand.java → ...tsservice/backend/OpenAccountCommand.java b/...mandside/accounts/OpenAccountCommand.java → ...tsservice/backend/OpenAccountCommand.java
@@ -1,4 +1,4 @@
-package net.chrisrichardson.eventstore.javaexamples.banking.backend.commandside.accounts;
+package net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.backend;
 
 
 import java.math.BigDecimal;

diff --git a/...mmandside/accounts/AccountController.java → ...ccountsservice/web/AccountController.java b/...mmandside/accounts/AccountController.java → ...ccountsservice/web/AccountController.java
@@ -1,6 +1,6 @@
-package net.chrisrichardson.eventstore.javaexamples.banking.web.commandside.accounts;
+package net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.web;
 
-import net.chrisrichardson.eventstore.javaexamples.banking.backend.commandside.accounts.AccountService;
+import net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.backend.AccountService;
 import net.chrisrichardson.eventstore.javaexamples.banking.common.accounts.CreateAccountRequest;
 import net.chrisrichardson.eventstore.javaexamples.banking.common.accounts.CreateAccountResponse;
 import net.chrisrichardson.eventstore.javaexamples.banking.common.accounts.DeleteAccountResponse;

diff --git a/...hardson/eventstore/javaexamples/banking/accountsservice/web/AccountsWebConfiguration.java b/...hardson/eventstore/javaexamples/banking/accountsservice/web/AccountsWebConfiguration.java
@@ -0,0 +1,15 @@
+package net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.web;
+
+import net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.backend.AccountsBackendConfiguration;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
+@Configuration
+@Import({AccountsBackendConfiguration.class})
+@ComponentScan
+public class AccountsWebConfiguration {
+
+
+}
diff --git a/...ntsCommandSideServiceIntegrationTest.java → ...ntsCommandSideServiceIntegrationTest.java b/...ntsCommandSideServiceIntegrationTest.java → ...ntsCommandSideServiceIntegrationTest.java
@@ -1,4 +1,4 @@
-package net.chrisrichardson.eventstore.javaexamples.banking.web;
+package net.chrisrichardson.eventstore.javaexamples.banking.accountsservice;
 
 import net.chrisrichardson.eventstore.javaexamples.banking.common.accounts.CreateAccountRequest;
 import net.chrisrichardson.eventstore.javaexamples.banking.common.accounts.CreateAccountResponse;
@@ -33,10 +33,9 @@ private String baseUrl(String path) {
 
 
   @Test
-  public void shouldCreateAccountsAndTransferMoney() {
+  public void shouldCreateAccounts() {
     BigDecimal initialFromAccountBalance = new BigDecimal(500);
     BigDecimal initialToAccountBalance = new BigDecimal(100);
-    BigDecimal amountToTransfer = new BigDecimal(150);
     String customerId = "00000000-00000000";
     String title = "My Account";
 
@@ -48,8 +47,6 @@ public void shouldCreateAccountsAndTransferMoney() {
 
     Assert.assertNotNull(fromAccountId);
     Assert.assertNotNull(toAccountId);
-
-
   }
 
 

diff --git a/...sCommandSideServiceTestConfiguration.java → ...sCommandSideServiceTestConfiguration.java b/...sCommandSideServiceTestConfiguration.java → ...sCommandSideServiceTestConfiguration.java
@@ -1,5 +1,8 @@
-package net.chrisrichardson.eventstore.javaexamples.banking.web;
+package net.chrisrichardson.eventstore.javaexamples.banking.accountsservice;
 
+import net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.web.AccountsWebConfiguration;
+import net.chrisrichardson.eventstore.javaexamples.banking.commonauth.AuthConfiguration;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.web.HttpMessageConverters;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -12,7 +15,8 @@
 import java.util.List;
 
 @Configuration
-@Import(AccountsCommandSideServiceConfiguration.class)
+@Import({AccountsWebConfiguration.class, AuthConfiguration.class})
+@EnableAutoConfiguration
 public class AccountsCommandSideServiceTestConfiguration {
 
   @Bean

diff --git a/...ommandside/accounts/AccountEventTest.java → ...untsservice/backend/AccountEventTest.java b/...ommandside/accounts/AccountEventTest.java → ...untsservice/backend/AccountEventTest.java
@@ -1,4 +1,4 @@
-package net.chrisrichardson.eventstore.javaexamples.banking.backend.commandside.accounts;
+package net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.backend;
 
 
 import net.chrisrichardson.eventstorestore.javaexamples.testutil.AbstractEntityEventTest;

diff --git a/...end/commandside/accounts/AccountTest.java → .../accountsservice/backend/AccountTest.java b/...end/commandside/accounts/AccountTest.java → .../accountsservice/backend/AccountTest.java
@@ -1,4 +1,4 @@
-package net.chrisrichardson.eventstore.javaexamples.banking.backend.commandside.accounts;
+package net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.backend;
 
 import io.eventuate.Event;
 import net.chrisrichardson.eventstore.javaexamples.banking.backend.common.accounts.AccountOpenedEvent;

diff --git a/...nts/AccountControllerIntegrationTest.java → ...web/AccountControllerIntegrationTest.java b/...nts/AccountControllerIntegrationTest.java → ...web/AccountControllerIntegrationTest.java
@@ -1,4 +1,4 @@
-package net.chrisrichardson.eventstore.javaexamples.banking.web.commandside.accounts;
+package net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.web;
 
 import org.junit.Before;
 import org.junit.Test;