From e0d0ccba1cf07170f31b805e8b2aa40589f2134c Mon Sep 17 00:00:00 2001 From: Artem Sidorkin Date: Fri, 23 Oct 2020 16:44:36 +0300 Subject: [PATCH] #44: Upgraded eventuate dependencies. Upgraded Spring boot. Upgraded gradle. Updated according the style guide. --- README.md | 43 +--- _build-and-test-all.sh | 70 ------ .../build.gradle | 9 + .../domain/events}/AccountChangedEvent.java | 2 +- .../domain/events}/AccountCreditedEvent.java | 2 +- ...ebitFailedDueToInsufficientFundsEvent.java | 2 +- .../domain/events}/AccountDebitedEvent.java | 2 +- .../domain/events/AccountDeletedEvent.java | 4 + .../accounts/domain/events}/AccountEvent.java | 4 +- .../domain/events}/AccountOpenedEvent.java | 2 +- .../AccountOpenEventSerializationTest.java | 7 +- .../accounts-service-api-web/build.gradle | 5 + .../webapi}/CreateAccountRequest.java | 2 +- .../webapi}/CreateAccountResponse.java | 2 +- .../webapi}/DeleteAccountResponse.java | 2 +- java-spring/accounts-service/Dockerfile | 7 +- java-spring/accounts-service/build.gradle | 28 ++- ...ration.java => AccountsConfiguration.java} | 9 +- .../accountsservice/AccountsServiceMain.java | 5 +- .../{backend => domain}/Account.java | 8 +- .../{backend => domain}/AccountCommand.java | 4 +- .../CreditAccountCommand.java | 2 +- .../DebitAccountCommand.java | 2 +- .../DeleteAccountCommand.java | 2 +- .../OpenAccountCommand.java | 2 +- .../{backend => service}/AccountService.java | 6 +- .../{backend => service}/AccountWorkflow.java | 10 +- .../web/AccountController.java | 8 +- .../web/AccountsWebConfiguration.java | 5 +- .../src/main/resources/application.properties | 5 + ...untsCommandSideServiceIntegrationTest.java | 19 +- ...tsCommandSideServiceTestConfiguration.java | 6 +- .../AccountEventTest.java | 3 +- .../{backend => service}/AccountTest.java | 6 +- .../web/AccountControllerIntegrationTest.java | 6 +- ...ontrollerIntegrationTestConfiguration.java | 3 +- .../build.gradle | 5 + .../view/webapi}/AccountHistoryResponse.java | 4 +- .../view/webapi}/GetAccountResponse.java | 2 +- .../view/webapi}/GetAccountsResponse.java | 2 +- java-spring/accounts-view-service/Dockerfile | 7 +- .../accounts-view-service/build.gradle | 21 +- ...ion.java => AccountViewConfiguration.java} | 9 +- .../AccountsViewServiceMain.java | 5 +- .../{backend => domain}/AccountInfo.java | 2 +- .../AccountInfoRepository.java | 4 +- .../AccountNotFoundException.java | 2 +- .../QuerySideDependencyChecker.java | 4 +- .../AccountInfoUpdateService.java | 16 +- .../AccountQueryService.java | 12 +- .../AccountQueryWorkflow.java | 20 +- .../{backend => service}/MoneyUtil.java | 2 +- .../web/AccountQueryController.java | 9 +- .../web/AccountViewWebConfiguration.java | 6 +- .../src/main/resources/application.properties | 5 + .../web/AccountInfoUpdateServiceTest.java | 25 +- ...countsQuerySideServiceIntegrationTest.java | 14 +- ...untsQuerySideServiceTestConfiguration.java | 6 +- .../api-gateway-service-api-web/build.gradle | 5 + .../apigateway/webapi}/AuthRequest.java | 2 +- .../apigateway/webapi}/ErrorResponse.java | 2 +- java-spring/api-gateway-service/Dockerfile | 7 +- java-spring/api-gateway-service/build.gradle | 9 +- .../ApiGatewayServiceConfiguration.java | 6 +- .../controller/AuthController.java | 12 +- .../controller/GatewayController.java | 6 +- .../utils/ContentRequestTransformer.java | 4 +- .../utils/HeadersRequestTransformer.java | 5 +- .../utils/ProxyRequestTransformer.java | 4 +- .../utils/URLRequestTransformer.java | 10 +- .../AuthControllerIntegrationTest.java | 13 +- ...ontrollerIntegrationTestConfiguration.java | 6 +- .../backend-integration-tests/build.gradle | 15 -- .../backend/BankingTestConfiguration.java | 15 -- .../backend/MoneyTransferIntegrationTest.java | 92 ------- .../AccountQuerySideIntegrationTest.java | 66 ----- .../AccountQuerySideTestConfiguration.java | 16 -- .../CustomerQuerySideIntegrationTest.java | 75 ------ .../CustomerQuerySideTestConfiguration.java | 14 -- .../build-and-test-all-eventuate-local.sh | 6 - java-spring/build-and-test-all.sh | 54 +++- java-spring/build.gradle | 31 ++- .../groovy/EventuateDependencyPlugin.groovy | 16 -- .../VerifyEventStoreEnvironmentPlugin.groovy | 15 -- java-spring/common-auth-web/build.gradle | 12 - java-spring/common-auth/build.gradle | 6 +- .../banking/commonauth/AuthConfiguration.java | 64 +---- .../commonauth/AuthConfigurationAdapter.java | 63 +++++ .../banking/commonauth/AuthProperties.java | 6 +- .../AuthPropertiesConfiguration.java | 14 ++ .../commonauth/CustomerAuthRepository.java | 8 +- .../commonauth/CustomerAuthService.java | 10 +- .../src/main/resources/auth.properties | 4 +- java-spring/common-backend/build.gradle | 13 - .../common/accounts/AccountDeletedEvent.java | 4 - .../src/main/resources/logback.xml | 22 -- java-spring/common-swagger/build.gradle | 6 +- .../CommonSwaggerConfiguration.java | 33 +-- .../build.gradle | 7 + .../events}/CustomerAddedToAccount.java | 2 +- .../domain/events}/CustomerCreatedEvent.java | 2 +- .../domain/events}/CustomerEvent.java | 4 +- .../events}/CustomerToAccountDeleted.java | 2 +- .../customers-service-api-web/build.gradle | 5 + .../webapi}/AddToAccountResponse.java | 2 +- .../customers/webapi}/CustomerResponse.java | 3 +- java-spring/customers-service/Dockerfile | 7 +- java-spring/customers-service/build.gradle | 22 +- ...ration.java => CustomerConfiguration.java} | 8 +- .../CustomersServiceMain.java | 11 +- .../AddToAccountCommand.java | 2 +- .../CreateCustomerCommand.java | 2 +- .../{backend => domain}/Customer.java | 8 +- .../{backend => domain}/CustomerCommand.java | 4 +- .../DeleteToAccountCommand.java | 2 +- .../{backend => service}/CustomerService.java | 7 +- .../web/CustomerController.java | 8 +- .../web/CustomersWebConfiguration.java | 6 +- .../src/main/resources/application.properties | 5 + ...mersCommandSideServiceIntegrationTest.java | 14 +- ...rsCommandSideServiceTestConfiguration.java | 16 +- .../CustomerEventTest.java | 3 +- .../{backend => service}/CustomerTest.java | 6 +- .../build.gradle | 2 - .../view/commonapi/CustomerView.java} | 8 +- .../build.gradle | 7 + .../view/webapi/CustomersQueryResponse.java | 28 +++ java-spring/customers-view-service/Dockerfile | 7 +- .../customers-view-service/build.gradle | 23 +- ...on.java => CustomerViewConfiguration.java} | 11 +- .../CustomersViewServiceMain.java | 15 +- .../backend/CustomerViewRepository.java | 11 - .../domain/CustomerViewRepository.java | 11 + .../ViewDependencyChecker.java | 4 +- .../CustomerInfoUpdateService.java | 13 +- .../CustomerQueryService.java | 17 +- .../CustomerQueryWorkflow.java | 10 +- .../web/CustomerQueryController.java | 9 +- .../web/CustomersQueryResponse.java | 28 --- .../web/CustomersViewWebConfiguration.java | 6 +- .../src/main/resources/application.properties | 5 + ...tomersQuerySideServiceIntegrationTest.java | 55 ---- ...mersQuerySideServiceTestConfiguration.java | 32 --- .../CustomerInfoUpdateServiceTest.java | 42 ++-- java-spring/docker-compose-common.yml | 54 ---- .../docker-compose-eventuate-local.yml | 161 ------------ java-spring/docker-compose.yml | 235 ++++++++++++++---- java-spring/gradle.properties | 16 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../rest-api-integration-tests/build.gradle | 14 -- .../banking/web/BankingAuthTest.java | 64 ----- .../web/BankingWebIntegrationTest.java | 49 ---- .../web/BankingWebTestConfiguration.java | 51 ---- java-spring/set-env.sh | 21 -- java-spring/settings.gradle | 19 +- java-spring/testutil/build.gradle | 10 +- .../testutil/AbstractEntityEventTest.java | 2 +- .../testutil/AbstractRestAPITest.java | 15 +- .../testutil/CustomersTestUtils.java | 16 +- .../build.gradle | 7 + .../domain/events}/CreditRecordedEvent.java | 3 +- .../domain/events}/DebitRecordedEvent.java | 2 +- .../events}/FailedDebitRecordedEvent.java | 2 +- .../events}/MoneyTransferCreatedEvent.java | 2 +- .../domain/events}/MoneyTransferEvent.java | 4 +- .../domain/events}/TransferDetails.java | 7 +- .../transactions-service-api-web/build.gradle | 5 + .../webapi}/CreateMoneyTransferRequest.java | 2 +- .../webapi}/CreateMoneyTransferResponse.java | 2 +- java-spring/transactions-service/Dockerfile | 7 +- java-spring/transactions-service/build.gradle | 20 +- ...n.java => MoneyTransferConfiguration.java} | 8 +- .../TransactionsServiceMain.java | 9 +- .../CreateMoneyTransferCommand.java | 5 +- .../{backend => domain}/MoneyTransfer.java | 8 +- .../MoneyTransferCommand.java | 4 +- .../RecordCreditCommand.java | 2 +- .../RecordDebitCommand.java | 2 +- .../RecordDebitFailedCommand.java | 2 +- .../MoneyTransferService.java | 7 +- .../MoneyTransferWorkflow.java | 12 +- .../web/MoneyTransferController.java | 9 +- .../web/MoneyTransferWebConfiguration.java | 6 +- .../src/main/resources/application.properties | 5 + ...ionsCommandSideServiceIntegrationTest.java | 12 +- ...nsCommandSideServiceTestConfiguration.java | 4 +- .../MoneyTransferEventTest.java | 3 +- ...oneyTransferControllerIntegrationTest.java | 6 +- ...ontrollerIntegrationTestConfiguration.java | 5 +- scala-spring/README.md | 37 --- .../build.gradle | 5 - .../examples/bank/accounts/Account.scala | 41 --- .../bank/accounts/AccountCommands.scala | 13 - .../bank/accounts/AccountConfiguration.scala | 21 -- .../bank/accounts/AccountService.scala | 12 - .../TransferWorkflowAccountHandlers.scala | 27 -- .../build.gradle | 22 -- ...ountsCommandSideServiceConfiguration.scala | 25 -- .../main/AccountsCommandSideServiceMain.scala | 10 - ...ntsCommandSideServiceIntegrationTest.scala | 32 --- ...sCommandSideServiceTestConfiguration.scala | 27 -- .../accounts-command-side-web/build.gradle | 10 - .../CommandSideWebAccountsConfiguration.scala | 11 - .../controllers/AccountController.scala | 20 -- .../controllers/CreateAccountRequest.scala | 3 - .../controllers/CreateAccountResponse.scala | 7 - .../accounts-query-side-backend/build.gradle | 16 -- .../examples/bank/queryside/AccountInfo.scala | 14 -- .../queryside/AccountInfoQueryService.scala | 17 -- .../queryside/AccountInfoUpdateService.scala | 95 ------- .../queryside/QuerySideConfiguration.scala | 20 -- .../QuerysideDependencyChecker.scala | 26 -- .../accounts-query-side-service/build.gradle | 23 -- ...ccountsQuerySideServiceConfiguration.scala | 24 -- .../main/AccountsQuerySideServiceMain.scala | 10 - ...ountsQuerySideServiceIntegrationTest.scala | 30 --- ...ntsQuerySideServiceTestConfiguration.scala | 27 -- .../accounts-query-side-web/build.gradle | 16 -- .../queryside/QuerySideWebConfiguration.scala | 13 - .../AccountQuerySideController.scala | 18 -- .../backend-integration-tests/build.gradle | 18 -- .../bank/MoneyTransferIntegrationTest.scala | 101 -------- .../config/BankingTestConfiguration.scala | 15 -- scala-spring/build-and-test-all.sh | 3 - scala-spring/build.gradle | 29 --- .../VerifyEventStoreEnvironmentPlugin.groovy | 15 -- .../VerifyMongoDBConfigurationPlugin.groovy | 15 -- scala-spring/common-backend/build.gradle | 10 - .../src/main/resources/logback.xml | 22 -- .../common/accounts/AccountEvents.scala | 18 -- .../backend/common/accounts/package-info.java | 2 - .../transactions/TransactionEvents.scala | 8 - .../common/transactions/TransferDetails.scala | 6 - .../common/transactions/package-info.java | 2 - scala-spring/common-web/build.gradle | 10 - .../examples/bank/web/util/WebUtil.scala | 20 -- scala-spring/docker-compose.yml | 46 ---- scala-spring/e2e-test/build.gradle | 19 -- .../examples/bank/web/EndToEndTest.scala | 68 ----- scala-spring/gradle.properties | 10 - .../gradle/gradle/wrapper/gradle-wrapper.jar | Bin 51017 -> 0 bytes .../gradle/wrapper/gradle-wrapper.properties | 6 - scala-spring/gradle/gradlew | 164 ------------ scala-spring/gradle/gradlew.bat | 90 ------- .../gradle/wrapper/gradle-wrapper.jar | Bin 50514 -> 0 bytes .../gradle/wrapper/gradle-wrapper.properties | 6 - scala-spring/gradlew | 164 ------------ scala-spring/gradlew.bat | 90 ------- scala-spring/handy-curl-commands.sh | 36 --- scala-spring/monolithic-service/build.gradle | 22 -- .../bank/web/BankingWebAppConfiguration.scala | 31 --- .../examples/bank/web/main/BankingMain.scala | 10 - .../bank/web/BankWebIntegrationTest.scala | 70 ------ .../web/BankingWebAppTestConfiguration.scala | 27 -- scala-spring/settings.gradle | 23 -- .../build.gradle | 5 - .../bank/transactions/MoneyTransfer.scala | 46 ---- .../transactions/MoneyTransferCommands.scala | 15 -- .../MoneyTransferEventHandlers.scala | 34 --- .../transactions/MoneyTransferService.scala | 13 - .../TransactionConfiguration.scala | 18 -- .../build.gradle | 22 -- ...tionsCommandSideServiceConfiguration.scala | 24 -- .../TransactionsCommandSideServiceMain.scala | 10 - ...onsCommandSideServiceIntegrationTest.scala | 30 --- ...sCommandSideServiceTestConfiguration.scala | 27 -- .../build.gradle | 10 - ...mandSideWebTransactionsConfiguration.scala | 11 - .../CreateMoneyTransferResponse.scala | 11 - .../controllers/MoneyTransferController.scala | 30 --- wait-for-docker-services.sh | 9 - wait-for-services.sh | 26 -- 272 files changed, 998 insertions(+), 3851 deletions(-) delete mode 100755 _build-and-test-all.sh create mode 100644 java-spring/accounts-service-api-messaging/build.gradle rename java-spring/{common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/accounts => accounts-service-api-messaging/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accounts/domain/events}/AccountChangedEvent.java (84%) rename java-spring/{common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/accounts => accounts-service-api-messaging/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accounts/domain/events}/AccountCreditedEvent.java (74%) rename java-spring/{common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/accounts => accounts-service-api-messaging/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accounts/domain/events}/AccountDebitFailedDueToInsufficientFundsEvent.java (81%) rename java-spring/{common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/accounts => accounts-service-api-messaging/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accounts/domain/events}/AccountDebitedEvent.java (74%) create mode 100644 java-spring/accounts-service-api-messaging/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accounts/domain/events/AccountDeletedEvent.java rename java-spring/{common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/accounts => accounts-service-api-messaging/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accounts/domain/events}/AccountEvent.java (58%) rename java-spring/{common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/accounts => accounts-service-api-messaging/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accounts/domain/events}/AccountOpenedEvent.java (89%) rename java-spring/{common-backend/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/common/accounts => accounts-service-api-messaging/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/accounts/domain/events}/AccountOpenEventSerializationTest.java (64%) create mode 100644 java-spring/accounts-service-api-web/build.gradle rename java-spring/{common/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/common/accounts => accounts-service-api-web/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accounts/webapi}/CreateAccountRequest.java (94%) rename java-spring/{common/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/common/accounts => accounts-service-api-web/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accounts/webapi}/CreateAccountResponse.java (81%) rename java-spring/{common/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/common/accounts => accounts-service-api-web/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accounts/webapi}/DeleteAccountResponse.java (81%) rename java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/{backend/AccountsBackendConfiguration.java => AccountsConfiguration.java} (65%) rename java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/{backend => domain}/Account.java (76%) rename java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/{backend => domain}/AccountCommand.java (58%) rename java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/{backend => domain}/CreditAccountCommand.java (95%) rename java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/{backend => domain}/DebitAccountCommand.java (95%) rename java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/{backend => domain}/DeleteAccountCommand.java (86%) rename java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/{backend => domain}/OpenAccountCommand.java (97%) rename java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/{backend => service}/AccountService.java (69%) rename java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/{backend => service}/AccountWorkflow.java (70%) create mode 100644 java-spring/accounts-service/src/main/resources/application.properties rename java-spring/accounts-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/{backend => service}/AccountEventTest.java (73%) rename java-spring/accounts-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/{backend => service}/AccountTest.java (70%) create mode 100644 java-spring/accounts-view-service-api-web/build.gradle rename java-spring/{common/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/common/accounts => accounts-view-service-api-web/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accounts/view/webapi}/AccountHistoryResponse.java (75%) rename java-spring/{common/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/common/accounts => accounts-view-service-api-web/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accounts/view/webapi}/GetAccountResponse.java (92%) rename java-spring/{common/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/common/accounts => accounts-view-service-api-web/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accounts/view/webapi}/GetAccountsResponse.java (83%) rename java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/{backend/AccountViewBackendConfiguration.java => AccountViewConfiguration.java} (66%) rename java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/{backend => domain}/AccountInfo.java (98%) rename java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/{backend => domain}/AccountInfoRepository.java (66%) rename java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/{backend => domain}/AccountNotFoundException.java (90%) rename java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/{backend => domain}/QuerySideDependencyChecker.java (91%) rename java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/{backend => service}/AccountInfoUpdateService.java (82%) rename java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/{backend => service}/AccountQueryService.java (52%) rename java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/{backend => service}/AccountQueryWorkflow.java (82%) rename java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/{backend => service}/MoneyUtil.java (90%) create mode 100644 java-spring/accounts-view-service/src/main/resources/application.properties create mode 100644 java-spring/api-gateway-service-api-web/build.gradle rename java-spring/{common-auth-web/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/commonauth/model => api-gateway-service-api-web/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/apigateway/webapi}/AuthRequest.java (88%) rename java-spring/{common-auth-web/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/commonauth/model => api-gateway-service-api-web/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/apigateway/webapi}/ErrorResponse.java (81%) rename java-spring/{common-auth-web/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/commonauth => api-gateway-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/apigateway}/controller/AuthController.java (79%) rename java-spring/{common-auth-web/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/commonauth/controller => api-gateway-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/apigateway}/AuthControllerIntegrationTest.java (84%) rename java-spring/{common-auth-web/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/commonauth/controller => api-gateway-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/apigateway}/AuthControllerIntegrationTestConfiguration.java (70%) delete mode 100644 java-spring/backend-integration-tests/build.gradle delete mode 100644 java-spring/backend-integration-tests/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/BankingTestConfiguration.java delete mode 100644 java-spring/backend-integration-tests/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/MoneyTransferIntegrationTest.java delete mode 100644 java-spring/backend-integration-tests/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/queryside/accounts/AccountQuerySideIntegrationTest.java delete mode 100644 java-spring/backend-integration-tests/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/queryside/accounts/AccountQuerySideTestConfiguration.java delete mode 100644 java-spring/backend-integration-tests/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/queryside/customers/CustomerQuerySideIntegrationTest.java delete mode 100644 java-spring/backend-integration-tests/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/queryside/customers/CustomerQuerySideTestConfiguration.java delete mode 100755 java-spring/build-and-test-all-eventuate-local.sh delete mode 100644 java-spring/buildSrc/src/main/groovy/EventuateDependencyPlugin.groovy delete mode 100644 java-spring/buildSrc/src/main/groovy/VerifyEventStoreEnvironmentPlugin.groovy delete mode 100644 java-spring/common-auth-web/build.gradle create mode 100755 java-spring/common-auth/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/commonauth/AuthConfigurationAdapter.java create mode 100755 java-spring/common-auth/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/commonauth/AuthPropertiesConfiguration.java delete mode 100644 java-spring/common-backend/build.gradle delete mode 100644 java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/accounts/AccountDeletedEvent.java delete mode 100644 java-spring/common-backend/src/main/resources/logback.xml create mode 100644 java-spring/customers-service-api-messaging/build.gradle rename java-spring/{common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/customers => customers-service-api-messaging/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customers/domain/events}/CustomerAddedToAccount.java (86%) rename java-spring/{common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/customers => customers-service-api-messaging/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customers/domain/events}/CustomerCreatedEvent.java (85%) rename java-spring/{common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/customers => customers-service-api-messaging/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customers/domain/events}/CustomerEvent.java (62%) rename java-spring/{common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/customers => customers-service-api-messaging/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customers/domain/events}/CustomerToAccountDeleted.java (81%) create mode 100644 java-spring/customers-service-api-web/build.gradle rename java-spring/{common/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/common/customers => customers-service-api-web/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customers/webapi}/AddToAccountResponse.java (80%) rename java-spring/{common/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/common/customers => customers-service-api-web/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customers/webapi}/CustomerResponse.java (83%) rename java-spring/customers-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/{backend/CustomerBackendConfiguration.java => CustomerConfiguration.java} (70%) rename java-spring/customers-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/{backend => domain}/AddToAccountCommand.java (95%) rename java-spring/customers-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/{backend => domain}/CreateCustomerCommand.java (95%) rename java-spring/customers-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/{backend => domain}/Customer.java (76%) rename java-spring/customers-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/{backend => domain}/CustomerCommand.java (57%) rename java-spring/customers-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/{backend => domain}/DeleteToAccountCommand.java (95%) rename java-spring/customers-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/{backend => service}/CustomerService.java (70%) create mode 100644 java-spring/customers-service/src/main/resources/application.properties rename java-spring/customers-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/{backend => service}/CustomerEventTest.java (73%) rename java-spring/customers-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/{backend => service}/CustomerTest.java (72%) rename java-spring/{customers-query-side-common => customers-view-service-api-common}/build.gradle (76%) rename java-spring/{customers-query-side-common/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/web/customers/queryside/common/QuerySideCustomer.java => customers-view-service-api-common/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customers/view/commonapi/CustomerView.java} (85%) create mode 100644 java-spring/customers-view-service-api-web/build.gradle create mode 100644 java-spring/customers-view-service-api-web/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customers/view/webapi/CustomersQueryResponse.java rename java-spring/customers-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersviewservice/{backend/CustomerViewBackendConfiguration.java => CustomerViewConfiguration.java} (66%) delete mode 100644 java-spring/customers-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersviewservice/backend/CustomerViewRepository.java create mode 100644 java-spring/customers-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersviewservice/domain/CustomerViewRepository.java rename java-spring/customers-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersviewservice/{backend => domain}/ViewDependencyChecker.java (91%) rename java-spring/customers-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersviewservice/{backend => service}/CustomerInfoUpdateService.java (86%) rename java-spring/customers-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersviewservice/{backend => service}/CustomerQueryService.java (51%) rename java-spring/customers-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersviewservice/{backend => service}/CustomerQueryWorkflow.java (80%) delete mode 100644 java-spring/customers-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersviewservice/web/CustomersQueryResponse.java create mode 100644 java-spring/customers-view-service/src/main/resources/application.properties delete mode 100644 java-spring/customers-view-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/customersviewservice/CustomersQuerySideServiceIntegrationTest.java delete mode 100644 java-spring/customers-view-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/customersviewservice/CustomersQuerySideServiceTestConfiguration.java rename java-spring/customers-view-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/customersviewservice/{backend => service}/CustomerInfoUpdateServiceTest.java (57%) delete mode 100644 java-spring/docker-compose-common.yml delete mode 100644 java-spring/docker-compose-eventuate-local.yml delete mode 100644 java-spring/rest-api-integration-tests/build.gradle delete mode 100644 java-spring/rest-api-integration-tests/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/web/BankingAuthTest.java delete mode 100644 java-spring/rest-api-integration-tests/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/web/BankingWebIntegrationTest.java delete mode 100644 java-spring/rest-api-integration-tests/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/web/BankingWebTestConfiguration.java delete mode 100644 java-spring/set-env.sh create mode 100644 java-spring/transactions-service-api-messaging/build.gradle rename java-spring/{common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/transactions => transactions-service-api-messaging/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactions/domain/events}/CreditRecordedEvent.java (76%) rename java-spring/{common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/transactions => transactions-service-api-messaging/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactions/domain/events}/DebitRecordedEvent.java (76%) rename java-spring/{common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/transactions => transactions-service-api-messaging/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactions/domain/events}/FailedDebitRecordedEvent.java (77%) rename java-spring/{common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/transactions => transactions-service-api-messaging/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactions/domain/events}/MoneyTransferCreatedEvent.java (77%) rename java-spring/{common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/transactions => transactions-service-api-messaging/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactions/domain/events}/MoneyTransferEvent.java (56%) rename java-spring/{common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/transactions => transactions-service-api-messaging/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactions/domain/events}/TransferDetails.java (82%) create mode 100644 java-spring/transactions-service-api-web/build.gradle rename java-spring/{common/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/common/transactions => transactions-service-api-web/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactions/webapi}/CreateMoneyTransferRequest.java (93%) rename java-spring/{common/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/common/transactions => transactions-service-api-web/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactions/webapi}/CreateMoneyTransferResponse.java (79%) rename java-spring/transactions-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/{backend/MoneyTransferBackendConfiguration.java => MoneyTransferConfiguration.java} (65%) rename java-spring/transactions-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/{backend => domain}/CreateMoneyTransferCommand.java (72%) rename java-spring/transactions-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/{backend => domain}/MoneyTransfer.java (73%) rename java-spring/transactions-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/{backend => domain}/MoneyTransferCommand.java (54%) rename java-spring/transactions-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/{backend => domain}/RecordCreditCommand.java (84%) rename java-spring/transactions-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/{backend => domain}/RecordDebitCommand.java (84%) rename java-spring/transactions-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/{backend => domain}/RecordDebitFailedCommand.java (84%) rename java-spring/transactions-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/{backend => service}/MoneyTransferService.java (60%) rename java-spring/transactions-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/{backend => service}/MoneyTransferWorkflow.java (59%) create mode 100644 java-spring/transactions-service/src/main/resources/application.properties rename java-spring/transactions-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/{backend => service}/MoneyTransferEventTest.java (71%) delete mode 100644 scala-spring/README.md delete mode 100644 scala-spring/accounts-command-side-backend/build.gradle delete mode 100644 scala-spring/accounts-command-side-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/accounts/Account.scala delete mode 100644 scala-spring/accounts-command-side-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/accounts/AccountCommands.scala delete mode 100644 scala-spring/accounts-command-side-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/accounts/AccountConfiguration.scala delete mode 100644 scala-spring/accounts-command-side-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/accounts/AccountService.scala delete mode 100644 scala-spring/accounts-command-side-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/accounts/TransferWorkflowAccountHandlers.scala delete mode 100644 scala-spring/accounts-command-side-service/build.gradle delete mode 100644 scala-spring/accounts-command-side-service/src/main/scala/net/chrisrichardson/eventstore/examples/bank/web/AccountsCommandSideServiceConfiguration.scala delete mode 100644 scala-spring/accounts-command-side-service/src/main/scala/net/chrisrichardson/eventstore/examples/bank/web/main/AccountsCommandSideServiceMain.scala delete mode 100644 scala-spring/accounts-command-side-service/src/test/scala/net/chrisrichardson/eventstore/examples/bank/web/AccountsCommandSideServiceIntegrationTest.scala delete mode 100644 scala-spring/accounts-command-side-service/src/test/scala/net/chrisrichardson/eventstore/examples/bank/web/AccountsCommandSideServiceTestConfiguration.scala delete mode 100644 scala-spring/accounts-command-side-web/build.gradle delete mode 100644 scala-spring/accounts-command-side-web/src/main/scala/net/chrisrichardson/eventstore/examples/bank/web/accounts/CommandSideWebAccountsConfiguration.scala delete mode 100644 scala-spring/accounts-command-side-web/src/main/scala/net/chrisrichardson/eventstore/examples/bank/web/accounts/controllers/AccountController.scala delete mode 100644 scala-spring/accounts-command-side-web/src/main/scala/net/chrisrichardson/eventstore/examples/bank/web/accounts/controllers/CreateAccountRequest.scala delete mode 100644 scala-spring/accounts-command-side-web/src/main/scala/net/chrisrichardson/eventstore/examples/bank/web/accounts/controllers/CreateAccountResponse.scala delete mode 100644 scala-spring/accounts-query-side-backend/build.gradle delete mode 100644 scala-spring/accounts-query-side-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/queryside/AccountInfo.scala delete mode 100644 scala-spring/accounts-query-side-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/queryside/AccountInfoQueryService.scala delete mode 100644 scala-spring/accounts-query-side-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/queryside/AccountInfoUpdateService.scala delete mode 100644 scala-spring/accounts-query-side-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/queryside/QuerySideConfiguration.scala delete mode 100644 scala-spring/accounts-query-side-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/queryside/QuerysideDependencyChecker.scala delete mode 100644 scala-spring/accounts-query-side-service/build.gradle delete mode 100644 scala-spring/accounts-query-side-service/src/main/scala/net/chrisrichardson/eventstore/examples/bank/web/AccountsQuerySideServiceConfiguration.scala delete mode 100644 scala-spring/accounts-query-side-service/src/main/scala/net/chrisrichardson/eventstore/examples/bank/web/main/AccountsQuerySideServiceMain.scala delete mode 100644 scala-spring/accounts-query-side-service/src/test/scala/net/chrisrichardson/eventstore/examples/bank/web/AccountsQuerySideServiceIntegrationTest.scala delete mode 100644 scala-spring/accounts-query-side-service/src/test/scala/net/chrisrichardson/eventstore/examples/bank/web/AccountsQuerySideServiceTestConfiguration.scala delete mode 100644 scala-spring/accounts-query-side-web/build.gradle delete mode 100644 scala-spring/accounts-query-side-web/src/main/scala/net/chrisrichardson/eventstore/examples/bank/web/queryside/QuerySideWebConfiguration.scala delete mode 100644 scala-spring/accounts-query-side-web/src/main/scala/net/chrisrichardson/eventstore/examples/bank/web/queryside/controllers/AccountQuerySideController.scala delete mode 100644 scala-spring/backend-integration-tests/build.gradle delete mode 100644 scala-spring/backend-integration-tests/src/test/scala/net/chrisrichardson/eventstore/examples/bank/MoneyTransferIntegrationTest.scala delete mode 100644 scala-spring/backend-integration-tests/src/test/scala/net/chrisrichardson/eventstore/examples/bank/config/BankingTestConfiguration.scala delete mode 100755 scala-spring/build-and-test-all.sh delete mode 100644 scala-spring/build.gradle delete mode 100644 scala-spring/buildSrc/src/main/groovy/VerifyEventStoreEnvironmentPlugin.groovy delete mode 100644 scala-spring/buildSrc/src/main/groovy/VerifyMongoDBConfigurationPlugin.groovy delete mode 100644 scala-spring/common-backend/build.gradle delete mode 100644 scala-spring/common-backend/src/main/resources/logback.xml delete mode 100644 scala-spring/common-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/backend/common/accounts/AccountEvents.scala delete mode 100644 scala-spring/common-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/backend/common/accounts/package-info.java delete mode 100644 scala-spring/common-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/backend/common/transactions/TransactionEvents.scala delete mode 100644 scala-spring/common-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/backend/common/transactions/TransferDetails.scala delete mode 100644 scala-spring/common-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/backend/common/transactions/package-info.java delete mode 100644 scala-spring/common-web/build.gradle delete mode 100644 scala-spring/common-web/src/main/scala/net/chrisrichardson/eventstore/examples/bank/web/util/WebUtil.scala delete mode 100644 scala-spring/docker-compose.yml delete mode 100644 scala-spring/e2e-test/build.gradle delete mode 100644 scala-spring/e2e-test/src/test/scala/net/chrisrichardson/eventstore/examples/bank/web/EndToEndTest.scala delete mode 100644 scala-spring/gradle.properties delete mode 100644 scala-spring/gradle/gradle/wrapper/gradle-wrapper.jar delete mode 100644 scala-spring/gradle/gradle/wrapper/gradle-wrapper.properties delete mode 100755 scala-spring/gradle/gradlew delete mode 100644 scala-spring/gradle/gradlew.bat delete mode 100644 scala-spring/gradle/wrapper/gradle-wrapper.jar delete mode 100644 scala-spring/gradle/wrapper/gradle-wrapper.properties delete mode 100755 scala-spring/gradlew delete mode 100644 scala-spring/gradlew.bat delete mode 100644 scala-spring/handy-curl-commands.sh delete mode 100644 scala-spring/monolithic-service/build.gradle delete mode 100644 scala-spring/monolithic-service/src/main/scala/net/chrisrichardson/eventstore/examples/bank/web/BankingWebAppConfiguration.scala delete mode 100644 scala-spring/monolithic-service/src/main/scala/net/chrisrichardson/eventstore/examples/bank/web/main/BankingMain.scala delete mode 100644 scala-spring/monolithic-service/src/test/scala/net/chrisrichardson/eventstore/examples/bank/web/BankWebIntegrationTest.scala delete mode 100644 scala-spring/monolithic-service/src/test/scala/net/chrisrichardson/eventstore/examples/bank/web/BankingWebAppTestConfiguration.scala delete mode 100644 scala-spring/settings.gradle delete mode 100644 scala-spring/transactions-command-side-backend/build.gradle delete mode 100644 scala-spring/transactions-command-side-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/transactions/MoneyTransfer.scala delete mode 100644 scala-spring/transactions-command-side-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/transactions/MoneyTransferCommands.scala delete mode 100644 scala-spring/transactions-command-side-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/transactions/MoneyTransferEventHandlers.scala delete mode 100644 scala-spring/transactions-command-side-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/transactions/MoneyTransferService.scala delete mode 100644 scala-spring/transactions-command-side-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/transactions/TransactionConfiguration.scala delete mode 100644 scala-spring/transactions-command-side-service/build.gradle delete mode 100644 scala-spring/transactions-command-side-service/src/main/scala/net/chrisrichardson/eventstore/examples/bank/web/TransactionsCommandSideServiceConfiguration.scala delete mode 100644 scala-spring/transactions-command-side-service/src/main/scala/net/chrisrichardson/eventstore/examples/bank/web/main/TransactionsCommandSideServiceMain.scala delete mode 100644 scala-spring/transactions-command-side-service/src/test/scala/net/chrisrichardson/eventstore/examples/bank/web/TransactionsCommandSideServiceIntegrationTest.scala delete mode 100644 scala-spring/transactions-command-side-service/src/test/scala/net/chrisrichardson/eventstore/examples/bank/web/TransactionsCommandSideServiceTestConfiguration.scala delete mode 100644 scala-spring/transactions-command-side-web/build.gradle delete mode 100644 scala-spring/transactions-command-side-web/src/main/scala/net/chrisrichardson/eventstore/examples/bank/web/transactions/CommandSideWebTransactionsConfiguration.scala delete mode 100644 scala-spring/transactions-command-side-web/src/main/scala/net/chrisrichardson/eventstore/examples/bank/web/transactions/controllers/CreateMoneyTransferResponse.scala delete mode 100644 scala-spring/transactions-command-side-web/src/main/scala/net/chrisrichardson/eventstore/examples/bank/web/transactions/controllers/MoneyTransferController.scala delete mode 100755 wait-for-docker-services.sh delete mode 100755 wait-for-services.sh diff --git a/README.md b/README.md index dedd799..8ba6f26 100644 --- a/README.md +++ b/README.md @@ -47,12 +47,7 @@ There is also an [API gateway](http://microservices.io/patterns/apigateway.html) # About the examples -There are currently the following versions of the example application: - - * java-spring - a Java and Spring Boot example - * scala-spring - a Scala and Spring Boot example (NOTE: this version is lagging the Java Spring and hasn't been updated in a longtime.) - -Other examples will be added shortly including a Scala/Play example. +There is currently a Java and Spring Boot example: java-spring For more information, please see the [wiki](../../wiki) @@ -63,9 +58,6 @@ It provides a simple yet powerful event-driven programming model that is based o Eventuate solves the distributed data management problems inherent in a microservice architecture. It consists of a scalable, distributed event store and client libraries for various languages and frameworks including Java, Scala, and the Spring framework. -There are two versions of Eventuate: - -* [Eventuate SaaS server](http://eventuate.io/usingeventuate.html) - this is a full featured event store that is hosted on AWS * [Eventuate Local](http://eventuate.io/usingeventuate.html) - an open-source event store that is built using MySQL and Kafka There is also an embedded test event store, which is great for integration tests. @@ -78,46 +70,19 @@ You just need to have Java 8 installed. The details of how to build and run the services depend slightly on whether you are using Eventuate SaaS or Eventuate Local. -## Building and running using Eventuate SaaS - -First, must [sign up to get your credentials](https://signup.eventuate.io/) in order to get free access to the SaaS version. - -Next, build the application - -``` -cd java-spring -./gradlew assemble -``` - -Next, you can launch the services using [Docker Compose](https://docs.docker.com/compose/): - -``` -docker-compose up -d -``` - -Finally, you can open the home page, which is served up by the API Gateway: `http://$DOCKER_HOST_IP:8080` - -Note: `DOCKER_HOST_IP` is the IP address of the machine where Docker is running, e.g. the IP address of the VirtualBox VM. - ## Building and running using Eventuate Local First, build the application ``` cd java-spring -./gradlew assemble -P eventuateDriver=local +./gradlew assemble ``` Next, launch the services using [Docker Compose](https://docs.docker.com/compose/): ``` -export DOCKER_HOST_IP=... -docker-compose -f docker-compose-eventuate-local.yml up -d +./gradlew mysqlbinlogComposeUp ``` -Note: You need to set `DOCKER_HOST_IP` before running Docker Compose. -This must be an IP address or resolvable hostname. -It cannot be `localhost`. -See this [guide to setting `DOCKER_HOST_IP`](http://eventuate.io/docs/usingdocker.html) for more information. - -Finally, you can open the home page, which is served up by the API Gateway: `http://$DOCKER_HOST_IP:8080` +Finally, you can open the home page, which is served up by the API Gateway: `http://localhost:8080` diff --git a/_build-and-test-all.sh b/_build-and-test-all.sh deleted file mode 100755 index b5187d5..0000000 --- a/_build-and-test-all.sh +++ /dev/null @@ -1,70 +0,0 @@ -#! /bin/bash - -set -e - -if [ -z "$DOCKER_HOST_IP" ] ; then - if [ -z "$DOCKER_HOST" ] ; then - export DOCKER_HOST_IP=`hostname` - else - echo using ${DOCKER_HOST?} - XX=${DOCKER_HOST%\:*} - export DOCKER_HOST_IP=${XX#tcp\:\/\/} - fi - echo set DOCKER_HOST_IP $DOCKER_HOST_IP -fi - -DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" - -DOCKER_COMPOSE="docker-compose -p event-sourcing-examples" - -if [ "$1" = "-f" ] ; then - shift; - DOCKER_COMPOSE="$DOCKER_COMPOSE -f ${1?}" - shift -fi - -if [ "$1" = "--use-existing" ] ; then - shift; -else - ${DOCKER_COMPOSE?} stop - ${DOCKER_COMPOSE?} rm -v --force -fi - -NO_RM=false - -if [ "$1" = "--no-rm" ] ; then - NO_RM=true - shift -fi - -${DOCKER_COMPOSE?} up -d mongodb $EXTRA_INFRASTRUCTURE_SERVICES - - -if [ -z "$SPRING_DATA_MONGODB_URI" ] ; then - export SPRING_DATA_MONGODB_URI=mongodb://${DOCKER_HOST_IP?}/mydb - echo Set SPRING_DATA_MONGODB_URI $SPRING_DATA_MONGODB_URI -fi - -export SERVICE_HOST=$DOCKER_HOST_IP - -./gradlew $BUILD_AND_TEST_ALL_EXTRA_GRADLE_ARGS $* build -x :e2e-test:test - -if [ -z "$EVENTUATE_LOCAL" ] && [ -z "$EVENTUATE_API_KEY_ID" -o -z "$EVENTUATE_API_KEY_SECRET" ] ; then - echo You must set EVENTUATE_API_KEY_ID and EVENTUATE_API_KEY_SECRET - exit -1 -fi - -${DOCKER_COMPOSE?} build - -${DOCKER_COMPOSE?} up -d - -$DIR/wait-for-services.sh $DOCKER_HOST_IP 8080 8081 8082 8083 8084 - -set -e - -./gradlew $BUILD_AND_TEST_ALL_EXTRA_GRADLE_ARGS -a $* :e2e-test:cleanTest :e2e-test:test -P ignoreE2EFailures=false - -if [ $NO_RM = false ] ; then - ${DOCKER_COMPOSE?} stop - ${DOCKER_COMPOSE?} rm -v --force -fi diff --git a/java-spring/accounts-service-api-messaging/build.gradle b/java-spring/accounts-service-api-messaging/build.gradle new file mode 100644 index 0000000..2d375cc --- /dev/null +++ b/java-spring/accounts-service-api-messaging/build.gradle @@ -0,0 +1,9 @@ +apply plugin: 'java' + +dependencies { + compile project(":common") + + compile "io.eventuate.local.java:eventuate-client-java-spring:$eventuateLocalVersion" + + testCompile "junit:junit:4.11" +} diff --git a/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/accounts/AccountChangedEvent.java b/java-spring/accounts-service-api-messaging/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accounts/domain/events/AccountChangedEvent.java similarity index 84% rename from java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/accounts/AccountChangedEvent.java rename to java-spring/accounts-service-api-messaging/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accounts/domain/events/AccountChangedEvent.java index 4506c45..5dfc589 100644 --- a/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/accounts/AccountChangedEvent.java +++ b/java-spring/accounts-service-api-messaging/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accounts/domain/events/AccountChangedEvent.java @@ -1,4 +1,4 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.backend.common.accounts; +package net.chrisrichardson.eventstore.javaexamples.banking.accounts.domain.events; import java.math.BigDecimal; diff --git a/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/accounts/AccountCreditedEvent.java b/java-spring/accounts-service-api-messaging/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accounts/domain/events/AccountCreditedEvent.java similarity index 74% rename from java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/accounts/AccountCreditedEvent.java rename to java-spring/accounts-service-api-messaging/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accounts/domain/events/AccountCreditedEvent.java index 2e1669f..54cd5c3 100644 --- a/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/accounts/AccountCreditedEvent.java +++ b/java-spring/accounts-service-api-messaging/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accounts/domain/events/AccountCreditedEvent.java @@ -1,4 +1,4 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.backend.common.accounts; +package net.chrisrichardson.eventstore.javaexamples.banking.accounts.domain.events; import java.math.BigDecimal; diff --git a/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/accounts/AccountDebitFailedDueToInsufficientFundsEvent.java b/java-spring/accounts-service-api-messaging/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accounts/domain/events/AccountDebitFailedDueToInsufficientFundsEvent.java similarity index 81% rename from java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/accounts/AccountDebitFailedDueToInsufficientFundsEvent.java rename to java-spring/accounts-service-api-messaging/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accounts/domain/events/AccountDebitFailedDueToInsufficientFundsEvent.java index 5bc24c1..5036db6 100644 --- a/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/accounts/AccountDebitFailedDueToInsufficientFundsEvent.java +++ b/java-spring/accounts-service-api-messaging/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accounts/domain/events/AccountDebitFailedDueToInsufficientFundsEvent.java @@ -1,4 +1,4 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.backend.common.accounts; +package net.chrisrichardson.eventstore.javaexamples.banking.accounts.domain.events; public class AccountDebitFailedDueToInsufficientFundsEvent extends AccountEvent { private String transactionId; diff --git a/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/accounts/AccountDebitedEvent.java b/java-spring/accounts-service-api-messaging/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accounts/domain/events/AccountDebitedEvent.java similarity index 74% rename from java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/accounts/AccountDebitedEvent.java rename to java-spring/accounts-service-api-messaging/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accounts/domain/events/AccountDebitedEvent.java index 5cd010f..a85edba 100644 --- a/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/accounts/AccountDebitedEvent.java +++ b/java-spring/accounts-service-api-messaging/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accounts/domain/events/AccountDebitedEvent.java @@ -1,4 +1,4 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.backend.common.accounts; +package net.chrisrichardson.eventstore.javaexamples.banking.accounts.domain.events; import java.math.BigDecimal; diff --git a/java-spring/accounts-service-api-messaging/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accounts/domain/events/AccountDeletedEvent.java b/java-spring/accounts-service-api-messaging/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accounts/domain/events/AccountDeletedEvent.java new file mode 100644 index 0000000..b79d8fa --- /dev/null +++ b/java-spring/accounts-service-api-messaging/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accounts/domain/events/AccountDeletedEvent.java @@ -0,0 +1,4 @@ +package net.chrisrichardson.eventstore.javaexamples.banking.accounts.domain.events; + +public class AccountDeletedEvent extends AccountEvent { +} diff --git a/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/accounts/AccountEvent.java b/java-spring/accounts-service-api-messaging/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accounts/domain/events/AccountEvent.java similarity index 58% rename from java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/accounts/AccountEvent.java rename to java-spring/accounts-service-api-messaging/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accounts/domain/events/AccountEvent.java index 5175669..cc2e7df 100644 --- a/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/accounts/AccountEvent.java +++ b/java-spring/accounts-service-api-messaging/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accounts/domain/events/AccountEvent.java @@ -1,8 +1,8 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.backend.common.accounts; +package net.chrisrichardson.eventstore.javaexamples.banking.accounts.domain.events; import io.eventuate.Event; import io.eventuate.EventEntity; -@EventEntity(entity="net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.backend.Account") +@EventEntity(entity="net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.domain.Account") public abstract class AccountEvent implements Event{ } diff --git a/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/accounts/AccountOpenedEvent.java b/java-spring/accounts-service-api-messaging/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accounts/domain/events/AccountOpenedEvent.java similarity index 89% rename from java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/accounts/AccountOpenedEvent.java rename to java-spring/accounts-service-api-messaging/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accounts/domain/events/AccountOpenedEvent.java index 77fd89a..717afc7 100644 --- a/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/accounts/AccountOpenedEvent.java +++ b/java-spring/accounts-service-api-messaging/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accounts/domain/events/AccountOpenedEvent.java @@ -1,4 +1,4 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.backend.common.accounts; +package net.chrisrichardson.eventstore.javaexamples.banking.accounts.domain.events; import java.math.BigDecimal; diff --git a/java-spring/common-backend/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/common/accounts/AccountOpenEventSerializationTest.java b/java-spring/accounts-service-api-messaging/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/accounts/domain/events/AccountOpenEventSerializationTest.java similarity index 64% rename from java-spring/common-backend/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/common/accounts/AccountOpenEventSerializationTest.java rename to java-spring/accounts-service-api-messaging/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/accounts/domain/events/AccountOpenEventSerializationTest.java index abe72dc..9802124 100644 --- a/java-spring/common-backend/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/common/accounts/AccountOpenEventSerializationTest.java +++ b/java-spring/accounts-service-api-messaging/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/accounts/domain/events/AccountOpenEventSerializationTest.java @@ -1,7 +1,7 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.common.accounts; +package net.chrisrichardson.eventstore.javaexamples.banking.accounts.domain.events; -import io.eventuate.javaclient.commonimpl.JSonMapper; -import net.chrisrichardson.eventstore.javaexamples.banking.backend.common.accounts.AccountOpenedEvent; +import io.eventuate.common.json.mapper.JSonMapper; +import net.chrisrichardson.eventstore.javaexamples.banking.accounts.domain.events.AccountOpenedEvent; import org.junit.Assert; import org.junit.Test; @@ -14,7 +14,6 @@ public void shouldSerde() { AccountOpenedEvent event = new AccountOpenedEvent("00000000-00000000", "My Account", new BigDecimal(55), ""); String json = JSonMapper.toJson(event); - System.out.println("json=" + json); AccountOpenedEvent event2 = JSonMapper.fromJson(json, AccountOpenedEvent.class); diff --git a/java-spring/accounts-service-api-web/build.gradle b/java-spring/accounts-service-api-web/build.gradle new file mode 100644 index 0000000..7e5f160 --- /dev/null +++ b/java-spring/accounts-service-api-web/build.gradle @@ -0,0 +1,5 @@ +apply plugin: 'java' + +dependencies { + compile project(":common") +} diff --git a/java-spring/common/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/common/accounts/CreateAccountRequest.java b/java-spring/accounts-service-api-web/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accounts/webapi/CreateAccountRequest.java similarity index 94% rename from java-spring/common/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/common/accounts/CreateAccountRequest.java rename to java-spring/accounts-service-api-web/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accounts/webapi/CreateAccountRequest.java index 77ddf22..15a4ce7 100644 --- a/java-spring/common/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/common/accounts/CreateAccountRequest.java +++ b/java-spring/accounts-service-api-web/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accounts/webapi/CreateAccountRequest.java @@ -1,4 +1,4 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.common.accounts; +package net.chrisrichardson.eventstore.javaexamples.banking.accounts.webapi; import javax.validation.constraints.DecimalMin; import javax.validation.constraints.NotNull; diff --git a/java-spring/common/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/common/accounts/CreateAccountResponse.java b/java-spring/accounts-service-api-web/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accounts/webapi/CreateAccountResponse.java similarity index 81% rename from java-spring/common/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/common/accounts/CreateAccountResponse.java rename to java-spring/accounts-service-api-web/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accounts/webapi/CreateAccountResponse.java index 743ba71..bac02cb 100644 --- a/java-spring/common/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/common/accounts/CreateAccountResponse.java +++ b/java-spring/accounts-service-api-web/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accounts/webapi/CreateAccountResponse.java @@ -1,4 +1,4 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.common.accounts; +package net.chrisrichardson.eventstore.javaexamples.banking.accounts.webapi; public class CreateAccountResponse { diff --git a/java-spring/common/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/common/accounts/DeleteAccountResponse.java b/java-spring/accounts-service-api-web/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accounts/webapi/DeleteAccountResponse.java similarity index 81% rename from java-spring/common/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/common/accounts/DeleteAccountResponse.java rename to java-spring/accounts-service-api-web/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accounts/webapi/DeleteAccountResponse.java index f3fbbf2..5488fb4 100644 --- a/java-spring/common/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/common/accounts/DeleteAccountResponse.java +++ b/java-spring/accounts-service-api-web/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accounts/webapi/DeleteAccountResponse.java @@ -1,4 +1,4 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.common.accounts; +package net.chrisrichardson.eventstore.javaexamples.banking.accounts.webapi; public class DeleteAccountResponse { diff --git a/java-spring/accounts-service/Dockerfile b/java-spring/accounts-service/Dockerfile index cfc6b09..7dc1f29 100644 --- a/java-spring/accounts-service/Dockerfile +++ b/java-spring/accounts-service/Dockerfile @@ -1,4 +1,3 @@ -FROM java:openjdk-8u91-jdk -CMD java ${JAVA_OPTS} -jar accounts-service.jar -EXPOSE 8080 -COPY build/libs/accounts-service.jar . \ No newline at end of file +ARG baseImageVersion +FROM eventuateio/eventuate-examples-docker-images-spring-example-base-image:$baseImageVersion +COPY build/libs/accounts-service.jar service.jar \ No newline at end of file diff --git a/java-spring/accounts-service/build.gradle b/java-spring/accounts-service/build.gradle index a4f394d..ce3083a 100644 --- a/java-spring/accounts-service/build.gradle +++ b/java-spring/accounts-service/build.gradle @@ -1,21 +1,23 @@ -apply plugin: VerifyEventStoreEnvironmentPlugin -apply plugin: EventuateDependencyPlugin - -apply plugin: 'spring-boot' +apply plugin: 'org.springframework.boot' dependencies { - compile project(":common-backend") compile project(":common-swagger") - compile "org.springframework.boot:spring-boot-starter-web" - compile "org.springframework.boot:spring-boot-starter-actuator" + compile project(":accounts-service-api-messaging") + compile project(":accounts-service-api-web") + + compile project(":transactions-service-api-messaging") + + compile "io.eventuate.local.java:eventuate-local-java-spring-jdbc:$eventuateLocalVersion" + compile "org.springframework.boot:spring-boot-starter-web:$springBootVersion" + compile "org.springframework.boot:spring-boot-starter-hateoas:$springBootVersion" + compile "org.springframework.boot:spring-boot-starter-actuator:$springBootVersion" + compile "org.springframework.boot:spring-boot-starter-jdbc:$springBootVersion" + + testCompile project(":common-auth") testCompile project(":testutil") testCompile "junit:junit:4.11" - testCompile "org.springframework.boot:spring-boot-starter-test" - testCompile "io.eventuate.client.java:eventuate-client-java-jdbc:$eventuateClientVersion" -} - -test { - ignoreFailures System.getenv("EVENTUATE_API_KEY_ID") == null + testCompile "org.springframework.boot:spring-boot-starter-test:$springBootVersion" + testCompile "io.eventuate.local.java:eventuate-client-java-spring-jdbc:$eventuateLocalVersion" } diff --git a/java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/backend/AccountsBackendConfiguration.java b/java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/AccountsConfiguration.java similarity index 65% rename from java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/backend/AccountsBackendConfiguration.java rename to java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/AccountsConfiguration.java index fd64afb..9a9e9dc 100644 --- a/java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/backend/AccountsBackendConfiguration.java +++ b/java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/AccountsConfiguration.java @@ -1,14 +1,18 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.backend; +package net.chrisrichardson.eventstore.javaexamples.banking.accountsservice; import io.eventuate.AggregateRepository; import io.eventuate.EventuateAggregateStore; import io.eventuate.javaclient.spring.EnableEventHandlers; +import net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.domain.Account; +import net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.domain.AccountCommand; +import net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.service.AccountService; +import net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.service.AccountWorkflow; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @Configuration @EnableEventHandlers -public class AccountsBackendConfiguration { +public class AccountsConfiguration { @Bean public AccountWorkflow accountWorkflow() { @@ -25,7 +29,6 @@ public AccountService accountService(AggregateRepository accountRepository(EventuateAggregateStore eventStore) { return new AggregateRepository(Account.class, eventStore); } - } diff --git a/java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/AccountsServiceMain.java b/java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/AccountsServiceMain.java index f076881..8065eec 100644 --- a/java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/AccountsServiceMain.java +++ b/java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/AccountsServiceMain.java @@ -1,8 +1,7 @@ package net.chrisrichardson.eventstore.javaexamples.banking.accountsservice; -import io.eventuate.javaclient.driver.EventuateDriverConfiguration; +import io.eventuate.local.java.spring.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; @@ -10,7 +9,7 @@ import org.springframework.context.annotation.Import; @Configuration -@Import({AccountsWebConfiguration.class, EventuateDriverConfiguration.class, CommonSwaggerConfiguration.class}) +@Import({AccountsConfiguration.class, AccountsWebConfiguration.class, EventuateDriverConfiguration.class}) @EnableAutoConfiguration @ComponentScan public class AccountsServiceMain { diff --git a/java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/backend/Account.java b/java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/domain/Account.java similarity index 76% rename from java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/backend/Account.java rename to java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/domain/Account.java index a1d7941..588326b 100644 --- a/java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/backend/Account.java +++ b/java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/domain/Account.java @@ -1,9 +1,13 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.backend; +package net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.domain; import io.eventuate.Event; import io.eventuate.EventUtil; import io.eventuate.ReflectiveMutableCommandProcessingAggregate; -import net.chrisrichardson.eventstore.javaexamples.banking.backend.common.accounts.*; +import net.chrisrichardson.eventstore.javaexamples.banking.accounts.domain.events.AccountCreditedEvent; +import net.chrisrichardson.eventstore.javaexamples.banking.accounts.domain.events.AccountDebitFailedDueToInsufficientFundsEvent; +import net.chrisrichardson.eventstore.javaexamples.banking.accounts.domain.events.AccountDebitedEvent; +import net.chrisrichardson.eventstore.javaexamples.banking.accounts.domain.events.AccountDeletedEvent; +import net.chrisrichardson.eventstore.javaexamples.banking.accounts.domain.events.AccountOpenedEvent; import java.math.BigDecimal; import java.util.ArrayList; diff --git a/java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/backend/AccountCommand.java b/java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/domain/AccountCommand.java similarity index 58% rename from java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/backend/AccountCommand.java rename to java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/domain/AccountCommand.java index e746430..03396a8 100644 --- a/java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/backend/AccountCommand.java +++ b/java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/domain/AccountCommand.java @@ -1,7 +1,7 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.backend; +package net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.domain; import io.eventuate.Command; -interface AccountCommand extends Command { +public interface AccountCommand extends Command { } diff --git a/java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/backend/CreditAccountCommand.java b/java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/domain/CreditAccountCommand.java similarity index 95% rename from java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/backend/CreditAccountCommand.java rename to java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/domain/CreditAccountCommand.java index 7b166d0..2f2ab3d 100644 --- a/java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/backend/CreditAccountCommand.java +++ b/java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/domain/CreditAccountCommand.java @@ -1,4 +1,4 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.backend; +package net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.domain; import java.math.BigDecimal; diff --git a/java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/backend/DebitAccountCommand.java b/java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/domain/DebitAccountCommand.java similarity index 95% rename from java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/backend/DebitAccountCommand.java rename to java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/domain/DebitAccountCommand.java index f15a366..90c39c0 100644 --- a/java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/backend/DebitAccountCommand.java +++ b/java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/domain/DebitAccountCommand.java @@ -1,4 +1,4 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.backend; +package net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.domain; import java.math.BigDecimal; diff --git a/java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/backend/DeleteAccountCommand.java b/java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/domain/DeleteAccountCommand.java similarity index 86% rename from java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/backend/DeleteAccountCommand.java rename to java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/domain/DeleteAccountCommand.java index 29cc315..0db3e8b 100644 --- a/java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/backend/DeleteAccountCommand.java +++ b/java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/domain/DeleteAccountCommand.java @@ -1,4 +1,4 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.backend; +package net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.domain; public class DeleteAccountCommand implements AccountCommand { } diff --git a/java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/backend/OpenAccountCommand.java b/java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/domain/OpenAccountCommand.java similarity index 97% rename from java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/backend/OpenAccountCommand.java rename to java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/domain/OpenAccountCommand.java index 5d58a3c..5edc58f 100644 --- a/java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/backend/OpenAccountCommand.java +++ b/java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/domain/OpenAccountCommand.java @@ -1,4 +1,4 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.backend; +package net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.domain; import java.math.BigDecimal; diff --git a/java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/backend/AccountService.java b/java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/service/AccountService.java similarity index 69% rename from java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/backend/AccountService.java rename to java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/service/AccountService.java index dcbf178..78de4fa 100644 --- a/java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/backend/AccountService.java +++ b/java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/service/AccountService.java @@ -1,8 +1,12 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.backend; +package net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.service; import io.eventuate.AggregateRepository; import io.eventuate.EntityWithIdAndVersion; +import net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.domain.Account; +import net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.domain.AccountCommand; +import net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.domain.DeleteAccountCommand; +import net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.domain.OpenAccountCommand; import java.math.BigDecimal; import java.util.concurrent.CompletableFuture; diff --git a/java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/backend/AccountWorkflow.java b/java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/service/AccountWorkflow.java similarity index 70% rename from java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/backend/AccountWorkflow.java rename to java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/service/AccountWorkflow.java index 8a8006d..9b7c004 100644 --- a/java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/backend/AccountWorkflow.java +++ b/java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/service/AccountWorkflow.java @@ -1,12 +1,16 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.backend; +package net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.service; import io.eventuate.EntityWithIdAndVersion; import io.eventuate.EventHandlerContext; import io.eventuate.EventHandlerMethod; import io.eventuate.EventSubscriber; -import net.chrisrichardson.eventstore.javaexamples.banking.backend.common.transactions.DebitRecordedEvent; -import net.chrisrichardson.eventstore.javaexamples.banking.backend.common.transactions.MoneyTransferCreatedEvent; + +import net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.domain.Account; +import net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.domain.CreditAccountCommand; +import net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.domain.DebitAccountCommand; +import net.chrisrichardson.eventstore.javaexamples.banking.transactions.domain.events.MoneyTransferCreatedEvent; +import net.chrisrichardson.eventstore.javaexamples.banking.transactions.domain.events.DebitRecordedEvent; import java.math.BigDecimal; import java.util.concurrent.CompletableFuture; diff --git a/java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/web/AccountController.java b/java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/web/AccountController.java index 206eb5e..5d95109 100644 --- a/java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/web/AccountController.java +++ b/java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/web/AccountController.java @@ -1,9 +1,9 @@ package net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.web; -import net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.backend.AccountService; -import net.chrisrichardson.eventstore.javaexamples.banking.common.accounts.CreateAccountRequest; -import net.chrisrichardson.eventstore.javaexamples.banking.common.accounts.CreateAccountResponse; -import net.chrisrichardson.eventstore.javaexamples.banking.common.accounts.DeleteAccountResponse; +import net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.service.AccountService; +import net.chrisrichardson.eventstore.javaexamples.banking.accounts.webapi.CreateAccountRequest; +import net.chrisrichardson.eventstore.javaexamples.banking.accounts.webapi.CreateAccountResponse; +import net.chrisrichardson.eventstore.javaexamples.banking.accounts.webapi.DeleteAccountResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/web/AccountsWebConfiguration.java b/java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/web/AccountsWebConfiguration.java index 92e764b..f94f3bc 100644 --- a/java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/web/AccountsWebConfiguration.java +++ b/java-spring/accounts-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/web/AccountsWebConfiguration.java @@ -1,13 +1,12 @@ package net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.web; -import net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.backend.AccountsBackendConfiguration; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import net.chrisrichardson.eventstore.javaexamples.banking.commonswagger.CommonSwaggerConfiguration; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; @Configuration -@Import({AccountsBackendConfiguration.class}) +@Import(CommonSwaggerConfiguration.class) @ComponentScan public class AccountsWebConfiguration { diff --git a/java-spring/accounts-service/src/main/resources/application.properties b/java-spring/accounts-service/src/main/resources/application.properties new file mode 100644 index 0000000..7c2c49c --- /dev/null +++ b/java-spring/accounts-service/src/main/resources/application.properties @@ -0,0 +1,5 @@ +spring.datasource.url=jdbc:mysql://${DOCKER_HOST_IP:localhost}/eventuate +spring.datasource.username=mysqluser +spring.datasource.password=mysqlpw +spring.datasource.driver-class-name=com.mysql.jdbc.Driver +eventuatelocal.kafka.bootstrap.servers=${DOCKER_HOST_IP:localhost}:9092 diff --git a/java-spring/accounts-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/AccountsCommandSideServiceIntegrationTest.java b/java-spring/accounts-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/AccountsCommandSideServiceIntegrationTest.java index 894d17c..7fa1e68 100644 --- a/java-spring/accounts-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/AccountsCommandSideServiceIntegrationTest.java +++ b/java-spring/accounts-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/AccountsCommandSideServiceIntegrationTest.java @@ -1,27 +1,23 @@ 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; +import net.chrisrichardson.eventstore.javaexamples.banking.accounts.webapi.CreateAccountRequest; +import net.chrisrichardson.eventstore.javaexamples.banking.accounts.webapi.CreateAccountResponse; 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.boot.test.context.SpringBootTest; +import org.springframework.boot.web.server.LocalServerPort; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.web.WebAppConfiguration; import org.springframework.web.client.RestTemplate; import java.math.BigDecimal; @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = AccountsCommandSideServiceTestConfiguration.class) -@WebAppConfiguration -@IntegrationTest({"server.port=0", "management.port=0"}) +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = AccountsCommandSideServiceTestConfiguration.class) public class AccountsCommandSideServiceIntegrationTest { - @Value("${local.server.port}") + @LocalServerPort private int port; private String baseUrl(String path) { @@ -48,7 +44,4 @@ public void shouldCreateAccounts() { Assert.assertNotNull(fromAccountId); Assert.assertNotNull(toAccountId); } - - - } diff --git a/java-spring/accounts-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/AccountsCommandSideServiceTestConfiguration.java b/java-spring/accounts-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/AccountsCommandSideServiceTestConfiguration.java index 9701a55..f421aba 100644 --- a/java-spring/accounts-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/AccountsCommandSideServiceTestConfiguration.java +++ b/java-spring/accounts-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/AccountsCommandSideServiceTestConfiguration.java @@ -1,9 +1,9 @@ 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 net.chrisrichardson.eventstore.javaexamples.banking.commonauth.AuthConfigurationAdapter; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.autoconfigure.web.HttpMessageConverters; +import org.springframework.boot.autoconfigure.http.HttpMessageConverters; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; @@ -15,7 +15,7 @@ import java.util.List; @Configuration -@Import({AccountsWebConfiguration.class, AuthConfiguration.class}) +@Import({AccountsConfiguration.class, AccountsWebConfiguration.class, AuthConfigurationAdapter.class}) @EnableAutoConfiguration public class AccountsCommandSideServiceTestConfiguration { diff --git a/java-spring/accounts-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/backend/AccountEventTest.java b/java-spring/accounts-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/service/AccountEventTest.java similarity index 73% rename from java-spring/accounts-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/backend/AccountEventTest.java rename to java-spring/accounts-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/service/AccountEventTest.java index bd8d205..0fef2dd 100644 --- a/java-spring/accounts-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/backend/AccountEventTest.java +++ b/java-spring/accounts-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/service/AccountEventTest.java @@ -1,6 +1,7 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.backend; +package net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.service; +import net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.domain.Account; import net.chrisrichardson.eventstorestore.javaexamples.testutil.AbstractEntityEventTest; public class AccountEventTest extends AbstractEntityEventTest { diff --git a/java-spring/accounts-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/backend/AccountTest.java b/java-spring/accounts-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/service/AccountTest.java similarity index 70% rename from java-spring/accounts-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/backend/AccountTest.java rename to java-spring/accounts-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/service/AccountTest.java index 77be8d4..25c4770 100644 --- a/java-spring/accounts-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/backend/AccountTest.java +++ b/java-spring/accounts-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/service/AccountTest.java @@ -1,7 +1,9 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.backend; +package net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.service; import io.eventuate.Event; -import net.chrisrichardson.eventstore.javaexamples.banking.backend.common.accounts.AccountOpenedEvent; +import net.chrisrichardson.eventstore.javaexamples.banking.accounts.domain.events.AccountOpenedEvent; +import net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.domain.Account; +import net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.domain.OpenAccountCommand; import org.junit.Assert; import org.junit.Test; diff --git a/java-spring/accounts-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/web/AccountControllerIntegrationTest.java b/java-spring/accounts-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/web/AccountControllerIntegrationTest.java index 8739c69..f53097c 100644 --- a/java-spring/accounts-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/web/AccountControllerIntegrationTest.java +++ b/java-spring/accounts-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/web/AccountControllerIntegrationTest.java @@ -4,8 +4,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.IntegrationTest; -import org.springframework.boot.test.SpringApplicationConfiguration; +import org.springframework.boot.test.context.SpringBootTest; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -18,8 +17,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = AccountControllerIntegrationTestConfiguration.class) -@IntegrationTest +@SpringBootTest(classes = AccountControllerIntegrationTestConfiguration.class) @WebAppConfiguration public class AccountControllerIntegrationTest { diff --git a/java-spring/accounts-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/web/AccountControllerIntegrationTestConfiguration.java b/java-spring/accounts-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/web/AccountControllerIntegrationTestConfiguration.java index 4a9a313..b806a97 100644 --- a/java-spring/accounts-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/web/AccountControllerIntegrationTestConfiguration.java +++ b/java-spring/accounts-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsservice/web/AccountControllerIntegrationTestConfiguration.java @@ -1,12 +1,13 @@ package net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.web; import io.eventuate.javaclient.spring.jdbc.EmbeddedTestAggregateStoreConfiguration; +import net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.AccountsConfiguration; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; @Configuration -@Import({AccountsWebConfiguration.class, EmbeddedTestAggregateStoreConfiguration.class}) +@Import({AccountsConfiguration.class, AccountsWebConfiguration.class, EmbeddedTestAggregateStoreConfiguration.class}) @EnableAutoConfiguration public class AccountControllerIntegrationTestConfiguration { diff --git a/java-spring/accounts-view-service-api-web/build.gradle b/java-spring/accounts-view-service-api-web/build.gradle new file mode 100644 index 0000000..7e5f160 --- /dev/null +++ b/java-spring/accounts-view-service-api-web/build.gradle @@ -0,0 +1,5 @@ +apply plugin: 'java' + +dependencies { + compile project(":common") +} diff --git a/java-spring/common/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/common/accounts/AccountHistoryResponse.java b/java-spring/accounts-view-service-api-web/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accounts/view/webapi/AccountHistoryResponse.java similarity index 75% rename from java-spring/common/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/common/accounts/AccountHistoryResponse.java rename to java-spring/accounts-view-service-api-web/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accounts/view/webapi/AccountHistoryResponse.java index ef629b6..e223168 100644 --- a/java-spring/common/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/common/accounts/AccountHistoryResponse.java +++ b/java-spring/accounts-view-service-api-web/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accounts/view/webapi/AccountHistoryResponse.java @@ -1,4 +1,6 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.common.accounts; +package net.chrisrichardson.eventstore.javaexamples.banking.accounts.view.webapi; + +import net.chrisrichardson.eventstore.javaexamples.banking.common.accounts.AccountHistoryEntry; import java.util.List; diff --git a/java-spring/common/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/common/accounts/GetAccountResponse.java b/java-spring/accounts-view-service-api-web/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accounts/view/webapi/GetAccountResponse.java similarity index 92% rename from java-spring/common/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/common/accounts/GetAccountResponse.java rename to java-spring/accounts-view-service-api-web/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accounts/view/webapi/GetAccountResponse.java index 2c2c88d..0dbaf67 100644 --- a/java-spring/common/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/common/accounts/GetAccountResponse.java +++ b/java-spring/accounts-view-service-api-web/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accounts/view/webapi/GetAccountResponse.java @@ -1,4 +1,4 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.common.accounts; +package net.chrisrichardson.eventstore.javaexamples.banking.accounts.view.webapi; import java.math.BigDecimal; diff --git a/java-spring/common/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/common/accounts/GetAccountsResponse.java b/java-spring/accounts-view-service-api-web/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accounts/view/webapi/GetAccountsResponse.java similarity index 83% rename from java-spring/common/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/common/accounts/GetAccountsResponse.java rename to java-spring/accounts-view-service-api-web/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accounts/view/webapi/GetAccountsResponse.java index 93551ec..a771a14 100644 --- a/java-spring/common/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/common/accounts/GetAccountsResponse.java +++ b/java-spring/accounts-view-service-api-web/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accounts/view/webapi/GetAccountsResponse.java @@ -1,4 +1,4 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.common.accounts; +package net.chrisrichardson.eventstore.javaexamples.banking.accounts.view.webapi; import java.util.List; diff --git a/java-spring/accounts-view-service/Dockerfile b/java-spring/accounts-view-service/Dockerfile index 30b248a..ad9b511 100644 --- a/java-spring/accounts-view-service/Dockerfile +++ b/java-spring/accounts-view-service/Dockerfile @@ -1,4 +1,3 @@ -FROM java:openjdk-8u91-jdk -CMD java ${JAVA_OPTS} -jar accounts-view-service.jar -EXPOSE 8080 -COPY build/libs/accounts-view-service.jar . +ARG baseImageVersion +FROM eventuateio/eventuate-examples-docker-images-spring-example-base-image:$baseImageVersion +COPY build/libs/accounts-view-service.jar service.jar diff --git a/java-spring/accounts-view-service/build.gradle b/java-spring/accounts-view-service/build.gradle index 5e51216..bafc335 100644 --- a/java-spring/accounts-view-service/build.gradle +++ b/java-spring/accounts-view-service/build.gradle @@ -1,24 +1,25 @@ apply plugin: VerifyMongoDBConfigurationPlugin -apply plugin: VerifyEventStoreEnvironmentPlugin -apply plugin: EventuateDependencyPlugin -apply plugin: 'spring-boot' +apply plugin: 'org.springframework.boot' dependencies { compile project(":common-swagger") - compile project(":common-backend") + + compile project(":accounts-service-api-messaging") + compile project(":accounts-view-service-api-web") + + compile project(":transactions-service-api-messaging") + + compile "io.eventuate.local.java:eventuate-local-java-spring-jdbc:$eventuateLocalVersion" compile "org.springframework.boot:spring-boot-starter-web:$springBootVersion" compile "org.springframework.boot:spring-boot-starter-actuator:$springBootVersion" - compile "io.eventuate.client.java:eventuate-client-java-spring:$eventuateClientVersion" + compile "org.springframework.boot:spring-boot-starter-hateoas:$springBootVersion" + compile "io.eventuate.local.java:eventuate-client-java-spring:$eventuateLocalVersion" compile "org.springframework.boot:spring-boot-starter-data-mongodb:$springBootVersion" 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" -} - -test { - ignoreFailures System.getenv("EVENTUATE_API_KEY_ID") == null + testCompile "io.eventuate.local.java:eventuate-client-java-spring-jdbc:$eventuateLocalVersion" } diff --git a/java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/backend/AccountViewBackendConfiguration.java b/java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/AccountViewConfiguration.java similarity index 66% rename from java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/backend/AccountViewBackendConfiguration.java rename to java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/AccountViewConfiguration.java index d6e7d32..280b27c 100644 --- a/java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/backend/AccountViewBackendConfiguration.java +++ b/java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/AccountViewConfiguration.java @@ -1,7 +1,12 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice.backend; +package net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice; import io.eventuate.javaclient.spring.EnableEventHandlers; +import net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice.domain.AccountInfoRepository; +import net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice.service.AccountInfoUpdateService; +import net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice.service.AccountQueryService; +import net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice.service.AccountQueryWorkflow; +import net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice.domain.QuerySideDependencyChecker; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.data.mongodb.core.MongoTemplate; @@ -10,7 +15,7 @@ @Configuration @EnableMongoRepositories @EnableEventHandlers -public class AccountViewBackendConfiguration { +public class AccountViewConfiguration { @Bean public AccountQueryWorkflow accountQueryWorkflow(AccountInfoUpdateService accountInfoUpdateService) { diff --git a/java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/AccountsViewServiceMain.java b/java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/AccountsViewServiceMain.java index 2913e76..d28dcab 100644 --- a/java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/AccountsViewServiceMain.java +++ b/java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/AccountsViewServiceMain.java @@ -1,8 +1,7 @@ package net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice; -import io.eventuate.javaclient.driver.EventuateDriverConfiguration; +import io.eventuate.local.java.spring.javaclient.driver.EventuateDriverConfiguration; import net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice.web.AccountViewWebConfiguration; -import net.chrisrichardson.eventstore.javaexamples.banking.commonswagger.CommonSwaggerConfiguration; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.context.annotation.ComponentScan; @@ -10,7 +9,7 @@ import org.springframework.context.annotation.Import; @Configuration -@Import({AccountViewWebConfiguration.class, EventuateDriverConfiguration.class, CommonSwaggerConfiguration.class}) +@Import({AccountViewConfiguration.class, AccountViewWebConfiguration.class, EventuateDriverConfiguration.class}) @EnableAutoConfiguration @ComponentScan public class AccountsViewServiceMain { diff --git a/java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/backend/AccountInfo.java b/java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/domain/AccountInfo.java similarity index 98% rename from java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/backend/AccountInfo.java rename to java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/domain/AccountInfo.java index 6c71642..f3f7c21 100644 --- a/java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/backend/AccountInfo.java +++ b/java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/domain/AccountInfo.java @@ -1,4 +1,4 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice.backend; +package net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice.domain; import com.fasterxml.jackson.annotation.JsonProperty; import net.chrisrichardson.eventstore.javaexamples.banking.common.accounts.AccountChangeInfo; diff --git a/java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/backend/AccountInfoRepository.java b/java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/domain/AccountInfoRepository.java similarity index 66% rename from java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/backend/AccountInfoRepository.java rename to java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/domain/AccountInfoRepository.java index 7df97af..6965212 100644 --- a/java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/backend/AccountInfoRepository.java +++ b/java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/domain/AccountInfoRepository.java @@ -1,10 +1,10 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice.backend; +package net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice.domain; import org.springframework.data.mongodb.repository.MongoRepository; import java.util.List; -interface AccountInfoRepository extends MongoRepository { +public interface AccountInfoRepository extends MongoRepository { List findByCustomerId(String customerId); } diff --git a/java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/backend/AccountNotFoundException.java b/java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/domain/AccountNotFoundException.java similarity index 90% rename from java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/backend/AccountNotFoundException.java rename to java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/domain/AccountNotFoundException.java index 7d6115b..2ac49d5 100644 --- a/java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/backend/AccountNotFoundException.java +++ b/java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/domain/AccountNotFoundException.java @@ -1,4 +1,4 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice.backend; +package net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice.domain; public class AccountNotFoundException extends RuntimeException { diff --git a/java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/backend/QuerySideDependencyChecker.java b/java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/domain/QuerySideDependencyChecker.java similarity index 91% rename from java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/backend/QuerySideDependencyChecker.java rename to java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/domain/QuerySideDependencyChecker.java index 16c353b..3cd2f27 100644 --- a/java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/backend/QuerySideDependencyChecker.java +++ b/java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/domain/QuerySideDependencyChecker.java @@ -1,4 +1,4 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice.backend; +package net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice.domain; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -19,7 +19,7 @@ public void checkDependencies() { try { logger.info("Checking mongodb connectivity {}", System.getenv("SPRING_DATA_MONGODB_URI")); - mongoTemplate.getDb().getCollectionNames(); + mongoTemplate.getCollectionNames(); } catch (Throwable e) { throw new RuntimeException("Error connecting to Mongo - have you set SPRING_DATA_MONGODB_URI or --spring.data.mongodb_uri?", e); diff --git a/java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/backend/AccountInfoUpdateService.java b/java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/service/AccountInfoUpdateService.java similarity index 82% rename from java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/backend/AccountInfoUpdateService.java rename to java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/service/AccountInfoUpdateService.java index 21a91df..8932083 100644 --- a/java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/backend/AccountInfoUpdateService.java +++ b/java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/service/AccountInfoUpdateService.java @@ -1,7 +1,9 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice.backend; +package net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice.service; -import com.mongodb.WriteResult; -import io.eventuate.Int128; +import com.mongodb.client.result.UpdateResult; +import io.eventuate.common.id.Int128; +import net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice.domain.AccountInfo; +import net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice.domain.AccountInfoRepository; import net.chrisrichardson.eventstore.javaexamples.banking.common.accounts.AccountChangeInfo; import net.chrisrichardson.eventstore.javaexamples.banking.common.accounts.AccountTransactionInfo; import net.chrisrichardson.eventstore.javaexamples.banking.common.transactions.TransferState; @@ -15,7 +17,7 @@ import java.math.BigDecimal; import java.util.Date; -import static net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice.backend.MoneyUtil.toIntegerRepr; +import static net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice.service.MoneyUtil.toIntegerRepr; import static org.springframework.data.mongodb.core.query.Criteria.where; public class AccountInfoUpdateService { @@ -34,7 +36,7 @@ public void create(String accountId, String customerId, String title, BigDecimal try { AccountChangeInfo ci = new AccountChangeInfo(); ci.setAmount(toIntegerRepr(initialBalance)); - WriteResult x = mongoTemplate.upsert(new Query(where("id").is(accountId).and("version").exists(false)), + UpdateResult x = mongoTemplate.upsert(new Query(where("id").is(accountId).and("version").exists(false)), new Update() .set("customerId", customerId) .set("title", title) @@ -55,7 +57,7 @@ public void create(String accountId, String customerId, String title, BigDecimal } public void delete(String accountId) { - accountInfoRepository.delete(accountId); + accountInfoRepository.deleteById(accountId); } @@ -68,7 +70,7 @@ public void addTransaction(String accountId, AccountTransactionInfo ti) { public void updateBalance(String accountId, String changeId, long balanceDelta, AccountChangeInfo ci) { - WriteResult x = mongoTemplate.updateMulti(new Query(where("id").is(accountId).and("version").lt(changeId)), + UpdateResult x = mongoTemplate.updateMulti(new Query(where("id").is(accountId).and("version").lt(changeId)), new Update(). inc("balance", balanceDelta). push("changes", ci). diff --git a/java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/backend/AccountQueryService.java b/java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/service/AccountQueryService.java similarity index 52% rename from java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/backend/AccountQueryService.java rename to java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/service/AccountQueryService.java index 277ca8c..6a0820e 100644 --- a/java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/backend/AccountQueryService.java +++ b/java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/service/AccountQueryService.java @@ -1,4 +1,8 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice.backend; +package net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice.service; + +import net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice.domain.AccountInfo; +import net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice.domain.AccountInfoRepository; +import net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice.domain.AccountNotFoundException; import java.util.List; @@ -11,11 +15,7 @@ public AccountQueryService(AccountInfoRepository accountInfoRepository) { } public AccountInfo findByAccountId(String accountId) { - AccountInfo account = accountInfoRepository.findOne(accountId); - if (account == null) - throw new AccountNotFoundException(accountId); - else - return account; + return accountInfoRepository.findById(accountId).orElseThrow(() -> new AccountNotFoundException(accountId)); } public List findByCustomerId(String customerId) { diff --git a/java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/backend/AccountQueryWorkflow.java b/java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/service/AccountQueryWorkflow.java similarity index 82% rename from java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/backend/AccountQueryWorkflow.java rename to java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/service/AccountQueryWorkflow.java index 5fc76de..d15d2e1 100644 --- a/java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/backend/AccountQueryWorkflow.java +++ b/java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/service/AccountQueryWorkflow.java @@ -1,23 +1,27 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice.backend; +package net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice.service; import io.eventuate.DispatchedEvent; import io.eventuate.EventHandlerMethod; import io.eventuate.EventSubscriber; -import io.eventuate.Int128; -import net.chrisrichardson.eventstore.javaexamples.banking.backend.common.accounts.*; -import net.chrisrichardson.eventstore.javaexamples.banking.backend.common.transactions.CreditRecordedEvent; -import net.chrisrichardson.eventstore.javaexamples.banking.backend.common.transactions.DebitRecordedEvent; -import net.chrisrichardson.eventstore.javaexamples.banking.backend.common.transactions.FailedDebitRecordedEvent; -import net.chrisrichardson.eventstore.javaexamples.banking.backend.common.transactions.MoneyTransferCreatedEvent; +import io.eventuate.common.id.Int128; +import net.chrisrichardson.eventstore.javaexamples.banking.accounts.domain.events.AccountChangedEvent; +import net.chrisrichardson.eventstore.javaexamples.banking.accounts.domain.events.AccountCreditedEvent; +import net.chrisrichardson.eventstore.javaexamples.banking.accounts.domain.events.AccountDebitedEvent; +import net.chrisrichardson.eventstore.javaexamples.banking.accounts.domain.events.AccountDeletedEvent; +import net.chrisrichardson.eventstore.javaexamples.banking.accounts.domain.events.AccountOpenedEvent; import net.chrisrichardson.eventstore.javaexamples.banking.common.accounts.AccountChangeInfo; import net.chrisrichardson.eventstore.javaexamples.banking.common.accounts.AccountTransactionInfo; import net.chrisrichardson.eventstore.javaexamples.banking.common.transactions.TransferState; +import net.chrisrichardson.eventstore.javaexamples.banking.transactions.domain.events.CreditRecordedEvent; +import net.chrisrichardson.eventstore.javaexamples.banking.transactions.domain.events.DebitRecordedEvent; +import net.chrisrichardson.eventstore.javaexamples.banking.transactions.domain.events.FailedDebitRecordedEvent; +import net.chrisrichardson.eventstore.javaexamples.banking.transactions.domain.events.MoneyTransferCreatedEvent; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.math.BigDecimal; -import static net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice.backend.MoneyUtil.toIntegerRepr; +import static net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice.service.MoneyUtil.toIntegerRepr; @EventSubscriber(id="querySideEventHandlers") public class AccountQueryWorkflow { diff --git a/java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/backend/MoneyUtil.java b/java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/service/MoneyUtil.java similarity index 90% rename from java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/backend/MoneyUtil.java rename to java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/service/MoneyUtil.java index 740aa76..f8fec14 100644 --- a/java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/backend/MoneyUtil.java +++ b/java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/service/MoneyUtil.java @@ -1,4 +1,4 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice.backend; +package net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice.service; import java.math.BigDecimal; diff --git a/java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/web/AccountQueryController.java b/java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/web/AccountQueryController.java index ef73230..93dfd93 100644 --- a/java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/web/AccountQueryController.java +++ b/java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/web/AccountQueryController.java @@ -1,8 +1,11 @@ package net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice.web; -import net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice.backend.AccountInfo; -import net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice.backend.AccountNotFoundException; -import net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice.backend.AccountQueryService; +import net.chrisrichardson.eventstore.javaexamples.banking.accounts.view.webapi.AccountHistoryResponse; +import net.chrisrichardson.eventstore.javaexamples.banking.accounts.view.webapi.GetAccountResponse; +import net.chrisrichardson.eventstore.javaexamples.banking.accounts.view.webapi.GetAccountsResponse; +import net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice.domain.AccountInfo; +import net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice.domain.AccountNotFoundException; +import net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice.service.AccountQueryService; import net.chrisrichardson.eventstore.javaexamples.banking.common.accounts.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; diff --git a/java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/web/AccountViewWebConfiguration.java b/java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/web/AccountViewWebConfiguration.java index 798e0e8..79a9c26 100644 --- a/java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/web/AccountViewWebConfiguration.java +++ b/java-spring/accounts-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/accountsviewservice/web/AccountViewWebConfiguration.java @@ -1,7 +1,7 @@ package net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice.web; -import net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice.backend.AccountViewBackendConfiguration; -import org.springframework.boot.autoconfigure.web.HttpMessageConverters; +import net.chrisrichardson.eventstore.javaexamples.banking.commonswagger.CommonSwaggerConfiguration; +import org.springframework.boot.autoconfigure.http.HttpMessageConverters; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; @@ -10,7 +10,7 @@ import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; @Configuration -@Import({AccountViewBackendConfiguration.class}) +@Import(CommonSwaggerConfiguration.class) @ComponentScan public class AccountViewWebConfiguration { diff --git a/java-spring/accounts-view-service/src/main/resources/application.properties b/java-spring/accounts-view-service/src/main/resources/application.properties new file mode 100644 index 0000000..7c2c49c --- /dev/null +++ b/java-spring/accounts-view-service/src/main/resources/application.properties @@ -0,0 +1,5 @@ +spring.datasource.url=jdbc:mysql://${DOCKER_HOST_IP:localhost}/eventuate +spring.datasource.username=mysqluser +spring.datasource.password=mysqlpw +spring.datasource.driver-class-name=com.mysql.jdbc.Driver +eventuatelocal.kafka.bootstrap.servers=${DOCKER_HOST_IP:localhost}:9092 diff --git a/java-spring/accounts-view-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/web/AccountInfoUpdateServiceTest.java b/java-spring/accounts-view-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/web/AccountInfoUpdateServiceTest.java index bca5a6d..d69f855 100644 --- a/java-spring/accounts-view-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/web/AccountInfoUpdateServiceTest.java +++ b/java-spring/accounts-view-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/web/AccountInfoUpdateServiceTest.java @@ -1,23 +1,23 @@ package net.chrisrichardson.eventstore.javaexamples.banking.web; -import io.eventuate.Int128; +import io.eventuate.common.id.IdGenerator; +import io.eventuate.common.id.IdGeneratorImpl; +import io.eventuate.common.id.Int128; import io.eventuate.javaclient.spring.jdbc.EventuateJdbcEventStoreConfiguration; -import io.eventuate.javaclient.spring.jdbc.IdGenerator; -import io.eventuate.javaclient.spring.jdbc.IdGeneratorImpl; -import net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice.backend.AccountInfo; -import net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice.backend.AccountInfoUpdateService; -import net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice.backend.AccountQueryService; -import net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice.backend.AccountViewBackendConfiguration; -import net.chrisrichardson.eventstore.javaexamples.banking.backend.common.accounts.AccountCreditedEvent; +import net.chrisrichardson.eventstore.javaexamples.banking.accounts.domain.events.AccountCreditedEvent; +import net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice.domain.AccountInfo; +import net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice.service.AccountInfoUpdateService; +import net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice.service.AccountQueryService; +import net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice.AccountViewConfiguration; import net.chrisrichardson.eventstore.javaexamples.banking.common.accounts.AccountChangeInfo; import net.chrisrichardson.eventstore.javaexamples.banking.common.accounts.AccountTransactionInfo; import net.chrisrichardson.eventstore.javaexamples.banking.common.transactions.TransferState; +import net.chrisrichardson.eventstore.javaexamples.banking.commonswagger.CommonSwaggerConfiguration; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.test.IntegrationTest; -import org.springframework.boot.test.SpringApplicationConfiguration; +import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -29,13 +29,12 @@ import static org.junit.Assert.*; @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = AccountInfoUpdateServiceTest.AccountInfoUpdateServiceTestConfiguration.class) -@IntegrationTest +@SpringBootTest(classes = AccountInfoUpdateServiceTest.AccountInfoUpdateServiceTestConfiguration.class) public class AccountInfoUpdateServiceTest { @Configuration @EnableAutoConfiguration - @Import({AccountViewBackendConfiguration.class, EventuateJdbcEventStoreConfiguration.class}) + @Import({AccountViewConfiguration.class, EventuateJdbcEventStoreConfiguration.class, CommonSwaggerConfiguration.class}) public static class AccountInfoUpdateServiceTestConfiguration { } diff --git a/java-spring/accounts-view-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/web/AccountsQuerySideServiceIntegrationTest.java b/java-spring/accounts-view-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/web/AccountsQuerySideServiceIntegrationTest.java index 663888e..a2474cd 100644 --- a/java-spring/accounts-view-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/web/AccountsQuerySideServiceIntegrationTest.java +++ b/java-spring/accounts-view-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/web/AccountsQuerySideServiceIntegrationTest.java @@ -1,15 +1,13 @@ package net.chrisrichardson.eventstore.javaexamples.banking.web; -import net.chrisrichardson.eventstore.javaexamples.banking.common.accounts.GetAccountResponse; +import net.chrisrichardson.eventstore.javaexamples.banking.accounts.view.webapi.GetAccountResponse; 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.boot.test.context.SpringBootTest; +import org.springframework.boot.web.server.LocalServerPort; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.web.WebAppConfiguration; import org.springframework.web.client.RestTemplate; import java.math.BigDecimal; @@ -21,12 +19,10 @@ import static net.chrisrichardson.eventstorestore.javaexamples.testutil.TestUtil.eventually; @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = AccountsQuerySideServiceTestConfiguration.class) -@WebAppConfiguration -@IntegrationTest({"server.port=0", "management.port=0"}) +@SpringBootTest(classes = AccountsQuerySideServiceTestConfiguration.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) public class AccountsQuerySideServiceIntegrationTest { - @Value("${local.server.port}") + @LocalServerPort private int port; private String baseUrl(String path) { diff --git a/java-spring/accounts-view-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/web/AccountsQuerySideServiceTestConfiguration.java b/java-spring/accounts-view-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/web/AccountsQuerySideServiceTestConfiguration.java index b8a99e4..d134946 100644 --- a/java-spring/accounts-view-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/web/AccountsQuerySideServiceTestConfiguration.java +++ b/java-spring/accounts-view-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/web/AccountsQuerySideServiceTestConfiguration.java @@ -1,10 +1,10 @@ package net.chrisrichardson.eventstore.javaexamples.banking.web; import io.eventuate.javaclient.spring.jdbc.EmbeddedTestAggregateStoreConfiguration; +import net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice.AccountViewConfiguration; import net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice.web.AccountViewWebConfiguration; -import net.chrisrichardson.eventstore.javaexamples.banking.commonswagger.CommonSwaggerConfiguration; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.autoconfigure.web.HttpMessageConverters; +import org.springframework.boot.autoconfigure.http.HttpMessageConverters; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; @@ -17,7 +17,7 @@ import java.util.List; @Configuration -@Import({AccountViewWebConfiguration.class, EmbeddedTestAggregateStoreConfiguration.class, CommonSwaggerConfiguration.class}) +@Import({AccountViewConfiguration.class, AccountViewWebConfiguration.class, EmbeddedTestAggregateStoreConfiguration.class}) @EnableAutoConfiguration @ComponentScan public class AccountsQuerySideServiceTestConfiguration { diff --git a/java-spring/api-gateway-service-api-web/build.gradle b/java-spring/api-gateway-service-api-web/build.gradle new file mode 100644 index 0000000..7e5f160 --- /dev/null +++ b/java-spring/api-gateway-service-api-web/build.gradle @@ -0,0 +1,5 @@ +apply plugin: 'java' + +dependencies { + compile project(":common") +} diff --git a/java-spring/common-auth-web/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/commonauth/model/AuthRequest.java b/java-spring/api-gateway-service-api-web/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/apigateway/webapi/AuthRequest.java similarity index 88% rename from java-spring/common-auth-web/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/commonauth/model/AuthRequest.java rename to java-spring/api-gateway-service-api-web/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/apigateway/webapi/AuthRequest.java index 262ac7c..0446cda 100644 --- a/java-spring/common-auth-web/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/commonauth/model/AuthRequest.java +++ b/java-spring/api-gateway-service-api-web/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/apigateway/webapi/AuthRequest.java @@ -1,4 +1,4 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.commonauth.model; +package net.chrisrichardson.eventstore.javaexamples.banking.apigateway.webapi; import org.hibernate.validator.constraints.Email; import org.hibernate.validator.constraints.NotBlank; diff --git a/java-spring/common-auth-web/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/commonauth/model/ErrorResponse.java b/java-spring/api-gateway-service-api-web/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/apigateway/webapi/ErrorResponse.java similarity index 81% rename from java-spring/common-auth-web/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/commonauth/model/ErrorResponse.java rename to java-spring/api-gateway-service-api-web/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/apigateway/webapi/ErrorResponse.java index 2aa5f1c..6fecf42 100644 --- a/java-spring/common-auth-web/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/commonauth/model/ErrorResponse.java +++ b/java-spring/api-gateway-service-api-web/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/apigateway/webapi/ErrorResponse.java @@ -1,4 +1,4 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.commonauth.model; +package net.chrisrichardson.eventstore.javaexamples.banking.apigateway.webapi; /** * Created by Main on 17.02.2016. diff --git a/java-spring/api-gateway-service/Dockerfile b/java-spring/api-gateway-service/Dockerfile index 21de9fd..9cdcbe6 100644 --- a/java-spring/api-gateway-service/Dockerfile +++ b/java-spring/api-gateway-service/Dockerfile @@ -1,4 +1,3 @@ -FROM java:openjdk-8u91-jdk -CMD java ${JAVA_OPTS} -jar api-gateway-service.jar -EXPOSE 8080 -COPY build/libs/api-gateway-service.jar . +ARG baseImageVersion +FROM eventuateio/eventuate-examples-docker-images-spring-example-base-image:$baseImageVersion +COPY build/libs/api-gateway-service.jar service.jar diff --git a/java-spring/api-gateway-service/build.gradle b/java-spring/api-gateway-service/build.gradle index ae92d18..d9849ce 100644 --- a/java-spring/api-gateway-service/build.gradle +++ b/java-spring/api-gateway-service/build.gradle @@ -1,8 +1,10 @@ apply plugin: 'java' -apply plugin: 'spring-boot' +apply plugin: 'org.springframework.boot' dependencies { - compile project(":common-auth-web") + compile project(":common-auth") + + compile project(":api-gateway-service-api-web") compile "org.apache.httpcomponents:httpclient:4.5" compile "org.apache.httpcomponents:fluent-hc:4.5.1" @@ -11,6 +13,7 @@ dependencies { compile "org.springframework.boot:spring-boot-starter-actuator:$springBootVersion" testCompile "junit:junit:4.11" + testCompile "org.springframework.boot:spring-boot-starter-test:$springBootVersion" } task copyWebStatic(type: Copy) { @@ -18,4 +21,4 @@ task copyWebStatic(type: Copy) { into "build/resources/main/static" } -jar.dependsOn(copyWebStatic) \ No newline at end of file +bootJar.dependsOn(copyWebStatic) \ No newline at end of file diff --git a/java-spring/api-gateway-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/apigateway/ApiGatewayServiceConfiguration.java b/java-spring/api-gateway-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/apigateway/ApiGatewayServiceConfiguration.java index e59c91c..97bf8c5 100755 --- a/java-spring/api-gateway-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/apigateway/ApiGatewayServiceConfiguration.java +++ b/java-spring/api-gateway-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/apigateway/ApiGatewayServiceConfiguration.java @@ -1,11 +1,11 @@ package net.chrisrichardson.eventstore.javaexamples.banking.apigateway; import com.fasterxml.jackson.databind.ObjectMapper; -import net.chrisrichardson.eventstore.javaexamples.banking.commonauth.AuthConfiguration; +import net.chrisrichardson.eventstore.javaexamples.banking.commonauth.AuthConfigurationAdapter; import org.apache.http.client.HttpClient; import org.apache.http.impl.client.HttpClients; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.autoconfigure.web.HttpMessageConverters; +import org.springframework.boot.autoconfigure.http.HttpMessageConverters; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; @@ -23,7 +23,7 @@ @Configuration @ComponentScan @EnableAutoConfiguration -@Import({AuthConfiguration.class}) +@Import({AuthConfigurationAdapter.class}) @EnableConfigurationProperties({ApiGatewayProperties.class}) public class ApiGatewayServiceConfiguration extends WebMvcConfigurerAdapter { diff --git a/java-spring/common-auth-web/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/commonauth/controller/AuthController.java b/java-spring/api-gateway-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/apigateway/controller/AuthController.java similarity index 79% rename from java-spring/common-auth-web/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/commonauth/controller/AuthController.java rename to java-spring/api-gateway-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/apigateway/controller/AuthController.java index 732651b..874a7b3 100644 --- a/java-spring/common-auth-web/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/commonauth/controller/AuthController.java +++ b/java-spring/api-gateway-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/apigateway/controller/AuthController.java @@ -1,11 +1,11 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.commonauth.controller; +package net.chrisrichardson.eventstore.javaexamples.banking.apigateway.controller; import com.fasterxml.jackson.databind.ObjectMapper; import net.chrisrichardson.eventstore.javaexamples.banking.common.customers.UserCredentials; import net.chrisrichardson.eventstore.javaexamples.banking.commonauth.CustomerAuthService; -import net.chrisrichardson.eventstore.javaexamples.banking.commonauth.model.ErrorResponse; +import net.chrisrichardson.eventstore.javaexamples.banking.apigateway.webapi.ErrorResponse; import net.chrisrichardson.eventstore.javaexamples.banking.commonauth.model.User; -import net.chrisrichardson.eventstore.javaexamples.banking.web.customers.queryside.common.QuerySideCustomer; +import net.chrisrichardson.eventstore.javaexamples.banking.customers.view.commonapi.CustomerView; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.EmptyResultDataAccessException; import org.springframework.dao.IncorrectResultSizeDataAccessException; @@ -38,8 +38,8 @@ public class AuthController { private static ObjectMapper objectMapper = new ObjectMapper(); @RequestMapping(value = "/login", method = POST) - public ResponseEntity doAuth(@RequestBody @Valid UserCredentials request) throws IOException { - QuerySideCustomer customer = customerAuthService.findByEmailAndPassword(request.getEmail(), request.getPassword()); + public ResponseEntity doAuth(@RequestBody @Valid UserCredentials request) throws IOException { + CustomerView customer = customerAuthService.findByEmailAndPassword(request.getEmail(), request.getPassword()); Token token = tokenService.allocateToken(objectMapper.writeValueAsString(new User(request.getEmail()))); return ResponseEntity.status(HttpStatus.OK).header("access-token", token.getKey()) @@ -53,7 +53,7 @@ public ErrorResponse customersNotFound() { } @RequestMapping(value = "/user", method = GET) - public ResponseEntity getCurrentUser() { + public ResponseEntity getCurrentUser() { Authentication auth = SecurityContextHolder.getContext().getAuthentication(); return ResponseEntity.status(HttpStatus.OK).body(customerAuthService.findByEmail(auth.getName())); diff --git a/java-spring/api-gateway-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/apigateway/controller/GatewayController.java b/java-spring/api-gateway-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/apigateway/controller/GatewayController.java index 71b9e51..993205a 100755 --- a/java-spring/api-gateway-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/apigateway/controller/GatewayController.java +++ b/java-spring/api-gateway-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/apigateway/controller/GatewayController.java @@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.servlet.mvc.multiaction.NoSuchRequestHandlingMethodException; +import org.springframework.web.servlet.NoHandlerFoundException; import javax.annotation.PostConstruct; import javax.servlet.http.HttpServletRequest; @@ -53,7 +53,7 @@ public void init() { @RequestMapping(value = "/api/**", method = {GET, POST, DELETE}) @ResponseBody - public ResponseEntity proxyRequest(HttpServletRequest request) throws NoSuchRequestHandlingMethodException, IOException, URISyntaxException { + public ResponseEntity proxyRequest(HttpServletRequest request) throws NoHandlerFoundException, IOException, URISyntaxException { HttpUriRequest proxiedRequest = createHttpUriRequest(request); logger.info("request: {}", proxiedRequest); HttpResponse proxiedResponse = httpClient.execute(proxiedRequest); @@ -68,7 +68,7 @@ private HttpHeaders makeResponseHeaders(HttpResponse response) { return result; } - private HttpUriRequest createHttpUriRequest(HttpServletRequest request) throws URISyntaxException, NoSuchRequestHandlingMethodException, IOException { + private HttpUriRequest createHttpUriRequest(HttpServletRequest request) throws URISyntaxException, NoHandlerFoundException, IOException { URLRequestTransformer urlRequestTransformer = new URLRequestTransformer(apiGatewayProperties); ContentRequestTransformer contentRequestTransformer = new ContentRequestTransformer(); HeadersRequestTransformer headersRequestTransformer = new HeadersRequestTransformer(); diff --git a/java-spring/api-gateway-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/apigateway/utils/ContentRequestTransformer.java b/java-spring/api-gateway-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/apigateway/utils/ContentRequestTransformer.java index afdd433..b4a519b 100644 --- a/java-spring/api-gateway-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/apigateway/utils/ContentRequestTransformer.java +++ b/java-spring/api-gateway-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/apigateway/utils/ContentRequestTransformer.java @@ -3,7 +3,7 @@ import org.apache.http.client.methods.RequestBuilder; import org.apache.http.entity.ContentType; import org.apache.http.entity.StringEntity; -import org.springframework.web.servlet.mvc.multiaction.NoSuchRequestHandlingMethodException; +import org.springframework.web.servlet.NoHandlerFoundException; import javax.servlet.http.HttpServletRequest; import java.io.IOException; @@ -13,7 +13,7 @@ public class ContentRequestTransformer extends ProxyRequestTransformer { @Override - public RequestBuilder transform(HttpServletRequest request) throws NoSuchRequestHandlingMethodException, URISyntaxException, IOException { + public RequestBuilder transform(HttpServletRequest request) throws NoHandlerFoundException, URISyntaxException, IOException { RequestBuilder requestBuilder = predecessor.transform(request); String requestContent = request.getReader().lines().collect(Collectors.joining("")); diff --git a/java-spring/api-gateway-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/apigateway/utils/HeadersRequestTransformer.java b/java-spring/api-gateway-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/apigateway/utils/HeadersRequestTransformer.java index c3c8bbb..bf8d2a9 100644 --- a/java-spring/api-gateway-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/apigateway/utils/HeadersRequestTransformer.java +++ b/java-spring/api-gateway-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/apigateway/utils/HeadersRequestTransformer.java @@ -1,8 +1,7 @@ package net.chrisrichardson.eventstore.javaexamples.banking.apigateway.utils; import org.apache.http.client.methods.RequestBuilder; -import org.springframework.web.servlet.mvc.multiaction.NoSuchRequestHandlingMethodException; - +import org.springframework.web.servlet.NoHandlerFoundException; import javax.servlet.http.HttpServletRequest; import java.io.IOException; import java.net.URISyntaxException; @@ -11,7 +10,7 @@ public class HeadersRequestTransformer extends ProxyRequestTransformer { @Override - public RequestBuilder transform(HttpServletRequest request) throws NoSuchRequestHandlingMethodException, URISyntaxException, IOException { + public RequestBuilder transform(HttpServletRequest request) throws NoHandlerFoundException, URISyntaxException, IOException { RequestBuilder requestBuilder = predecessor.transform(request); Enumeration headerNames = request.getHeaderNames(); diff --git a/java-spring/api-gateway-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/apigateway/utils/ProxyRequestTransformer.java b/java-spring/api-gateway-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/apigateway/utils/ProxyRequestTransformer.java index 57406c0..5126041 100644 --- a/java-spring/api-gateway-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/apigateway/utils/ProxyRequestTransformer.java +++ b/java-spring/api-gateway-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/apigateway/utils/ProxyRequestTransformer.java @@ -1,7 +1,7 @@ package net.chrisrichardson.eventstore.javaexamples.banking.apigateway.utils; import org.apache.http.client.methods.RequestBuilder; -import org.springframework.web.servlet.mvc.multiaction.NoSuchRequestHandlingMethodException; +import org.springframework.web.servlet.NoHandlerFoundException; import javax.servlet.http.HttpServletRequest; import java.io.IOException; @@ -11,7 +11,7 @@ public abstract class ProxyRequestTransformer { protected ProxyRequestTransformer predecessor; - public abstract RequestBuilder transform(HttpServletRequest request) throws NoSuchRequestHandlingMethodException, URISyntaxException, IOException; + public abstract RequestBuilder transform(HttpServletRequest request) throws NoHandlerFoundException, URISyntaxException, IOException; public void setPredecessor(ProxyRequestTransformer transformer) { this.predecessor = transformer; diff --git a/java-spring/api-gateway-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/apigateway/utils/URLRequestTransformer.java b/java-spring/api-gateway-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/apigateway/utils/URLRequestTransformer.java index 60ee208..888d912 100644 --- a/java-spring/api-gateway-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/apigateway/utils/URLRequestTransformer.java +++ b/java-spring/api-gateway-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/apigateway/utils/URLRequestTransformer.java @@ -2,8 +2,9 @@ import net.chrisrichardson.eventstore.javaexamples.banking.apigateway.ApiGatewayProperties; import org.apache.http.client.methods.RequestBuilder; +import org.springframework.http.HttpHeaders; import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.servlet.mvc.multiaction.NoSuchRequestHandlingMethodException; +import org.springframework.web.servlet.NoHandlerFoundException; import javax.servlet.http.HttpServletRequest; import java.net.URI; @@ -18,7 +19,7 @@ public URLRequestTransformer(ApiGatewayProperties apiGatewayProperties) { } @Override - public RequestBuilder transform(HttpServletRequest request) throws NoSuchRequestHandlingMethodException, URISyntaxException { + public RequestBuilder transform(HttpServletRequest request) throws NoHandlerFoundException, URISyntaxException { String requestURI = request.getRequestURI(); URI uri; if (request.getQueryString() != null && !request.getQueryString().isEmpty()) { @@ -32,14 +33,15 @@ public RequestBuilder transform(HttpServletRequest request) throws NoSuchRequest return rb; } - private String getServiceUrl(String requestURI, HttpServletRequest httpServletRequest) throws NoSuchRequestHandlingMethodException { + private String getServiceUrl(String requestURI, HttpServletRequest httpServletRequest) throws NoHandlerFoundException { ApiGatewayProperties.Endpoint endpoint = apiGatewayProperties.getEndpoints().stream() .filter(e -> requestURI.matches(e.getPath()) && e.getMethod() == RequestMethod.valueOf(httpServletRequest.getMethod()) ) - .findFirst().orElseThrow(() -> new NoSuchRequestHandlingMethodException(httpServletRequest)); + .findFirst().orElseThrow(() -> new NoHandlerFoundException(httpServletRequest.getMethod(), + httpServletRequest.getRequestURL().toString(), new HttpHeaders())); return endpoint.getLocation() + requestURI; } } diff --git a/java-spring/common-auth-web/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/commonauth/controller/AuthControllerIntegrationTest.java b/java-spring/api-gateway-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/apigateway/AuthControllerIntegrationTest.java similarity index 84% rename from java-spring/common-auth-web/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/commonauth/controller/AuthControllerIntegrationTest.java rename to java-spring/api-gateway-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/apigateway/AuthControllerIntegrationTest.java index 8fb03c7..fba955d 100644 --- a/java-spring/common-auth-web/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/commonauth/controller/AuthControllerIntegrationTest.java +++ b/java-spring/api-gateway-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/apigateway/AuthControllerIntegrationTest.java @@ -1,19 +1,19 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.commonauth.controller; +package net.chrisrichardson.eventstore.javaexamples.banking.apigateway; import com.fasterxml.jackson.databind.ObjectMapper; +import net.chrisrichardson.eventstore.javaexamples.banking.apigateway.controller.AuthController; import net.chrisrichardson.eventstore.javaexamples.banking.common.customers.Address; import net.chrisrichardson.eventstore.javaexamples.banking.common.customers.Name; import net.chrisrichardson.eventstore.javaexamples.banking.commonauth.CustomerAuthService; import net.chrisrichardson.eventstore.javaexamples.banking.commonauth.model.User; -import net.chrisrichardson.eventstore.javaexamples.banking.web.customers.queryside.common.QuerySideCustomer; +import net.chrisrichardson.eventstore.javaexamples.banking.customers.view.commonapi.CustomerView; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.springframework.boot.test.IntegrationTest; -import org.springframework.boot.test.SpringApplicationConfiguration; +import org.springframework.boot.test.context.SpringBootTest; import org.springframework.dao.EmptyResultDataAccessException; import org.springframework.http.MediaType; import org.springframework.security.core.token.DefaultToken; @@ -29,8 +29,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = AuthControllerIntegrationTestConfiguration.class) -@IntegrationTest +@SpringBootTest(classes = AuthControllerIntegrationTestConfiguration.class) @WebAppConfiguration public class AuthControllerIntegrationTest { @@ -55,7 +54,7 @@ public void setup() { @Test public void shouldLogin() throws Exception { - when(customerAuthService.findByEmailAndPassword("my@email.com", "my_password")).thenReturn(new QuerySideCustomer("id", new Name("test", "test"), "my@email.com", "my_password", "ssn", "", new Address(), null)); + when(customerAuthService.findByEmailAndPassword("my@email.com", "my_password")).thenReturn(new CustomerView("id", new Name("test", "test"), "my@email.com", "my_password", "ssn", "", new Address(), null)); when(customerAuthService.findByEmailAndPassword("not_my@email.com", "not_my_password")).thenThrow(new EmptyResultDataAccessException(1)); when(tokenService.allocateToken(om.writeValueAsString(new User("my@email.com")))).thenReturn(new DefaultToken("key", System.currentTimeMillis(), "")); diff --git a/java-spring/common-auth-web/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/commonauth/controller/AuthControllerIntegrationTestConfiguration.java b/java-spring/api-gateway-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/apigateway/AuthControllerIntegrationTestConfiguration.java similarity index 70% rename from java-spring/common-auth-web/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/commonauth/controller/AuthControllerIntegrationTestConfiguration.java rename to java-spring/api-gateway-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/apigateway/AuthControllerIntegrationTestConfiguration.java index 95d484b..5f8cff5 100644 --- a/java-spring/common-auth-web/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/commonauth/controller/AuthControllerIntegrationTestConfiguration.java +++ b/java-spring/api-gateway-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/apigateway/AuthControllerIntegrationTestConfiguration.java @@ -1,12 +1,12 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.commonauth.controller; +package net.chrisrichardson.eventstore.javaexamples.banking.apigateway; -import net.chrisrichardson.eventstore.javaexamples.banking.commonauth.AuthConfiguration; +import net.chrisrichardson.eventstore.javaexamples.banking.commonauth.AuthConfigurationAdapter; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; @Configuration -@Import(AuthConfiguration.class) +@Import(AuthConfigurationAdapter.class) @EnableAutoConfiguration public class AuthControllerIntegrationTestConfiguration { } diff --git a/java-spring/backend-integration-tests/build.gradle b/java-spring/backend-integration-tests/build.gradle deleted file mode 100644 index 6cc950a..0000000 --- a/java-spring/backend-integration-tests/build.gradle +++ /dev/null @@ -1,15 +0,0 @@ -apply plugin: VerifyMongoDBConfigurationPlugin - -dependencies { - - testCompile project(":transactions-service") - testCompile project(":accounts-service") - testCompile project(":accounts-view-service") - testCompile project(":customers-service") - testCompile project(":customers-view-service") - 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" - -} diff --git a/java-spring/backend-integration-tests/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/BankingTestConfiguration.java b/java-spring/backend-integration-tests/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/BankingTestConfiguration.java deleted file mode 100644 index 3267ff2..0000000 --- a/java-spring/backend-integration-tests/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/BankingTestConfiguration.java +++ /dev/null @@ -1,15 +0,0 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.backend; - -import io.eventuate.javaclient.spring.jdbc.EmbeddedTestAggregateStoreConfiguration; -import net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.backend.AccountsBackendConfiguration; -import net.chrisrichardson.eventstore.javaexamples.banking.transactionsservice.backend.MoneyTransferBackendConfiguration; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Import; - -@Configuration -@Import({AccountsBackendConfiguration.class, MoneyTransferBackendConfiguration.class, EmbeddedTestAggregateStoreConfiguration.class}) -@EnableAutoConfiguration -public class BankingTestConfiguration { - -} diff --git a/java-spring/backend-integration-tests/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/MoneyTransferIntegrationTest.java b/java-spring/backend-integration-tests/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/MoneyTransferIntegrationTest.java deleted file mode 100644 index 515a394..0000000 --- a/java-spring/backend-integration-tests/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/MoneyTransferIntegrationTest.java +++ /dev/null @@ -1,92 +0,0 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.backend; - -import io.eventuate.EntityWithIdAndVersion; -import io.eventuate.EventuateAggregateStore; -import net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.backend.Account; -import net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.backend.AccountService; -import net.chrisrichardson.eventstore.javaexamples.banking.common.transactions.TransferState; -import net.chrisrichardson.eventstore.javaexamples.banking.backend.common.transactions.TransferDetails; -import net.chrisrichardson.eventstore.javaexamples.banking.transactionsservice.backend.MoneyTransfer; -import net.chrisrichardson.eventstore.javaexamples.banking.transactionsservice.backend.MoneyTransferService; -import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; -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 java.math.BigDecimal; - -import static net.chrisrichardson.eventstorestore.javaexamples.testutil.TestUtil.await; -import static net.chrisrichardson.eventstorestore.javaexamples.testutil.TestUtil.eventually; - - -@RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = BankingTestConfiguration.class) -@IntegrationTest -public class MoneyTransferIntegrationTest { - - @Autowired - private AccountService accountService; - - @Autowired - private MoneyTransferService moneyTransferService; - - @Autowired - private EventuateAggregateStore eventStore; - - - @Test - public void shouldTransferMoney() { - final EntityWithIdAndVersion fromAccount = await(accountService.openAccount("00000000-00000000", "My Account", new BigDecimal(150), "")); - - final EntityWithIdAndVersion toAccount = await(accountService.openAccount("00000000-00000000", "My Account", new BigDecimal(300), "")); - - final EntityWithIdAndVersion transaction = await( - moneyTransferService.transferMoney(new TransferDetails(fromAccount.getEntityId(), - toAccount.getEntityId(), - new BigDecimal(80)))); - - - eventually( - () -> eventStore.find(Account.class, fromAccount.getEntityId()), - account -> Assert.assertEquals(new BigDecimal(70), account.getEntity().getBalance())); - - eventually( - () -> eventStore.find(Account.class, toAccount.getEntityId()), - account -> Assert.assertEquals(new BigDecimal(380), account.getEntity().getBalance())); - - eventually( - () -> eventStore.find(MoneyTransfer.class, transaction.getEntityId()), - updatedTransaction -> Assert.assertEquals(TransferState.COMPLETED, updatedTransaction.getEntity().getState())); - } - - @Test - public void shouldFailDueToInsufficientFunds() { - final EntityWithIdAndVersion fromAccount = await(accountService.openAccount("00000000-00000000", "My Account", new BigDecimal(150), "")); - - final EntityWithIdAndVersion toAccount = await(accountService.openAccount("00000000-00000000", "My Account", new BigDecimal(300), "")); - - final EntityWithIdAndVersion transaction = await( - moneyTransferService.transferMoney(new TransferDetails(fromAccount.getEntityId(), - toAccount.getEntityId(), - new BigDecimal(200)))); - - - eventually( - () -> eventStore.find(MoneyTransfer.class, transaction.getEntityId()), - updatedTransaction -> Assert.assertEquals(TransferState.FAILED_DUE_TO_INSUFFICIENT_FUNDS, updatedTransaction.getEntity().getState())); - - eventually( - () -> eventStore.find(Account.class, fromAccount.getEntityId()), - account -> Assert.assertEquals(new BigDecimal(150), account.getEntity().getBalance())); - - eventually( - () -> eventStore.find(Account.class, toAccount.getEntityId()), - account -> Assert.assertEquals(new BigDecimal(300), account.getEntity().getBalance())); - - } - - -} diff --git a/java-spring/backend-integration-tests/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/queryside/accounts/AccountQuerySideIntegrationTest.java b/java-spring/backend-integration-tests/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/queryside/accounts/AccountQuerySideIntegrationTest.java deleted file mode 100644 index 00ac5d8..0000000 --- a/java-spring/backend-integration-tests/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/queryside/accounts/AccountQuerySideIntegrationTest.java +++ /dev/null @@ -1,66 +0,0 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.backend.queryside.accounts; - -import io.eventuate.EntityWithIdAndVersion; -import io.eventuate.EventuateAggregateStore; -import net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.backend.Account; -import net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.backend.AccountService; -import net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice.backend.AccountQueryService; -import net.chrisrichardson.eventstore.javaexamples.banking.common.transactions.TransferState; -import net.chrisrichardson.eventstore.javaexamples.banking.backend.common.transactions.TransferDetails; -import net.chrisrichardson.eventstore.javaexamples.banking.transactionsservice.backend.MoneyTransfer; -import net.chrisrichardson.eventstore.javaexamples.banking.transactionsservice.backend.MoneyTransferService; -import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; -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 java.math.BigDecimal; -import java.util.concurrent.CompletableFuture; - -import static net.chrisrichardson.eventstorestore.javaexamples.testutil.TestUtil.await; -import static net.chrisrichardson.eventstorestore.javaexamples.testutil.TestUtil.eventually; - -@RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = AccountQuerySideTestConfiguration.class) -@IntegrationTest -public class AccountQuerySideIntegrationTest { - - @Autowired - private AccountService accountService; - - @Autowired - private MoneyTransferService moneyTransferService; - - @Autowired - private EventuateAggregateStore eventStore; - - @Autowired - private AccountQueryService accountQueryService; - - @Test - public void shouldUpdateQuerySide() throws Exception { - - final EntityWithIdAndVersion fromAccount = await(accountService.openAccount("00000000-00000000", "My Account", new BigDecimal(150), "")); - - final EntityWithIdAndVersion toAccount = await(accountService.openAccount("00000000-00000000", "My Account", new BigDecimal(300), "")); - - final EntityWithIdAndVersion transaction = await( - moneyTransferService.transferMoney(new TransferDetails(fromAccount.getEntityId(), - toAccount.getEntityId(), - new BigDecimal(80)))); - - eventually( - () -> eventStore.find(MoneyTransfer.class, transaction.getEntityId()), - updatedTransaction -> Assert.assertEquals(TransferState.COMPLETED, updatedTransaction.getEntity().getState())); - - eventually( - () -> CompletableFuture.completedFuture(accountQueryService.findByAccountId(fromAccount.getEntityId())), - accountInfo -> Assert.assertEquals(70 * 100, accountInfo.getBalance())); - eventually( - () -> CompletableFuture.completedFuture(accountQueryService.findByAccountId(toAccount.getEntityId())), - accountInfo -> Assert.assertEquals(380 * 100, accountInfo.getBalance())); - } -} diff --git a/java-spring/backend-integration-tests/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/queryside/accounts/AccountQuerySideTestConfiguration.java b/java-spring/backend-integration-tests/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/queryside/accounts/AccountQuerySideTestConfiguration.java deleted file mode 100644 index 5e57b90..0000000 --- a/java-spring/backend-integration-tests/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/queryside/accounts/AccountQuerySideTestConfiguration.java +++ /dev/null @@ -1,16 +0,0 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.backend.queryside.accounts; - -import io.eventuate.javaclient.spring.jdbc.EmbeddedTestAggregateStoreConfiguration; -import net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.backend.AccountsBackendConfiguration; -import net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice.backend.AccountViewBackendConfiguration; -import net.chrisrichardson.eventstore.javaexamples.banking.transactionsservice.backend.MoneyTransferBackendConfiguration; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Import; - -@Configuration -@Import({AccountsBackendConfiguration.class, MoneyTransferBackendConfiguration.class, EmbeddedTestAggregateStoreConfiguration.class, - AccountViewBackendConfiguration.class}) -@EnableAutoConfiguration -public class AccountQuerySideTestConfiguration { -} diff --git a/java-spring/backend-integration-tests/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/queryside/customers/CustomerQuerySideIntegrationTest.java b/java-spring/backend-integration-tests/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/queryside/customers/CustomerQuerySideIntegrationTest.java deleted file mode 100644 index 33477a1..0000000 --- a/java-spring/backend-integration-tests/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/queryside/customers/CustomerQuerySideIntegrationTest.java +++ /dev/null @@ -1,75 +0,0 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.backend.queryside.customers; - -import io.eventuate.EntityWithIdAndVersion; -import io.eventuate.EventuateAggregateStore; -import net.chrisrichardson.eventstore.javaexamples.banking.common.customers.CustomerInfo; -import net.chrisrichardson.eventstore.javaexamples.banking.customersservice.backend.Customer; -import net.chrisrichardson.eventstore.javaexamples.banking.customersservice.backend.CustomerService; -import net.chrisrichardson.eventstore.javaexamples.banking.customersviewservice.backend.CustomerQueryService; -import net.chrisrichardson.eventstore.javaexamples.banking.web.customers.queryside.common.QuerySideCustomer; -import net.chrisrichardson.eventstore.javaexamples.banking.common.customers.ToAccountInfo; -import net.chrisrichardson.eventstorestore.javaexamples.testutil.Producer; -import net.chrisrichardson.eventstorestore.javaexamples.testutil.Verifier; -import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; -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 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; - -/** - * Created by Main on 10.02.2016. - */ -@RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = CustomerQuerySideTestConfiguration.class) -@IntegrationTest -public class CustomerQuerySideIntegrationTest { - - @Autowired - private CustomerService customerService; - - @Autowired - private CustomerQueryService customerQueryService; - - @Autowired - private EventuateAggregateStore eventStore; - - @Test - public void shouldCreateCustomerAndAddToAccount() throws Exception { - CustomerInfo customerInfo = generateCustomerInfo(); - EntityWithIdAndVersion customer = await(customerService.createCustomer(customerInfo)); - - ToAccountInfo toAccountInfo = generateToAccountInfo(); - EntityWithIdAndVersion customerWithNewAccount = await(customerService.addToAccount(customer.getEntityId(), toAccountInfo)); - - eventually( - new Producer() { - @Override - public CompletableFuture produce() { - return customerQueryService.findByCustomerId(customer.getEntityId()); - } - }, - new Verifier() { - @Override - public void verify(QuerySideCustomer querySideCustomer) { - Assert.assertEquals(customerInfo.getName(), querySideCustomer.getName()); - Assert.assertEquals(customerInfo.getSsn(), querySideCustomer.getSsn()); - Assert.assertEquals(customerInfo.getUserCredentials().getEmail(), querySideCustomer.getEmail()); - Assert.assertEquals(customerInfo.getPhoneNumber(), querySideCustomer.getPhoneNumber()); - Assert.assertEquals(customerInfo.getAddress(), querySideCustomer.getAddress()); - - Assert.assertNotNull(querySideCustomer.getToAccounts()); - Assert.assertFalse(querySideCustomer.getToAccounts().isEmpty()); - Assert.assertEquals(querySideCustomer.getToAccounts().get("11111111-11111111"), toAccountInfo); - } - }); - } -} diff --git a/java-spring/backend-integration-tests/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/queryside/customers/CustomerQuerySideTestConfiguration.java b/java-spring/backend-integration-tests/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/queryside/customers/CustomerQuerySideTestConfiguration.java deleted file mode 100644 index dbe31ce..0000000 --- a/java-spring/backend-integration-tests/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/queryside/customers/CustomerQuerySideTestConfiguration.java +++ /dev/null @@ -1,14 +0,0 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.backend.queryside.customers; - -import io.eventuate.javaclient.spring.jdbc.EmbeddedTestAggregateStoreConfiguration; -import net.chrisrichardson.eventstore.javaexamples.banking.customersservice.backend.CustomerBackendConfiguration; -import net.chrisrichardson.eventstore.javaexamples.banking.customersviewservice.backend.CustomerViewBackendConfiguration; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Import; - -@Configuration -@Import({CustomerBackendConfiguration.class, EmbeddedTestAggregateStoreConfiguration.class, CustomerViewBackendConfiguration.class}) -@EnableAutoConfiguration -public class CustomerQuerySideTestConfiguration { -} diff --git a/java-spring/build-and-test-all-eventuate-local.sh b/java-spring/build-and-test-all-eventuate-local.sh deleted file mode 100755 index d5c1dc1..0000000 --- a/java-spring/build-and-test-all-eventuate-local.sh +++ /dev/null @@ -1,6 +0,0 @@ -#! /bin/bash - -export JAVA_OPTS="-Xmx128m -Xms128m" -export EXTRA_INFRASTRUCTURE_SERVICES=cdcservice -export EVENTUATE_LOCAL=yes -../_build-and-test-all.sh -f docker-compose-eventuate-local.yml $* -P eventuateDriver=local diff --git a/java-spring/build-and-test-all.sh b/java-spring/build-and-test-all.sh index e123e57..17138d1 100755 --- a/java-spring/build-and-test-all.sh +++ b/java-spring/build-and-test-all.sh @@ -1,4 +1,54 @@ #! /bin/bash -export JAVA_OPTS="-Xmx128m -Xms128m" -../_build-and-test-all.sh $* +set -e + +if [ -z "$DOCKER_HOST_IP" ] ; then + if [ -z "$DOCKER_HOST" ] ; then + export DOCKER_HOST_IP=`hostname` + else + echo using ${DOCKER_HOST?} + XX=${DOCKER_HOST%\:*} + export DOCKER_HOST_IP=${XX#tcp\:\/\/} + fi + echo set DOCKER_HOST_IP $DOCKER_HOST_IP +fi + +DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" + +dockerall="./gradlew mysqlbinlogCompose" +dockerinfrastructure="./gradlew mysqlbinloginfrastructureCompose" + +if [ "$1" = "--use-existing" ] ; then + shift; +else + ${dockerall}Down +fi + +NO_RM=false + +if [ "$1" = "--no-rm" ] ; then + NO_RM=true + shift +fi + +${dockerinfrastructure}Up + + +if [ -z "$SPRING_DATA_MONGODB_URI" ] ; then + export SPRING_DATA_MONGODB_URI=mongodb://${DOCKER_HOST_IP?}/mydb + echo Set SPRING_DATA_MONGODB_URI $SPRING_DATA_MONGODB_URI +fi + +export SERVICE_HOST=$DOCKER_HOST_IP + +./gradlew $BUILD_AND_TEST_ALL_EXTRA_GRADLE_ARGS $* build -x :e2e-test:test + +${dockerall}Up + +set -e + +./gradlew $BUILD_AND_TEST_ALL_EXTRA_GRADLE_ARGS -a $* :e2e-test:cleanTest :e2e-test:test -P ignoreE2EFailures=false + +if [ $NO_RM = false ] ; then + ${dockerall}Down +fi diff --git a/java-spring/build.gradle b/java-spring/build.gradle index 611d01c..15898cd 100644 --- a/java-spring/build.gradle +++ b/java-spring/build.gradle @@ -1,21 +1,22 @@ buildscript { repositories { mavenCentral() + maven { + url "https://plugins.gradle.org/m2/" + } } dependencies { classpath("org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion") + classpath "com.avast.gradle:gradle-docker-compose-plugin:$dockerComposePluginVersion" } } +apply plugin: 'docker-compose' + allprojects { group = "net.chrisrichardson.eventstore" } - -task wrapper(type: Wrapper) { - gradleVersion = '2.0' -} - subprojects { apply plugin: 'java' sourceCompatibility = 1.8 @@ -27,3 +28,23 @@ subprojects { eventuateMavenRepoUrl.split(',').each { repoUrl -> maven { url repoUrl } } } } + +dockerCompose { + environment.put "EVENTUATE_COMMON_VERSION", eventuateCommonImageVersion + environment.put "EVENTUATE_CDC_VERSION", eventuateCdcImageVersion + environment.put "EVENTUATE_JAVA_BASE_IMAGE_VERSION", eventuateExamplesBaseImageVersion + + removeOrphans = true + + mysqlbinlog { + projectName = null + removeContainers = project.ext.removeContainers + } + + mysqlbinloginfrastructure { + projectName = null + startedServices = ["cdc-service", "mongodb"] + removeContainers = project.ext.removeContainers + } + +} diff --git a/java-spring/buildSrc/src/main/groovy/EventuateDependencyPlugin.groovy b/java-spring/buildSrc/src/main/groovy/EventuateDependencyPlugin.groovy deleted file mode 100644 index 308e417..0000000 --- a/java-spring/buildSrc/src/main/groovy/EventuateDependencyPlugin.groovy +++ /dev/null @@ -1,16 +0,0 @@ -import org.gradle.api.Plugin -import org.gradle.api.Project - -class EventuateDependencyPlugin implements Plugin { - - @Override - void apply(Project project) { - project.dependencies { - if (project.hasProperty("eventuateDriver") && project.property("eventuateDriver").equals("local")) { - compile "io.eventuate.local.java:eventuate-local-java-jdbc:${project.eventuateLocalVersion}" - compile "io.eventuate.local.java:eventuate-local-java-embedded-cdc-autoconfigure:${project.eventuateLocalVersion}" - } else - compile "io.eventuate.client.java:eventuate-client-java-http-stomp-spring:${project.eventuateClientVersion}" - } - } -} diff --git a/java-spring/buildSrc/src/main/groovy/VerifyEventStoreEnvironmentPlugin.groovy b/java-spring/buildSrc/src/main/groovy/VerifyEventStoreEnvironmentPlugin.groovy deleted file mode 100644 index dcdba2c..0000000 --- a/java-spring/buildSrc/src/main/groovy/VerifyEventStoreEnvironmentPlugin.groovy +++ /dev/null @@ -1,15 +0,0 @@ -import org.gradle.api.* - - -class VerifyEventStoreEnvironmentPlugin implements Plugin { - void apply(Project project) { - project.test { - beforeSuite { x -> - if (x.parent == null) { - if (System.getenv("EVENTUATE_API_KEY_ID") == null && System.getenv("EVENTUATE_API_KEY_SECRET") == null) - logger.warn("\nPLEASE make sure that Eventuate-related environment variables EVENTUATE_API_KEY_ID and EVENTUATE_API_KEY_SECRET are set, see sample-set-remote-env.sh !!!!\n") - } - } - } - } -} diff --git a/java-spring/common-auth-web/build.gradle b/java-spring/common-auth-web/build.gradle deleted file mode 100644 index 4a622c4..0000000 --- a/java-spring/common-auth-web/build.gradle +++ /dev/null @@ -1,12 +0,0 @@ -apply plugin: 'java' - -dependencies { - compile project(":common-auth") - compile project(":common") - - compile "org.springframework.boot:spring-boot-starter-web:$springBootVersion" - compile "org.springframework.boot:spring-boot-starter-security:$springBootVersion" - - testCompile "junit:junit:4.11" - testCompile "org.springframework.boot:spring-boot-starter-test:$springBootVersion" -} diff --git a/java-spring/common-auth/build.gradle b/java-spring/common-auth/build.gradle index 15a7af4..f741f34 100644 --- a/java-spring/common-auth/build.gradle +++ b/java-spring/common-auth/build.gradle @@ -2,14 +2,12 @@ apply plugin: 'java' dependencies { compile project(":common") - compile project(":customers-query-side-common") + compile project(":customers-view-service-api-common") compile "org.springframework.boot:spring-boot-starter-web:$springBootVersion" compile "org.springframework.boot:spring-boot-starter-data-mongodb:$springBootVersion" - compile "org.springframework.security:spring-security-config:4.0.2.RELEASE" - compile "org.springframework.security:spring-security-web:4.0.2.RELEASE" - + compile "org.springframework.boot:spring-boot-starter-security:$springBootVersion" testCompile "junit:junit:4.11" } \ No newline at end of file diff --git a/java-spring/common-auth/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/commonauth/AuthConfiguration.java b/java-spring/common-auth/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/commonauth/AuthConfiguration.java index 737bd46..3f7b3bd 100755 --- a/java-spring/common-auth/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/commonauth/AuthConfiguration.java +++ b/java-spring/common-auth/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/commonauth/AuthConfiguration.java @@ -1,25 +1,13 @@ package net.chrisrichardson.eventstore.javaexamples.banking.commonauth; -import net.chrisrichardson.eventstore.javaexamples.banking.web.customers.queryside.common.QuerySideCustomer; -import net.chrisrichardson.eventstore.javaexamples.banking.commonauth.filter.StatelessAuthenticationFilter; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.context.properties.EnableConfigurationProperties; 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.data.mongodb.repository.config.EnableMongoRepositories; -import org.springframework.http.HttpMethod; -import org.springframework.security.authentication.AuthenticationManager; -import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; -import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; -import org.springframework.security.core.authority.AuthorityUtils; import org.springframework.security.core.token.KeyBasedPersistenceTokenService; import org.springframework.security.core.token.TokenService; -import org.springframework.security.core.userdetails.User; -import org.springframework.security.core.userdetails.UserDetailsService; -import org.springframework.security.web.authentication.www.BasicAuthenticationFilter; import java.security.SecureRandom; @@ -27,31 +15,8 @@ @ComponentScan @EnableWebSecurity @EnableMongoRepositories -@EnableConfigurationProperties({AuthProperties.class}) -public class AuthConfiguration extends WebSecurityConfigurerAdapter { - - @Autowired - private AuthProperties securityProperties; - - @Autowired - private TokenAuthenticationService tokenAuthenticationService; - - @Autowired - CustomerAuthService customerAuthService; - - @Override - protected void configure(AuthenticationManagerBuilder auth) throws Exception { - auth.userDetailsService(userDetailsServiceBean()); - } - - @Override - public UserDetailsService userDetailsServiceBean() { - return email -> { - QuerySideCustomer customer = customerAuthService.findByEmail(email); - return new User(email, customer.getPassword(), true, true, true, true, - AuthorityUtils.createAuthorityList("USER")); - }; - } +@Import(AuthPropertiesConfiguration.class) +public class AuthConfiguration { @Bean public CustomerAuthService customerAuthService(CustomerAuthRepository customerAuthRepository) { @@ -59,28 +24,7 @@ public CustomerAuthService customerAuthService(CustomerAuthRepository customerAu } @Bean - @Override - public AuthenticationManager authenticationManagerBean() throws Exception { - return super.authenticationManagerBean(); - } - - @Override - protected void configure(HttpSecurity http) throws Exception { - http - .csrf() - .disable() - .httpBasic() - .and() - .authorizeRequests() - .antMatchers(HttpMethod.POST, "/api/customers", "/api/login").permitAll() - .antMatchers("/api/**").permitAll() - .anyRequest().permitAll() - .and() - .addFilterAfter(new StatelessAuthenticationFilter(tokenAuthenticationService), BasicAuthenticationFilter.class); - } - - @Bean - public TokenService tokenService() { + public TokenService tokenService(AuthProperties securityProperties) { KeyBasedPersistenceTokenService res = new KeyBasedPersistenceTokenService(); res.setSecureRandom(new SecureRandom()); res.setServerSecret(securityProperties.getServerSecret()); diff --git a/java-spring/common-auth/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/commonauth/AuthConfigurationAdapter.java b/java-spring/common-auth/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/commonauth/AuthConfigurationAdapter.java new file mode 100755 index 0000000..ff58305 --- /dev/null +++ b/java-spring/common-auth/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/commonauth/AuthConfigurationAdapter.java @@ -0,0 +1,63 @@ +package net.chrisrichardson.eventstore.javaexamples.banking.commonauth; + +import net.chrisrichardson.eventstore.javaexamples.banking.customers.view.commonapi.CustomerView; +import net.chrisrichardson.eventstore.javaexamples.banking.commonauth.filter.StatelessAuthenticationFilter; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Import; +import org.springframework.http.HttpMethod; +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; +import org.springframework.security.core.authority.AuthorityUtils; +import org.springframework.security.core.userdetails.User; +import org.springframework.security.core.userdetails.UserDetailsService; +import org.springframework.security.web.authentication.www.BasicAuthenticationFilter; + +@Configuration +@Import(AuthConfiguration.class) +public class AuthConfigurationAdapter extends WebSecurityConfigurerAdapter { + + @Autowired + private TokenAuthenticationService tokenAuthenticationService; + + @Autowired + private CustomerAuthService customerAuthService; + + @Override + protected void configure(AuthenticationManagerBuilder auth) throws Exception { + auth.userDetailsService(userDetailsServiceBean()); + } + + @Override + public UserDetailsService userDetailsServiceBean() { + return email -> { + CustomerView customer = customerAuthService.findByEmail(email); + return new User(email, "{noop}" + customer.getPassword(), true, true, true, true, + AuthorityUtils.createAuthorityList("USER")); + }; + } + + @Bean + @Override + public AuthenticationManager authenticationManagerBean() throws Exception { + return super.authenticationManagerBean(); + } + + @Override + protected void configure(HttpSecurity http) throws Exception { + http + .csrf() + .disable() + .httpBasic() + .and() + .authorizeRequests() + .antMatchers(HttpMethod.POST, "/api/customers", "/api/login").permitAll() + .antMatchers("/api/**").permitAll() + .anyRequest().permitAll() + .and() + .addFilterAfter(new StatelessAuthenticationFilter(tokenAuthenticationService), BasicAuthenticationFilter.class); + } +} diff --git a/java-spring/common-auth/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/commonauth/AuthProperties.java b/java-spring/common-auth/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/commonauth/AuthProperties.java index 7f47e10..3fcf671 100755 --- a/java-spring/common-auth/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/commonauth/AuthProperties.java +++ b/java-spring/common-auth/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/commonauth/AuthProperties.java @@ -1,10 +1,14 @@ package net.chrisrichardson.eventstore.javaexamples.banking.commonauth; +import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.context.annotation.PropertySource; -@ConfigurationProperties(locations = "classpath:auth.properties", ignoreUnknownFields = false, prefix = "auth") public class AuthProperties { + @Value("${auth.server.secret}") private String serverSecret; + + @Value("${auth.server.integer}") private Integer serverInteger; public String getServerSecret() { diff --git a/java-spring/common-auth/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/commonauth/AuthPropertiesConfiguration.java b/java-spring/common-auth/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/commonauth/AuthPropertiesConfiguration.java new file mode 100755 index 0000000..5a65515 --- /dev/null +++ b/java-spring/common-auth/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/commonauth/AuthPropertiesConfiguration.java @@ -0,0 +1,14 @@ +package net.chrisrichardson.eventstore.javaexamples.banking.commonauth; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.PropertySource; + +@Configuration +@PropertySource(value="classpath:auth.properties") +public class AuthPropertiesConfiguration { + @Bean + public AuthProperties authProperties() { + return new AuthProperties(); + } +} diff --git a/java-spring/common-auth/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/commonauth/CustomerAuthRepository.java b/java-spring/common-auth/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/commonauth/CustomerAuthRepository.java index 0a83b75..3ecf1e1 100644 --- a/java-spring/common-auth/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/commonauth/CustomerAuthRepository.java +++ b/java-spring/common-auth/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/commonauth/CustomerAuthRepository.java @@ -1,13 +1,13 @@ package net.chrisrichardson.eventstore.javaexamples.banking.commonauth; -import net.chrisrichardson.eventstore.javaexamples.banking.web.customers.queryside.common.QuerySideCustomer; +import net.chrisrichardson.eventstore.javaexamples.banking.customers.view.commonapi.CustomerView; import org.springframework.data.mongodb.repository.MongoRepository; import java.util.List; -interface CustomerAuthRepository extends MongoRepository { +interface CustomerAuthRepository extends MongoRepository { - List findByEmail(String email); + List findByEmail(String email); - List findByEmailAndPassword(String email, String password); + List findByEmailAndPassword(String email, String password); } \ No newline at end of file diff --git a/java-spring/common-auth/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/commonauth/CustomerAuthService.java b/java-spring/common-auth/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/commonauth/CustomerAuthService.java index 96f5eff..0b127fa 100644 --- a/java-spring/common-auth/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/commonauth/CustomerAuthService.java +++ b/java-spring/common-auth/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/commonauth/CustomerAuthService.java @@ -1,6 +1,6 @@ package net.chrisrichardson.eventstore.javaexamples.banking.commonauth; -import net.chrisrichardson.eventstore.javaexamples.banking.web.customers.queryside.common.QuerySideCustomer; +import net.chrisrichardson.eventstore.javaexamples.banking.customers.view.commonapi.CustomerView; import org.springframework.dao.EmptyResultDataAccessException; import org.springframework.dao.support.DataAccessUtils; @@ -14,16 +14,16 @@ public CustomerAuthService(CustomerAuthRepository customerAuthRepository) { this.customerAuthRepository = customerAuthRepository; } - public QuerySideCustomer findByEmail(String email) { - QuerySideCustomer result = DataAccessUtils.uniqueResult(customerAuthRepository.findByEmail(email)); + public CustomerView findByEmail(String email) { + CustomerView result = DataAccessUtils.uniqueResult(customerAuthRepository.findByEmail(email)); if (result==null) throw new EmptyResultDataAccessException(1); return result; } - public QuerySideCustomer findByEmailAndPassword(String email, String password) { - QuerySideCustomer result = DataAccessUtils.uniqueResult(customerAuthRepository.findByEmailAndPassword(email, password)); + public CustomerView findByEmailAndPassword(String email, String password) { + CustomerView result = DataAccessUtils.uniqueResult(customerAuthRepository.findByEmailAndPassword(email, password)); if (result==null) throw new EmptyResultDataAccessException(1); diff --git a/java-spring/common-auth/src/main/resources/auth.properties b/java-spring/common-auth/src/main/resources/auth.properties index f3bfa4a..c3ec92e 100644 --- a/java-spring/common-auth/src/main/resources/auth.properties +++ b/java-spring/common-auth/src/main/resources/auth.properties @@ -1,2 +1,2 @@ -auth.serverSecret=the_cake_is_a_lie -auth.serverInteger=1 \ No newline at end of file +auth.server.secret=the_cake_is_a_lie +auth.server.integer=1 \ No newline at end of file diff --git a/java-spring/common-backend/build.gradle b/java-spring/common-backend/build.gradle deleted file mode 100644 index b0df157..0000000 --- a/java-spring/common-backend/build.gradle +++ /dev/null @@ -1,13 +0,0 @@ -apply plugin: 'java' - -dependencies { - compile project(":common") - - compile "io.eventuate.client.java:eventuate-client-java-spring:$eventuateClientVersion" - - testCompile "junit:junit:4.11" - testCompile "org.springframework.boot:spring-boot-starter-test:$springBootVersion" - testCompile "io.eventuate.client.java:eventuate-client-java-jdbc:$eventuateClientVersion" - - -} diff --git a/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/accounts/AccountDeletedEvent.java b/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/accounts/AccountDeletedEvent.java deleted file mode 100644 index 61240a1..0000000 --- a/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/accounts/AccountDeletedEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.backend.common.accounts; - -public class AccountDeletedEvent extends AccountEvent { -} diff --git a/java-spring/common-backend/src/main/resources/logback.xml b/java-spring/common-backend/src/main/resources/logback.xml deleted file mode 100644 index 654ade8..0000000 --- a/java-spring/common-backend/src/main/resources/logback.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - %d{HH:mm:ss.SSS} %-5level %logger{36} - %msg%n - - - - - - - - - - - - - - diff --git a/java-spring/common-swagger/build.gradle b/java-spring/common-swagger/build.gradle index b72a5d1..2675eb2 100644 --- a/java-spring/common-swagger/build.gradle +++ b/java-spring/common-swagger/build.gradle @@ -1,7 +1,5 @@ dependencies { - compile "io.eventuate.client.java:eventuate-client-java-spring:$eventuateClientVersion" - - compile "io.springfox:springfox-swagger2:2.2.2" - compile 'io.springfox:springfox-swagger-ui:2.2.2' + compile "io.eventuate.local.java:eventuate-client-java-spring:$eventuateLocalVersion" + compile "io.eventuate.util:eventuate-util-spring-swagger:$eventuateUtilVersion" } \ No newline at end of file diff --git a/java-spring/common-swagger/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/commonswagger/CommonSwaggerConfiguration.java b/java-spring/common-swagger/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/commonswagger/CommonSwaggerConfiguration.java index b1cbd55..6956821 100644 --- a/java-spring/common-swagger/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/commonswagger/CommonSwaggerConfiguration.java +++ b/java-spring/common-swagger/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/commonswagger/CommonSwaggerConfiguration.java @@ -1,43 +1,16 @@ package net.chrisrichardson.eventstore.javaexamples.banking.commonswagger; -import com.fasterxml.classmate.TypeResolver; -import org.springframework.beans.factory.annotation.Autowired; +import io.eventuate.util.spring.swagger.EventuateSwaggerConfig; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.http.ResponseEntity; -import org.springframework.web.context.request.async.DeferredResult; -import springfox.documentation.builders.RequestHandlerSelectors; -import springfox.documentation.schema.WildcardType; -import springfox.documentation.spi.DocumentationType; -import springfox.documentation.spring.web.plugins.Docket; import springfox.documentation.swagger2.annotations.EnableSwagger2; -import java.util.concurrent.CompletableFuture; - -import static springfox.documentation.schema.AlternateTypeRules.newRule; - @Configuration @EnableSwagger2 public class CommonSwaggerConfiguration { @Bean - public Docket api() { - return new Docket(DocumentationType.SWAGGER_2) - .select() - .apis(RequestHandlerSelectors.basePackage("net.chrisrichardson.eventstore.javaexamples.banking")) - .build() - .pathMapping("/") - .genericModelSubstitutes(ResponseEntity.class, CompletableFuture.class) - .alternateTypeRules( - newRule(typeResolver.resolve(DeferredResult.class, - typeResolver.resolve(ResponseEntity.class, WildcardType.class)), - typeResolver.resolve(WildcardType.class)) - ) - .useDefaultResponseMessages(false) - ; + public EventuateSwaggerConfig eventuateSwaggerConfig() { + return () -> "net.chrisrichardson.eventstore.javaexamples.banking"; } - - @Autowired - private TypeResolver typeResolver; - } diff --git a/java-spring/customers-service-api-messaging/build.gradle b/java-spring/customers-service-api-messaging/build.gradle new file mode 100644 index 0000000..3e5f28d --- /dev/null +++ b/java-spring/customers-service-api-messaging/build.gradle @@ -0,0 +1,7 @@ +apply plugin: 'java' + +dependencies { + compile project(":common") + + compile "io.eventuate.local.java:eventuate-client-java-spring:$eventuateLocalVersion" +} diff --git a/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/customers/CustomerAddedToAccount.java b/java-spring/customers-service-api-messaging/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customers/domain/events/CustomerAddedToAccount.java similarity index 86% rename from java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/customers/CustomerAddedToAccount.java rename to java-spring/customers-service-api-messaging/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customers/domain/events/CustomerAddedToAccount.java index ea47143..f499fc9 100644 --- a/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/customers/CustomerAddedToAccount.java +++ b/java-spring/customers-service-api-messaging/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customers/domain/events/CustomerAddedToAccount.java @@ -1,4 +1,4 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.backend.common.customers; +package net.chrisrichardson.eventstore.javaexamples.banking.customers.domain.events; import net.chrisrichardson.eventstore.javaexamples.banking.common.customers.ToAccountInfo; diff --git a/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/customers/CustomerCreatedEvent.java b/java-spring/customers-service-api-messaging/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customers/domain/events/CustomerCreatedEvent.java similarity index 85% rename from java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/customers/CustomerCreatedEvent.java rename to java-spring/customers-service-api-messaging/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customers/domain/events/CustomerCreatedEvent.java index 31bc3b5..f2dfdaa 100644 --- a/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/customers/CustomerCreatedEvent.java +++ b/java-spring/customers-service-api-messaging/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customers/domain/events/CustomerCreatedEvent.java @@ -1,4 +1,4 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.backend.common.customers; +package net.chrisrichardson.eventstore.javaexamples.banking.customers.domain.events; import net.chrisrichardson.eventstore.javaexamples.banking.common.customers.CustomerInfo; diff --git a/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/customers/CustomerEvent.java b/java-spring/customers-service-api-messaging/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customers/domain/events/CustomerEvent.java similarity index 62% rename from java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/customers/CustomerEvent.java rename to java-spring/customers-service-api-messaging/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customers/domain/events/CustomerEvent.java index 70633b3..94e0eb6 100644 --- a/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/customers/CustomerEvent.java +++ b/java-spring/customers-service-api-messaging/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customers/domain/events/CustomerEvent.java @@ -1,4 +1,4 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.backend.common.customers; +package net.chrisrichardson.eventstore.javaexamples.banking.customers.domain.events; import io.eventuate.Event; @@ -7,6 +7,6 @@ /** * Created by Main on 11.02.2016. */ -@EventEntity(entity = "net.chrisrichardson.eventstore.javaexamples.banking.customersservice.backend.Customer") +@EventEntity(entity = "net.chrisrichardson.eventstore.javaexamples.banking.customersservice.domain.Customer") public abstract class CustomerEvent implements Event { } \ No newline at end of file diff --git a/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/customers/CustomerToAccountDeleted.java b/java-spring/customers-service-api-messaging/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customers/domain/events/CustomerToAccountDeleted.java similarity index 81% rename from java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/customers/CustomerToAccountDeleted.java rename to java-spring/customers-service-api-messaging/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customers/domain/events/CustomerToAccountDeleted.java index 06876b8..c7f0d2b 100644 --- a/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/customers/CustomerToAccountDeleted.java +++ b/java-spring/customers-service-api-messaging/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customers/domain/events/CustomerToAccountDeleted.java @@ -1,4 +1,4 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.backend.common.customers; +package net.chrisrichardson.eventstore.javaexamples.banking.customers.domain.events; public class CustomerToAccountDeleted extends CustomerEvent { diff --git a/java-spring/customers-service-api-web/build.gradle b/java-spring/customers-service-api-web/build.gradle new file mode 100644 index 0000000..7e5f160 --- /dev/null +++ b/java-spring/customers-service-api-web/build.gradle @@ -0,0 +1,5 @@ +apply plugin: 'java' + +dependencies { + compile project(":common") +} diff --git a/java-spring/common/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/common/customers/AddToAccountResponse.java b/java-spring/customers-service-api-web/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customers/webapi/AddToAccountResponse.java similarity index 80% rename from java-spring/common/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/common/customers/AddToAccountResponse.java rename to java-spring/customers-service-api-web/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customers/webapi/AddToAccountResponse.java index d1012ba..a38f749 100644 --- a/java-spring/common/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/common/customers/AddToAccountResponse.java +++ b/java-spring/customers-service-api-web/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customers/webapi/AddToAccountResponse.java @@ -1,4 +1,4 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.common.customers; +package net.chrisrichardson.eventstore.javaexamples.banking.customers.webapi; public class AddToAccountResponse { diff --git a/java-spring/common/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/common/customers/CustomerResponse.java b/java-spring/customers-service-api-web/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customers/webapi/CustomerResponse.java similarity index 83% rename from java-spring/common/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/common/customers/CustomerResponse.java rename to java-spring/customers-service-api-web/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customers/webapi/CustomerResponse.java index 09a54e7..b842802 100644 --- a/java-spring/common/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/common/customers/CustomerResponse.java +++ b/java-spring/customers-service-api-web/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customers/webapi/CustomerResponse.java @@ -1,5 +1,6 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.common.customers; +package net.chrisrichardson.eventstore.javaexamples.banking.customers.webapi; +import net.chrisrichardson.eventstore.javaexamples.banking.common.customers.CustomerInfo; import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; diff --git a/java-spring/customers-service/Dockerfile b/java-spring/customers-service/Dockerfile index 0adc92d..2bdbd4f 100644 --- a/java-spring/customers-service/Dockerfile +++ b/java-spring/customers-service/Dockerfile @@ -1,4 +1,3 @@ -FROM java:openjdk-8u91-jdk -CMD java ${JAVA_OPTS} -jar customers-service.jar -EXPOSE 8080 -COPY build/libs/customers-service.jar . +ARG baseImageVersion +FROM eventuateio/eventuate-examples-docker-images-spring-example-base-image:$baseImageVersion +COPY build/libs/customers-service.jar service.jar \ No newline at end of file diff --git a/java-spring/customers-service/build.gradle b/java-spring/customers-service/build.gradle index 047df3c..2e57e21 100644 --- a/java-spring/customers-service/build.gradle +++ b/java-spring/customers-service/build.gradle @@ -1,19 +1,23 @@ apply plugin: VerifyMongoDBConfigurationPlugin -apply plugin: VerifyEventStoreEnvironmentPlugin - -apply plugin: 'spring-boot' -apply plugin: EventuateDependencyPlugin +apply plugin: 'org.springframework.boot' dependencies { - compile project(":common") - compile project(":common-backend") compile project(":common-swagger") - compile "org.springframework.boot:spring-boot-starter-web" - compile "org.springframework.boot:spring-boot-starter-actuator" + compile project(":customers-service-api-messaging") + compile project(":customers-service-api-web") + + compile project(":accounts-service-api-web") + + compile "io.eventuate.local.java:eventuate-local-java-spring-jdbc:$eventuateLocalVersion" + + compile "org.springframework.boot:spring-boot-starter-web:$springBootVersion" + compile "org.springframework.boot:spring-boot-starter-actuator:$springBootVersion" + compile "org.springframework.boot:spring-boot-starter-jdbc:$springBootVersion" + testCompile project(":common-auth") 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" + testCompile "io.eventuate.local.java:eventuate-client-java-spring-jdbc:$eventuateLocalVersion" } \ No newline at end of file diff --git a/java-spring/customers-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/backend/CustomerBackendConfiguration.java b/java-spring/customers-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/CustomerConfiguration.java similarity index 70% rename from java-spring/customers-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/backend/CustomerBackendConfiguration.java rename to java-spring/customers-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/CustomerConfiguration.java index 77fd7f0..f21ce45 100644 --- a/java-spring/customers-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/backend/CustomerBackendConfiguration.java +++ b/java-spring/customers-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/CustomerConfiguration.java @@ -1,16 +1,18 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.customersservice.backend; +package net.chrisrichardson.eventstore.javaexamples.banking.customersservice; import io.eventuate.AggregateRepository; import io.eventuate.EventuateAggregateStore; import io.eventuate.javaclient.spring.EnableEventHandlers; +import net.chrisrichardson.eventstore.javaexamples.banking.customersservice.service.CustomerService; +import net.chrisrichardson.eventstore.javaexamples.banking.customersservice.domain.Customer; +import net.chrisrichardson.eventstore.javaexamples.banking.customersservice.domain.CustomerCommand; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; @Configuration @EnableEventHandlers -@ComponentScan -public class CustomerBackendConfiguration { +public class CustomerConfiguration { @Bean public CustomerService customerService(AggregateRepository customerRepository) { diff --git a/java-spring/customers-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/CustomersServiceMain.java b/java-spring/customers-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/CustomersServiceMain.java index 64815e7..ed4c165 100644 --- a/java-spring/customers-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/CustomersServiceMain.java +++ b/java-spring/customers-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/CustomersServiceMain.java @@ -1,20 +1,17 @@ package net.chrisrichardson.eventstore.javaexamples.banking.customersservice; -import io.eventuate.javaclient.driver.EventuateDriverConfiguration; -import net.chrisrichardson.eventstore.javaexamples.banking.commonswagger.CommonSwaggerConfiguration; +import io.eventuate.local.java.spring.javaclient.driver.EventuateDriverConfiguration; import net.chrisrichardson.eventstore.javaexamples.banking.customersservice.web.CustomersWebConfiguration; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.autoconfigure.web.HttpMessageConverters; -import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; -import org.springframework.http.converter.HttpMessageConverter; -import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; @Configuration -@Import({CustomersWebConfiguration.class, EventuateDriverConfiguration.class, CommonSwaggerConfiguration.class}) +@Import({CustomerConfiguration.class, CustomersWebConfiguration.class, EventuateDriverConfiguration.class}) @EnableAutoConfiguration +@ComponentScan public class CustomersServiceMain { public static void main(String[] args) { diff --git a/java-spring/customers-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/backend/AddToAccountCommand.java b/java-spring/customers-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/domain/AddToAccountCommand.java similarity index 95% rename from java-spring/customers-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/backend/AddToAccountCommand.java rename to java-spring/customers-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/domain/AddToAccountCommand.java index b685ffc..019f5b4 100644 --- a/java-spring/customers-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/backend/AddToAccountCommand.java +++ b/java-spring/customers-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/domain/AddToAccountCommand.java @@ -1,4 +1,4 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.customersservice.backend; +package net.chrisrichardson.eventstore.javaexamples.banking.customersservice.domain; import net.chrisrichardson.eventstore.javaexamples.banking.common.customers.ToAccountInfo; diff --git a/java-spring/customers-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/backend/CreateCustomerCommand.java b/java-spring/customers-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/domain/CreateCustomerCommand.java similarity index 95% rename from java-spring/customers-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/backend/CreateCustomerCommand.java rename to java-spring/customers-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/domain/CreateCustomerCommand.java index a34c7c1..c776d9a 100644 --- a/java-spring/customers-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/backend/CreateCustomerCommand.java +++ b/java-spring/customers-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/domain/CreateCustomerCommand.java @@ -1,4 +1,4 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.customersservice.backend; +package net.chrisrichardson.eventstore.javaexamples.banking.customersservice.domain; import net.chrisrichardson.eventstore.javaexamples.banking.common.customers.CustomerInfo; diff --git a/java-spring/customers-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/backend/Customer.java b/java-spring/customers-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/domain/Customer.java similarity index 76% rename from java-spring/customers-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/backend/Customer.java rename to java-spring/customers-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/domain/Customer.java index d97d104..3c26f02 100644 --- a/java-spring/customers-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/backend/Customer.java +++ b/java-spring/customers-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/domain/Customer.java @@ -1,12 +1,12 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.customersservice.backend; +package net.chrisrichardson.eventstore.javaexamples.banking.customersservice.domain; import io.eventuate.Event; import io.eventuate.EventUtil; import io.eventuate.ReflectiveMutableCommandProcessingAggregate; -import net.chrisrichardson.eventstore.javaexamples.banking.backend.common.customers.CustomerAddedToAccount; -import net.chrisrichardson.eventstore.javaexamples.banking.backend.common.customers.CustomerCreatedEvent; -import net.chrisrichardson.eventstore.javaexamples.banking.backend.common.customers.CustomerToAccountDeleted; import net.chrisrichardson.eventstore.javaexamples.banking.common.customers.CustomerInfo; +import net.chrisrichardson.eventstore.javaexamples.banking.customers.domain.events.CustomerAddedToAccount; +import net.chrisrichardson.eventstore.javaexamples.banking.customers.domain.events.CustomerCreatedEvent; +import net.chrisrichardson.eventstore.javaexamples.banking.customers.domain.events.CustomerToAccountDeleted; import java.util.List; diff --git a/java-spring/customers-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/backend/CustomerCommand.java b/java-spring/customers-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/domain/CustomerCommand.java similarity index 57% rename from java-spring/customers-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/backend/CustomerCommand.java rename to java-spring/customers-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/domain/CustomerCommand.java index da3c411..2e08e32 100644 --- a/java-spring/customers-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/backend/CustomerCommand.java +++ b/java-spring/customers-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/domain/CustomerCommand.java @@ -1,6 +1,6 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.customersservice.backend; +package net.chrisrichardson.eventstore.javaexamples.banking.customersservice.domain; import io.eventuate.Command; -interface CustomerCommand extends Command { +public interface CustomerCommand extends Command { } diff --git a/java-spring/customers-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/backend/DeleteToAccountCommand.java b/java-spring/customers-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/domain/DeleteToAccountCommand.java similarity index 95% rename from java-spring/customers-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/backend/DeleteToAccountCommand.java rename to java-spring/customers-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/domain/DeleteToAccountCommand.java index bb1aaa4..e58c8d6 100644 --- a/java-spring/customers-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/backend/DeleteToAccountCommand.java +++ b/java-spring/customers-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/domain/DeleteToAccountCommand.java @@ -1,4 +1,4 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.customersservice.backend; +package net.chrisrichardson.eventstore.javaexamples.banking.customersservice.domain; public class DeleteToAccountCommand implements CustomerCommand { diff --git a/java-spring/customers-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/backend/CustomerService.java b/java-spring/customers-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/service/CustomerService.java similarity index 70% rename from java-spring/customers-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/backend/CustomerService.java rename to java-spring/customers-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/service/CustomerService.java index 71619ba..57dec63 100644 --- a/java-spring/customers-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/backend/CustomerService.java +++ b/java-spring/customers-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/service/CustomerService.java @@ -1,10 +1,15 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.customersservice.backend; +package net.chrisrichardson.eventstore.javaexamples.banking.customersservice.service; import io.eventuate.AggregateRepository; import io.eventuate.EntityWithIdAndVersion; import net.chrisrichardson.eventstore.javaexamples.banking.common.customers.CustomerInfo; import net.chrisrichardson.eventstore.javaexamples.banking.common.customers.ToAccountInfo; +import net.chrisrichardson.eventstore.javaexamples.banking.customersservice.domain.AddToAccountCommand; +import net.chrisrichardson.eventstore.javaexamples.banking.customersservice.domain.CreateCustomerCommand; +import net.chrisrichardson.eventstore.javaexamples.banking.customersservice.domain.Customer; +import net.chrisrichardson.eventstore.javaexamples.banking.customersservice.domain.CustomerCommand; +import net.chrisrichardson.eventstore.javaexamples.banking.customersservice.domain.DeleteToAccountCommand; import java.util.concurrent.CompletableFuture; diff --git a/java-spring/customers-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/web/CustomerController.java b/java-spring/customers-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/web/CustomerController.java index fa6f570..4f6ee63 100644 --- a/java-spring/customers-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/web/CustomerController.java +++ b/java-spring/customers-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/web/CustomerController.java @@ -1,11 +1,11 @@ package net.chrisrichardson.eventstore.javaexamples.banking.customersservice.web; -import net.chrisrichardson.eventstore.javaexamples.banking.common.accounts.DeleteAccountResponse; -import net.chrisrichardson.eventstore.javaexamples.banking.common.customers.AddToAccountResponse; +import net.chrisrichardson.eventstore.javaexamples.banking.accounts.webapi.DeleteAccountResponse; +import net.chrisrichardson.eventstore.javaexamples.banking.customers.webapi.AddToAccountResponse; import net.chrisrichardson.eventstore.javaexamples.banking.common.customers.CustomerInfo; -import net.chrisrichardson.eventstore.javaexamples.banking.common.customers.CustomerResponse; +import net.chrisrichardson.eventstore.javaexamples.banking.customers.webapi.CustomerResponse; import net.chrisrichardson.eventstore.javaexamples.banking.common.customers.ToAccountInfo; -import net.chrisrichardson.eventstore.javaexamples.banking.customersservice.backend.CustomerService; +import net.chrisrichardson.eventstore.javaexamples.banking.customersservice.service.CustomerService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/java-spring/customers-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/web/CustomersWebConfiguration.java b/java-spring/customers-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/web/CustomersWebConfiguration.java index 1567586..6f6ad61 100644 --- a/java-spring/customers-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/web/CustomersWebConfiguration.java +++ b/java-spring/customers-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/web/CustomersWebConfiguration.java @@ -1,7 +1,7 @@ package net.chrisrichardson.eventstore.javaexamples.banking.customersservice.web; -import net.chrisrichardson.eventstore.javaexamples.banking.customersservice.backend.CustomerBackendConfiguration; -import org.springframework.boot.autoconfigure.web.HttpMessageConverters; +import net.chrisrichardson.eventstore.javaexamples.banking.commonswagger.CommonSwaggerConfiguration; +import org.springframework.boot.autoconfigure.http.HttpMessageConverters; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; @@ -11,7 +11,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; @Configuration -@Import({CustomerBackendConfiguration.class}) +@Import(CommonSwaggerConfiguration.class) @ComponentScan public class CustomersWebConfiguration extends WebMvcConfigurerAdapter { diff --git a/java-spring/customers-service/src/main/resources/application.properties b/java-spring/customers-service/src/main/resources/application.properties new file mode 100644 index 0000000..7c2c49c --- /dev/null +++ b/java-spring/customers-service/src/main/resources/application.properties @@ -0,0 +1,5 @@ +spring.datasource.url=jdbc:mysql://${DOCKER_HOST_IP:localhost}/eventuate +spring.datasource.username=mysqluser +spring.datasource.password=mysqlpw +spring.datasource.driver-class-name=com.mysql.jdbc.Driver +eventuatelocal.kafka.bootstrap.servers=${DOCKER_HOST_IP:localhost}:9092 diff --git a/java-spring/customers-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/CustomersCommandSideServiceIntegrationTest.java b/java-spring/customers-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/CustomersCommandSideServiceIntegrationTest.java index bd88150..d76d22e 100644 --- a/java-spring/customers-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/CustomersCommandSideServiceIntegrationTest.java +++ b/java-spring/customers-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/CustomersCommandSideServiceIntegrationTest.java @@ -1,27 +1,23 @@ package net.chrisrichardson.eventstore.javaexamples.banking.customersservice; import net.chrisrichardson.eventstore.javaexamples.banking.common.customers.CustomerInfo; -import net.chrisrichardson.eventstore.javaexamples.banking.common.customers.CustomerResponse; +import net.chrisrichardson.eventstore.javaexamples.banking.customers.webapi.CustomerResponse; 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.boot.test.context.SpringBootTest; +import org.springframework.boot.web.server.LocalServerPort; 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.CustomersTestUtils.generateCustomerInfo; @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = CustomersCommandSideServiceTestConfiguration.class) -@WebAppConfiguration -@IntegrationTest({"server.port=0", "management.port=0"}) +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = CustomersCommandSideServiceTestConfiguration.class) public class CustomersCommandSideServiceIntegrationTest { - @Value("${local.server.port}") + @LocalServerPort private int port; private String baseUrl(String path) { diff --git a/java-spring/customers-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/CustomersCommandSideServiceTestConfiguration.java b/java-spring/customers-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/CustomersCommandSideServiceTestConfiguration.java index baf0dd9..dc16846 100644 --- a/java-spring/customers-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/CustomersCommandSideServiceTestConfiguration.java +++ b/java-spring/customers-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/CustomersCommandSideServiceTestConfiguration.java @@ -1,10 +1,11 @@ package net.chrisrichardson.eventstore.javaexamples.banking.customersservice; import io.eventuate.javaclient.spring.jdbc.EmbeddedTestAggregateStoreConfiguration; -import net.chrisrichardson.eventstore.javaexamples.banking.commonauth.AuthConfiguration; +import net.chrisrichardson.eventstore.javaexamples.banking.commonauth.AuthConfigurationAdapter; +import net.chrisrichardson.eventstore.javaexamples.banking.commonswagger.CommonSwaggerConfiguration; import net.chrisrichardson.eventstore.javaexamples.banking.customersservice.web.CustomersWebConfiguration; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.autoconfigure.web.HttpMessageConverters; +import org.springframework.boot.autoconfigure.http.HttpMessageConverters; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; @@ -16,18 +17,13 @@ import java.util.List; @Configuration -@Import({CustomersWebConfiguration.class, +@Import({CustomerConfiguration.class, + CustomersWebConfiguration.class, EmbeddedTestAggregateStoreConfiguration.class, - AuthConfiguration.class}) + AuthConfigurationAdapter.class}) @EnableAutoConfiguration public class CustomersCommandSideServiceTestConfiguration { - @Bean - public HttpMessageConverters customConverters() { - HttpMessageConverter additional = new MappingJackson2HttpMessageConverter(); - return new HttpMessageConverters(additional); - } - @Bean public RestTemplate restTemplate(HttpMessageConverters converters) { RestTemplate restTemplate = new RestTemplate(); diff --git a/java-spring/customers-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/backend/CustomerEventTest.java b/java-spring/customers-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/service/CustomerEventTest.java similarity index 73% rename from java-spring/customers-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/backend/CustomerEventTest.java rename to java-spring/customers-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/service/CustomerEventTest.java index 731eea6..d373b1e 100644 --- a/java-spring/customers-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/backend/CustomerEventTest.java +++ b/java-spring/customers-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/service/CustomerEventTest.java @@ -1,6 +1,7 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.customersservice.backend; +package net.chrisrichardson.eventstore.javaexamples.banking.customersservice.service; +import net.chrisrichardson.eventstore.javaexamples.banking.customersservice.domain.Customer; import net.chrisrichardson.eventstorestore.javaexamples.testutil.AbstractEntityEventTest; public class CustomerEventTest extends AbstractEntityEventTest { diff --git a/java-spring/customers-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/backend/CustomerTest.java b/java-spring/customers-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/service/CustomerTest.java similarity index 72% rename from java-spring/customers-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/backend/CustomerTest.java rename to java-spring/customers-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/service/CustomerTest.java index 7d2a23f..764948e 100644 --- a/java-spring/customers-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/backend/CustomerTest.java +++ b/java-spring/customers-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/customersservice/service/CustomerTest.java @@ -1,8 +1,10 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.customersservice.backend; +package net.chrisrichardson.eventstore.javaexamples.banking.customersservice.service; import io.eventuate.Event; -import net.chrisrichardson.eventstore.javaexamples.banking.backend.common.customers.CustomerCreatedEvent; import net.chrisrichardson.eventstore.javaexamples.banking.common.customers.CustomerInfo; +import net.chrisrichardson.eventstore.javaexamples.banking.customers.domain.events.CustomerCreatedEvent; +import net.chrisrichardson.eventstore.javaexamples.banking.customersservice.domain.CreateCustomerCommand; +import net.chrisrichardson.eventstore.javaexamples.banking.customersservice.domain.Customer; import org.junit.Assert; import org.junit.Test; diff --git a/java-spring/customers-query-side-common/build.gradle b/java-spring/customers-view-service-api-common/build.gradle similarity index 76% rename from java-spring/customers-query-side-common/build.gradle rename to java-spring/customers-view-service-api-common/build.gradle index fea6765..f4737fc 100644 --- a/java-spring/customers-query-side-common/build.gradle +++ b/java-spring/customers-view-service-api-common/build.gradle @@ -5,6 +5,4 @@ dependencies { compile "commons-lang:commons-lang:2.6" compile "org.springframework.boot:spring-boot-starter-data-mongodb:$springBootVersion" - - testCompile group: 'junit', name: 'junit', version: '4.11' } diff --git a/java-spring/customers-query-side-common/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/web/customers/queryside/common/QuerySideCustomer.java b/java-spring/customers-view-service-api-common/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customers/view/commonapi/CustomerView.java similarity index 85% rename from java-spring/customers-query-side-common/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/web/customers/queryside/common/QuerySideCustomer.java rename to java-spring/customers-view-service-api-common/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customers/view/commonapi/CustomerView.java index 234a463..9b7b68f 100644 --- a/java-spring/customers-query-side-common/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/web/customers/queryside/common/QuerySideCustomer.java +++ b/java-spring/customers-view-service-api-common/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customers/view/commonapi/CustomerView.java @@ -1,4 +1,4 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.web.customers.queryside.common; +package net.chrisrichardson.eventstore.javaexamples.banking.customers.view.commonapi; import net.chrisrichardson.eventstore.javaexamples.banking.common.customers.Address; import net.chrisrichardson.eventstore.javaexamples.banking.common.customers.Name; @@ -12,7 +12,7 @@ * Created by Main on 05.02.2016. */ @Document -public class QuerySideCustomer { +public class CustomerView { private String id; private Name name; @@ -24,10 +24,10 @@ public class QuerySideCustomer { private Address address; private Map toAccounts; - public QuerySideCustomer() { + public CustomerView() { } - public QuerySideCustomer(String id, Name name, String email, String password, String ssn, String phoneNumber, Address address, Map toAccounts) { + public CustomerView(String id, Name name, String email, String password, String ssn, String phoneNumber, Address address, Map toAccounts) { this.id = id; this.name = name; this.email = email; diff --git a/java-spring/customers-view-service-api-web/build.gradle b/java-spring/customers-view-service-api-web/build.gradle new file mode 100644 index 0000000..a669db8 --- /dev/null +++ b/java-spring/customers-view-service-api-web/build.gradle @@ -0,0 +1,7 @@ +apply plugin: 'java' + +dependencies { + compile project(":common") + + compile project(":customers-view-service-api-common") +} diff --git a/java-spring/customers-view-service-api-web/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customers/view/webapi/CustomersQueryResponse.java b/java-spring/customers-view-service-api-web/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customers/view/webapi/CustomersQueryResponse.java new file mode 100644 index 0000000..cbaf66d --- /dev/null +++ b/java-spring/customers-view-service-api-web/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customers/view/webapi/CustomersQueryResponse.java @@ -0,0 +1,28 @@ +package net.chrisrichardson.eventstore.javaexamples.banking.customers.view.webapi; + +import net.chrisrichardson.eventstore.javaexamples.banking.customers.view.commonapi.CustomerView; + +import java.util.List; + +/** + * Created by Main on 05.02.2016. + */ +public class CustomersQueryResponse { + + private List customers; + + public CustomersQueryResponse() { + } + + public CustomersQueryResponse(List customers) { + this.customers = customers; + } + + public List getCustomers() { + return customers; + } + + public void setCustomers(List customers) { + this.customers = customers; + } +} diff --git a/java-spring/customers-view-service/Dockerfile b/java-spring/customers-view-service/Dockerfile index 9c7ea55..ba1babe 100644 --- a/java-spring/customers-view-service/Dockerfile +++ b/java-spring/customers-view-service/Dockerfile @@ -1,4 +1,3 @@ -FROM java:openjdk-8u91-jdk -CMD java ${JAVA_OPTS} -jar customers-view-service.jar -EXPOSE 8080 -COPY build/libs/customers-view-service.jar . \ No newline at end of file +ARG baseImageVersion +FROM eventuateio/eventuate-examples-docker-images-spring-example-base-image:$baseImageVersion +COPY build/libs/customers-view-service.jar service.jar diff --git a/java-spring/customers-view-service/build.gradle b/java-spring/customers-view-service/build.gradle index bd2b72e..1cc42f6 100644 --- a/java-spring/customers-view-service/build.gradle +++ b/java-spring/customers-view-service/build.gradle @@ -1,14 +1,15 @@ apply plugin: VerifyMongoDBConfigurationPlugin -apply plugin: VerifyEventStoreEnvironmentPlugin -apply plugin: EventuateDependencyPlugin -apply plugin: 'spring-boot' +apply plugin: 'org.springframework.boot' dependencies { - compile project(":common-backend") - compile project(":customers-query-side-common") + compile project(":accounts-service-api-messaging") + compile project(":customers-service-api-messaging") + compile project(":customers-view-service-api-web") compile project(":common-swagger") + compile "io.eventuate.local.java:eventuate-local-java-spring-jdbc:$eventuateLocalVersion" + compile "org.springframework.boot:spring-boot-starter-web:$springBootVersion" compile "org.springframework.boot:spring-boot-starter-actuator:$springBootVersion" compile "org.springframework.boot:spring-boot-starter-data-mongodb:$springBootVersion" @@ -18,13 +19,7 @@ dependencies { compile 'com.fasterxml.jackson.module:jackson-module-scala_2.10:2.4.3' testCompile project(":testutil") - testCompile project(":customers-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 -} - + testCompile "org.springframework.boot:spring-boot-starter-test:$springBootVersion" + testCompile "io.eventuate.local.java:eventuate-client-java-spring-jdbc:$eventuateLocalVersion" +} \ No newline at end of file diff --git a/java-spring/customers-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersviewservice/backend/CustomerViewBackendConfiguration.java b/java-spring/customers-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersviewservice/CustomerViewConfiguration.java similarity index 66% rename from java-spring/customers-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersviewservice/backend/CustomerViewBackendConfiguration.java rename to java-spring/customers-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersviewservice/CustomerViewConfiguration.java index ce5da81..e7d545c 100644 --- a/java-spring/customers-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersviewservice/backend/CustomerViewBackendConfiguration.java +++ b/java-spring/customers-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersviewservice/CustomerViewConfiguration.java @@ -1,8 +1,12 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.customersviewservice.backend; +package net.chrisrichardson.eventstore.javaexamples.banking.customersviewservice; import io.eventuate.javaclient.spring.EnableEventHandlers; +import net.chrisrichardson.eventstore.javaexamples.banking.customersviewservice.service.CustomerInfoUpdateService; +import net.chrisrichardson.eventstore.javaexamples.banking.customersviewservice.service.CustomerQueryService; +import net.chrisrichardson.eventstore.javaexamples.banking.customersviewservice.service.CustomerQueryWorkflow; +import net.chrisrichardson.eventstore.javaexamples.banking.customersviewservice.domain.CustomerViewRepository; +import net.chrisrichardson.eventstore.javaexamples.banking.customersviewservice.domain.ViewDependencyChecker; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.repository.config.EnableMongoRepositories; @@ -13,8 +17,7 @@ @Configuration @EnableMongoRepositories @EnableEventHandlers -@ComponentScan -public class CustomerViewBackendConfiguration { +public class CustomerViewConfiguration { @Bean public CustomerQueryWorkflow customerQueryWorkflow(CustomerInfoUpdateService accountInfoUpdateService) { return new CustomerQueryWorkflow(accountInfoUpdateService); diff --git a/java-spring/customers-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersviewservice/CustomersViewServiceMain.java b/java-spring/customers-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersviewservice/CustomersViewServiceMain.java index f18eebe..676776c 100644 --- a/java-spring/customers-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersviewservice/CustomersViewServiceMain.java +++ b/java-spring/customers-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersviewservice/CustomersViewServiceMain.java @@ -1,22 +1,19 @@ package net.chrisrichardson.eventstore.javaexamples.banking.customersviewservice; -import io.eventuate.javaclient.driver.EventuateDriverConfiguration; -import net.chrisrichardson.eventstore.javaexamples.banking.commonswagger.CommonSwaggerConfiguration; +import io.eventuate.local.java.spring.javaclient.driver.EventuateDriverConfiguration; import net.chrisrichardson.eventstore.javaexamples.banking.customersviewservice.web.CustomersViewWebConfiguration; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.autoconfigure.web.HttpMessageConverters; -import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; -import org.springframework.http.converter.HttpMessageConverter; -import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; @Configuration -@Import({CustomersViewWebConfiguration.class, - EventuateDriverConfiguration.class, - CommonSwaggerConfiguration.class}) +@Import({CustomerViewConfiguration.class, + CustomersViewWebConfiguration.class, + EventuateDriverConfiguration.class}) @EnableAutoConfiguration +@ComponentScan public class CustomersViewServiceMain { public static void main(String[] args) { diff --git a/java-spring/customers-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersviewservice/backend/CustomerViewRepository.java b/java-spring/customers-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersviewservice/backend/CustomerViewRepository.java deleted file mode 100644 index 6d6f8cb..0000000 --- a/java-spring/customers-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersviewservice/backend/CustomerViewRepository.java +++ /dev/null @@ -1,11 +0,0 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.customersviewservice.backend; - -import net.chrisrichardson.eventstore.javaexamples.banking.web.customers.queryside.common.QuerySideCustomer; -import org.springframework.data.mongodb.repository.MongoRepository; - -import java.util.List; - -interface CustomerViewRepository extends MongoRepository { - - List findByEmailLike(String email); -} diff --git a/java-spring/customers-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersviewservice/domain/CustomerViewRepository.java b/java-spring/customers-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersviewservice/domain/CustomerViewRepository.java new file mode 100644 index 0000000..0b589c8 --- /dev/null +++ b/java-spring/customers-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersviewservice/domain/CustomerViewRepository.java @@ -0,0 +1,11 @@ +package net.chrisrichardson.eventstore.javaexamples.banking.customersviewservice.domain; + +import net.chrisrichardson.eventstore.javaexamples.banking.customers.view.commonapi.CustomerView; +import org.springframework.data.mongodb.repository.MongoRepository; + +import java.util.List; + +public interface CustomerViewRepository extends MongoRepository { + + List findByEmailLike(String email); +} diff --git a/java-spring/customers-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersviewservice/backend/ViewDependencyChecker.java b/java-spring/customers-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersviewservice/domain/ViewDependencyChecker.java similarity index 91% rename from java-spring/customers-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersviewservice/backend/ViewDependencyChecker.java rename to java-spring/customers-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersviewservice/domain/ViewDependencyChecker.java index 2a0d095..13885d0 100644 --- a/java-spring/customers-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersviewservice/backend/ViewDependencyChecker.java +++ b/java-spring/customers-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersviewservice/domain/ViewDependencyChecker.java @@ -1,4 +1,4 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.customersviewservice.backend; +package net.chrisrichardson.eventstore.javaexamples.banking.customersviewservice.domain; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -19,7 +19,7 @@ public void checkDependencies() { try { logger.info("Checking mongodb connectivity {}", System.getenv("SPRING_DATA_MONGODB_URI")); - mongoTemplate.getDb().getCollectionNames(); + mongoTemplate.getCollectionNames(); } catch (Throwable e) { throw new RuntimeException("Error connecting to Mongo - have you set SPRING_DATA_MONGODB_URI or --spring.data.mongodb_uri?", e); diff --git a/java-spring/customers-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersviewservice/backend/CustomerInfoUpdateService.java b/java-spring/customers-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersviewservice/service/CustomerInfoUpdateService.java similarity index 86% rename from java-spring/customers-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersviewservice/backend/CustomerInfoUpdateService.java rename to java-spring/customers-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersviewservice/service/CustomerInfoUpdateService.java index 7a2a324..77ed478 100644 --- a/java-spring/customers-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersviewservice/backend/CustomerInfoUpdateService.java +++ b/java-spring/customers-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersviewservice/service/CustomerInfoUpdateService.java @@ -1,8 +1,9 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.customersviewservice.backend; +package net.chrisrichardson.eventstore.javaexamples.banking.customersviewservice.service; import net.chrisrichardson.eventstore.javaexamples.banking.common.customers.CustomerInfo; import net.chrisrichardson.eventstore.javaexamples.banking.common.customers.ToAccountInfo; -import net.chrisrichardson.eventstore.javaexamples.banking.web.customers.queryside.common.QuerySideCustomer; +import net.chrisrichardson.eventstore.javaexamples.banking.customersviewservice.domain.CustomerViewRepository; +import net.chrisrichardson.eventstore.javaexamples.banking.customers.view.commonapi.CustomerView; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.dao.DuplicateKeyException; @@ -31,7 +32,7 @@ public CustomerInfoUpdateService(CustomerViewRepository querySideCustomerReposit public void create(String id, CustomerInfo customerInfo) { try { - querySideCustomerRepository.save(new QuerySideCustomer(id, + querySideCustomerRepository.save(new CustomerView(id, customerInfo.getName(), customerInfo.getUserCredentials().getEmail(), customerInfo.getUserCredentials().getPassword(), @@ -51,20 +52,20 @@ public void addToAccount(String id, ToAccountInfo accountInfo) { mongoTemplate.upsert(new Query(where("id").is(id)), new Update(). set("toAccounts." + accountInfo.getId(), accountInfo), - QuerySideCustomer.class); + CustomerView.class); } public void deleteToAccountFromAllCustomers(String accountId) { mongoTemplate.updateMulti(new Query(where("toAccounts." + accountId).exists(true)), new Update(). unset("toAccounts." + accountId), - QuerySideCustomer.class); + CustomerView.class); } public void deleteToAccount(String customerId, String accountId) { mongoTemplate.upsert(new Query(where("id").is(customerId)), new Update(). unset("toAccounts." + accountId), - QuerySideCustomer.class); + CustomerView.class); } } diff --git a/java-spring/customers-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersviewservice/backend/CustomerQueryService.java b/java-spring/customers-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersviewservice/service/CustomerQueryService.java similarity index 51% rename from java-spring/customers-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersviewservice/backend/CustomerQueryService.java rename to java-spring/customers-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersviewservice/service/CustomerQueryService.java index 1296783..4aae6d9 100644 --- a/java-spring/customers-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersviewservice/backend/CustomerQueryService.java +++ b/java-spring/customers-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersviewservice/service/CustomerQueryService.java @@ -1,7 +1,8 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.customersviewservice.backend; +package net.chrisrichardson.eventstore.javaexamples.banking.customersviewservice.service; import io.eventuate.CompletableFutureUtil; -import net.chrisrichardson.eventstore.javaexamples.banking.web.customers.queryside.common.QuerySideCustomer; +import net.chrisrichardson.eventstore.javaexamples.banking.customersviewservice.domain.CustomerViewRepository; +import net.chrisrichardson.eventstore.javaexamples.banking.customers.view.commonapi.CustomerView; import org.springframework.dao.EmptyResultDataAccessException; import java.util.List; @@ -15,16 +16,12 @@ public CustomerQueryService(CustomerViewRepository querySideCustomerRepository) this.querySideCustomerRepository = querySideCustomerRepository; } - public CompletableFuture findByCustomerId(String customerId) { - QuerySideCustomer customer = querySideCustomerRepository.findOne(customerId); - if (customer == null) - return CompletableFutureUtil.failedFuture(new EmptyResultDataAccessException(1)); - else - return CompletableFuture.completedFuture(customer); + public CompletableFuture findByCustomerId(String customerId) { + return querySideCustomerRepository.findById(customerId).map(c -> CompletableFuture.completedFuture(c)).orElse(CompletableFutureUtil.failedFuture(new EmptyResultDataAccessException(1))); } - public CompletableFuture> findByEmail(String email) { - List customers = querySideCustomerRepository.findByEmailLike(email); + public CompletableFuture> findByEmail(String email) { + List customers = querySideCustomerRepository.findByEmailLike(email); if (customers.isEmpty()) return CompletableFutureUtil.failedFuture(new EmptyResultDataAccessException(1)); else diff --git a/java-spring/customers-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersviewservice/backend/CustomerQueryWorkflow.java b/java-spring/customers-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersviewservice/service/CustomerQueryWorkflow.java similarity index 80% rename from java-spring/customers-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersviewservice/backend/CustomerQueryWorkflow.java rename to java-spring/customers-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersviewservice/service/CustomerQueryWorkflow.java index 1c4e2c5..1bd026b 100644 --- a/java-spring/customers-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersviewservice/backend/CustomerQueryWorkflow.java +++ b/java-spring/customers-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersviewservice/service/CustomerQueryWorkflow.java @@ -1,13 +1,13 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.customersviewservice.backend; +package net.chrisrichardson.eventstore.javaexamples.banking.customersviewservice.service; import io.eventuate.DispatchedEvent; import io.eventuate.EventHandlerMethod; import io.eventuate.EventSubscriber; -import net.chrisrichardson.eventstore.javaexamples.banking.backend.common.accounts.AccountDeletedEvent; -import net.chrisrichardson.eventstore.javaexamples.banking.backend.common.customers.CustomerAddedToAccount; -import net.chrisrichardson.eventstore.javaexamples.banking.backend.common.customers.CustomerCreatedEvent; -import net.chrisrichardson.eventstore.javaexamples.banking.backend.common.customers.CustomerToAccountDeleted; +import net.chrisrichardson.eventstore.javaexamples.banking.accounts.domain.events.AccountDeletedEvent; import net.chrisrichardson.eventstore.javaexamples.banking.common.customers.ToAccountInfo; +import net.chrisrichardson.eventstore.javaexamples.banking.customers.domain.events.CustomerAddedToAccount; +import net.chrisrichardson.eventstore.javaexamples.banking.customers.domain.events.CustomerCreatedEvent; +import net.chrisrichardson.eventstore.javaexamples.banking.customers.domain.events.CustomerToAccountDeleted; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/java-spring/customers-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersviewservice/web/CustomerQueryController.java b/java-spring/customers-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersviewservice/web/CustomerQueryController.java index c00a24d..f5b3b0e 100644 --- a/java-spring/customers-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersviewservice/web/CustomerQueryController.java +++ b/java-spring/customers-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersviewservice/web/CustomerQueryController.java @@ -1,7 +1,8 @@ package net.chrisrichardson.eventstore.javaexamples.banking.customersviewservice.web; -import net.chrisrichardson.eventstore.javaexamples.banking.customersviewservice.backend.CustomerQueryService; -import net.chrisrichardson.eventstore.javaexamples.banking.web.customers.queryside.common.QuerySideCustomer; +import net.chrisrichardson.eventstore.javaexamples.banking.customers.view.webapi.CustomersQueryResponse; +import net.chrisrichardson.eventstore.javaexamples.banking.customersviewservice.service.CustomerQueryService; +import net.chrisrichardson.eventstore.javaexamples.banking.customers.view.commonapi.CustomerView; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.EmptyResultDataAccessException; import org.springframework.http.HttpStatus; @@ -25,7 +26,7 @@ public CustomerQueryController(CustomerQueryService customerQueryService) { } @RequestMapping(value = "/customers/{customerId}", method = RequestMethod.GET) - public CompletableFuture getCustomer(@PathVariable String customerId) { + public CompletableFuture getCustomer(@PathVariable String customerId) { return customerQueryService.findByCustomerId(customerId); } @@ -42,7 +43,7 @@ public void customersNotFound() { } - private CustomersQueryResponse getCustomersQueryResponse(List customersList) { + private CustomersQueryResponse getCustomersQueryResponse(List customersList) { return new CustomersQueryResponse(customersList); } } diff --git a/java-spring/customers-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersviewservice/web/CustomersQueryResponse.java b/java-spring/customers-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersviewservice/web/CustomersQueryResponse.java deleted file mode 100644 index 235cbe0..0000000 --- a/java-spring/customers-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersviewservice/web/CustomersQueryResponse.java +++ /dev/null @@ -1,28 +0,0 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.customersviewservice.web; - -import net.chrisrichardson.eventstore.javaexamples.banking.web.customers.queryside.common.QuerySideCustomer; - -import java.util.List; - -/** - * Created by Main on 05.02.2016. - */ -public class CustomersQueryResponse { - - private List customers; - - public CustomersQueryResponse() { - } - - public CustomersQueryResponse(List customers) { - this.customers = customers; - } - - public List getCustomers() { - return customers; - } - - public void setCustomers(List customers) { - this.customers = customers; - } -} diff --git a/java-spring/customers-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersviewservice/web/CustomersViewWebConfiguration.java b/java-spring/customers-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersviewservice/web/CustomersViewWebConfiguration.java index 0ea92c8..04d154c 100644 --- a/java-spring/customers-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersviewservice/web/CustomersViewWebConfiguration.java +++ b/java-spring/customers-view-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/customersviewservice/web/CustomersViewWebConfiguration.java @@ -1,7 +1,7 @@ package net.chrisrichardson.eventstore.javaexamples.banking.customersviewservice.web; -import net.chrisrichardson.eventstore.javaexamples.banking.customersviewservice.backend.CustomerViewBackendConfiguration; -import org.springframework.boot.autoconfigure.web.HttpMessageConverters; +import net.chrisrichardson.eventstore.javaexamples.banking.commonswagger.CommonSwaggerConfiguration; +import org.springframework.boot.autoconfigure.http.HttpMessageConverters; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; @@ -11,7 +11,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; @Configuration -@Import({CustomerViewBackendConfiguration.class}) +@Import({CommonSwaggerConfiguration.class}) @ComponentScan public class CustomersViewWebConfiguration extends WebMvcConfigurerAdapter { diff --git a/java-spring/customers-view-service/src/main/resources/application.properties b/java-spring/customers-view-service/src/main/resources/application.properties new file mode 100644 index 0000000..7c2c49c --- /dev/null +++ b/java-spring/customers-view-service/src/main/resources/application.properties @@ -0,0 +1,5 @@ +spring.datasource.url=jdbc:mysql://${DOCKER_HOST_IP:localhost}/eventuate +spring.datasource.username=mysqluser +spring.datasource.password=mysqlpw +spring.datasource.driver-class-name=com.mysql.jdbc.Driver +eventuatelocal.kafka.bootstrap.servers=${DOCKER_HOST_IP:localhost}:9092 diff --git a/java-spring/customers-view-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/customersviewservice/CustomersQuerySideServiceIntegrationTest.java b/java-spring/customers-view-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/customersviewservice/CustomersQuerySideServiceIntegrationTest.java deleted file mode 100644 index 2f68662..0000000 --- a/java-spring/customers-view-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/customersviewservice/CustomersQuerySideServiceIntegrationTest.java +++ /dev/null @@ -1,55 +0,0 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.customersviewservice; - -import net.chrisrichardson.eventstore.javaexamples.banking.common.customers.CustomerInfo; -import net.chrisrichardson.eventstore.javaexamples.banking.common.customers.CustomerResponse; -import net.chrisrichardson.eventstorestore.javaexamples.testutil.CustomersTestUtils; -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.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.web.WebAppConfiguration; -import org.springframework.web.client.RestTemplate; - -import javax.annotation.PostConstruct; - -import static net.chrisrichardson.eventstorestore.javaexamples.testutil.CustomersTestUtils.generateCustomerInfo; - -@RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = CustomersQuerySideServiceTestConfiguration.class) -@WebAppConfiguration -@IntegrationTest({"server.port=0", "management.port=0"}) -public class CustomersQuerySideServiceIntegrationTest { - - @Value("${local.server.port}") - private int port; - - private String baseUrl(String path) { - return "http://localhost:" + port + "/api" + path; - } - - @Autowired - RestTemplate restTemplate; - - CustomersTestUtils customersTestUtils; - - @PostConstruct - private void init() { - customersTestUtils = new CustomersTestUtils(restTemplate, baseUrl("/customers/")); - } - - - @Test - public void shouldGetCustomerById() { - - CustomerInfo customerInfo = generateCustomerInfo(); - - final CustomerResponse customerResponse = restTemplate.postForEntity(baseUrl("/customers"), customerInfo, CustomerResponse.class).getBody(); - final String customerId = customerResponse.getId(); - - customersTestUtils.assertCustomerResponse(customerId, customerInfo); - } - -} diff --git a/java-spring/customers-view-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/customersviewservice/CustomersQuerySideServiceTestConfiguration.java b/java-spring/customers-view-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/customersviewservice/CustomersQuerySideServiceTestConfiguration.java deleted file mode 100644 index bd462e6..0000000 --- a/java-spring/customers-view-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/customersviewservice/CustomersQuerySideServiceTestConfiguration.java +++ /dev/null @@ -1,32 +0,0 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.customersviewservice; - -import io.eventuate.javaclient.spring.jdbc.EmbeddedTestAggregateStoreConfiguration; -import net.chrisrichardson.eventstore.javaexamples.banking.commonauth.AuthConfiguration; -import net.chrisrichardson.eventstore.javaexamples.banking.customersservice.web.CustomersWebConfiguration; -import net.chrisrichardson.eventstore.javaexamples.banking.customersviewservice.web.CustomersViewWebConfiguration; -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; -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 java.util.Arrays; -import java.util.List; - -@Configuration -@Import({CustomersWebConfiguration.class, CustomersViewWebConfiguration.class, EmbeddedTestAggregateStoreConfiguration.class, AuthConfiguration.class}) -@EnableAutoConfiguration -public class CustomersQuerySideServiceTestConfiguration { - - @Bean - public RestTemplate restTemplate(HttpMessageConverters converters) { - RestTemplate restTemplate = new RestTemplate(); - HttpMessageConverter httpMessageConverter = converters.getConverters().get(0); - List> httpMessageConverters = Arrays.asList(new MappingJackson2HttpMessageConverter()); - restTemplate.setMessageConverters((List>) httpMessageConverters); - return restTemplate; - } -} diff --git a/java-spring/customers-view-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/customersviewservice/backend/CustomerInfoUpdateServiceTest.java b/java-spring/customers-view-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/customersviewservice/service/CustomerInfoUpdateServiceTest.java similarity index 57% rename from java-spring/customers-view-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/customersviewservice/backend/CustomerInfoUpdateServiceTest.java rename to java-spring/customers-view-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/customersviewservice/service/CustomerInfoUpdateServiceTest.java index 7c37109..576eb32 100644 --- a/java-spring/customers-view-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/customersviewservice/backend/CustomerInfoUpdateServiceTest.java +++ b/java-spring/customers-view-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/customersviewservice/service/CustomerInfoUpdateServiceTest.java @@ -1,17 +1,18 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.customersviewservice.backend; +package net.chrisrichardson.eventstore.javaexamples.banking.customersviewservice.service; +import io.eventuate.common.id.IdGenerator; +import io.eventuate.common.id.IdGeneratorImpl; import io.eventuate.javaclient.spring.jdbc.EmbeddedTestAggregateStoreConfiguration; -import io.eventuate.javaclient.spring.jdbc.IdGenerator; -import io.eventuate.javaclient.spring.jdbc.IdGeneratorImpl; import net.chrisrichardson.eventstore.javaexamples.banking.common.customers.CustomerInfo; import net.chrisrichardson.eventstore.javaexamples.banking.common.customers.ToAccountInfo; -import net.chrisrichardson.eventstore.javaexamples.banking.web.customers.queryside.common.QuerySideCustomer; +import net.chrisrichardson.eventstore.javaexamples.banking.customersviewservice.CustomerViewConfiguration; +import net.chrisrichardson.eventstore.javaexamples.banking.customersviewservice.web.CustomersViewWebConfiguration; +import net.chrisrichardson.eventstore.javaexamples.banking.customers.view.commonapi.CustomerView; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.test.IntegrationTest; -import org.springframework.boot.test.SpringApplicationConfiguration; +import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -22,13 +23,14 @@ import static org.junit.Assert.*; @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = CustomerInfoUpdateServiceTest.CustomerInfoUpdateServiceTestConfiguration.class) -@IntegrationTest +@SpringBootTest(classes = CustomerInfoUpdateServiceTest.CustomerInfoUpdateServiceTestConfiguration.class) public class CustomerInfoUpdateServiceTest { @Configuration @EnableAutoConfiguration - @Import({CustomerViewBackendConfiguration.class, EmbeddedTestAggregateStoreConfiguration.class}) + @Import({CustomerViewConfiguration.class, + CustomersViewWebConfiguration.class, + EmbeddedTestAggregateStoreConfiguration.class}) public static class CustomerInfoUpdateServiceTestConfiguration { } @@ -47,13 +49,13 @@ public void shouldSaveQuerysideCustomer() throws ExecutionException, Interrupted CustomerInfo customerInfo = generateCustomerInfo(); customerInfoUpdateService.create(customerId, customerInfo); - QuerySideCustomer querySideCustomer = customerQueryService.findByCustomerId(customerId).get(); + CustomerView customerView = customerQueryService.findByCustomerId(customerId).get(); - assertEquals(customerInfo.getName(), querySideCustomer.getName()); - assertEquals(customerInfo.getAddress(), querySideCustomer.getAddress()); - assertEquals(customerInfo.getUserCredentials().getEmail(), querySideCustomer.getEmail()); - assertEquals(customerInfo.getPhoneNumber(), querySideCustomer.getPhoneNumber()); - assertEquals(customerInfo.getSsn(), querySideCustomer.getSsn()); + assertEquals(customerInfo.getName(), customerView.getName()); + assertEquals(customerInfo.getAddress(), customerView.getAddress()); + assertEquals(customerInfo.getUserCredentials().getEmail(), customerView.getEmail()); + assertEquals(customerInfo.getPhoneNumber(), customerView.getPhoneNumber()); + assertEquals(customerInfo.getSsn(), customerView.getSsn()); } @Test @@ -69,14 +71,14 @@ public void shouldAddAndDeleteToAccount() throws ExecutionException, Interrupted customerInfoUpdateService.addToAccount(customerId, toAccountInfo); - QuerySideCustomer querySideCustomer = customerQueryService.findByCustomerId(customerId).get(); + CustomerView customerView = customerQueryService.findByCustomerId(customerId).get(); - assertTrue(querySideCustomer.getToAccounts().containsKey(accountId)); - assertEquals(toAccountInfo, querySideCustomer.getToAccounts().get(accountId)); + assertTrue(customerView.getToAccounts().containsKey(accountId)); + assertEquals(toAccountInfo, customerView.getToAccounts().get(accountId)); customerInfoUpdateService.deleteToAccountFromAllCustomers(accountId); - querySideCustomer = customerQueryService.findByCustomerId(customerId).get(); + customerView = customerQueryService.findByCustomerId(customerId).get(); - assertFalse(querySideCustomer.getToAccounts().containsKey(accountId)); + assertFalse(customerView.getToAccounts().containsKey(accountId)); } } \ No newline at end of file diff --git a/java-spring/docker-compose-common.yml b/java-spring/docker-compose-common.yml deleted file mode 100644 index 7cd0387..0000000 --- a/java-spring/docker-compose-common.yml +++ /dev/null @@ -1,54 +0,0 @@ -apigateway: - build: ./api-gateway-service/ - restart: unless-stopped - ports: - - "8080:8080" - environment: - SPRING_DATA_MONGODB_URI: mongodb://mongodb/mydb - ACCOUNTS_COMMANDSIDE_SERVICE_HOST: accountsservice - TRANSFERS_COMMANDSIDE_SERVICE_HOST: transactionsservice - ACCOUNTS_QUERYSIDE_SERVICE_HOST: accountsviewservice - CUSTOMERS_COMMANDSIDE_SERVICE_HOST: customersservice - CUSTOMERS_QUERYSIDE_SERVICE_HOST: customersviewservice - - -accountsservice: - build: ./accounts-service/ - restart: unless-stopped - ports: - - "8085:8080" - -transactionsservice: - build: ./transactions-service/ - restart: unless-stopped - ports: - - "8082:8080" - -accountsviewservice: - build: ./accounts-view-service/ - restart: unless-stopped - environment: - SPRING_DATA_MONGODB_URI: mongodb://mongodb/mydb - ports: - - "8081:8080" - -customersservice: - build: ./customers-service/ - restart: unless-stopped - ports: - - "8083:8080" - -customersviewservice: - build: ./customers-view-service/ - restart: unless-stopped - ports: - - "8084:8080" - environment: - SPRING_DATA_MONGODB_URI: mongodb://mongodb/mydb - -mongodb: - image: mongo:3.0.4 - hostname: mongodb - command: mongod --smallfiles - ports: - - "27017:27017" diff --git a/java-spring/docker-compose-eventuate-local.yml b/java-spring/docker-compose-eventuate-local.yml deleted file mode 100644 index cf549f6..0000000 --- a/java-spring/docker-compose-eventuate-local.yml +++ /dev/null @@ -1,161 +0,0 @@ -zookeeper: - image: eventuateio/eventuateio-local-zookeeper:0.9.0 - ports: - - 2181:2181 - - 2888:2888 - - 3888:3888 - - -kafka: - image: eventuateio/eventuateio-local-kafka:0.9.0 - ports: - - 9092:9092 - links: - - zookeeper - environment: - - ADVERTISED_HOST_NAME=${DOCKER_HOST_IP} - - KAFKA_HEAP_OPTS=-Xmx320m -Xms320m - - ZOOKEEPER_SERVERS=zookeeper:2181 - -mysql: - image: eventuateio/eventuateio-local-mysql:0.9.0 - ports: - - 3306:3306 - environment: - - MYSQL_ROOT_PASSWORD=rootpassword - - MYSQL_USER=mysqluser - - MYSQL_PASSWORD=mysqlpw - - -cdcservice: - image: eventuateio/eventuateio-local-cdc-service:0.9.0 - ports: - - "8099:8080" - links: - - mysql - - kafka - - zookeeper - environment: - SPRING_DATASOURCE_URL: jdbc:mysql://mysql/eventuate - SPRING_DATASOURCE_USERNAME: mysqluser - SPRING_DATASOURCE_PASSWORD: mysqlpw - SPRING_DATASOURCE_DRIVER_CLASS_NAME: com.mysql.jdbc.Driver - EVENTUATELOCAL_KAFKA_BOOTSTRAP_SERVERS: kafka:9092 - EVENTUATELOCAL_ZOOKEEPER_CONNECTION_STRING: zookeeper:2181 - EVENTUATELOCAL_CDC_DB_USER_NAME: root - EVENTUATELOCAL_CDC_DB_PASSWORD: rootpassword - -mongodb: - extends: - file: docker-compose-common.yml - service: mongodb - -apigateway: - extends: - file: docker-compose-common.yml - service: apigateway - links: - - accountsservice - - transactionsservice - - accountsviewservice - - customersservice - - customersviewservice - - mongodb - -accountsservice: - extends: - file: docker-compose-common.yml - service: accountsservice - links: - - mysql - - kafka - - zookeeper - environment: - SPRING_DATASOURCE_URL: jdbc:mysql://mysql/eventuate - SPRING_DATASOURCE_USERNAME: mysqluser - SPRING_DATASOURCE_PASSWORD: mysqlpw - SPRING_DATASOURCE_DRIVER_CLASS_NAME: com.mysql.jdbc.Driver - EVENTUATELOCAL_KAFKA_BOOTSTRAP_SERVERS: kafka:9092 - EVENTUATELOCAL_ZOOKEEPER_CONNECTION_STRING: zookeeper:2181 - EVENTUATELOCAL_CDC_DB_USER_NAME: root - EVENTUATELOCAL_CDC_DB_PASSWORD: rootpassword - - -transactionsservice: - extends: - file: docker-compose-common.yml - service: transactionsservice - links: - - mysql - - kafka - - zookeeper - environment: - SPRING_DATASOURCE_URL: jdbc:mysql://mysql/eventuate - SPRING_DATASOURCE_USERNAME: mysqluser - SPRING_DATASOURCE_PASSWORD: mysqlpw - SPRING_DATASOURCE_DRIVER_CLASS_NAME: com.mysql.jdbc.Driver - EVENTUATELOCAL_KAFKA_BOOTSTRAP_SERVERS: kafka:9092 - EVENTUATELOCAL_ZOOKEEPER_CONNECTION_STRING: zookeeper:2181 - EVENTUATELOCAL_CDC_DB_USER_NAME: root - EVENTUATELOCAL_CDC_DB_PASSWORD: rootpassword - -accountsviewservice: - extends: - file: docker-compose-common.yml - service: accountsviewservice - links: - - mongodb - - mysql - - kafka - - zookeeper - environment: - SPRING_DATA_MONGODB_URI: mongodb://mongodb/mydb - SPRING_DATASOURCE_URL: jdbc:mysql://mysql/eventuate - SPRING_DATASOURCE_USERNAME: mysqluser - SPRING_DATASOURCE_PASSWORD: mysqlpw - SPRING_DATASOURCE_DRIVER_CLASS_NAME: com.mysql.jdbc.Driver - EVENTUATELOCAL_KAFKA_BOOTSTRAP_SERVERS: kafka:9092 - EVENTUATELOCAL_ZOOKEEPER_CONNECTION_STRING: zookeeper:2181 - EVENTUATELOCAL_CDC_DB_USER_NAME: root - EVENTUATELOCAL_CDC_DB_PASSWORD: rootpassword - - -customersservice: - extends: - file: docker-compose-common.yml - service: customersservice - links: - - mysql - - kafka - - zookeeper - environment: - SPRING_DATASOURCE_URL: jdbc:mysql://mysql/eventuate - SPRING_DATASOURCE_USERNAME: mysqluser - SPRING_DATASOURCE_PASSWORD: mysqlpw - SPRING_DATASOURCE_DRIVER_CLASS_NAME: com.mysql.jdbc.Driver - EVENTUATELOCAL_KAFKA_BOOTSTRAP_SERVERS: kafka:9092 - EVENTUATELOCAL_ZOOKEEPER_CONNECTION_STRING: zookeeper:2181 - EVENTUATELOCAL_CDC_DB_USER_NAME: root - EVENTUATELOCAL_CDC_DB_PASSWORD: rootpassword - -customersviewservice: - extends: - file: docker-compose-common.yml - service: customersviewservice - links: - - mongodb - - mysql - - kafka - - zookeeper - environment: - SPRING_DATA_MONGODB_URI: mongodb://mongodb/mydb - environment: - SPRING_DATA_MONGODB_URI: mongodb://mongodb/mydb - SPRING_DATASOURCE_URL: jdbc:mysql://mysql/eventuate - SPRING_DATASOURCE_USERNAME: mysqluser - SPRING_DATASOURCE_PASSWORD: mysqlpw - SPRING_DATASOURCE_DRIVER_CLASS_NAME: com.mysql.jdbc.Driver - EVENTUATELOCAL_KAFKA_BOOTSTRAP_SERVERS: kafka:9092 - EVENTUATELOCAL_ZOOKEEPER_CONNECTION_STRING: zookeeper:2181 - EVENTUATELOCAL_CDC_DB_USER_NAME: root - EVENTUATELOCAL_CDC_DB_PASSWORD: rootpassword diff --git a/java-spring/docker-compose.yml b/java-spring/docker-compose.yml index 51deb2a..4c05c56 100644 --- a/java-spring/docker-compose.yml +++ b/java-spring/docker-compose.yml @@ -1,61 +1,188 @@ -apigateway: - extends: - file: docker-compose-common.yml - service: apigateway - links: - - accountsservice - - transactionsservice - - accountsviewservice - - customersservice - - customersviewservice - - mongodb +version: '3' +services: + zookeeper: + image: confluentinc/cp-zookeeper:5.2.4 + ports: + - 2181:2181 + environment: + ZOOKEEPER_CLIENT_PORT: 2181 + KAFKA_HEAP_OPTS: -Xmx64m + + kafka: + image: "confluentinc/cp-kafka:5.2.4" + ports: + - 9092:9092 + - 29092:29092 + depends_on: + - zookeeper + environment: + KAFKA_LISTENERS: LC://kafka:29092,LX://kafka:9092 + KAFKA_ADVERTISED_LISTENERS: LC://kafka:29092,LX://${DOCKER_HOST_IP:-localhost}:9092 + KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: LC:PLAINTEXT,LX:PLAINTEXT + KAFKA_INTER_BROKER_LISTENER_NAME: LC + KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181 + KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1 + KAFKA_HEAP_OPTS: -Xmx192m + + mysql: + image: eventuateio/eventuate-mysql:$EVENTUATE_COMMON_VERSION + ports: + - 3306:3306 + environment: + - MYSQL_ROOT_PASSWORD=rootpassword + - MYSQL_USER=mysqluser + - MYSQL_PASSWORD=mysqlpw + + + cdc-service: + image: eventuateio/eventuate-cdc-service:$EVENTUATE_CDC_VERSION + ports: + - "8099:8080" + depends_on: + - mysql + - kafka + - zookeeper + environment: + SPRING_DATASOURCE_URL: jdbc:mysql://mysql/eventuate + SPRING_DATASOURCE_USERNAME: mysqluser + SPRING_DATASOURCE_PASSWORD: mysqlpw + SPRING_DATASOURCE_DRIVER_CLASS_NAME: com.mysql.jdbc.Driver + EVENTUATELOCAL_KAFKA_BOOTSTRAP_SERVERS: kafka:29092 + EVENTUATELOCAL_ZOOKEEPER_CONNECTION_STRING: zookeeper:2181 + EVENTUATELOCAL_CDC_DB_USER_NAME: root + EVENTUATELOCAL_CDC_DB_PASSWORD: rootpassword + EVENTUATELOCAL_CDC_READER_NAME: MySqlReader + EVENTUATELOCAL_CDC_OFFSET_STORE_KEY: MySqlBinlog + EVENTUATELOCAL_CDC_MYSQL_BINLOG_CLIENT_UNIQUE_ID: 1234567890 + EVENTUATELOCAL_CDC_READ_OLD_DEBEZIUM_DB_OFFSET_STORAGE_TOPIC: "false" + EVENTUATE_CDC_TYPE: "EventuateLocal" + + mongodb: + image: mongo:3.0.4 + hostname: mongodb + command: mongod --smallfiles + ports: + - "27017:27017" -accountsservice: - extends: - file: docker-compose-common.yml - service: accountsservice - environment: - EVENTUATE_API_KEY_ID: ${EVENTUATE_API_KEY_ID} - EVENTUATE_API_KEY_SECRET: ${EVENTUATE_API_KEY_SECRET} + api-gateway-service: + build: + context: ./api-gateway-service/ + args: + baseImageVersion: ${EVENTUATE_JAVA_BASE_IMAGE_VERSION?} + restart: unless-stopped + ports: + - "8080:8080" + environment: + SPRING_DATA_MONGODB_URI: mongodb://mongodb/mydb + ACCOUNTS_COMMANDSIDE_SERVICE_HOST: accounts-service + TRANSFERS_COMMANDSIDE_SERVICE_HOST: transactions-service + ACCOUNTS_QUERYSIDE_SERVICE_HOST: accounts-view-service + CUSTOMERS_COMMANDSIDE_SERVICE_HOST: customers-service + CUSTOMERS_QUERYSIDE_SERVICE_HOST: customers-view-service + depends_on: + - accounts-service + - transactions-service + - accounts-view-service + - customers-service + - customers-view-service + - mongodb -transactionsservice: - extends: - file: docker-compose-common.yml - service: transactionsservice - environment: - EVENTUATE_API_KEY_ID: ${EVENTUATE_API_KEY_ID} - EVENTUATE_API_KEY_SECRET: ${EVENTUATE_API_KEY_SECRET} + accounts-service: + build: + context: ./accounts-service/ + args: + baseImageVersion: ${EVENTUATE_JAVA_BASE_IMAGE_VERSION?} + restart: unless-stopped + ports: + - "8085:8080" + depends_on: + - mysql + - kafka + - zookeeper + environment: + SPRING_DATASOURCE_URL: jdbc:mysql://mysql/eventuate + SPRING_DATASOURCE_USERNAME: mysqluser + SPRING_DATASOURCE_PASSWORD: mysqlpw + SPRING_DATASOURCE_DRIVER_CLASS_NAME: com.mysql.jdbc.Driver + EVENTUATELOCAL_KAFKA_BOOTSTRAP_SERVERS: kafka:29092 + transactions-service: + build: + context: ./transactions-service/ + args: + baseImageVersion: ${EVENTUATE_JAVA_BASE_IMAGE_VERSION?} + restart: unless-stopped + ports: + - "8082:8080" + depends_on: + - mysql + - kafka + - zookeeper + environment: + SPRING_DATASOURCE_URL: jdbc:mysql://mysql/eventuate + SPRING_DATASOURCE_USERNAME: mysqluser + SPRING_DATASOURCE_PASSWORD: mysqlpw + SPRING_DATASOURCE_DRIVER_CLASS_NAME: com.mysql.jdbc.Driver + EVENTUATELOCAL_KAFKA_BOOTSTRAP_SERVERS: kafka:29092 -accountsviewservice: - extends: - file: docker-compose-common.yml - service: accountsviewservice - links: - - mongodb - environment: - EVENTUATE_API_KEY_ID: ${EVENTUATE_API_KEY_ID} - EVENTUATE_API_KEY_SECRET: ${EVENTUATE_API_KEY_SECRET} + accounts-view-service: + build: + context: ./accounts-view-service/ + args: + baseImageVersion: ${EVENTUATE_JAVA_BASE_IMAGE_VERSION?} + restart: unless-stopped + ports: + - "8081:8080" + depends_on: + - mongodb + - mysql + - kafka + - zookeeper + environment: + SPRING_DATA_MONGODB_URI: mongodb://mongodb/mydb + SPRING_DATASOURCE_URL: jdbc:mysql://mysql/eventuate + SPRING_DATASOURCE_USERNAME: mysqluser + SPRING_DATASOURCE_PASSWORD: mysqlpw + SPRING_DATASOURCE_DRIVER_CLASS_NAME: com.mysql.jdbc.Driver + EVENTUATELOCAL_KAFKA_BOOTSTRAP_SERVERS: kafka:29092 -customersservice: - extends: - file: docker-compose-common.yml - service: customersservice - environment: - EVENTUATE_API_KEY_ID: ${EVENTUATE_API_KEY_ID} - EVENTUATE_API_KEY_SECRET: ${EVENTUATE_API_KEY_SECRET} -customersviewservice: - extends: - file: docker-compose-common.yml - service: customersviewservice - links: - - mongodb - environment: - EVENTUATE_API_KEY_ID: ${EVENTUATE_API_KEY_ID} - EVENTUATE_API_KEY_SECRET: ${EVENTUATE_API_KEY_SECRET} + customers-service: + build: + context: ./customers-service/ + args: + baseImageVersion: ${EVENTUATE_JAVA_BASE_IMAGE_VERSION?} + restart: unless-stopped + ports: + - "8083:8080" + depends_on: + - mysql + - kafka + - zookeeper + environment: + SPRING_DATASOURCE_URL: jdbc:mysql://mysql/eventuate + SPRING_DATASOURCE_USERNAME: mysqluser + SPRING_DATASOURCE_PASSWORD: mysqlpw + SPRING_DATASOURCE_DRIVER_CLASS_NAME: com.mysql.jdbc.Driver + EVENTUATELOCAL_KAFKA_BOOTSTRAP_SERVERS: kafka:29092 -mongodb: - extends: - file: docker-compose-common.yml - service: mongodb + customers-view-service: + build: + context: ./customers-view-service/ + args: + baseImageVersion: ${EVENTUATE_JAVA_BASE_IMAGE_VERSION?} + restart: unless-stopped + ports: + - "8084:8080" + depends_on: + - mongodb + - mysql + - kafka + - zookeeper + environment: + SPRING_DATA_MONGODB_URI: mongodb://mongodb/mydb + SPRING_DATASOURCE_URL: jdbc:mysql://mysql/eventuate + SPRING_DATASOURCE_USERNAME: mysqluser + SPRING_DATASOURCE_PASSWORD: mysqlpw + SPRING_DATASOURCE_DRIVER_CLASS_NAME: com.mysql.jdbc.Driver + EVENTUATELOCAL_KAFKA_BOOTSTRAP_SERVERS: kafka:29092 \ No newline at end of file diff --git a/java-spring/gradle.properties b/java-spring/gradle.properties index 1135d71..f0af53d 100644 --- a/java-spring/gradle.properties +++ b/java-spring/gradle.properties @@ -1,9 +1,17 @@ org.gradle.jvmargs=-XX:MaxPermSize=512m -eventuateMavenRepoUrl= +eventuateMavenRepoUrl=https://dl.bintray.com/eventuateio-oss/eventuate-maven-release,https://dl.bintray.com/eventuateio-oss/eventuate-maven-milestone,https://dl.bintray.com/eventuateio-oss/eventuate-maven-rc,file:///Users/cer/.m2/testdeploy,https://snapshots.repositories.eventuate.io/repository -springBootVersion=1.3.5.RELEASE +springBootVersion=2.3.4.RELEASE +dockerComposePluginVersion=0.13.4 -eventuateClientVersion=0.14.0.RELEASE -eventuateLocalVersion=0.11.0.RELEASE +eventuateLocalVersion=0.35.0.BUILD-SNAPSHOT +eventuateUtilVersion=0.8.0.BUILD-SNAPSHOT + +eventuateCommonImageVersion=0.12.0.RELEASE +eventuateCdcImageVersion=0.9.0.RELEASE + +eventuateExamplesBaseImageVersion=BUILD-6 + +removeContainers=false \ No newline at end of file diff --git a/java-spring/gradle/wrapper/gradle-wrapper.properties b/java-spring/gradle/wrapper/gradle-wrapper.properties index c8b3142..2f6ef87 100644 --- a/java-spring/gradle/wrapper/gradle-wrapper.properties +++ b/java-spring/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-2.11-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip \ No newline at end of file diff --git a/java-spring/rest-api-integration-tests/build.gradle b/java-spring/rest-api-integration-tests/build.gradle deleted file mode 100644 index 8ed53ba..0000000 --- a/java-spring/rest-api-integration-tests/build.gradle +++ /dev/null @@ -1,14 +0,0 @@ -apply plugin: VerifyMongoDBConfigurationPlugin - -dependencies { - testCompile project(":common-auth-web") - testCompile project(":transactions-service") - testCompile project(":accounts-service") - testCompile project(":accounts-view-service") - testCompile project(":customers-service") - testCompile project(":customers-view-service") - 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" -} \ No newline at end of file diff --git a/java-spring/rest-api-integration-tests/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/web/BankingAuthTest.java b/java-spring/rest-api-integration-tests/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/web/BankingAuthTest.java deleted file mode 100644 index 43193d7..0000000 --- a/java-spring/rest-api-integration-tests/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/web/BankingAuthTest.java +++ /dev/null @@ -1,64 +0,0 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.web; - -import net.chrisrichardson.eventstore.javaexamples.banking.common.customers.CustomerInfo; -import net.chrisrichardson.eventstore.javaexamples.banking.common.customers.CustomerResponse; -import net.chrisrichardson.eventstore.javaexamples.banking.web.customers.queryside.common.QuerySideCustomer; -import net.chrisrichardson.eventstorestore.javaexamples.testutil.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.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.web.WebAppConfiguration; -import org.springframework.web.client.RestTemplate; - -import javax.annotation.PostConstruct; - -import static net.chrisrichardson.eventstorestore.javaexamples.testutil.CustomersTestUtils.generateCustomerInfo; - -/** - * Created by Main on 15.02.2016. - */ -@RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = BankingWebTestConfiguration.class) -@WebAppConfiguration -@IntegrationTest({"server.port=0", "management.port=0"}) -public class BankingAuthTest { - - @Value("${local.server.port}") - private int port; - - @Autowired - RestTemplate restTemplate; - - CustomersTestUtils customersTestUtils; - - @PostConstruct - private void init() { - customersTestUtils = new CustomersTestUtils(restTemplate, baseUrl("/customers/")); - } - - private String baseUrl(String path) { - return "http://localhost:" + port + "/api" + path; - } - - @Test - public void shouldCreateCustomerAndLogin() { - CustomerInfo customerInfo = generateCustomerInfo(); - - final CustomerResponse customerResponse = restTemplate.postForEntity(baseUrl("/customers"), customerInfo, CustomerResponse.class).getBody(); - final String customerId = customerResponse.getId(); - - Assert.assertNotNull(customerId); - Assert.assertEquals(customerInfo, customerResponse.getCustomerInfo()); - - customersTestUtils.assertCustomerResponse(customerId, customerInfo); - - final QuerySideCustomer loginQuerySideCustomer = restTemplate.postForEntity(baseUrl("/login"), customerInfo.getUserCredentials(), QuerySideCustomer.class).getBody(); - - customersTestUtils.assertQuerySideCustomerEqualscCustomerInfo(loginQuerySideCustomer, customerResponse.getCustomerInfo()); - } -} diff --git a/java-spring/rest-api-integration-tests/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/web/BankingWebIntegrationTest.java b/java-spring/rest-api-integration-tests/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/web/BankingWebIntegrationTest.java deleted file mode 100644 index b0fc3ff..0000000 --- a/java-spring/rest-api-integration-tests/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/web/BankingWebIntegrationTest.java +++ /dev/null @@ -1,49 +0,0 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.web; - -import net.chrisrichardson.eventstorestore.javaexamples.testutil.AbstractRestAPITest; - -import net.chrisrichardson.eventstorestore.javaexamples.testutil.CustomersTestUtils; -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.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.web.WebAppConfiguration; -import org.springframework.web.client.RestTemplate; -import javax.annotation.PostConstruct; - -@RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = BankingWebTestConfiguration.class) -@WebAppConfiguration -@IntegrationTest({"server.port=0", "management.port=0"}) -public class BankingWebIntegrationTest extends AbstractRestAPITest { - - @Value("${local.server.port}") - private int port; - - CustomersTestUtils customersTestUtils; - - @PostConstruct - private void init() { - customersTestUtils = new CustomersTestUtils(restTemplate, baseUrl("/customers/")); - } - - @Override - public String baseUrl(String path) { - return "http://localhost:" + port + "/api" + path; - } - - @Override - public CustomersTestUtils getCustomersTestUtils() { - return customersTestUtils; - } - - @Autowired - RestTemplate restTemplate; - - @Override - public RestTemplate getRestTemplate() { - return restTemplate; - } -} diff --git a/java-spring/rest-api-integration-tests/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/web/BankingWebTestConfiguration.java b/java-spring/rest-api-integration-tests/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/web/BankingWebTestConfiguration.java deleted file mode 100644 index 0de078b..0000000 --- a/java-spring/rest-api-integration-tests/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/web/BankingWebTestConfiguration.java +++ /dev/null @@ -1,51 +0,0 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.web; - -import io.eventuate.javaclient.spring.jdbc.EmbeddedTestAggregateStoreConfiguration; -import net.chrisrichardson.eventstore.javaexamples.banking.accountsservice.web.AccountsWebConfiguration; -import net.chrisrichardson.eventstore.javaexamples.banking.accountsviewservice.web.AccountViewWebConfiguration; -import net.chrisrichardson.eventstore.javaexamples.banking.commonauth.AuthConfiguration; -import net.chrisrichardson.eventstore.javaexamples.banking.customersservice.web.CustomersWebConfiguration; -import net.chrisrichardson.eventstore.javaexamples.banking.customersviewservice.web.CustomersViewWebConfiguration; -import net.chrisrichardson.eventstore.javaexamples.banking.transactionsservice.web.MoneyTransferWebConfiguration; -import net.chrisrichardson.eventstorestore.javaexamples.testutil.RestTemplateErrorHandler; -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; -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 java.util.Arrays; -import java.util.List; - -@Configuration -@Import({AccountsWebConfiguration.class, - MoneyTransferWebConfiguration.class, - AccountViewWebConfiguration.class, - CustomersViewWebConfiguration.class, - CustomersWebConfiguration.class, - EmbeddedTestAggregateStoreConfiguration.class, - AuthConfiguration.class}) -@EnableAutoConfiguration -public class BankingWebTestConfiguration extends WebMvcConfigurerAdapter { - - @Bean - public HttpMessageConverters customConverters() { - HttpMessageConverter additional = new MappingJackson2HttpMessageConverter(); - return new HttpMessageConverters(additional); - } - - @Bean - public RestTemplate restTemplate(HttpMessageConverters converters) { - RestTemplate restTemplate = new RestTemplate(); - HttpMessageConverter httpMessageConverter = converters.getConverters().get(0); - List> httpMessageConverters = Arrays.asList(new MappingJackson2HttpMessageConverter()); - restTemplate.setMessageConverters((List>) httpMessageConverters); - - restTemplate.setErrorHandler(new RestTemplateErrorHandler()); - return restTemplate; - } -} diff --git a/java-spring/set-env.sh b/java-spring/set-env.sh deleted file mode 100644 index f84392f..0000000 --- a/java-spring/set-env.sh +++ /dev/null @@ -1,21 +0,0 @@ -if [ -z "$DOCKER_HOST_IP" ] ; then - if [ -z "$DOCKER_HOST" ] ; then - export DOCKER_HOST_IP=`hostname` - else - echo using ${DOCKER_HOST?} - XX=${DOCKER_HOST%\:*} - export DOCKER_HOST_IP=${XX#tcp\:\/\/} - fi -fi - -echo DOCKER_HOST_IP is $DOCKER_HOST_IP - -export SPRING_DATASOURCE_URL=jdbc:mysql://${DOCKER_HOST_IP}/eventuate -export SPRING_DATASOURCE_USERNAME=mysqluser -export SPRING_DATASOURCE_PASSWORD=mysqlpw -export SPRING_DATASOURCE_DRIVER_CLASS_NAME=com.mysql.jdbc.Driver -export EVENTUATELOCAL_KAFKA_BOOTSTRAP_SERVERS=$DOCKER_HOST_IP:9092 -export EVENTUATELOCAL_CDC_DB_USER_NAME=root -export EVENTUATELOCAL_CDC_DB_PASSWORD=rootpassword -export EVENTUATELOCAL_ZOOKEEPER_CONNECTION_STRING=$DOCKER_HOST_IP:2181 - diff --git a/java-spring/settings.gradle b/java-spring/settings.gradle index 7badf00..0e5ae34 100644 --- a/java-spring/settings.gradle +++ b/java-spring/settings.gradle @@ -1,21 +1,30 @@ include 'testutil' include 'common' -include 'common-backend' include 'common-auth' -include 'common-auth-web' include 'common-swagger' -include 'customers-query-side-common' include 'accounts-service' +include 'accounts-service-api-messaging' +include 'accounts-service-api-web' + include 'accounts-view-service' +include 'accounts-view-service-api-web' + include 'transactions-service' +include 'transactions-service-api-messaging' +include 'transactions-service-api-web' + include 'customers-service' +include 'customers-service-api-messaging' +include 'customers-service-api-web' + include 'customers-view-service' +include 'customers-view-service-api-common' +include 'customers-view-service-api-web' include 'api-gateway-service' +include 'api-gateway-service-api-web' -include 'backend-integration-tests' -include 'rest-api-integration-tests' include 'e2e-test' rootProject.name = 'java-spring-event-sourcing-example' diff --git a/java-spring/testutil/build.gradle b/java-spring/testutil/build.gradle index 5a16a5e..3e5ac8d 100644 --- a/java-spring/testutil/build.gradle +++ b/java-spring/testutil/build.gradle @@ -1,10 +1,14 @@ apply plugin: 'java' dependencies { - compile project(":common") - compile project(":common-auth") + compile project(":accounts-service-api-web") + compile project(":accounts-view-service-api-web") + compile project(":customers-service-api-web") + compile project(":transactions-service-api-web") - compile "io.eventuate.client.java:eventuate-client-java-spring:$eventuateClientVersion" + compile project(":customers-view-service-api-common") + + compile "io.eventuate.local.java:eventuate-client-java-spring:$eventuateLocalVersion" compile "org.springframework.boot:spring-boot-starter-web:$springBootVersion" compile "junit:junit:4.11" diff --git a/java-spring/testutil/src/main/java/net/chrisrichardson/eventstorestore/javaexamples/testutil/AbstractEntityEventTest.java b/java-spring/testutil/src/main/java/net/chrisrichardson/eventstorestore/javaexamples/testutil/AbstractEntityEventTest.java index 2b617e0..693a70a 100644 --- a/java-spring/testutil/src/main/java/net/chrisrichardson/eventstorestore/javaexamples/testutil/AbstractEntityEventTest.java +++ b/java-spring/testutil/src/main/java/net/chrisrichardson/eventstorestore/javaexamples/testutil/AbstractEntityEventTest.java @@ -2,7 +2,7 @@ import io.eventuate.Aggregate; import io.eventuate.ReflectiveMutableCommandProcessingAggregate; -import io.eventuate.javaclient.spring.EventEntityUtil; +import io.eventuate.javaclient.eventdispatcher.EventEntityUtil; import org.junit.Test; import org.springframework.util.ReflectionUtils; diff --git a/java-spring/testutil/src/main/java/net/chrisrichardson/eventstorestore/javaexamples/testutil/AbstractRestAPITest.java b/java-spring/testutil/src/main/java/net/chrisrichardson/eventstorestore/javaexamples/testutil/AbstractRestAPITest.java index e87e23d..689719c 100644 --- a/java-spring/testutil/src/main/java/net/chrisrichardson/eventstorestore/javaexamples/testutil/AbstractRestAPITest.java +++ b/java-spring/testutil/src/main/java/net/chrisrichardson/eventstorestore/javaexamples/testutil/AbstractRestAPITest.java @@ -1,10 +1,17 @@ package net.chrisrichardson.eventstorestore.javaexamples.testutil; +import net.chrisrichardson.eventstore.javaexamples.banking.accounts.view.webapi.AccountHistoryResponse; +import net.chrisrichardson.eventstore.javaexamples.banking.accounts.view.webapi.GetAccountResponse; +import net.chrisrichardson.eventstore.javaexamples.banking.accounts.view.webapi.GetAccountsResponse; +import net.chrisrichardson.eventstore.javaexamples.banking.accounts.webapi.CreateAccountRequest; +import net.chrisrichardson.eventstore.javaexamples.banking.accounts.webapi.CreateAccountResponse; +import net.chrisrichardson.eventstore.javaexamples.banking.accounts.webapi.DeleteAccountResponse; import net.chrisrichardson.eventstore.javaexamples.banking.common.accounts.*; import net.chrisrichardson.eventstore.javaexamples.banking.common.customers.*; -import net.chrisrichardson.eventstore.javaexamples.banking.common.transactions.CreateMoneyTransferRequest; -import net.chrisrichardson.eventstore.javaexamples.banking.common.transactions.CreateMoneyTransferResponse; -import net.chrisrichardson.eventstore.javaexamples.banking.web.customers.queryside.common.QuerySideCustomer; +import net.chrisrichardson.eventstore.javaexamples.banking.transactions.webapi.CreateMoneyTransferRequest; +import net.chrisrichardson.eventstore.javaexamples.banking.transactions.webapi.CreateMoneyTransferResponse; +import net.chrisrichardson.eventstore.javaexamples.banking.customers.webapi.CustomerResponse; +import net.chrisrichardson.eventstore.javaexamples.banking.customers.view.commonapi.CustomerView; import org.junit.Assert; import org.junit.Test; import org.springframework.web.client.RestTemplate; @@ -158,7 +165,7 @@ private void assertAccountBalance(AuthenticatedRestTemplate authenticatedRestTem private void assertToAccountsContains(final String customerId, AuthenticatedRestTemplate authenticatedRestTemplate, final ToAccountInfo toAccountInfo) { eventually( () -> CompletableFuture.completedFuture(authenticatedRestTemplate.getForEntity(baseUrl("/customers/" + customerId), - QuerySideCustomer.class)), + CustomerView.class)), customerResponse -> { assertEquals(customerId, customerResponse.getId()); assertTrue(customerResponse.getToAccounts().values().stream().anyMatch(t -> t.equals(toAccountInfo))); diff --git a/java-spring/testutil/src/main/java/net/chrisrichardson/eventstorestore/javaexamples/testutil/CustomersTestUtils.java b/java-spring/testutil/src/main/java/net/chrisrichardson/eventstorestore/javaexamples/testutil/CustomersTestUtils.java index 25eaeae..763f408 100644 --- a/java-spring/testutil/src/main/java/net/chrisrichardson/eventstorestore/javaexamples/testutil/CustomersTestUtils.java +++ b/java-spring/testutil/src/main/java/net/chrisrichardson/eventstorestore/javaexamples/testutil/CustomersTestUtils.java @@ -1,7 +1,7 @@ package net.chrisrichardson.eventstorestore.javaexamples.testutil; import net.chrisrichardson.eventstore.javaexamples.banking.common.customers.*; -import net.chrisrichardson.eventstore.javaexamples.banking.web.customers.queryside.common.QuerySideCustomer; +import net.chrisrichardson.eventstore.javaexamples.banking.customers.view.commonapi.CustomerView; import org.junit.Assert; import org.springframework.web.client.RestTemplate; @@ -22,19 +22,19 @@ public CustomersTestUtils(RestTemplate restTemplate, String customersBaseUrl) { public void assertCustomerResponse(final String customerId, final CustomerInfo customerInfo) { AuthenticatedRestTemplate art = new AuthenticatedRestTemplate(restTemplate, customerInfo.getUserCredentials()); eventually( - () -> CompletableFuture.completedFuture(art.getForEntity(customersBaseUrl + customerId, QuerySideCustomer.class)), + () -> CompletableFuture.completedFuture(art.getForEntity(customersBaseUrl + customerId, CustomerView.class)), 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.getUserCredentials().getEmail()); - Assert.assertEquals(querySideCustomer.getPhoneNumber(), customerInfo.getPhoneNumber()); - Assert.assertEquals(querySideCustomer.getSsn(), customerInfo.getSsn()); - Assert.assertEquals(querySideCustomer.getAddress(), customerInfo.getAddress()); + public void assertQuerySideCustomerEqualscCustomerInfo(CustomerView customerView, CustomerInfo customerInfo) { + Assert.assertEquals(customerView.getName(), customerInfo.getName()); + Assert.assertEquals(customerView.getEmail(), customerInfo.getUserCredentials().getEmail()); + Assert.assertEquals(customerView.getPhoneNumber(), customerInfo.getPhoneNumber()); + Assert.assertEquals(customerView.getSsn(), customerInfo.getSsn()); + Assert.assertEquals(customerView.getAddress(), customerInfo.getAddress()); } public static CustomerInfo generateCustomerInfo() { diff --git a/java-spring/transactions-service-api-messaging/build.gradle b/java-spring/transactions-service-api-messaging/build.gradle new file mode 100644 index 0000000..3e5f28d --- /dev/null +++ b/java-spring/transactions-service-api-messaging/build.gradle @@ -0,0 +1,7 @@ +apply plugin: 'java' + +dependencies { + compile project(":common") + + compile "io.eventuate.local.java:eventuate-client-java-spring:$eventuateLocalVersion" +} diff --git a/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/transactions/CreditRecordedEvent.java b/java-spring/transactions-service-api-messaging/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactions/domain/events/CreditRecordedEvent.java similarity index 76% rename from java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/transactions/CreditRecordedEvent.java rename to java-spring/transactions-service-api-messaging/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactions/domain/events/CreditRecordedEvent.java index eebddbd..4d2df97 100644 --- a/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/transactions/CreditRecordedEvent.java +++ b/java-spring/transactions-service-api-messaging/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactions/domain/events/CreditRecordedEvent.java @@ -1,5 +1,4 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.backend.common.transactions; - +package net.chrisrichardson.eventstore.javaexamples.banking.transactions.domain.events; public class CreditRecordedEvent extends MoneyTransferEvent { private TransferDetails details; diff --git a/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/transactions/DebitRecordedEvent.java b/java-spring/transactions-service-api-messaging/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactions/domain/events/DebitRecordedEvent.java similarity index 76% rename from java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/transactions/DebitRecordedEvent.java rename to java-spring/transactions-service-api-messaging/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactions/domain/events/DebitRecordedEvent.java index e0fd751..2443f57 100644 --- a/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/transactions/DebitRecordedEvent.java +++ b/java-spring/transactions-service-api-messaging/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactions/domain/events/DebitRecordedEvent.java @@ -1,4 +1,4 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.backend.common.transactions; +package net.chrisrichardson.eventstore.javaexamples.banking.transactions.domain.events; public class DebitRecordedEvent extends MoneyTransferEvent { private TransferDetails details; diff --git a/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/transactions/FailedDebitRecordedEvent.java b/java-spring/transactions-service-api-messaging/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactions/domain/events/FailedDebitRecordedEvent.java similarity index 77% rename from java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/transactions/FailedDebitRecordedEvent.java rename to java-spring/transactions-service-api-messaging/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactions/domain/events/FailedDebitRecordedEvent.java index 1a089e6..201964f 100644 --- a/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/transactions/FailedDebitRecordedEvent.java +++ b/java-spring/transactions-service-api-messaging/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactions/domain/events/FailedDebitRecordedEvent.java @@ -1,4 +1,4 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.backend.common.transactions; +package net.chrisrichardson.eventstore.javaexamples.banking.transactions.domain.events; public class FailedDebitRecordedEvent extends MoneyTransferEvent { diff --git a/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/transactions/MoneyTransferCreatedEvent.java b/java-spring/transactions-service-api-messaging/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactions/domain/events/MoneyTransferCreatedEvent.java similarity index 77% rename from java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/transactions/MoneyTransferCreatedEvent.java rename to java-spring/transactions-service-api-messaging/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactions/domain/events/MoneyTransferCreatedEvent.java index a09759b..f971b6e 100644 --- a/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/transactions/MoneyTransferCreatedEvent.java +++ b/java-spring/transactions-service-api-messaging/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactions/domain/events/MoneyTransferCreatedEvent.java @@ -1,4 +1,4 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.backend.common.transactions; +package net.chrisrichardson.eventstore.javaexamples.banking.transactions.domain.events; public class MoneyTransferCreatedEvent extends MoneyTransferEvent { diff --git a/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/transactions/MoneyTransferEvent.java b/java-spring/transactions-service-api-messaging/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactions/domain/events/MoneyTransferEvent.java similarity index 56% rename from java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/transactions/MoneyTransferEvent.java rename to java-spring/transactions-service-api-messaging/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactions/domain/events/MoneyTransferEvent.java index 244166b..7148d28 100644 --- a/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/transactions/MoneyTransferEvent.java +++ b/java-spring/transactions-service-api-messaging/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactions/domain/events/MoneyTransferEvent.java @@ -1,8 +1,8 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.backend.common.transactions; +package net.chrisrichardson.eventstore.javaexamples.banking.transactions.domain.events; import io.eventuate.Event; import io.eventuate.EventEntity; -@EventEntity(entity="net.chrisrichardson.eventstore.javaexamples.banking.transactionsservice.backend.MoneyTransfer") +@EventEntity(entity="net.chrisrichardson.eventstore.javaexamples.banking.transactionsservice.domain.MoneyTransfer") public abstract class MoneyTransferEvent implements Event { } diff --git a/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/transactions/TransferDetails.java b/java-spring/transactions-service-api-messaging/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactions/domain/events/TransferDetails.java similarity index 82% rename from java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/transactions/TransferDetails.java rename to java-spring/transactions-service-api-messaging/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactions/domain/events/TransferDetails.java index 169d7ee..53e48fe 100644 --- a/java-spring/common-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/common/transactions/TransferDetails.java +++ b/java-spring/transactions-service-api-messaging/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactions/domain/events/TransferDetails.java @@ -1,9 +1,4 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.backend.common.transactions; - -/* -case class TransferDetails(fromAccountId : EntityIdentifier, toAccountId : EntityIdentifier, amount : BigDecimal) - */ - +package net.chrisrichardson.eventstore.javaexamples.banking.transactions.domain.events; import java.math.BigDecimal; import java.util.Date; diff --git a/java-spring/transactions-service-api-web/build.gradle b/java-spring/transactions-service-api-web/build.gradle new file mode 100644 index 0000000..7e5f160 --- /dev/null +++ b/java-spring/transactions-service-api-web/build.gradle @@ -0,0 +1,5 @@ +apply plugin: 'java' + +dependencies { + compile project(":common") +} diff --git a/java-spring/common/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/common/transactions/CreateMoneyTransferRequest.java b/java-spring/transactions-service-api-web/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactions/webapi/CreateMoneyTransferRequest.java similarity index 93% rename from java-spring/common/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/common/transactions/CreateMoneyTransferRequest.java rename to java-spring/transactions-service-api-web/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactions/webapi/CreateMoneyTransferRequest.java index f82937e..4880c84 100644 --- a/java-spring/common/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/common/transactions/CreateMoneyTransferRequest.java +++ b/java-spring/transactions-service-api-web/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactions/webapi/CreateMoneyTransferRequest.java @@ -1,4 +1,4 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.common.transactions; +package net.chrisrichardson.eventstore.javaexamples.banking.transactions.webapi; import javax.validation.constraints.DecimalMin; import javax.validation.constraints.NotNull; diff --git a/java-spring/common/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/common/transactions/CreateMoneyTransferResponse.java b/java-spring/transactions-service-api-web/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactions/webapi/CreateMoneyTransferResponse.java similarity index 79% rename from java-spring/common/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/common/transactions/CreateMoneyTransferResponse.java rename to java-spring/transactions-service-api-web/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactions/webapi/CreateMoneyTransferResponse.java index dfb55be..00e35d0 100644 --- a/java-spring/common/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/common/transactions/CreateMoneyTransferResponse.java +++ b/java-spring/transactions-service-api-web/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactions/webapi/CreateMoneyTransferResponse.java @@ -1,4 +1,4 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.common.transactions; +package net.chrisrichardson.eventstore.javaexamples.banking.transactions.webapi; public class CreateMoneyTransferResponse { diff --git a/java-spring/transactions-service/Dockerfile b/java-spring/transactions-service/Dockerfile index b75309e..54a70f3 100644 --- a/java-spring/transactions-service/Dockerfile +++ b/java-spring/transactions-service/Dockerfile @@ -1,4 +1,3 @@ -FROM java:openjdk-8u91-jdk -CMD java ${JAVA_OPTS} -jar transactions-service.jar -EXPOSE 8080 -COPY build/libs/transactions-service.jar . \ No newline at end of file +ARG baseImageVersion +FROM eventuateio/eventuate-examples-docker-images-spring-example-base-image:$baseImageVersion +COPY build/libs/transactions-service.jar service.jar diff --git a/java-spring/transactions-service/build.gradle b/java-spring/transactions-service/build.gradle index ccc4a03..c7a9413 100644 --- a/java-spring/transactions-service/build.gradle +++ b/java-spring/transactions-service/build.gradle @@ -1,22 +1,20 @@ -apply plugin: 'spring-boot' -apply plugin: EventuateDependencyPlugin - -apply plugin: VerifyEventStoreEnvironmentPlugin +apply plugin: 'org.springframework.boot' dependencies { - compile project(":common-backend") compile project(":common-swagger") + compile project(":transactions-service-api-messaging") + compile project(":transactions-service-api-web") + compile project(":accounts-service-api-messaging") + + compile "io.eventuate.local.java:eventuate-local-java-spring-jdbc:$eventuateLocalVersion" + compile "org.springframework.boot:spring-boot-starter-web:$springBootVersion" compile "org.springframework.boot:spring-boot-starter-actuator:$springBootVersion" + compile "org.springframework.boot:spring-boot-starter-jdbc:$springBootVersion" 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" + testCompile "io.eventuate.local.java:eventuate-client-java-spring-jdbc:$eventuateLocalVersion" } - -test { - ignoreFailures System.getenv("EVENTUATE_API_KEY_ID") == null -} - diff --git a/java-spring/transactions-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/backend/MoneyTransferBackendConfiguration.java b/java-spring/transactions-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/MoneyTransferConfiguration.java similarity index 65% rename from java-spring/transactions-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/backend/MoneyTransferBackendConfiguration.java rename to java-spring/transactions-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/MoneyTransferConfiguration.java index 5ebebcc..668b9e1 100644 --- a/java-spring/transactions-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/backend/MoneyTransferBackendConfiguration.java +++ b/java-spring/transactions-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/MoneyTransferConfiguration.java @@ -1,14 +1,18 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.transactionsservice.backend; +package net.chrisrichardson.eventstore.javaexamples.banking.transactionsservice; import io.eventuate.AggregateRepository; import io.eventuate.EventuateAggregateStore; import io.eventuate.javaclient.spring.EnableEventHandlers; +import net.chrisrichardson.eventstore.javaexamples.banking.transactionsservice.domain.MoneyTransfer; +import net.chrisrichardson.eventstore.javaexamples.banking.transactionsservice.domain.MoneyTransferCommand; +import net.chrisrichardson.eventstore.javaexamples.banking.transactionsservice.service.MoneyTransferService; +import net.chrisrichardson.eventstore.javaexamples.banking.transactionsservice.service.MoneyTransferWorkflow; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @Configuration @EnableEventHandlers -public class MoneyTransferBackendConfiguration { +public class MoneyTransferConfiguration { @Bean public MoneyTransferService moneyTransferService(AggregateRepository moneyTransferRepository) { diff --git a/java-spring/transactions-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/TransactionsServiceMain.java b/java-spring/transactions-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/TransactionsServiceMain.java index 4c7be34..0159f02 100644 --- a/java-spring/transactions-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/TransactionsServiceMain.java +++ b/java-spring/transactions-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/TransactionsServiceMain.java @@ -1,7 +1,6 @@ package net.chrisrichardson.eventstore.javaexamples.banking.transactionsservice; -import io.eventuate.javaclient.driver.EventuateDriverConfiguration; -import net.chrisrichardson.eventstore.javaexamples.banking.commonswagger.CommonSwaggerConfiguration; +import io.eventuate.local.java.spring.javaclient.driver.EventuateDriverConfiguration; import net.chrisrichardson.eventstore.javaexamples.banking.transactionsservice.web.MoneyTransferWebConfiguration; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; @@ -10,9 +9,9 @@ import org.springframework.context.annotation.Import; @Configuration -@Import({MoneyTransferWebConfiguration.class, - EventuateDriverConfiguration.class, - CommonSwaggerConfiguration.class}) +@Import({MoneyTransferConfiguration.class, + MoneyTransferWebConfiguration.class, + EventuateDriverConfiguration.class}) @EnableAutoConfiguration @ComponentScan public class TransactionsServiceMain { diff --git a/java-spring/transactions-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/backend/CreateMoneyTransferCommand.java b/java-spring/transactions-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/domain/CreateMoneyTransferCommand.java similarity index 72% rename from java-spring/transactions-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/backend/CreateMoneyTransferCommand.java rename to java-spring/transactions-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/domain/CreateMoneyTransferCommand.java index e5cb1f4..0049f23 100644 --- a/java-spring/transactions-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/backend/CreateMoneyTransferCommand.java +++ b/java-spring/transactions-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/domain/CreateMoneyTransferCommand.java @@ -1,6 +1,7 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.transactionsservice.backend; +package net.chrisrichardson.eventstore.javaexamples.banking.transactionsservice.domain; -import net.chrisrichardson.eventstore.javaexamples.banking.backend.common.transactions.TransferDetails; + +import net.chrisrichardson.eventstore.javaexamples.banking.transactions.domain.events.TransferDetails; public class CreateMoneyTransferCommand implements MoneyTransferCommand { private TransferDetails details; diff --git a/java-spring/transactions-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/backend/MoneyTransfer.java b/java-spring/transactions-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/domain/MoneyTransfer.java similarity index 73% rename from java-spring/transactions-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/backend/MoneyTransfer.java rename to java-spring/transactions-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/domain/MoneyTransfer.java index eb31f04..ede74e3 100644 --- a/java-spring/transactions-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/backend/MoneyTransfer.java +++ b/java-spring/transactions-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/domain/MoneyTransfer.java @@ -1,10 +1,14 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.transactionsservice.backend; +package net.chrisrichardson.eventstore.javaexamples.banking.transactionsservice.domain; import io.eventuate.Event; import io.eventuate.EventUtil; import io.eventuate.ReflectiveMutableCommandProcessingAggregate; -import net.chrisrichardson.eventstore.javaexamples.banking.backend.common.transactions.*; import net.chrisrichardson.eventstore.javaexamples.banking.common.transactions.TransferState; +import net.chrisrichardson.eventstore.javaexamples.banking.transactions.domain.events.CreditRecordedEvent; +import net.chrisrichardson.eventstore.javaexamples.banking.transactions.domain.events.DebitRecordedEvent; +import net.chrisrichardson.eventstore.javaexamples.banking.transactions.domain.events.FailedDebitRecordedEvent; +import net.chrisrichardson.eventstore.javaexamples.banking.transactions.domain.events.MoneyTransferCreatedEvent; +import net.chrisrichardson.eventstore.javaexamples.banking.transactions.domain.events.TransferDetails; import java.util.List; diff --git a/java-spring/transactions-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/backend/MoneyTransferCommand.java b/java-spring/transactions-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/domain/MoneyTransferCommand.java similarity index 54% rename from java-spring/transactions-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/backend/MoneyTransferCommand.java rename to java-spring/transactions-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/domain/MoneyTransferCommand.java index 64b3819..4b0abd2 100644 --- a/java-spring/transactions-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/backend/MoneyTransferCommand.java +++ b/java-spring/transactions-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/domain/MoneyTransferCommand.java @@ -1,6 +1,6 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.transactionsservice.backend; +package net.chrisrichardson.eventstore.javaexamples.banking.transactionsservice.domain; import io.eventuate.Command; -interface MoneyTransferCommand extends Command { +public interface MoneyTransferCommand extends Command { } diff --git a/java-spring/transactions-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/backend/RecordCreditCommand.java b/java-spring/transactions-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/domain/RecordCreditCommand.java similarity index 84% rename from java-spring/transactions-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/backend/RecordCreditCommand.java rename to java-spring/transactions-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/domain/RecordCreditCommand.java index 015ce28..3bad2b2 100644 --- a/java-spring/transactions-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/backend/RecordCreditCommand.java +++ b/java-spring/transactions-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/domain/RecordCreditCommand.java @@ -1,4 +1,4 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.transactionsservice.backend; +package net.chrisrichardson.eventstore.javaexamples.banking.transactionsservice.domain; public class RecordCreditCommand implements MoneyTransferCommand { } diff --git a/java-spring/transactions-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/backend/RecordDebitCommand.java b/java-spring/transactions-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/domain/RecordDebitCommand.java similarity index 84% rename from java-spring/transactions-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/backend/RecordDebitCommand.java rename to java-spring/transactions-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/domain/RecordDebitCommand.java index e4be904..f85bfbc 100644 --- a/java-spring/transactions-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/backend/RecordDebitCommand.java +++ b/java-spring/transactions-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/domain/RecordDebitCommand.java @@ -1,4 +1,4 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.transactionsservice.backend; +package net.chrisrichardson.eventstore.javaexamples.banking.transactionsservice.domain; public class RecordDebitCommand implements MoneyTransferCommand { } diff --git a/java-spring/transactions-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/backend/RecordDebitFailedCommand.java b/java-spring/transactions-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/domain/RecordDebitFailedCommand.java similarity index 84% rename from java-spring/transactions-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/backend/RecordDebitFailedCommand.java rename to java-spring/transactions-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/domain/RecordDebitFailedCommand.java index 559e574..26a3270 100644 --- a/java-spring/transactions-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/backend/RecordDebitFailedCommand.java +++ b/java-spring/transactions-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/domain/RecordDebitFailedCommand.java @@ -1,4 +1,4 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.transactionsservice.backend; +package net.chrisrichardson.eventstore.javaexamples.banking.transactionsservice.domain; public class RecordDebitFailedCommand implements MoneyTransferCommand { } diff --git a/java-spring/transactions-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/backend/MoneyTransferService.java b/java-spring/transactions-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/service/MoneyTransferService.java similarity index 60% rename from java-spring/transactions-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/backend/MoneyTransferService.java rename to java-spring/transactions-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/service/MoneyTransferService.java index c0209da..c512def 100644 --- a/java-spring/transactions-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/backend/MoneyTransferService.java +++ b/java-spring/transactions-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/service/MoneyTransferService.java @@ -1,8 +1,11 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.transactionsservice.backend; +package net.chrisrichardson.eventstore.javaexamples.banking.transactionsservice.service; import io.eventuate.AggregateRepository; import io.eventuate.EntityWithIdAndVersion; -import net.chrisrichardson.eventstore.javaexamples.banking.backend.common.transactions.TransferDetails; +import net.chrisrichardson.eventstore.javaexamples.banking.transactions.domain.events.TransferDetails; +import net.chrisrichardson.eventstore.javaexamples.banking.transactionsservice.domain.CreateMoneyTransferCommand; +import net.chrisrichardson.eventstore.javaexamples.banking.transactionsservice.domain.MoneyTransfer; +import net.chrisrichardson.eventstore.javaexamples.banking.transactionsservice.domain.MoneyTransferCommand; import java.util.concurrent.CompletableFuture; diff --git a/java-spring/transactions-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/backend/MoneyTransferWorkflow.java b/java-spring/transactions-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/service/MoneyTransferWorkflow.java similarity index 59% rename from java-spring/transactions-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/backend/MoneyTransferWorkflow.java rename to java-spring/transactions-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/service/MoneyTransferWorkflow.java index a6724a4..d102787 100644 --- a/java-spring/transactions-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/backend/MoneyTransferWorkflow.java +++ b/java-spring/transactions-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/service/MoneyTransferWorkflow.java @@ -1,13 +1,17 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.transactionsservice.backend; +package net.chrisrichardson.eventstore.javaexamples.banking.transactionsservice.service; import io.eventuate.EntityWithIdAndVersion; import io.eventuate.EventHandlerContext; import io.eventuate.EventHandlerMethod; import io.eventuate.EventSubscriber; -import net.chrisrichardson.eventstore.javaexamples.banking.backend.common.accounts.AccountCreditedEvent; -import net.chrisrichardson.eventstore.javaexamples.banking.backend.common.accounts.AccountDebitFailedDueToInsufficientFundsEvent; -import net.chrisrichardson.eventstore.javaexamples.banking.backend.common.accounts.AccountDebitedEvent; +import net.chrisrichardson.eventstore.javaexamples.banking.accounts.domain.events.AccountCreditedEvent; +import net.chrisrichardson.eventstore.javaexamples.banking.accounts.domain.events.AccountDebitFailedDueToInsufficientFundsEvent; +import net.chrisrichardson.eventstore.javaexamples.banking.accounts.domain.events.AccountDebitedEvent; +import net.chrisrichardson.eventstore.javaexamples.banking.transactionsservice.domain.MoneyTransfer; +import net.chrisrichardson.eventstore.javaexamples.banking.transactionsservice.domain.RecordCreditCommand; +import net.chrisrichardson.eventstore.javaexamples.banking.transactionsservice.domain.RecordDebitCommand; +import net.chrisrichardson.eventstore.javaexamples.banking.transactionsservice.domain.RecordDebitFailedCommand; import java.util.concurrent.CompletableFuture; diff --git a/java-spring/transactions-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/web/MoneyTransferController.java b/java-spring/transactions-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/web/MoneyTransferController.java index df2cb80..fae84c7 100644 --- a/java-spring/transactions-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/web/MoneyTransferController.java +++ b/java-spring/transactions-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/web/MoneyTransferController.java @@ -1,10 +1,9 @@ package net.chrisrichardson.eventstore.javaexamples.banking.transactionsservice.web; - -import net.chrisrichardson.eventstore.javaexamples.banking.backend.common.transactions.TransferDetails; -import net.chrisrichardson.eventstore.javaexamples.banking.common.transactions.CreateMoneyTransferRequest; -import net.chrisrichardson.eventstore.javaexamples.banking.common.transactions.CreateMoneyTransferResponse; -import net.chrisrichardson.eventstore.javaexamples.banking.transactionsservice.backend.MoneyTransferService; +import net.chrisrichardson.eventstore.javaexamples.banking.transactions.webapi.CreateMoneyTransferRequest; +import net.chrisrichardson.eventstore.javaexamples.banking.transactions.webapi.CreateMoneyTransferResponse; +import net.chrisrichardson.eventstore.javaexamples.banking.transactions.domain.events.TransferDetails; +import net.chrisrichardson.eventstore.javaexamples.banking.transactionsservice.service.MoneyTransferService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RequestBody; diff --git a/java-spring/transactions-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/web/MoneyTransferWebConfiguration.java b/java-spring/transactions-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/web/MoneyTransferWebConfiguration.java index 643bbe7..95572c5 100644 --- a/java-spring/transactions-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/web/MoneyTransferWebConfiguration.java +++ b/java-spring/transactions-service/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/web/MoneyTransferWebConfiguration.java @@ -1,7 +1,7 @@ package net.chrisrichardson.eventstore.javaexamples.banking.transactionsservice.web; -import net.chrisrichardson.eventstore.javaexamples.banking.transactionsservice.backend.MoneyTransferBackendConfiguration; -import org.springframework.boot.autoconfigure.web.HttpMessageConverters; +import net.chrisrichardson.eventstore.javaexamples.banking.commonswagger.CommonSwaggerConfiguration; +import org.springframework.boot.autoconfigure.http.HttpMessageConverters; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; @@ -10,7 +10,7 @@ import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; @Configuration -@Import({MoneyTransferBackendConfiguration.class}) +@Import({CommonSwaggerConfiguration.class}) @ComponentScan public class MoneyTransferWebConfiguration { diff --git a/java-spring/transactions-service/src/main/resources/application.properties b/java-spring/transactions-service/src/main/resources/application.properties new file mode 100644 index 0000000..7c2c49c --- /dev/null +++ b/java-spring/transactions-service/src/main/resources/application.properties @@ -0,0 +1,5 @@ +spring.datasource.url=jdbc:mysql://${DOCKER_HOST_IP:localhost}/eventuate +spring.datasource.username=mysqluser +spring.datasource.password=mysqlpw +spring.datasource.driver-class-name=com.mysql.jdbc.Driver +eventuatelocal.kafka.bootstrap.servers=${DOCKER_HOST_IP:localhost}:9092 diff --git a/java-spring/transactions-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/TransactionsCommandSideServiceIntegrationTest.java b/java-spring/transactions-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/TransactionsCommandSideServiceIntegrationTest.java index 14a0e7b..de6068f 100644 --- a/java-spring/transactions-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/TransactionsCommandSideServiceIntegrationTest.java +++ b/java-spring/transactions-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/TransactionsCommandSideServiceIntegrationTest.java @@ -3,20 +3,16 @@ 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.boot.test.context.SpringBootTest; +import org.springframework.boot.web.server.LocalServerPort; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.web.WebAppConfiguration; import org.springframework.web.client.RestTemplate; @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = TransactionsCommandSideServiceTestConfiguration.class) -@WebAppConfiguration -@IntegrationTest({"server.port=0", "management.port=0"}) +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = TransactionsCommandSideServiceTestConfiguration.class) public class TransactionsCommandSideServiceIntegrationTest { - @Value("${local.server.port}") + @LocalServerPort private int port; private String baseUrl(String path) { diff --git a/java-spring/transactions-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/TransactionsCommandSideServiceTestConfiguration.java b/java-spring/transactions-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/TransactionsCommandSideServiceTestConfiguration.java index 70182ef..57f9f3d 100644 --- a/java-spring/transactions-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/TransactionsCommandSideServiceTestConfiguration.java +++ b/java-spring/transactions-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/TransactionsCommandSideServiceTestConfiguration.java @@ -2,7 +2,7 @@ import net.chrisrichardson.eventstore.javaexamples.banking.transactionsservice.web.MoneyTransferWebConfiguration; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.autoconfigure.web.HttpMessageConverters; +import org.springframework.boot.autoconfigure.http.HttpMessageConverters; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; @@ -14,7 +14,7 @@ import java.util.List; @Configuration -@Import(MoneyTransferWebConfiguration.class) +@Import({MoneyTransferConfiguration.class, MoneyTransferWebConfiguration.class}) @EnableAutoConfiguration public class TransactionsCommandSideServiceTestConfiguration { diff --git a/java-spring/transactions-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/backend/MoneyTransferEventTest.java b/java-spring/transactions-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/service/MoneyTransferEventTest.java similarity index 71% rename from java-spring/transactions-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/backend/MoneyTransferEventTest.java rename to java-spring/transactions-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/service/MoneyTransferEventTest.java index 58cd9f9..1f3c36d 100644 --- a/java-spring/transactions-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/backend/MoneyTransferEventTest.java +++ b/java-spring/transactions-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/service/MoneyTransferEventTest.java @@ -1,5 +1,6 @@ -package net.chrisrichardson.eventstore.javaexamples.banking.transactionsservice.backend; +package net.chrisrichardson.eventstore.javaexamples.banking.transactionsservice.service; +import net.chrisrichardson.eventstore.javaexamples.banking.transactionsservice.domain.MoneyTransfer; import net.chrisrichardson.eventstorestore.javaexamples.testutil.AbstractEntityEventTest; public class MoneyTransferEventTest extends AbstractEntityEventTest { diff --git a/java-spring/transactions-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/web/MoneyTransferControllerIntegrationTest.java b/java-spring/transactions-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/web/MoneyTransferControllerIntegrationTest.java index f6931bc..ccd15b7 100644 --- a/java-spring/transactions-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/web/MoneyTransferControllerIntegrationTest.java +++ b/java-spring/transactions-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/web/MoneyTransferControllerIntegrationTest.java @@ -5,8 +5,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.IntegrationTest; -import org.springframework.boot.test.SpringApplicationConfiguration; +import org.springframework.boot.test.context.SpringBootTest; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -19,8 +18,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = MoneyTransferControllerIntegrationTestConfiguration.class) -@IntegrationTest +@SpringBootTest(classes = MoneyTransferControllerIntegrationTestConfiguration.class) @WebAppConfiguration public class MoneyTransferControllerIntegrationTest { diff --git a/java-spring/transactions-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/web/MoneyTransferControllerIntegrationTestConfiguration.java b/java-spring/transactions-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/web/MoneyTransferControllerIntegrationTestConfiguration.java index da8a456..71d8481 100644 --- a/java-spring/transactions-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/web/MoneyTransferControllerIntegrationTestConfiguration.java +++ b/java-spring/transactions-service/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/transactionsservice/web/MoneyTransferControllerIntegrationTestConfiguration.java @@ -1,12 +1,15 @@ package net.chrisrichardson.eventstore.javaexamples.banking.transactionsservice.web; import io.eventuate.javaclient.spring.jdbc.EmbeddedTestAggregateStoreConfiguration; +import net.chrisrichardson.eventstore.javaexamples.banking.transactionsservice.MoneyTransferConfiguration; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; @Configuration -@Import({MoneyTransferWebConfiguration.class, EmbeddedTestAggregateStoreConfiguration.class}) +@Import({MoneyTransferConfiguration.class, + MoneyTransferWebConfiguration.class, + EmbeddedTestAggregateStoreConfiguration.class}) @EnableAutoConfiguration public class MoneyTransferControllerIntegrationTestConfiguration { } diff --git a/scala-spring/README.md b/scala-spring/README.md deleted file mode 100644 index 234fe74..0000000 --- a/scala-spring/README.md +++ /dev/null @@ -1,37 +0,0 @@ -This is the Scala/Spring version of the Event Sourcing/CQRS money transfer example application. - -# About the application - -This application consists of three microservices: - - * Account Service - the command side business logic for Accounts - * Money Transfer Service - the command side business logic for Money Transfers - * Query service - query side implementation of a MongoDB-based, denormalized view of Accounts and MoneyTransfers - -The Account Service consists of the following modules: - - * accounts-command-side-backend - the Account aggregate - * accounts-command-side-web - a REST API for creating and retrieving Accounts - * accounts-command-side-service - a standalone microservice - -The Money Transfer Service consists of the following modules: - - * transactions-command-side-backend - the MoneyTransfer aggregate - * transactions-command-side-web - a REST API for creating and retrieving Money Transfers - * transactions-command-side-service - a standalone microservice - -The Query Service consists the following modules: - - * accounts-query-side-backend - MongoDB-based, denormalized view of Accounts and MoneyTransfers - * accounts-query-side-web - a REST API for querying the denormalized view - * accounts-query-side-service - a standalone microservice - -# Deploying the application - -These services can be deployed either as either separate standalone services using the Event Store server, or they can be deployed as a monolithic application for simpified integration testing. - -The three services can also be packaged as a single monolithic web application in order to be used with the embedded Event Store: - - * monolithic-service - all-in-one, monolithic packaging of the application - - diff --git a/scala-spring/accounts-command-side-backend/build.gradle b/scala-spring/accounts-command-side-backend/build.gradle deleted file mode 100644 index 222d391..0000000 --- a/scala-spring/accounts-command-side-backend/build.gradle +++ /dev/null @@ -1,5 +0,0 @@ -dependencies { - compile "org.scala-lang:scala-library:2.10.2" - compile project(":common-backend") - compile "net.chrisrichardson.eventstore.client:eventstore-client-event-handling_2.10:$eventStoreClientVersion" -} diff --git a/scala-spring/accounts-command-side-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/accounts/Account.scala b/scala-spring/accounts-command-side-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/accounts/Account.scala deleted file mode 100644 index 5f71c80..0000000 --- a/scala-spring/accounts-command-side-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/accounts/Account.scala +++ /dev/null @@ -1,41 +0,0 @@ -package net.chrisrichardson.eventstore.examples.bank.accounts - -import net.chrisrichardson.eventstore.PatternMatchingCommandProcessingAggregate -import net.chrisrichardson.eventstore.examples.bank.accounts.AccountCommands.{DebitAccountCommand, AccountCommand, CreditAccountCommand, OpenAccountCommand} -import net.chrisrichardson.eventstore.examples.bank.backend.common.accounts.{AccountCreditedEvent, AccountDebitFailedDueToInsufficientFundsEvent, AccountDebitedEvent, AccountOpenedEvent} - -case class Account(balance : BigDecimal) - extends PatternMatchingCommandProcessingAggregate[Account, AccountCommand] { - - def this() = this(null) - - - def processCommand = { - case OpenAccountCommand(initialBalance) => - Seq(AccountOpenedEvent(initialBalance)) - - case CreditAccountCommand(amount, transactionId) => - Seq(AccountCreditedEvent(amount, transactionId)) - - case DebitAccountCommand(amount, transactionId) if amount <= balance => - Seq(AccountDebitedEvent(amount, transactionId)) - - case DebitAccountCommand(amount, transactionId) => - Seq(AccountDebitFailedDueToInsufficientFundsEvent(amount, transactionId)) - } - - def applyEvent = { - - case AccountOpenedEvent(initialBalance) => copy(balance = initialBalance) - - case AccountDebitedEvent(amount, _) => copy(balance = balance - amount) - - case AccountCreditedEvent(amount, _) => - copy(balance = balance + amount) - - case AccountDebitFailedDueToInsufficientFundsEvent(amount, _) => - this - - } - -} diff --git a/scala-spring/accounts-command-side-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/accounts/AccountCommands.scala b/scala-spring/accounts-command-side-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/accounts/AccountCommands.scala deleted file mode 100644 index 336becd..0000000 --- a/scala-spring/accounts-command-side-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/accounts/AccountCommands.scala +++ /dev/null @@ -1,13 +0,0 @@ -package net.chrisrichardson.eventstore.examples.bank.accounts - -import net.chrisrichardson.eventstore.{Command, EntityId} - -object AccountCommands { - - sealed trait AccountCommand extends Command - - case class OpenAccountCommand(initialBalance : BigDecimal) extends AccountCommand - case class DebitAccountCommand(amount : BigDecimal, transactionId : EntityId) extends AccountCommand - case class CreditAccountCommand(amount : BigDecimal, transactionId : EntityId) extends AccountCommand - -} diff --git a/scala-spring/accounts-command-side-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/accounts/AccountConfiguration.scala b/scala-spring/accounts-command-side-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/accounts/AccountConfiguration.scala deleted file mode 100644 index 7dd00c9..0000000 --- a/scala-spring/accounts-command-side-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/accounts/AccountConfiguration.scala +++ /dev/null @@ -1,21 +0,0 @@ -package net.chrisrichardson.eventstore.examples.bank.accounts - -import net.chrisrichardson.eventstore.EventStore -import net.chrisrichardson.eventstore.subscriptions.EnableEventHandlers -import net.chrisrichardson.utils.config.MetricRegistryConfiguration -import org.springframework.context.annotation.{Bean, Configuration, Import} - -@Configuration -@Import(Array(classOf[MetricRegistryConfiguration])) -@EnableEventHandlers -class AccountConfiguration { - - @Bean - def accountService(eventStore : EventStore) = new AccountService()(eventStore) - - - @Bean - def transferWorkflow(eventStore: EventStore): TransferWorkflowAccountHandlers = { - new TransferWorkflowAccountHandlers(eventStore) - } -} diff --git a/scala-spring/accounts-command-side-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/accounts/AccountService.scala b/scala-spring/accounts-command-side-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/accounts/AccountService.scala deleted file mode 100644 index 9cbe3ce..0000000 --- a/scala-spring/accounts-command-side-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/accounts/AccountService.scala +++ /dev/null @@ -1,12 +0,0 @@ -package net.chrisrichardson.eventstore.examples.bank.accounts - -import net.chrisrichardson.eventstore.EventStore -import net.chrisrichardson.eventstore.examples.bank.accounts.AccountCommands.OpenAccountCommand -import net.chrisrichardson.eventstore.util.ServiceUtil._ - -class AccountService(implicit eventStore : EventStore) { - - def openAccount(initialBalance : BigDecimal) = - newEntity[Account] <== OpenAccountCommand(initialBalance) - -} diff --git a/scala-spring/accounts-command-side-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/accounts/TransferWorkflowAccountHandlers.scala b/scala-spring/accounts-command-side-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/accounts/TransferWorkflowAccountHandlers.scala deleted file mode 100644 index 8ac21ea..0000000 --- a/scala-spring/accounts-command-side-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/accounts/TransferWorkflowAccountHandlers.scala +++ /dev/null @@ -1,27 +0,0 @@ -package net.chrisrichardson.eventstore.examples.bank.accounts - -import net.chrisrichardson.eventstore.EventStore -import net.chrisrichardson.eventstore.examples.bank.accounts.AccountCommands.{CreditAccountCommand, DebitAccountCommand} -import net.chrisrichardson.eventstore.examples.bank.backend.common.transactions.{DebitRecordedEvent, MoneyTransferCreatedEvent} -import net.chrisrichardson.eventstore.subscriptions.{EventHandlerMethod, CompoundEventHandler, EventSubscriber} -import net.chrisrichardson.eventstore.util.EventHandlingUtil._ - -@EventSubscriber(id = "accountEventHandlers") -class TransferWorkflowAccountHandlers(eventStore: EventStore) extends CompoundEventHandler { - - implicit val es = eventStore - - @EventHandlerMethod - val performDebit = - handlerForEvent[MoneyTransferCreatedEvent] { de => - existingEntity[Account](de.event.details.fromAccountId) <== - DebitAccountCommand(de.event.details.amount, de.entityId) - } - - @EventHandlerMethod - val performCredit = handlerForEvent[DebitRecordedEvent] { de => - existingEntity[Account](de.event.details.toAccountId) <== - CreditAccountCommand(de.event.details.amount, de.entityId) - } - -} diff --git a/scala-spring/accounts-command-side-service/build.gradle b/scala-spring/accounts-command-side-service/build.gradle deleted file mode 100644 index 2ae2454..0000000 --- a/scala-spring/accounts-command-side-service/build.gradle +++ /dev/null @@ -1,22 +0,0 @@ -apply plugin: 'scala' -apply plugin: 'spring-boot' -apply plugin: VerifyEventStoreEnvironmentPlugin - -dependencies { - compile "org.scala-lang:scala-library:2.10.2" - compile project(":accounts-command-side-web") - - compile "org.springframework.boot:spring-boot-starter-web" - compile "org.springframework.boot:spring-boot-starter-actuator" - - compile "net.chrisrichardson.eventstore.client:eventstore-http-stomp-client_2.10:$eventStoreClientVersion" - - testCompile "org.springframework.boot:spring-boot-starter-test" - testCompile scalaTestDependency - -} - -test { - ignoreFailures true -} - diff --git a/scala-spring/accounts-command-side-service/src/main/scala/net/chrisrichardson/eventstore/examples/bank/web/AccountsCommandSideServiceConfiguration.scala b/scala-spring/accounts-command-side-service/src/main/scala/net/chrisrichardson/eventstore/examples/bank/web/AccountsCommandSideServiceConfiguration.scala deleted file mode 100644 index 13d33a4..0000000 --- a/scala-spring/accounts-command-side-service/src/main/scala/net/chrisrichardson/eventstore/examples/bank/web/AccountsCommandSideServiceConfiguration.scala +++ /dev/null @@ -1,25 +0,0 @@ -package net.chrisrichardson.eventstore.examples.bank.web - -import net.chrisrichardson.eventstore.client.config.EventStoreHttpClientConfiguration -import net.chrisrichardson.eventstore.examples.bank.web.accounts.CommandSideWebAccountsConfiguration -import net.chrisrichardson.eventstore.json.EventStoreCommonObjectMapping -import org.springframework.boot.autoconfigure.EnableAutoConfiguration -import org.springframework.boot.autoconfigure.web.HttpMessageConverters -import org.springframework.context.annotation._ -import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter - -@Configuration -@EnableAutoConfiguration -@Import(Array(classOf[CommandSideWebAccountsConfiguration], classOf[EventStoreHttpClientConfiguration])) -@ComponentScan -class AccountsCommandSideServiceConfiguration { - - @Bean - def scalaJSonConverter: HttpMessageConverters = { - val additional = new MappingJackson2HttpMessageConverter - additional.setObjectMapper(EventStoreCommonObjectMapping.getObjectMapper) - new HttpMessageConverters(additional) - } - - -} diff --git a/scala-spring/accounts-command-side-service/src/main/scala/net/chrisrichardson/eventstore/examples/bank/web/main/AccountsCommandSideServiceMain.scala b/scala-spring/accounts-command-side-service/src/main/scala/net/chrisrichardson/eventstore/examples/bank/web/main/AccountsCommandSideServiceMain.scala deleted file mode 100644 index c10e188..0000000 --- a/scala-spring/accounts-command-side-service/src/main/scala/net/chrisrichardson/eventstore/examples/bank/web/main/AccountsCommandSideServiceMain.scala +++ /dev/null @@ -1,10 +0,0 @@ -package net.chrisrichardson.eventstore.examples.bank.web.main - -import net.chrisrichardson.eventstore.examples.bank.web.AccountsCommandSideServiceConfiguration -import org.springframework.boot.SpringApplication - -object AccountsCommandSideServiceMain { - - def main(args: Array[String]) : Unit = SpringApplication.run(classOf[AccountsCommandSideServiceConfiguration], args :_ *) - -} diff --git a/scala-spring/accounts-command-side-service/src/test/scala/net/chrisrichardson/eventstore/examples/bank/web/AccountsCommandSideServiceIntegrationTest.scala b/scala-spring/accounts-command-side-service/src/test/scala/net/chrisrichardson/eventstore/examples/bank/web/AccountsCommandSideServiceIntegrationTest.scala deleted file mode 100644 index 0fbe451..0000000 --- a/scala-spring/accounts-command-side-service/src/test/scala/net/chrisrichardson/eventstore/examples/bank/web/AccountsCommandSideServiceIntegrationTest.scala +++ /dev/null @@ -1,32 +0,0 @@ -package net.chrisrichardson.eventstore.examples.bank.web - -import net.chrisrichardson.eventstore.examples.bank.web.accounts.controllers.{CreateAccountRequest, CreateAccountResponse} -import org.junit.Assert -import org.junit.runner.RunWith -import org.scalatest.FlatSpec -import org.scalatest.junit.JUnitRunner -import org.springframework.boot.SpringApplication -import org.springframework.web.client.RestTemplate - -@RunWith(classOf[JUnitRunner]) -class AccountsCommandSideServiceIntegrationTest extends FlatSpec { - - val sa = new SpringApplication(classOf[AccountsCommandSideServiceTestConfiguration]) - val ctx = sa.run() - - // var server = ctx.getBean(classOf[EmbeddedServletContainer]) - - val port = 8080 - - val baseUrl = s"http://localhost:$port/" - - val restTemplate = ctx.getBean(classOf[RestTemplate]) - - it should "create account" in { - - val CreateAccountResponse(accountId) = restTemplate.postForEntity(s"$baseUrl/accounts", CreateAccountRequest(BigDecimal(500)), classOf[CreateAccountResponse]).getBody - Assert.assertNotNull(accountId) - - } - -} diff --git a/scala-spring/accounts-command-side-service/src/test/scala/net/chrisrichardson/eventstore/examples/bank/web/AccountsCommandSideServiceTestConfiguration.scala b/scala-spring/accounts-command-side-service/src/test/scala/net/chrisrichardson/eventstore/examples/bank/web/AccountsCommandSideServiceTestConfiguration.scala deleted file mode 100644 index ec570c1..0000000 --- a/scala-spring/accounts-command-side-service/src/test/scala/net/chrisrichardson/eventstore/examples/bank/web/AccountsCommandSideServiceTestConfiguration.scala +++ /dev/null @@ -1,27 +0,0 @@ -package net.chrisrichardson.eventstore.examples.bank.web - - -import com.fasterxml.jackson.databind.ObjectMapper -import net.chrisrichardson.eventstore.json.EventStoreCommonObjectMapping -import org.springframework.boot.autoconfigure.EnableAutoConfiguration -import org.springframework.context.annotation.{Bean, Import, Configuration} -import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter -import org.springframework.web.client.RestTemplate -import scala.collection.JavaConversions._ - -@Configuration -@Import(Array(classOf[AccountsCommandSideServiceConfiguration])) -class AccountsCommandSideServiceTestConfiguration { - - @Bean - def restTemplate() = { - val restTemplate = new RestTemplate() - restTemplate.getMessageConverters foreach { - case mc: MappingJackson2HttpMessageConverter => - mc.setObjectMapper(EventStoreCommonObjectMapping.getObjectMapper) - case _ => - } - restTemplate - } - -} diff --git a/scala-spring/accounts-command-side-web/build.gradle b/scala-spring/accounts-command-side-web/build.gradle deleted file mode 100644 index 827fd7c..0000000 --- a/scala-spring/accounts-command-side-web/build.gradle +++ /dev/null @@ -1,10 +0,0 @@ -apply plugin: 'scala' - -dependencies { - compile "org.scala-lang:scala-library:2.10.2" - compile project(":accounts-command-side-backend") - compile project(":common-web") - - testCompile "org.springframework.boot:spring-boot-starter-test:$springBootVersion" - testCompile scalaTestDependency -} diff --git a/scala-spring/accounts-command-side-web/src/main/scala/net/chrisrichardson/eventstore/examples/bank/web/accounts/CommandSideWebAccountsConfiguration.scala b/scala-spring/accounts-command-side-web/src/main/scala/net/chrisrichardson/eventstore/examples/bank/web/accounts/CommandSideWebAccountsConfiguration.scala deleted file mode 100644 index 6575269..0000000 --- a/scala-spring/accounts-command-side-web/src/main/scala/net/chrisrichardson/eventstore/examples/bank/web/accounts/CommandSideWebAccountsConfiguration.scala +++ /dev/null @@ -1,11 +0,0 @@ -package net.chrisrichardson.eventstore.examples.bank.web.accounts - -import net.chrisrichardson.eventstore.examples.bank.accounts.AccountConfiguration -import org.springframework.context.annotation.{ComponentScan, Configuration, Import} - -@Configuration -@Import(Array(classOf[AccountConfiguration])) -@ComponentScan -class CommandSideWebAccountsConfiguration { - -} diff --git a/scala-spring/accounts-command-side-web/src/main/scala/net/chrisrichardson/eventstore/examples/bank/web/accounts/controllers/AccountController.scala b/scala-spring/accounts-command-side-web/src/main/scala/net/chrisrichardson/eventstore/examples/bank/web/accounts/controllers/AccountController.scala deleted file mode 100644 index f346862..0000000 --- a/scala-spring/accounts-command-side-web/src/main/scala/net/chrisrichardson/eventstore/examples/bank/web/accounts/controllers/AccountController.scala +++ /dev/null @@ -1,20 +0,0 @@ -package net.chrisrichardson.eventstore.examples.bank.web.accounts.controllers - -import net.chrisrichardson.eventstore.EventStore -import net.chrisrichardson.eventstore.examples.bank.accounts.AccountService -import net.chrisrichardson.eventstore.examples.bank.web.util.WebUtil -import org.springframework.beans.factory.annotation.Autowired -import org.springframework.web.bind.annotation._ -import scala.concurrent.ExecutionContext.Implicits.global - - -@RestController -class AccountController @Autowired() (accountService : AccountService, eventStore : EventStore) { - - @RequestMapping(value=Array("/accounts"), method = Array(RequestMethod.POST)) - def create(@RequestBody request : CreateAccountRequest) = { - val f = accountService.openAccount(request.initialBalance) - WebUtil.toDeferredResult(f map(account => CreateAccountResponse(account.entityId.id))) - - } -} diff --git a/scala-spring/accounts-command-side-web/src/main/scala/net/chrisrichardson/eventstore/examples/bank/web/accounts/controllers/CreateAccountRequest.scala b/scala-spring/accounts-command-side-web/src/main/scala/net/chrisrichardson/eventstore/examples/bank/web/accounts/controllers/CreateAccountRequest.scala deleted file mode 100644 index 0e1b602..0000000 --- a/scala-spring/accounts-command-side-web/src/main/scala/net/chrisrichardson/eventstore/examples/bank/web/accounts/controllers/CreateAccountRequest.scala +++ /dev/null @@ -1,3 +0,0 @@ -package net.chrisrichardson.eventstore.examples.bank.web.accounts.controllers - -case class CreateAccountRequest(initialBalance : BigDecimal) diff --git a/scala-spring/accounts-command-side-web/src/main/scala/net/chrisrichardson/eventstore/examples/bank/web/accounts/controllers/CreateAccountResponse.scala b/scala-spring/accounts-command-side-web/src/main/scala/net/chrisrichardson/eventstore/examples/bank/web/accounts/controllers/CreateAccountResponse.scala deleted file mode 100644 index 6177f5b..0000000 --- a/scala-spring/accounts-command-side-web/src/main/scala/net/chrisrichardson/eventstore/examples/bank/web/accounts/controllers/CreateAccountResponse.scala +++ /dev/null @@ -1,7 +0,0 @@ -package net.chrisrichardson.eventstore.examples.bank.web.accounts.controllers - -/** - * Created by cer on 7/16/14. - */ -case class CreateAccountResponse(accountId : String) -case class GetAccountResponse(accountId : String, balance : String) diff --git a/scala-spring/accounts-query-side-backend/build.gradle b/scala-spring/accounts-query-side-backend/build.gradle deleted file mode 100644 index 7bc4f51..0000000 --- a/scala-spring/accounts-query-side-backend/build.gradle +++ /dev/null @@ -1,16 +0,0 @@ -apply plugin: 'scala' - -dependencies { - - compile project(":common-backend") - - compile "org.scala-lang:scala-library:2.10.2" - compile "org.springframework.boot:spring-boot-starter-data-mongodb:$springBootVersion" - - compile "net.chrisrichardson.eventstore.client:eventstore-java-client_2.10:$eventStoreClientVersion" - - testCompile scalaTestDependency - - testCompile "junit:junit:4.11" - testCompile "net.chrisrichardson.eventstore.client:eventstore-jdbc_2.10:$eventStoreClientVersion" -} diff --git a/scala-spring/accounts-query-side-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/queryside/AccountInfo.scala b/scala-spring/accounts-query-side-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/queryside/AccountInfo.scala deleted file mode 100644 index 1f32c37..0000000 --- a/scala-spring/accounts-query-side-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/queryside/AccountInfo.scala +++ /dev/null @@ -1,14 +0,0 @@ -package net.chrisrichardson.eventstore.examples.bank.queryside - -import org.springframework.data.mongodb.repository.MongoRepository - -case class AccountInfo(id : String, balance : Long, - changes : java.util.List[AccountChangeInfo], - transactions : java.util.List[AccountTransactionInfo], - version : String) - -case class AccountChangeInfo(changeId : String, transactionId : String, transactionType : String, amount : Long, balanceDelta: Long) - -case class AccountTransactionInfo(transactionId : String, fromAccountId: String, toAccountId: String, amount : Long) - -trait AccountInfoRepository extends MongoRepository[AccountInfo, String] \ No newline at end of file diff --git a/scala-spring/accounts-query-side-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/queryside/AccountInfoQueryService.scala b/scala-spring/accounts-query-side-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/queryside/AccountInfoQueryService.scala deleted file mode 100644 index b8e1f3f..0000000 --- a/scala-spring/accounts-query-side-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/queryside/AccountInfoQueryService.scala +++ /dev/null @@ -1,17 +0,0 @@ -package net.chrisrichardson.eventstore.examples.bank.queryside - -import net.chrisrichardson.eventstore.EntityId - -class AccountInfoQueryService(accountInfoRepository : AccountInfoRepository) { - - def findByAccountId(accountId : EntityId) : AccountInfo = { - val account = accountInfoRepository.findOne(accountId.id) - if (account == null) - throw new AccountNotFoundException(accountId) - else - account - } - -} - -class AccountNotFoundException(accountId : EntityId) extends RuntimeException("Account not found " + accountId) \ No newline at end of file diff --git a/scala-spring/accounts-query-side-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/queryside/AccountInfoUpdateService.scala b/scala-spring/accounts-query-side-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/queryside/AccountInfoUpdateService.scala deleted file mode 100644 index ebb5394..0000000 --- a/scala-spring/accounts-query-side-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/queryside/AccountInfoUpdateService.scala +++ /dev/null @@ -1,95 +0,0 @@ -package net.chrisrichardson.eventstore.examples.bank.queryside - -import net.chrisrichardson.eventstore.EntityId -import net.chrisrichardson.eventstore.Event -import net.chrisrichardson.eventstore.Event.EventId -import net.chrisrichardson.eventstore.examples.bank.backend.common.transactions.MoneyTransferCreatedEvent -import net.chrisrichardson.eventstore.examples.bank._ -import net.chrisrichardson.eventstore.examples.bank.backend.common.accounts._ -import net.chrisrichardson.eventstore.subscriptions.{EventSubscriber, DispatchedEvent, EventHandlerMethod, CompoundEventHandler} -import net.chrisrichardson.eventstore.util.ServiceUtil._ -import net.chrisrichardson.utils.logging.Logging -import org.springframework.data.mongodb.core.MongoTemplate - -import scala.collection.JavaConversions._ - -import org.springframework.data.mongodb.core.query.Criteria.where -import org.springframework.data.mongodb.core.query.Query -import org.springframework.data.mongodb.core.query.Update -import scala.concurrent.ExecutionContext.Implicits.global - -import scala.concurrent.Future - -@EventSubscriber (id = "querySideEventHandlers") -class AccountInfoUpdateService(accountInfoRepository : AccountInfoRepository, mongoTemplate : MongoTemplate) extends CompoundEventHandler with Logging { - - - @EventHandlerMethod - def created(de: DispatchedEvent[AccountOpenedEvent]) = Future { - logger.info("About to save") - try { - - if (de.event.initialBalance != null) - accountInfoRepository.save(AccountInfo(de.entityId.id, toIntegerRepr(de.event.initialBalance), Seq(), Seq(), de.eventId.asString)) - else - logger.error("Event with initialBalance == null {}", de.entityId) - } - catch { - case t : Throwable => - logger.error("Error during saving: ") - logger.error("Error during saving: ", t) - throw t - } - logger.info("Saved in mongo") - } - - @EventHandlerMethod - def recordDebit(de: DispatchedEvent[AccountDebitedEvent]) = saveChange(de, -1) - - @EventHandlerMethod - def recordCredit(de: DispatchedEvent[AccountCreditedEvent]) = saveChange(de, +1) - - @EventHandlerMethod - def recordDebitFailed(de: DispatchedEvent[AccountDebitFailedDueToInsufficientFundsEvent]) = saveChange(de, 0) - - def toIntegerRepr(d : BigDecimal) = (d * 100).toLong - def saveChange[T <: AccountChangedEvent](de : DispatchedEvent[T], delta : Int) = Future { - val changeId = de.eventId.asString - val transactionId = de.event.transactionId.id - val amount = toIntegerRepr(de.event.amount) - - val ci= AccountChangeInfo(changeId, transactionId, de.event.getClass.getSimpleName, amount, amount * delta) - - mongoTemplate.updateMulti(new Query(where("id").is(de.entityId.id).and("version").lt(changeId)), - new Update(). - inc("balance", amount * delta). - push("changes", ci). - set("version", changeId), - classOf[AccountInfo]) - } - - @EventHandlerMethod - def recordTransfer(de: DispatchedEvent[MoneyTransferCreatedEvent]) = Future { - val eventId = de.eventId.asString - val fromAccountId = de.event.details.fromAccountId.id - val toAccountId = de.event.details.toAccountId.id - - val ti = AccountTransactionInfo(de.entityId.id, fromAccountId, toAccountId, toIntegerRepr(de.event.details.amount)) - - mongoTemplate.updateMulti(new Query(where("id").is(fromAccountId).and("version").lt(eventId)), - new Update(). - push("transactions", ti). - set("version", eventId), - classOf[AccountInfo]) - - mongoTemplate.updateMulti(new Query(where("id").is(toAccountId).and("version").lt(eventId)), - new Update(). - push("transactions", ti). - set("version", eventId), - classOf[AccountInfo]) - - } - - - -} diff --git a/scala-spring/accounts-query-side-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/queryside/QuerySideConfiguration.scala b/scala-spring/accounts-query-side-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/queryside/QuerySideConfiguration.scala deleted file mode 100644 index ff2c4ba..0000000 --- a/scala-spring/accounts-query-side-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/queryside/QuerySideConfiguration.scala +++ /dev/null @@ -1,20 +0,0 @@ -package net.chrisrichardson.eventstore.examples.bank.queryside - -import org.springframework.context.annotation.{Bean, Configuration} -import org.springframework.data.mongodb.core.MongoTemplate -import org.springframework.data.mongodb.repository.config.EnableMongoRepositories - -@Configuration -@EnableMongoRepositories -class QuerySideConfiguration { - - @Bean - def accountUpdateService(accountInfoRepository: AccountInfoRepository, mongoTemplate: MongoTemplate): AccountInfoUpdateService = - new AccountInfoUpdateService(accountInfoRepository, mongoTemplate) - - @Bean - def accountInfoQueryService(accountInfoRepository : AccountInfoRepository) = new AccountInfoQueryService(accountInfoRepository) - - @Bean - def querysideDependencyChecker(mongoTemplate : MongoTemplate) = new QuerysideDependencyChecker(mongoTemplate) -} diff --git a/scala-spring/accounts-query-side-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/queryside/QuerysideDependencyChecker.scala b/scala-spring/accounts-query-side-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/queryside/QuerysideDependencyChecker.scala deleted file mode 100644 index 2c37f90..0000000 --- a/scala-spring/accounts-query-side-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/queryside/QuerysideDependencyChecker.scala +++ /dev/null @@ -1,26 +0,0 @@ -package net.chrisrichardson.eventstore.examples.bank.queryside - -import javax.annotation.PostConstruct - -import net.chrisrichardson.utils.logging.Logging -import org.springframework.beans.factory.annotation.Autowired -import org.springframework.data.mongodb.core.MongoTemplate - -import scala.concurrent.{TimeoutException, Await, Future} -import scala.concurrent.duration._ -import scala.concurrent.ExecutionContext.Implicits.global - -class QuerysideDependencyChecker (mongoTemplate : MongoTemplate) extends Logging { - - @PostConstruct - def checkDependencies(): Unit = { - try { - Await.result(Future { mongoTemplate.getDb.getCollectionNames}, 5 seconds) - } catch { - case e : Throwable => - logger.error("Error connecting to Mongo - have you set SPRING_DATA_MONGODB_URI or --spring.data.mongodb_uri?", e) - throw e - } - } - -} diff --git a/scala-spring/accounts-query-side-service/build.gradle b/scala-spring/accounts-query-side-service/build.gradle deleted file mode 100644 index c650557..0000000 --- a/scala-spring/accounts-query-side-service/build.gradle +++ /dev/null @@ -1,23 +0,0 @@ -apply plugin: 'scala' -apply plugin: 'spring-boot' -apply plugin: VerifyMongoDBConfigurationPlugin -apply plugin: VerifyEventStoreEnvironmentPlugin - -dependencies { - compile "org.scala-lang:scala-library:2.10.2" - compile project(":accounts-query-side-web") - - compile "org.springframework.boot:spring-boot-starter-web" - compile "org.springframework.boot:spring-boot-starter-actuator" - - compile "net.chrisrichardson.eventstore.client:eventstore-http-stomp-client_2.10:$eventStoreClientVersion" - - testCompile "org.springframework.boot:spring-boot-starter-test" - testCompile scalaTestDependency - -} - -test { - ignoreFailures true -} - diff --git a/scala-spring/accounts-query-side-service/src/main/scala/net/chrisrichardson/eventstore/examples/bank/web/AccountsQuerySideServiceConfiguration.scala b/scala-spring/accounts-query-side-service/src/main/scala/net/chrisrichardson/eventstore/examples/bank/web/AccountsQuerySideServiceConfiguration.scala deleted file mode 100644 index 396829b..0000000 --- a/scala-spring/accounts-query-side-service/src/main/scala/net/chrisrichardson/eventstore/examples/bank/web/AccountsQuerySideServiceConfiguration.scala +++ /dev/null @@ -1,24 +0,0 @@ -package net.chrisrichardson.eventstore.examples.bank.web - -import net.chrisrichardson.eventstore.client.config.EventStoreHttpClientConfiguration -import net.chrisrichardson.eventstore.examples.bank.web.queryside.QuerySideWebConfiguration -import net.chrisrichardson.eventstore.json.EventStoreCommonObjectMapping -import org.springframework.boot.autoconfigure.EnableAutoConfiguration -import org.springframework.boot.autoconfigure.web.HttpMessageConverters -import org.springframework.context.annotation._ -import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter - -@Configuration -@EnableAutoConfiguration -@Import(Array(classOf[QuerySideWebConfiguration], classOf[EventStoreHttpClientConfiguration])) -@ComponentScan -class AccountsQuerySideServiceConfiguration { - - @Bean - def scalaJSonConverter: HttpMessageConverters = { - val additional = new MappingJackson2HttpMessageConverter - additional.setObjectMapper(EventStoreCommonObjectMapping.getObjectMapper) - new HttpMessageConverters(additional) - } - -} diff --git a/scala-spring/accounts-query-side-service/src/main/scala/net/chrisrichardson/eventstore/examples/bank/web/main/AccountsQuerySideServiceMain.scala b/scala-spring/accounts-query-side-service/src/main/scala/net/chrisrichardson/eventstore/examples/bank/web/main/AccountsQuerySideServiceMain.scala deleted file mode 100644 index 4be2004..0000000 --- a/scala-spring/accounts-query-side-service/src/main/scala/net/chrisrichardson/eventstore/examples/bank/web/main/AccountsQuerySideServiceMain.scala +++ /dev/null @@ -1,10 +0,0 @@ -package net.chrisrichardson.eventstore.examples.bank.web.main - -import net.chrisrichardson.eventstore.examples.bank.web.AccountsQuerySideServiceConfiguration -import org.springframework.boot.SpringApplication - -object AccountsQuerySideServiceMain { - - def main(args: Array[String]) : Unit = SpringApplication.run(classOf[AccountsQuerySideServiceConfiguration], args :_ *) - -} diff --git a/scala-spring/accounts-query-side-service/src/test/scala/net/chrisrichardson/eventstore/examples/bank/web/AccountsQuerySideServiceIntegrationTest.scala b/scala-spring/accounts-query-side-service/src/test/scala/net/chrisrichardson/eventstore/examples/bank/web/AccountsQuerySideServiceIntegrationTest.scala deleted file mode 100644 index 8c8b66d..0000000 --- a/scala-spring/accounts-query-side-service/src/test/scala/net/chrisrichardson/eventstore/examples/bank/web/AccountsQuerySideServiceIntegrationTest.scala +++ /dev/null @@ -1,30 +0,0 @@ -package net.chrisrichardson.eventstore.examples.bank.web - -import org.junit.runner.RunWith -import org.scalatest.FlatSpec -import org.scalatest.concurrent.Eventually._ -import org.scalatest.junit.JUnitRunner -import org.scalatest.time.{Millis, Span} -import org.springframework.boot.SpringApplication -import org.springframework.web.client.RestTemplate - -@RunWith(classOf[JUnitRunner]) -class AccountsQuerySideServiceIntegrationTest extends FlatSpec { - - val sa = new SpringApplication(classOf[AccountsQuerySideServiceTestConfiguration]) - val ctx = sa.run() - - // var server = ctx.getBean(classOf[EmbeddedServletContainer]) - - val port = 8080 - - val baseUrl = s"http://localhost:$port/" - - val restTemplate = ctx.getBean(classOf[RestTemplate]) - - implicit val reallyLongPatienceConfig = PatienceConfig(timeout = Span(10 * 1000, Millis), interval = Span(1 * 1000, Millis)) - - it should "create accounts and transfer money" in { - // FIXME - } -} diff --git a/scala-spring/accounts-query-side-service/src/test/scala/net/chrisrichardson/eventstore/examples/bank/web/AccountsQuerySideServiceTestConfiguration.scala b/scala-spring/accounts-query-side-service/src/test/scala/net/chrisrichardson/eventstore/examples/bank/web/AccountsQuerySideServiceTestConfiguration.scala deleted file mode 100644 index c5865c8..0000000 --- a/scala-spring/accounts-query-side-service/src/test/scala/net/chrisrichardson/eventstore/examples/bank/web/AccountsQuerySideServiceTestConfiguration.scala +++ /dev/null @@ -1,27 +0,0 @@ -package net.chrisrichardson.eventstore.examples.bank.web - - -import com.fasterxml.jackson.databind.ObjectMapper -import net.chrisrichardson.eventstore.json.EventStoreCommonObjectMapping -import org.springframework.context.annotation.{Bean, Configuration, Import} -import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter -import org.springframework.web.client.RestTemplate - -import scala.collection.JavaConversions._ - -@Configuration -@Import(Array(classOf[AccountsQuerySideServiceConfiguration])) -class AccountsQuerySideServiceTestConfiguration { - - @Bean - def restTemplate() = { - val restTemplate = new RestTemplate() - restTemplate.getMessageConverters foreach { - case mc: MappingJackson2HttpMessageConverter => - mc.setObjectMapper(EventStoreCommonObjectMapping.getObjectMapper) - case _ => - } - restTemplate - } - -} diff --git a/scala-spring/accounts-query-side-web/build.gradle b/scala-spring/accounts-query-side-web/build.gradle deleted file mode 100644 index 8c99463..0000000 --- a/scala-spring/accounts-query-side-web/build.gradle +++ /dev/null @@ -1,16 +0,0 @@ -apply plugin: 'scala' - -dependencies { - compile "org.scala-lang:scala-library:2.10.2" - compile project(":accounts-query-side-backend") - compile project(":common-web") - - compile "org.springframework.boot:spring-boot-starter-actuator:$springBootVersion" - - testCompile "org.springframework.boot:spring-boot-starter-test" - testCompile scalaTestDependency - -} - - - diff --git a/scala-spring/accounts-query-side-web/src/main/scala/net/chrisrichardson/eventstore/examples/bank/web/queryside/QuerySideWebConfiguration.scala b/scala-spring/accounts-query-side-web/src/main/scala/net/chrisrichardson/eventstore/examples/bank/web/queryside/QuerySideWebConfiguration.scala deleted file mode 100644 index a564d04..0000000 --- a/scala-spring/accounts-query-side-web/src/main/scala/net/chrisrichardson/eventstore/examples/bank/web/queryside/QuerySideWebConfiguration.scala +++ /dev/null @@ -1,13 +0,0 @@ -package net.chrisrichardson.eventstore.examples.bank.web.queryside - -import net.chrisrichardson.eventstore.examples.bank.queryside.QuerySideConfiguration -import net.chrisrichardson.eventstore.subscriptions.EnableEventHandlers -import org.springframework.context.annotation._ - -@Configuration -@Import(Array(classOf[QuerySideConfiguration])) -@ComponentScan -@EnableEventHandlers -class QuerySideWebConfiguration { - -} diff --git a/scala-spring/accounts-query-side-web/src/main/scala/net/chrisrichardson/eventstore/examples/bank/web/queryside/controllers/AccountQuerySideController.scala b/scala-spring/accounts-query-side-web/src/main/scala/net/chrisrichardson/eventstore/examples/bank/web/queryside/controllers/AccountQuerySideController.scala deleted file mode 100644 index d0c3e3a..0000000 --- a/scala-spring/accounts-query-side-web/src/main/scala/net/chrisrichardson/eventstore/examples/bank/web/queryside/controllers/AccountQuerySideController.scala +++ /dev/null @@ -1,18 +0,0 @@ -package net.chrisrichardson.eventstore.examples.bank.web.queryside.controllers - -import net.chrisrichardson.eventstore.EntityId -import net.chrisrichardson.eventstore.examples.bank.queryside.{AccountNotFoundException, AccountInfoQueryService} -import org.springframework.beans.factory.annotation.Autowired -import org.springframework.http.HttpStatus -import org.springframework.web.bind.annotation._ - -@RestController -class AccountQuerySideController @Autowired() (accountInfoQueryService : AccountInfoQueryService) { - - @RequestMapping(value=Array("/accounts/{accountId}"), method = Array(RequestMethod.GET)) - def get(@PathVariable accountId : String) = accountInfoQueryService.findByAccountId(EntityId(accountId)) - - @ResponseStatus(value = HttpStatus.NOT_FOUND, reason = "account not found") - @ExceptionHandler(Array(classOf[AccountNotFoundException])) - def accountNotFound() {} -} diff --git a/scala-spring/backend-integration-tests/build.gradle b/scala-spring/backend-integration-tests/build.gradle deleted file mode 100644 index 15c4e5e..0000000 --- a/scala-spring/backend-integration-tests/build.gradle +++ /dev/null @@ -1,18 +0,0 @@ -apply plugin: 'scala' -apply plugin: VerifyMongoDBConfigurationPlugin - -dependencies { - - compile "org.scala-lang:scala-library:2.10.2" - - compile project(":transactions-command-side-backend") - compile project(":accounts-command-side-backend") - compile project(":accounts-query-side-backend") - - testCompile scalaTestDependency - - testCompile "junit:junit:4.11" - testCompile "net.chrisrichardson.eventstore.client:eventstore-jdbc_2.10:$eventStoreClientVersion" -} - - diff --git a/scala-spring/backend-integration-tests/src/test/scala/net/chrisrichardson/eventstore/examples/bank/MoneyTransferIntegrationTest.scala b/scala-spring/backend-integration-tests/src/test/scala/net/chrisrichardson/eventstore/examples/bank/MoneyTransferIntegrationTest.scala deleted file mode 100644 index f391d45..0000000 --- a/scala-spring/backend-integration-tests/src/test/scala/net/chrisrichardson/eventstore/examples/bank/MoneyTransferIntegrationTest.scala +++ /dev/null @@ -1,101 +0,0 @@ -package net.chrisrichardson.eventstore.examples.bank - -import net.chrisrichardson.eventstore.EventStore -import net.chrisrichardson.eventstore.examples.bank.accounts.{AccountService, Account} -import net.chrisrichardson.eventstore.examples.bank.backend.common.accounts.AccountDebitedEvent -import net.chrisrichardson.eventstore.examples.bank.config.BankingTestConfiguration -import net.chrisrichardson.eventstore.examples.bank.queryside.AccountInfoQueryService -import net.chrisrichardson.eventstore.examples.bank.backend.common.transactions.TransferDetails -import net.chrisrichardson.eventstore.examples.bank.transactions.{MoneyTransferService, TransferStates, MoneyTransfer} -import net.chrisrichardson.eventstore.jdbc.config.JdbcEventStoreConfiguration -import org.junit.runner.RunWith -import org.scalatest.FlatSpec -import org.scalatest.junit.JUnitRunner -import org.scalatest.time.{Millis, Span} -import org.springframework.context.annotation.Import - -import scala.concurrent.{Await, Future} -import scala.concurrent.duration._ -import org.scalatest.concurrent.Eventually._ -import org.scalatest.Matchers._ -import scala.collection.JavaConversions._ -import org.springframework.context.annotation.AnnotationConfigApplicationContext -import scala.reflect.ClassTag - -trait SpringTest { - def configClasses : Seq[Class[_]] - val ctx = new AnnotationConfigApplicationContext(configClasses :_ *) - def bean[T](implicit m : ClassTag[T]) : T = ctx.getBean(m.runtimeClass).asInstanceOf[T] - def bean[T](name : String)(implicit m : ClassTag[T]) : T = ctx.getBean(name, m.runtimeClass).asInstanceOf[T] - -} - - -@RunWith(classOf[JUnitRunner]) -class MoneyTransferIntegrationTest extends FlatSpec with SpringTest { - - def configClasses = Seq(classOf[BankingTestConfiguration]) - - val accountService = bean[AccountService] - val transactionService = bean[MoneyTransferService] - val eventStore = bean[EventStore] - val accountInfoQueryService = bean[AccountInfoQueryService] - - def await[T](body : => Future[T]) = Await.result(body, 500 milliseconds) - - val longWait = PatienceConfig(Span(5000, Millis), Span(50, Millis)) - - - it should "transfer money" in { - val account1 = await { accountService.openAccount(BigDecimal(150)) } - val account2 = await { accountService.openAccount(BigDecimal(300)) } - - val transaction = await { transactionService.transferMoney(TransferDetails(account1.entityId, account2.entityId, BigDecimal(80))) } - - eventually { - val updatedTransaction = await { eventStore.find[MoneyTransfer](transaction.entityId)} - updatedTransaction.entity.state should be(TransferStates.COMPLETED) - }(longWait) - - eventually { - val updatedAccount1 = await { eventStore.find[Account](account1.entityId) } - updatedAccount1.entity.balance should be(70) - }(longWait) - - eventually { - val updatedAccount2 = await { eventStore.find[Account](account2.entityId) } - updatedAccount2.entity.balance should be(380) - }(longWait) - - eventually { - val accountInfo = accountInfoQueryService.findByAccountId(account1.entityId) - accountInfo.balance should be(70*100) - accountInfo.changes.map(_.transactionType) should be(Seq(classOf[AccountDebitedEvent].getSimpleName)) - }(longWait) - - } - - it should "fail to transfer money due to insufficient funds" in { - val account1 = await { accountService.openAccount(BigDecimal(150)) } - val account2 = await { accountService.openAccount(BigDecimal(300)) } - - val transaction = await { transactionService.transferMoney(TransferDetails(account1.entityId, account2.entityId, BigDecimal(200))) } - - eventually { - val updatedTransaction = await { eventStore.find[MoneyTransfer](transaction.entityId)} - updatedTransaction.entity.state should be(TransferStates.FAILED_DUE_TO_INSUFFICIENT_FUNDS) - }(longWait) - - eventually { - val updatedAccount1 = await { eventStore.find[Account](account1.entityId) } - updatedAccount1.entity.balance should be(150) - }(longWait) - - eventually { - val updatedAccount2 = await { eventStore.find[Account](account2.entityId) } - updatedAccount2.entity.balance should be(300) - }(longWait) - - } - -} diff --git a/scala-spring/backend-integration-tests/src/test/scala/net/chrisrichardson/eventstore/examples/bank/config/BankingTestConfiguration.scala b/scala-spring/backend-integration-tests/src/test/scala/net/chrisrichardson/eventstore/examples/bank/config/BankingTestConfiguration.scala deleted file mode 100644 index bda4368..0000000 --- a/scala-spring/backend-integration-tests/src/test/scala/net/chrisrichardson/eventstore/examples/bank/config/BankingTestConfiguration.scala +++ /dev/null @@ -1,15 +0,0 @@ -package net.chrisrichardson.eventstore.examples.bank.config - -import net.chrisrichardson.eventstore.examples.bank.accounts.AccountConfiguration -import net.chrisrichardson.eventstore.examples.bank.queryside.QuerySideConfiguration -import net.chrisrichardson.eventstore.examples.bank.transactions.TransactionConfiguration -import net.chrisrichardson.eventstore.jdbc.config.JdbcEventStoreConfiguration -import org.springframework.boot.autoconfigure.EnableAutoConfiguration -import org.springframework.context.annotation.{Import, Configuration} - -@Configuration -@EnableAutoConfiguration -@Import(Array(classOf[JdbcEventStoreConfiguration], classOf[AccountConfiguration], classOf[TransactionConfiguration], classOf[QuerySideConfiguration])) -class BankingTestConfiguration { - -} diff --git a/scala-spring/build-and-test-all.sh b/scala-spring/build-and-test-all.sh deleted file mode 100755 index 5ea0a3b..0000000 --- a/scala-spring/build-and-test-all.sh +++ /dev/null @@ -1,3 +0,0 @@ -#! /bin/bash - -../_build-and-test-all.sh $* diff --git a/scala-spring/build.gradle b/scala-spring/build.gradle deleted file mode 100644 index d522a5a..0000000 --- a/scala-spring/build.gradle +++ /dev/null @@ -1,29 +0,0 @@ -buildscript { - repositories { - mavenCentral() - } - dependencies { - classpath("org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion") - } -} - -allprojects { - group = "net.chrisrichardson.eventstore" -} - - -task wrapper(type: Wrapper) { - gradleVersion = '2.0' -} - -subprojects { - apply plugin: 'java' - apply plugin: 'scala' - sourceCompatibility = 1.7 - targetCompatibility = 1.7 - - repositories { - mavenCentral() - eventuateMavenRepoUrl.split(',').each { repoUrl -> maven { url repoUrl } } - } -} diff --git a/scala-spring/buildSrc/src/main/groovy/VerifyEventStoreEnvironmentPlugin.groovy b/scala-spring/buildSrc/src/main/groovy/VerifyEventStoreEnvironmentPlugin.groovy deleted file mode 100644 index 030e0e1..0000000 --- a/scala-spring/buildSrc/src/main/groovy/VerifyEventStoreEnvironmentPlugin.groovy +++ /dev/null @@ -1,15 +0,0 @@ -import org.gradle.api.* - - -class VerifyEventStoreEnvironmentPlugin implements Plugin { - void apply(Project project) { - project.test { - beforeSuite { x -> - if (x.parent == null) { - if (System.getenv("EVENTUATE_API_KEY_ID") == null && System.getenv("EVENTUATE_API_KEY_SECRET") == null) - logger.warn("\nPLEASE make sure that Eventuate-related environment variables EVENTUATE_API_KEY_ID and EVENTUATE_API_KEY_SECRET are set, see sample-set-remote-env.sh !!!!\n") - } - } - } - } -} diff --git a/scala-spring/buildSrc/src/main/groovy/VerifyMongoDBConfigurationPlugin.groovy b/scala-spring/buildSrc/src/main/groovy/VerifyMongoDBConfigurationPlugin.groovy deleted file mode 100644 index 1486a0d..0000000 --- a/scala-spring/buildSrc/src/main/groovy/VerifyMongoDBConfigurationPlugin.groovy +++ /dev/null @@ -1,15 +0,0 @@ -import org.gradle.api.* - - -class VerifyMongoDBConfigurationPlugin implements Plugin { - void apply(Project project) { - project.test { - beforeSuite { x -> - if (x.parent == null) { - if (System.getenv("SPRING_DATA_MONGODB_URI") == null) - throw new RuntimeException("Please make sure that the environment variable SPRING_DATA_MONGODB_URI is set, e.g. export SPRING_DATA_MONGODB_URI=mongodb://192.168.59.103/mydb") - } - } - } - } -} \ No newline at end of file diff --git a/scala-spring/common-backend/build.gradle b/scala-spring/common-backend/build.gradle deleted file mode 100644 index 44619f0..0000000 --- a/scala-spring/common-backend/build.gradle +++ /dev/null @@ -1,10 +0,0 @@ -apply plugin: 'scala' - -dependencies { - compile "org.scala-lang:scala-library:2.10.2" - compile "net.chrisrichardson.eventstore.client:eventstore-java-client_2.10:$eventStoreClientVersion" - - testCompile scalaTestDependency - - testCompile "junit:junit:4.11" -} diff --git a/scala-spring/common-backend/src/main/resources/logback.xml b/scala-spring/common-backend/src/main/resources/logback.xml deleted file mode 100644 index d4123dc..0000000 --- a/scala-spring/common-backend/src/main/resources/logback.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - %d{HH:mm:ss.SSS} %-5level %logger{36} - %msg%n - - - - - - - - - - - - - - diff --git a/scala-spring/common-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/backend/common/accounts/AccountEvents.scala b/scala-spring/common-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/backend/common/accounts/AccountEvents.scala deleted file mode 100644 index 76a479f..0000000 --- a/scala-spring/common-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/backend/common/accounts/AccountEvents.scala +++ /dev/null @@ -1,18 +0,0 @@ -package net.chrisrichardson.eventstore.examples.bank.backend.common.accounts - -import net.chrisrichardson.eventstore.{EntityId, Event} - -trait AccountChangedEvent extends Event { - val amount : BigDecimal - val transactionId : EntityId -} - -case class AccountOpenedEvent(initialBalance : BigDecimal) extends Event - -case class AccountCreditedEvent(amount : BigDecimal, transactionId : EntityId) extends AccountChangedEvent - -case class AccountDebitedEvent(amount : BigDecimal, transactionId : EntityId) extends AccountChangedEvent - -case class AccountDebitFailedDueToInsufficientFundsEvent(amount : BigDecimal, transactionId : EntityId) extends AccountChangedEvent - - diff --git a/scala-spring/common-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/backend/common/accounts/package-info.java b/scala-spring/common-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/backend/common/accounts/package-info.java deleted file mode 100644 index 6663c42..0000000 --- a/scala-spring/common-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/backend/common/accounts/package-info.java +++ /dev/null @@ -1,2 +0,0 @@ -@net.chrisrichardson.eventstore.EventEntity(entity="net.chrisrichardson.eventstore.examples.bank.accounts.Account") -package net.chrisrichardson.eventstore.examples.bank.backend.common.accounts; \ No newline at end of file diff --git a/scala-spring/common-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/backend/common/transactions/TransactionEvents.scala b/scala-spring/common-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/backend/common/transactions/TransactionEvents.scala deleted file mode 100644 index be3ed86..0000000 --- a/scala-spring/common-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/backend/common/transactions/TransactionEvents.scala +++ /dev/null @@ -1,8 +0,0 @@ -package net.chrisrichardson.eventstore.examples.bank.backend.common.transactions - -import net.chrisrichardson.eventstore.Event - -case class MoneyTransferCreatedEvent(details : TransferDetails) extends Event -case class DebitRecordedEvent(details : TransferDetails) extends Event -case class CreditRecordedEvent(details : TransferDetails) extends Event -case class TransferFailedDueToInsufficientFundsEvent() extends Event diff --git a/scala-spring/common-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/backend/common/transactions/TransferDetails.scala b/scala-spring/common-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/backend/common/transactions/TransferDetails.scala deleted file mode 100644 index 5546a38..0000000 --- a/scala-spring/common-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/backend/common/transactions/TransferDetails.scala +++ /dev/null @@ -1,6 +0,0 @@ -package net.chrisrichardson.eventstore.examples.bank.backend.common.transactions - -import net.chrisrichardson.eventstore.EntityId - - -case class TransferDetails(fromAccountId : EntityId, toAccountId : EntityId, amount : BigDecimal) diff --git a/scala-spring/common-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/backend/common/transactions/package-info.java b/scala-spring/common-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/backend/common/transactions/package-info.java deleted file mode 100644 index f243e0e..0000000 --- a/scala-spring/common-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/backend/common/transactions/package-info.java +++ /dev/null @@ -1,2 +0,0 @@ -@net.chrisrichardson.eventstore.EventEntity(entity="net.chrisrichardson.eventstore.examples.bank.transactions.MoneyTransfer") -package net.chrisrichardson.eventstore.examples.bank.backend.common.transactions; \ No newline at end of file diff --git a/scala-spring/common-web/build.gradle b/scala-spring/common-web/build.gradle deleted file mode 100644 index 6973ba4..0000000 --- a/scala-spring/common-web/build.gradle +++ /dev/null @@ -1,10 +0,0 @@ -apply plugin: 'scala' - -dependencies { - compile "org.scala-lang:scala-library:2.10.2" - compile "org.springframework.boot:spring-boot-starter-web:$springBootVersion" - -} - - - diff --git a/scala-spring/common-web/src/main/scala/net/chrisrichardson/eventstore/examples/bank/web/util/WebUtil.scala b/scala-spring/common-web/src/main/scala/net/chrisrichardson/eventstore/examples/bank/web/util/WebUtil.scala deleted file mode 100644 index c63e376..0000000 --- a/scala-spring/common-web/src/main/scala/net/chrisrichardson/eventstore/examples/bank/web/util/WebUtil.scala +++ /dev/null @@ -1,20 +0,0 @@ -package net.chrisrichardson.eventstore.examples.bank.web.util - -import org.springframework.web.context.request.async.DeferredResult - -import scala.concurrent.ExecutionContext.Implicits.global -import scala.concurrent.Future - -object WebUtil { - def toDeferredResult[T](future: Future[T]): DeferredResult[T] = { - val result = new DeferredResult[T] - future onSuccess { - case r => result.setResult(r) - } - future onFailure { - case t => result.setErrorResult(t) - } - result - } - -} diff --git a/scala-spring/docker-compose.yml b/scala-spring/docker-compose.yml deleted file mode 100644 index c19a110..0000000 --- a/scala-spring/docker-compose.yml +++ /dev/null @@ -1,46 +0,0 @@ -accountscommandside: - image: java:8 - working_dir: /app - volumes: - - ./accounts-command-side-service/build/libs:/app - command: java -jar /app/accounts-command-side-service.jar - ports: - - "8080:8080" - environment: - EVENTUATE_API_KEY_ID: - EVENTUATE_API_KEY_SECRET: - -transactionscommandside: - image: java:8 - working_dir: /app - volumes: - - ./transactions-command-side-service/build/libs:/app - command: java -jar /app/transactions-command-side-service.jar - ports: - - "8082:8080" - environment: - EVENTUATE_API_KEY_ID: - EVENTUATE_API_KEY_SECRET: - - -accountsqueryside: - image: java:8 - working_dir: /app - volumes: - - ./accounts-query-side-service/build/libs:/app - command: java -jar /app/accounts-query-side-service.jar - ports: - - "8081:8080" - links: - - mongodb - environment: - EVENTUATE_API_KEY_ID: - EVENTUATE_API_KEY_SECRET: - SPRING_DATA_MONGODB_URI: mongodb://mongodb/mydb - -mongodb: - image: mongo:3.0.4 - hostname: mongodb - command: mongod --smallfiles - ports: - - "27017:27017" diff --git a/scala-spring/e2e-test/build.gradle b/scala-spring/e2e-test/build.gradle deleted file mode 100644 index 8a9dd60..0000000 --- a/scala-spring/e2e-test/build.gradle +++ /dev/null @@ -1,19 +0,0 @@ -apply plugin: 'scala' -apply plugin: VerifyMongoDBConfigurationPlugin - -dependencies { - compile "org.scala-lang:scala-library:2.10.2" - - testCompile project(":accounts-command-side-web") - testCompile project(":transactions-command-side-web") - testCompile project(":accounts-query-side-web") - - testCompile "junit:junit:4.11" - testCompile "org.springframework.boot:spring-boot-starter-test:$springBootVersion" - testCompile scalaTestDependency - -} - -test { - ignoreFailures (!project.hasProperty("ignoreE2EFailures") || ignoreE2EFailures.toBoolean()) -} diff --git a/scala-spring/e2e-test/src/test/scala/net/chrisrichardson/eventstore/examples/bank/web/EndToEndTest.scala b/scala-spring/e2e-test/src/test/scala/net/chrisrichardson/eventstore/examples/bank/web/EndToEndTest.scala deleted file mode 100644 index fd3ae03..0000000 --- a/scala-spring/e2e-test/src/test/scala/net/chrisrichardson/eventstore/examples/bank/web/EndToEndTest.scala +++ /dev/null @@ -1,68 +0,0 @@ -package net.chrisrichardson.eventstore.examples.bank.web - -import net.chrisrichardson.eventstore.EntityId -import net.chrisrichardson.eventstore.examples.bank.queryside.AccountInfo -import net.chrisrichardson.eventstore.examples.bank.web.accounts.controllers.{CreateAccountRequest, CreateAccountResponse} -import net.chrisrichardson.eventstore.examples.bank.web.transactions.controllers.{CreateMoneyTransferResponse, GetMoneyTransferResponse, MoneyTransferRequest} -import net.chrisrichardson.eventstore.json.EventStoreCommonObjectMapping.EventStoreCommonObjectMapper -import org.junit.runner.RunWith -import org.scalatest.FlatSpec -import org.scalatest.Matchers._ -import org.scalatest.concurrent.Eventually._ -import org.scalatest.junit.JUnitRunner -import org.scalatest.time.{Millis, Span} -import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter -import org.springframework.web.client.RestTemplate -import scala.collection.JavaConversions._ - -@RunWith(classOf[JUnitRunner]) -class EndToEndTest extends FlatSpec { - - val serviceHost = Option(System.getenv("SERVICE_HOST")) getOrElse "localhost" - val accountsCommandSideBaseUrl = s"http://$serviceHost:8080/" - val accountsQuerySideBaseUrl = s"http://$serviceHost:8081/" - val transactionsCommandSideBaseUrl = s"http://$serviceHost:8082/" - - val restTemplate = new RestTemplate() - restTemplate.getMessageConverters foreach { - case mc: MappingJackson2HttpMessageConverter => - mc.setObjectMapper(EventStoreCommonObjectMapper) - case _ => - } - - implicit val reallyLongPatienceConfig = PatienceConfig(timeout = Span(10 * 1000, Millis), interval = Span(1 * 1000, Millis)) - - it should "create accounts and transfer money" in { - - val CreateAccountResponse(fromAccountId) = restTemplate.postForEntity(s"$accountsCommandSideBaseUrl/accounts", CreateAccountRequest(BigDecimal(500)), classOf[CreateAccountResponse]).getBody - val CreateAccountResponse(toAccountId) = restTemplate.postForEntity(s"$accountsCommandSideBaseUrl/accounts", CreateAccountRequest(BigDecimal(100)), classOf[CreateAccountResponse]).getBody - - eventually { - val accountInfo = restTemplate.getForEntity(s"$accountsQuerySideBaseUrl/accounts/" + fromAccountId, classOf[AccountInfo]).getBody - accountInfo should not be null - val AccountInfo(accountId, initialBalance, _, _, _) = accountInfo - accountId should be(fromAccountId) - initialBalance should be(500*100) - }(reallyLongPatienceConfig) - - - val CreateMoneyTransferResponse(transactionId) = restTemplate.postForEntity(s"$transactionsCommandSideBaseUrl/transfers", - MoneyTransferRequest(EntityId(fromAccountId), EntityId(toAccountId), BigDecimal(150)), classOf[CreateMoneyTransferResponse]).getBody - - eventually { - val AccountInfo(_, newFromAccountBalance, _, _, _) = restTemplate.getForEntity(s"$accountsQuerySideBaseUrl/accounts/" + fromAccountId, classOf[AccountInfo]).getBody - newFromAccountBalance should be(350*100) - }(reallyLongPatienceConfig) - eventually { - val AccountInfo(_, newToAccountBalance, _, _, _) = restTemplate.getForEntity(s"$accountsQuerySideBaseUrl/accounts/" + toAccountId, classOf[AccountInfo]).getBody - newToAccountBalance should be(250*100) - }(reallyLongPatienceConfig) - - eventually { - val GetMoneyTransferResponse(_, state) = restTemplate.getForEntity(s"$transactionsCommandSideBaseUrl/transfers/" + transactionId, classOf[GetMoneyTransferResponse]).getBody - state should be("COMPLETED$") - }(reallyLongPatienceConfig) - - } - -} diff --git a/scala-spring/gradle.properties b/scala-spring/gradle.properties deleted file mode 100644 index 6ec43fa..0000000 --- a/scala-spring/gradle.properties +++ /dev/null @@ -1,10 +0,0 @@ - -org.gradle.jvmargs=-XX:MaxPermSize=512m - -eventuateMavenRepoUrl=http://mavenrepo.eventuate.io/release - -scalaTestDependency=org.scalatest:scalatest_2.10:2.0 - -springBootVersion=1.2.8.RELEASE - -eventStoreClientVersion=0.12 diff --git a/scala-spring/gradle/gradle/wrapper/gradle-wrapper.jar b/scala-spring/gradle/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index b7612167031001b7b84baf2a959e8ea8ad03c011..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 51017 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

N(DARnfPMFG|;(rIGZH1uB1rN;y7UlJ8 znb!RwO#5WS_%cPPlwSw94PTKP64}}J!~E1}ch9``2jvUrB*#@up8L&*`tqgq ztTAS@^33w-5hFZAH&{j)?l0<)9X(d`N|yLk!E=iT%PD-FTJ!|hqyj%RFFP`SaL;|_ z$(+VYhKm)K@Oe~+eZK(6ElQNdfimBrdKjeVl57_7p^|)jrzt|wyRonj$j9Bji!

f)EE4q$t9yObmyG04W0z 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 t|KH7qPwVTc?c*oWQQiM74F8)Y \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >&- -APP_HOME="`pwd -P`" -cd "$SAVED" >&- - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=$((i+1)) - done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac -fi - -# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules -function splitJvmOpts() { - JVM_OPTS=("$@") -} -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" - -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/scala-spring/gradle/gradlew.bat b/scala-spring/gradle/gradlew.bat deleted file mode 100644 index aec9973..0000000 --- a/scala-spring/gradle/gradlew.bat +++ /dev/null @@ -1,90 +0,0 @@ -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windowz variants - -if not "%OS%" == "Windows_NT" goto win9xME_args -if "%@eval[2+2]" == "4" goto 4NT_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* -goto execute - -:4NT_args -@rem Get arguments from the 4NT Shell from JP Software -set CMD_LINE_ARGS=%$ - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/scala-spring/gradle/wrapper/gradle-wrapper.jar b/scala-spring/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 667288ad6c2b3b87c990ece1267e56f0bcbf3622..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 50514 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 \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >&- -APP_HOME="`pwd -P`" -cd "$SAVED" >&- - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=$((i+1)) - done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac -fi - -# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules -function splitJvmOpts() { - JVM_OPTS=("$@") -} -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" - -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/scala-spring/gradlew.bat b/scala-spring/gradlew.bat deleted file mode 100644 index aec9973..0000000 --- a/scala-spring/gradlew.bat +++ /dev/null @@ -1,90 +0,0 @@ -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windowz variants - -if not "%OS%" == "Windows_NT" goto win9xME_args -if "%@eval[2+2]" == "4" goto 4NT_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* -goto execute - -:4NT_args -@rem Get arguments from the 4NT Shell from JP Software -set CMD_LINE_ARGS=%$ - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/scala-spring/handy-curl-commands.sh b/scala-spring/handy-curl-commands.sh deleted file mode 100644 index f7424c7..0000000 --- a/scala-spring/handy-curl-commands.sh +++ /dev/null @@ -1,36 +0,0 @@ -#! /bin/bash -e - - -# Create account 1 - -account1=$(curl -v --data '{"initialBalance" : 500}' -H "content-type: application/json" http://localhost:8080/accounts) - -# {"accountId":"0000014ae4caf314-ae7453bbb71e0000"} - -curl -v http://localhost:8081/accounts/0000014ae4caf314-ae7453bbb71e0000 - -# {"accountId":"0000014ae4caf314-ae7453bbb71e0000","balance":50000} - -# Create account 2 - -account2=$(curl -v --data '{"initialBalance" : 300}' -H "content-type: application/json" http://localhost:8080/accounts) - -# {"accountId":"0000014ae4cc8415-ae7453bbb71e0000"} - -curl -v http://localhost:8081/accounts/0000014ae4cc8415-ae7453bbb71e0000 - -# - - -transfer=$(curl -v --data '{"amount" : 150, "fromAccountId" : "0000014ae4caf314-ae7453bbb71e0000", "toAccountId" : "0000014ae4cc8415-ae7453bbb71e0000"}' -H "content-type: application/json" http://localhost:8082/transfers) - -# {"moneyTransferId":"0000014ae4cef030-ae7453bbb71e0000"} - - - - - - - - - diff --git a/scala-spring/monolithic-service/build.gradle b/scala-spring/monolithic-service/build.gradle deleted file mode 100644 index 054ba23..0000000 --- a/scala-spring/monolithic-service/build.gradle +++ /dev/null @@ -1,22 +0,0 @@ -apply plugin: 'scala' -apply plugin: 'spring-boot' -apply plugin: VerifyMongoDBConfigurationPlugin - -dependencies { - compile "org.scala-lang:scala-library:2.10.2" - compile project(":accounts-command-side-web") - compile project(":transactions-command-side-web") - compile project(":accounts-query-side-web") - - compile "org.springframework.boot:spring-boot-starter-web" - compile "org.springframework.boot:spring-boot-starter-actuator" - - compile "net.chrisrichardson.eventstore.client:eventstore-jdbc_2.10:$eventStoreClientVersion" - - testCompile "org.springframework.boot:spring-boot-starter-test" - testCompile scalaTestDependency - -} - - - diff --git a/scala-spring/monolithic-service/src/main/scala/net/chrisrichardson/eventstore/examples/bank/web/BankingWebAppConfiguration.scala b/scala-spring/monolithic-service/src/main/scala/net/chrisrichardson/eventstore/examples/bank/web/BankingWebAppConfiguration.scala deleted file mode 100644 index 2643e1d..0000000 --- a/scala-spring/monolithic-service/src/main/scala/net/chrisrichardson/eventstore/examples/bank/web/BankingWebAppConfiguration.scala +++ /dev/null @@ -1,31 +0,0 @@ -package net.chrisrichardson.eventstore.examples.bank.web - -import net.chrisrichardson.eventstore.embedded.config.EmbeddedEventStoreConfiguration -import net.chrisrichardson.eventstore.examples.bank.accounts.AccountConfiguration -import net.chrisrichardson.eventstore.examples.bank.queryside.QuerySideConfiguration -import net.chrisrichardson.eventstore.examples.bank.transactions.TransactionConfiguration -import net.chrisrichardson.eventstore.examples.bank.web.accounts.CommandSideWebAccountsConfiguration -import net.chrisrichardson.eventstore.examples.bank.web.queryside.QuerySideWebConfiguration -import net.chrisrichardson.eventstore.examples.bank.web.transactions.CommandSideWebTransactionsConfiguration -import net.chrisrichardson.eventstore.json.EventStoreCommonObjectMapping -import org.springframework.boot.autoconfigure.EnableAutoConfiguration -import org.springframework.boot.autoconfigure.web.HttpMessageConverters -import org.springframework.context.annotation._ -import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter - -@Configuration -@EnableAutoConfiguration -@Import(Array(classOf[CommandSideWebTransactionsConfiguration], classOf[CommandSideWebAccountsConfiguration], classOf[QuerySideWebConfiguration], - classOf[EmbeddedEventStoreConfiguration])) -@ComponentScan -class BankingWebAppConfiguration { - - - @Bean - def scalaJSonConverter: HttpMessageConverters = { - val additional = new MappingJackson2HttpMessageConverter - additional.setObjectMapper(EventStoreCommonObjectMapping.getObjectMapper) - new HttpMessageConverters(additional) - } - -} diff --git a/scala-spring/monolithic-service/src/main/scala/net/chrisrichardson/eventstore/examples/bank/web/main/BankingMain.scala b/scala-spring/monolithic-service/src/main/scala/net/chrisrichardson/eventstore/examples/bank/web/main/BankingMain.scala deleted file mode 100644 index ca4ac28..0000000 --- a/scala-spring/monolithic-service/src/main/scala/net/chrisrichardson/eventstore/examples/bank/web/main/BankingMain.scala +++ /dev/null @@ -1,10 +0,0 @@ -package net.chrisrichardson.eventstore.examples.bank.web.main - -import net.chrisrichardson.eventstore.examples.bank.web.BankingWebAppConfiguration -import org.springframework.boot.SpringApplication - -object BankingMain { - - def main(args: Array[String]) : Unit = SpringApplication.run(classOf[BankingWebAppConfiguration], args :_ *) - -} diff --git a/scala-spring/monolithic-service/src/test/scala/net/chrisrichardson/eventstore/examples/bank/web/BankWebIntegrationTest.scala b/scala-spring/monolithic-service/src/test/scala/net/chrisrichardson/eventstore/examples/bank/web/BankWebIntegrationTest.scala deleted file mode 100644 index 72d9087..0000000 --- a/scala-spring/monolithic-service/src/test/scala/net/chrisrichardson/eventstore/examples/bank/web/BankWebIntegrationTest.scala +++ /dev/null @@ -1,70 +0,0 @@ -package net.chrisrichardson.eventstore.examples.bank.web - -import net.chrisrichardson.eventstore.EntityId -import net.chrisrichardson.eventstore.examples.bank.queryside.AccountInfo -import net.chrisrichardson.eventstore.examples.bank.web.accounts.controllers.{CreateAccountRequest, CreateAccountResponse} -import net.chrisrichardson.eventstore.examples.bank.web.transactions.controllers.{CreateMoneyTransferResponse, GetMoneyTransferResponse, MoneyTransferRequest} -import org.junit.runner.RunWith -import org.scalatest.FlatSpec -import org.scalatest.Matchers._ -import org.scalatest.concurrent.Eventually._ -import org.scalatest.junit.JUnitRunner -import org.scalatest.time.{Millis, Span} -import org.springframework.boot.SpringApplication -import org.springframework.http.HttpStatus -import org.springframework.web.client.{HttpClientErrorException, RestTemplate} - -@RunWith(classOf[JUnitRunner]) -class BankWebIntegrationTest extends FlatSpec { - - val sa = new SpringApplication(classOf[BankingWebAppTestConfiguration]) - val ctx = sa.run() - - // var server = ctx.getBean(classOf[EmbeddedServletContainer]) - - val port = 8080 - - val baseUrl = s"http://localhost:$port/" - - val restTemplate = ctx.getBean(classOf[RestTemplate]) - - implicit val reallyLongPatienceConfig = PatienceConfig(timeout = Span(10 * 1000, Millis), interval = Span(1 * 1000, Millis)) - - it should "create accounts and transfer money" in { - - val CreateAccountResponse(fromAccountId) = restTemplate.postForEntity(s"$baseUrl/accounts", CreateAccountRequest(BigDecimal(500)), classOf[CreateAccountResponse]).getBody - val CreateAccountResponse(toAccountId) = restTemplate.postForEntity(s"$baseUrl/accounts", CreateAccountRequest(BigDecimal(100)), classOf[CreateAccountResponse]).getBody - - val AccountInfo(accountId, initialBalance, _, _, _) = eventually { - val accountInfo = restTemplate.getForEntity(s"$baseUrl/accounts/" + fromAccountId, classOf[AccountInfo]).getBody - accountInfo should not be null - accountInfo - }(reallyLongPatienceConfig) - - accountId should be(fromAccountId) - initialBalance should be(500*100) - - val CreateMoneyTransferResponse(transactionId) = restTemplate.postForEntity(s"$baseUrl/transfers", - MoneyTransferRequest(EntityId(fromAccountId), EntityId(toAccountId), BigDecimal(150)), classOf[CreateMoneyTransferResponse]).getBody - - eventually { - val AccountInfo(_, newFromAccountBalance, _, _, _) = restTemplate.getForEntity(s"$baseUrl/accounts/" + fromAccountId, classOf[AccountInfo]).getBody - newFromAccountBalance should be(350*100) - }(reallyLongPatienceConfig) - eventually { - val AccountInfo(_, newToAccountBalance, _, _, _) = restTemplate.getForEntity(s"$baseUrl/accounts/" + toAccountId, classOf[AccountInfo]).getBody - newToAccountBalance should be(250*100) - }(reallyLongPatienceConfig) - - eventually { - val GetMoneyTransferResponse(_, state) = restTemplate.getForEntity(s"$baseUrl/transfers/" + transactionId, classOf[GetMoneyTransferResponse]).getBody - state should be("COMPLETED$") - }(reallyLongPatienceConfig) - - } - - it should "Return 404 for non-existent account" in { - val t = the[HttpClientErrorException] thrownBy restTemplate.getForEntity(s"$baseUrl/accounts/" + "non-existent-account-id", classOf[AccountInfo]) - t.getStatusCode shouldBe HttpStatus.NOT_FOUND - } -} diff --git a/scala-spring/monolithic-service/src/test/scala/net/chrisrichardson/eventstore/examples/bank/web/BankingWebAppTestConfiguration.scala b/scala-spring/monolithic-service/src/test/scala/net/chrisrichardson/eventstore/examples/bank/web/BankingWebAppTestConfiguration.scala deleted file mode 100644 index f4c6a24..0000000 --- a/scala-spring/monolithic-service/src/test/scala/net/chrisrichardson/eventstore/examples/bank/web/BankingWebAppTestConfiguration.scala +++ /dev/null @@ -1,27 +0,0 @@ -package net.chrisrichardson.eventstore.examples.bank.web - - -import com.fasterxml.jackson.databind.ObjectMapper -import net.chrisrichardson.eventstore.json.EventStoreCommonObjectMapping -import org.springframework.boot.autoconfigure.EnableAutoConfiguration -import org.springframework.context.annotation.{Bean, Import, Configuration} -import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter -import org.springframework.web.client.RestTemplate -import scala.collection.JavaConversions._ - -@Configuration -@Import(Array(classOf[BankingWebAppConfiguration])) -class BankingWebAppTestConfiguration { - - @Bean - def restTemplate() = { - val restTemplate = new RestTemplate() - restTemplate.getMessageConverters foreach { - case mc: MappingJackson2HttpMessageConverter => - mc.setObjectMapper(EventStoreCommonObjectMapping.getObjectMapper) - case _ => - } - restTemplate - } - -} diff --git a/scala-spring/settings.gradle b/scala-spring/settings.gradle deleted file mode 100644 index 3beee8e..0000000 --- a/scala-spring/settings.gradle +++ /dev/null @@ -1,23 +0,0 @@ -include 'common-web' - -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-query-side-backend' -include 'accounts-query-side-web' - -include 'backend-integration-tests' - -include 'monolithic-service' -include 'accounts-command-side-service' -include 'accounts-query-side-service' -include 'transactions-command-side-service' - -include 'e2e-test' - -rootProject.name = 'scala-spring-event-sourcing-example' diff --git a/scala-spring/transactions-command-side-backend/build.gradle b/scala-spring/transactions-command-side-backend/build.gradle deleted file mode 100644 index 222d391..0000000 --- a/scala-spring/transactions-command-side-backend/build.gradle +++ /dev/null @@ -1,5 +0,0 @@ -dependencies { - compile "org.scala-lang:scala-library:2.10.2" - compile project(":common-backend") - compile "net.chrisrichardson.eventstore.client:eventstore-client-event-handling_2.10:$eventStoreClientVersion" -} diff --git a/scala-spring/transactions-command-side-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/transactions/MoneyTransfer.scala b/scala-spring/transactions-command-side-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/transactions/MoneyTransfer.scala deleted file mode 100644 index 479a56b..0000000 --- a/scala-spring/transactions-command-side-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/transactions/MoneyTransfer.scala +++ /dev/null @@ -1,46 +0,0 @@ -package net.chrisrichardson.eventstore.examples.bank.transactions - -import net.chrisrichardson.eventstore.PatternMatchingCommandProcessingAggregate -import net.chrisrichardson.eventstore.examples.bank.backend.common.transactions._ -import net.chrisrichardson.eventstore.examples.bank.transactions.MoneyTransferCommands._ - -object TransferStates { - sealed trait State - object NEW extends State - object INITIAL extends State - object DEBITED extends State - object COMPLETED extends State - object FAILED_DUE_TO_INSUFFICIENT_FUNDS extends State -} - - - -case class MoneyTransfer(state : TransferStates.State, details : TransferDetails) - extends PatternMatchingCommandProcessingAggregate[MoneyTransfer, MoneyTransferCommand] { - - def this() = this(TransferStates.NEW, null) - - def processCommand = { - case CreateMoneyTransferCommand(withDetails) if state == TransferStates.NEW => - Seq(MoneyTransferCreatedEvent(withDetails)) - - case RecordDebitCommand(accountId) if state == TransferStates.INITIAL && accountId == details.fromAccountId => - Seq(DebitRecordedEvent(details)) - - case RecordDebitFailedDueToInsufficientFundsCommand(accountId) if state == TransferStates.INITIAL && accountId == details.fromAccountId => - Seq(TransferFailedDueToInsufficientFundsEvent()) - - case RecordCreditCommand(accountId) if state == TransferStates.DEBITED && accountId == details.toAccountId => - Seq(CreditRecordedEvent(details)) - } - - def applyEvent = { - - case MoneyTransferCreatedEvent(withDetails) => copy(state=TransferStates.INITIAL, details=withDetails) - case DebitRecordedEvent(_) => copy(state=TransferStates.DEBITED) - case TransferFailedDueToInsufficientFundsEvent() => copy(state=TransferStates.FAILED_DUE_TO_INSUFFICIENT_FUNDS) - case CreditRecordedEvent(_) => copy(state=TransferStates.COMPLETED) - - } - -} diff --git a/scala-spring/transactions-command-side-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/transactions/MoneyTransferCommands.scala b/scala-spring/transactions-command-side-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/transactions/MoneyTransferCommands.scala deleted file mode 100644 index 1c2992a..0000000 --- a/scala-spring/transactions-command-side-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/transactions/MoneyTransferCommands.scala +++ /dev/null @@ -1,15 +0,0 @@ -package net.chrisrichardson.eventstore.examples.bank.transactions - -import net.chrisrichardson.eventstore.{Command, EntityId} -import net.chrisrichardson.eventstore.examples.bank.backend.common.transactions.TransferDetails - -object MoneyTransferCommands { - - sealed trait MoneyTransferCommand extends Command - - case class CreateMoneyTransferCommand(details : TransferDetails) extends MoneyTransferCommand - case class RecordDebitCommand(accountId : EntityId) extends MoneyTransferCommand - case class RecordDebitFailedDueToInsufficientFundsCommand(accountId : EntityId) extends MoneyTransferCommand - case class RecordCreditCommand(accountId : EntityId) extends MoneyTransferCommand - -} diff --git a/scala-spring/transactions-command-side-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/transactions/MoneyTransferEventHandlers.scala b/scala-spring/transactions-command-side-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/transactions/MoneyTransferEventHandlers.scala deleted file mode 100644 index 92a43f3..0000000 --- a/scala-spring/transactions-command-side-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/transactions/MoneyTransferEventHandlers.scala +++ /dev/null @@ -1,34 +0,0 @@ -package net.chrisrichardson.eventstore.examples.bank.transactions - -import net.chrisrichardson.eventstore.EventStore -import net.chrisrichardson.eventstore.examples.bank.backend.common.accounts._ -import net.chrisrichardson.eventstore.examples.bank.transactions.MoneyTransferCommands.{RecordDebitFailedDueToInsufficientFundsCommand, RecordCreditCommand, RecordDebitCommand} -import net.chrisrichardson.eventstore.subscriptions.{CompoundEventHandler, EventSubscriber} -import net.chrisrichardson.eventstore.util.EventHandlingUtil._ -import net.chrisrichardson.eventstore.subscriptions.EventHandler - -@EventSubscriber (id = "transactionEventHandlers") -class MoneyTransferEventHandlers(implicit eventStore: EventStore) - extends CompoundEventHandler { - - @EventHandler - val recordDebit = - handlerForEvent[AccountDebitedEvent] { de => - existingEntity[MoneyTransfer](de.event.transactionId) <== - RecordDebitCommand(de.entityId) - } - - @EventHandler - val recordCredit = - handlerForEvent[AccountCreditedEvent] { de => - existingEntity[MoneyTransfer](de.event.transactionId) <== - RecordCreditCommand(de.entityId) - } - - @EventHandler - val recordDebitFailed = - handlerForEvent[AccountDebitFailedDueToInsufficientFundsEvent] { de => - existingEntity[MoneyTransfer](de.event.transactionId) <== - RecordDebitFailedDueToInsufficientFundsCommand(de.entityId) - } -} diff --git a/scala-spring/transactions-command-side-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/transactions/MoneyTransferService.scala b/scala-spring/transactions-command-side-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/transactions/MoneyTransferService.scala deleted file mode 100644 index 2652472..0000000 --- a/scala-spring/transactions-command-side-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/transactions/MoneyTransferService.scala +++ /dev/null @@ -1,13 +0,0 @@ -package net.chrisrichardson.eventstore.examples.bank.transactions - -import net.chrisrichardson.eventstore.EventStore -import net.chrisrichardson.eventstore.examples.bank.backend.common.transactions.TransferDetails -import net.chrisrichardson.eventstore.examples.bank.transactions.MoneyTransferCommands.CreateMoneyTransferCommand -import net.chrisrichardson.eventstore.util.ServiceUtil._ - -class MoneyTransferService(implicit eventStore : EventStore) { - - def transferMoney(transferDetails : TransferDetails) = - newEntity[MoneyTransfer] <== CreateMoneyTransferCommand(transferDetails) - -} diff --git a/scala-spring/transactions-command-side-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/transactions/TransactionConfiguration.scala b/scala-spring/transactions-command-side-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/transactions/TransactionConfiguration.scala deleted file mode 100644 index 73fff8d..0000000 --- a/scala-spring/transactions-command-side-backend/src/main/scala/net/chrisrichardson/eventstore/examples/bank/transactions/TransactionConfiguration.scala +++ /dev/null @@ -1,18 +0,0 @@ -package net.chrisrichardson.eventstore.examples.bank.transactions - -import net.chrisrichardson.eventstore.EventStore -import net.chrisrichardson.eventstore.subscriptions.EnableEventHandlers -import org.springframework.context.annotation.{Bean, Configuration} - -@Configuration -@EnableEventHandlers -class TransactionConfiguration { - - @Bean - def accountTransactionService(eventStore : EventStore) = new MoneyTransferService()(eventStore) - - @Bean - def moneyTransferWorkflow(eventStore: EventStore): MoneyTransferEventHandlers = { - new MoneyTransferEventHandlers()(eventStore) - } -} diff --git a/scala-spring/transactions-command-side-service/build.gradle b/scala-spring/transactions-command-side-service/build.gradle deleted file mode 100644 index 033dc31..0000000 --- a/scala-spring/transactions-command-side-service/build.gradle +++ /dev/null @@ -1,22 +0,0 @@ -apply plugin: 'scala' -apply plugin: 'spring-boot' -apply plugin: VerifyEventStoreEnvironmentPlugin - -dependencies { - compile "org.scala-lang:scala-library:2.10.2" - compile project(":transactions-command-side-web") - - compile "org.springframework.boot:spring-boot-starter-web" - compile "org.springframework.boot:spring-boot-starter-actuator" - - compile "net.chrisrichardson.eventstore.client:eventstore-http-stomp-client_2.10:$eventStoreClientVersion" - - testCompile "org.springframework.boot:spring-boot-starter-test" - testCompile scalaTestDependency - -} - -test { - ignoreFailures true -} - diff --git a/scala-spring/transactions-command-side-service/src/main/scala/net/chrisrichardson/eventstore/examples/bank/web/TransactionsCommandSideServiceConfiguration.scala b/scala-spring/transactions-command-side-service/src/main/scala/net/chrisrichardson/eventstore/examples/bank/web/TransactionsCommandSideServiceConfiguration.scala deleted file mode 100644 index b3ae274..0000000 --- a/scala-spring/transactions-command-side-service/src/main/scala/net/chrisrichardson/eventstore/examples/bank/web/TransactionsCommandSideServiceConfiguration.scala +++ /dev/null @@ -1,24 +0,0 @@ -package net.chrisrichardson.eventstore.examples.bank.web - -import net.chrisrichardson.eventstore.client.config.EventStoreHttpClientConfiguration -import net.chrisrichardson.eventstore.examples.bank.web.transactions.CommandSideWebTransactionsConfiguration -import net.chrisrichardson.eventstore.json.EventStoreCommonObjectMapping -import org.springframework.boot.autoconfigure.EnableAutoConfiguration -import org.springframework.boot.autoconfigure.web.HttpMessageConverters -import org.springframework.context.annotation._ -import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter - -@Configuration -@EnableAutoConfiguration -@Import(Array(classOf[CommandSideWebTransactionsConfiguration], classOf[EventStoreHttpClientConfiguration])) -@ComponentScan -class TransactionsCommandSideServiceConfiguration { - - @Bean - def scalaJSonConverter: HttpMessageConverters = { - val additional = new MappingJackson2HttpMessageConverter - additional.setObjectMapper(EventStoreCommonObjectMapping.getObjectMapper) - new HttpMessageConverters(additional) - } - -} diff --git a/scala-spring/transactions-command-side-service/src/main/scala/net/chrisrichardson/eventstore/examples/bank/web/main/TransactionsCommandSideServiceMain.scala b/scala-spring/transactions-command-side-service/src/main/scala/net/chrisrichardson/eventstore/examples/bank/web/main/TransactionsCommandSideServiceMain.scala deleted file mode 100644 index f9a3728..0000000 --- a/scala-spring/transactions-command-side-service/src/main/scala/net/chrisrichardson/eventstore/examples/bank/web/main/TransactionsCommandSideServiceMain.scala +++ /dev/null @@ -1,10 +0,0 @@ -package net.chrisrichardson.eventstore.examples.bank.web.main - -import net.chrisrichardson.eventstore.examples.bank.web.TransactionsCommandSideServiceConfiguration -import org.springframework.boot.SpringApplication - -object TransactionsCommandSideServiceMain { - - def main(args: Array[String]) : Unit = SpringApplication.run(classOf[TransactionsCommandSideServiceConfiguration], args :_ *) - -} diff --git a/scala-spring/transactions-command-side-service/src/test/scala/net/chrisrichardson/eventstore/examples/bank/web/TransactionsCommandSideServiceIntegrationTest.scala b/scala-spring/transactions-command-side-service/src/test/scala/net/chrisrichardson/eventstore/examples/bank/web/TransactionsCommandSideServiceIntegrationTest.scala deleted file mode 100644 index 8465635..0000000 --- a/scala-spring/transactions-command-side-service/src/test/scala/net/chrisrichardson/eventstore/examples/bank/web/TransactionsCommandSideServiceIntegrationTest.scala +++ /dev/null @@ -1,30 +0,0 @@ -package net.chrisrichardson.eventstore.examples.bank.web - -import org.junit.runner.RunWith -import org.scalatest.FlatSpec -import org.scalatest.concurrent.Eventually._ -import org.scalatest.junit.JUnitRunner -import org.scalatest.time.{Millis, Span} -import org.springframework.boot.SpringApplication -import org.springframework.web.client.RestTemplate - -@RunWith(classOf[JUnitRunner]) -class TransactionsCommandSideServiceIntegrationTest extends FlatSpec { - - val sa = new SpringApplication(classOf[TransactionsCommandSideServiceTestConfiguration]) - val ctx = sa.run() - - // var server = ctx.getBean(classOf[EmbeddedServletContainer]) - - val port = 8080 - - val baseUrl = s"http://localhost:$port/" - - val restTemplate = ctx.getBean(classOf[RestTemplate]) - - implicit val reallyLongPatienceConfig = PatienceConfig(timeout = Span(10 * 1000, Millis), interval = Span(1 * 1000, Millis)) - - it should "create accounts and transfer money" in { - // FIXME - } -} diff --git a/scala-spring/transactions-command-side-service/src/test/scala/net/chrisrichardson/eventstore/examples/bank/web/TransactionsCommandSideServiceTestConfiguration.scala b/scala-spring/transactions-command-side-service/src/test/scala/net/chrisrichardson/eventstore/examples/bank/web/TransactionsCommandSideServiceTestConfiguration.scala deleted file mode 100644 index 3cf4b2b..0000000 --- a/scala-spring/transactions-command-side-service/src/test/scala/net/chrisrichardson/eventstore/examples/bank/web/TransactionsCommandSideServiceTestConfiguration.scala +++ /dev/null @@ -1,27 +0,0 @@ -package net.chrisrichardson.eventstore.examples.bank.web - - -import com.fasterxml.jackson.databind.ObjectMapper -import net.chrisrichardson.eventstore.json.EventStoreCommonObjectMapping -import org.springframework.boot.autoconfigure.EnableAutoConfiguration -import org.springframework.context.annotation.{Bean, Import, Configuration} -import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter -import org.springframework.web.client.RestTemplate -import scala.collection.JavaConversions._ - -@Configuration -@Import(Array(classOf[TransactionsCommandSideServiceConfiguration])) -class TransactionsCommandSideServiceTestConfiguration { - - @Bean - def restTemplate() = { - val restTemplate = new RestTemplate() - restTemplate.getMessageConverters foreach { - case mc: MappingJackson2HttpMessageConverter => - mc.setObjectMapper(EventStoreCommonObjectMapping.getObjectMapper) - case _ => - } - restTemplate - } - -} diff --git a/scala-spring/transactions-command-side-web/build.gradle b/scala-spring/transactions-command-side-web/build.gradle deleted file mode 100644 index 3f6f7fd..0000000 --- a/scala-spring/transactions-command-side-web/build.gradle +++ /dev/null @@ -1,10 +0,0 @@ -apply plugin: 'scala' - -dependencies { - compile "org.scala-lang:scala-library:2.10.2" - compile project(":transactions-command-side-backend") - compile project(":common-web") - - testCompile "org.springframework.boot:spring-boot-starter-test:$springBootVersion" - testCompile scalaTestDependency -} diff --git a/scala-spring/transactions-command-side-web/src/main/scala/net/chrisrichardson/eventstore/examples/bank/web/transactions/CommandSideWebTransactionsConfiguration.scala b/scala-spring/transactions-command-side-web/src/main/scala/net/chrisrichardson/eventstore/examples/bank/web/transactions/CommandSideWebTransactionsConfiguration.scala deleted file mode 100644 index 49f1194..0000000 --- a/scala-spring/transactions-command-side-web/src/main/scala/net/chrisrichardson/eventstore/examples/bank/web/transactions/CommandSideWebTransactionsConfiguration.scala +++ /dev/null @@ -1,11 +0,0 @@ -package net.chrisrichardson.eventstore.examples.bank.web.transactions - -import net.chrisrichardson.eventstore.examples.bank.transactions.TransactionConfiguration -import org.springframework.context.annotation.{ComponentScan, Configuration, Import} - -@Configuration -@Import(Array(classOf[TransactionConfiguration])) -@ComponentScan -class CommandSideWebTransactionsConfiguration { - -} diff --git a/scala-spring/transactions-command-side-web/src/main/scala/net/chrisrichardson/eventstore/examples/bank/web/transactions/controllers/CreateMoneyTransferResponse.scala b/scala-spring/transactions-command-side-web/src/main/scala/net/chrisrichardson/eventstore/examples/bank/web/transactions/controllers/CreateMoneyTransferResponse.scala deleted file mode 100644 index 18ff348..0000000 --- a/scala-spring/transactions-command-side-web/src/main/scala/net/chrisrichardson/eventstore/examples/bank/web/transactions/controllers/CreateMoneyTransferResponse.scala +++ /dev/null @@ -1,11 +0,0 @@ -package net.chrisrichardson.eventstore.examples.bank.web.transactions.controllers - -import net.chrisrichardson.eventstore.EntityId -import net.chrisrichardson.eventstore.examples.bank.transactions.TransferStates - -case class CreateMoneyTransferResponse(transactionId : String) - -case class MoneyTransferRequest(fromAccountId : EntityId, toAccountId : EntityId, amount: BigDecimal) - -case class GetMoneyTransferResponse(transactionId : String, status : String) - diff --git a/scala-spring/transactions-command-side-web/src/main/scala/net/chrisrichardson/eventstore/examples/bank/web/transactions/controllers/MoneyTransferController.scala b/scala-spring/transactions-command-side-web/src/main/scala/net/chrisrichardson/eventstore/examples/bank/web/transactions/controllers/MoneyTransferController.scala deleted file mode 100644 index 7b0575b..0000000 --- a/scala-spring/transactions-command-side-web/src/main/scala/net/chrisrichardson/eventstore/examples/bank/web/transactions/controllers/MoneyTransferController.scala +++ /dev/null @@ -1,30 +0,0 @@ -package net.chrisrichardson.eventstore.examples.bank.web.transactions.controllers - -import net.chrisrichardson.eventstore.EntityId -import net.chrisrichardson.eventstore.EventStore -import net.chrisrichardson.eventstore.examples.bank.backend.common.transactions.TransferDetails -import net.chrisrichardson.eventstore.examples.bank.transactions.{MoneyTransferService, MoneyTransfer} -import net.chrisrichardson.eventstore.examples.bank.web.util.WebUtil -import org.springframework.beans.factory.annotation.Autowired -import org.springframework.web.bind.annotation._ - -import scala.concurrent.ExecutionContext.Implicits.global - -@RestController -class MoneyTransferController @Autowired()(moneyTransferService : MoneyTransferService, - eventStore : EventStore) { - - @RequestMapping(value=Array("/transfers"), method = Array(RequestMethod.POST)) - def create(@RequestBody transferDetails : TransferDetails) = WebUtil.toDeferredResult { - for (transaction <- moneyTransferService.transferMoney(transferDetails)) - yield CreateMoneyTransferResponse(transaction.entityId.id) - } - - @RequestMapping(value=Array("/transfers/{transferId}"), method = Array(RequestMethod.GET)) - def get(@PathVariable transferId : String) = { - val f = eventStore.find[MoneyTransfer](EntityId(transferId)) - WebUtil.toDeferredResult(f map(transactionAggregate => GetMoneyTransferResponse(transferId, transactionAggregate.entity.state.getClass.getSimpleName))) - } - -} - diff --git a/wait-for-docker-services.sh b/wait-for-docker-services.sh deleted file mode 100755 index d9a856f..0000000 --- a/wait-for-docker-services.sh +++ /dev/null @@ -1,9 +0,0 @@ -while [[ true ]]; do - nc -z -w 4 ${SERVICE_HOST?} 8080 && nc -z -w 4 ${SERVICE_HOST?} 8081 && nc -z -w 4 ${SERVICE_HOST?} 8082 - if [[ "$?" -eq "0" ]]; then - echo connected - break - fi - echo -n . - sleep 1 -done \ No newline at end of file diff --git a/wait-for-services.sh b/wait-for-services.sh deleted file mode 100755 index 7107e42..0000000 --- a/wait-for-services.sh +++ /dev/null @@ -1,26 +0,0 @@ -#! /bin/bash - -done=false - -host=$1 -shift -ports=$* - -while [[ "$done" = false ]]; do - for port in $ports; do - curl -q http://${host}:${port}/health >& /dev/null - if [[ "$?" -eq "0" ]]; then - done=true - else - done=false - break - fi - done - if [[ "$done" = true ]]; then - echo connected - break; - fi - #curl -q http://${1?}:8080/health >& /dev/null && curl -q http://${1?}:8081/health >& /dev/null && curl -q http://${1?}:8082/health >& /dev/null - echo -n . - sleep 1 -done