From e143d0f49b00149664ca31024f4090c2439bc1f1 Mon Sep 17 00:00:00 2001 From: dartpopikyardo Date: Mon, 3 Oct 2016 22:50:34 +0300 Subject: [PATCH 01/13] - improved build-and-test-all-eventuate-local.sh and _build-and-test-all.sh: use EVENTUATE_LOCAL environment variable --- _build-and-test-all.sh | 2 +- java-spring/build-and-test-all-eventuate-local.sh | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/_build-and-test-all.sh b/_build-and-test-all.sh index d42d286..102d73f 100755 --- a/_build-and-test-all.sh +++ b/_build-and-test-all.sh @@ -46,7 +46,7 @@ export SERVICE_HOST=$DOCKER_HOST_IP ./gradlew $* build -x :e2e-test:test -if [ -z "$EVENTUATE_API_KEY_ID" -o -z "$EVENTUATE_API_KEY_SECRET" ] ; then +if [ -z "$EVENTUATE_LOCAL" ] && [ -z "$EVENTUATE_API_KEY_ID" -o -z "$EVENTUATE_API_KEY_SECRET" ] ; then echo You must set EVENTUATE_API_KEY_ID and EVENTUATE_API_KEY_SECRET exit -1 fi diff --git a/java-spring/build-and-test-all-eventuate-local.sh b/java-spring/build-and-test-all-eventuate-local.sh index 7647cab..d5c1dc1 100755 --- a/java-spring/build-and-test-all-eventuate-local.sh +++ b/java-spring/build-and-test-all-eventuate-local.sh @@ -2,4 +2,5 @@ export JAVA_OPTS="-Xmx128m -Xms128m" export EXTRA_INFRASTRUCTURE_SERVICES=cdcservice -../_build-and-test-all.sh -f docker-compose-eventuate-local.yml -P eventuateDriver=local $* +export EVENTUATE_LOCAL=yes +../_build-and-test-all.sh -f docker-compose-eventuate-local.yml $* -P eventuateDriver=local From db05a80e01bbd0d7896afab558db74dbe6b6e0e5 Mon Sep 17 00:00:00 2001 From: dartpopikyardo Date: Fri, 7 Oct 2016 20:10:51 +0300 Subject: [PATCH 02/13] fixed logback files --- java-spring/api-gateway-service/src/main/resources/logback.xml | 2 +- java-spring/common-backend/src/main/resources/logback.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-spring/api-gateway-service/src/main/resources/logback.xml b/java-spring/api-gateway-service/src/main/resources/logback.xml index 3469522..ee9420b 100755 --- a/java-spring/api-gateway-service/src/main/resources/logback.xml +++ b/java-spring/api-gateway-service/src/main/resources/logback.xml @@ -18,7 +18,7 @@ - + \ No newline at end of file diff --git a/java-spring/common-backend/src/main/resources/logback.xml b/java-spring/common-backend/src/main/resources/logback.xml index ce0479c..654ade8 100644 --- a/java-spring/common-backend/src/main/resources/logback.xml +++ b/java-spring/common-backend/src/main/resources/logback.xml @@ -16,7 +16,7 @@ - + From 1c0ae8a38cf59d31248e38614cb50640f17a95a5 Mon Sep 17 00:00:00 2001 From: dartpopikyardo Date: Mon, 10 Oct 2016 21:05:35 +0300 Subject: [PATCH 03/13] converted all docker-compose files to use build: rather than volumes for images --- .../accounts-command-side-service/Dockerfile | 5 +++++ .../accounts-query-side-service/Dockerfile | 5 +++++ java-spring/api-gateway-service/Dockerfile | 6 ++++++ .../customers-command-side-service/Dockerfile | 5 +++++ .../customers-query-side-service/Dockerfile | 5 +++++ java-spring/docker-compose-common.yml | 18 ++++++------------ java-spring/docker-compose-eventuate-local.yml | 14 -------------- java-spring/docker-compose.yml | 12 ------------ .../Dockerfile | 5 +++++ 9 files changed, 37 insertions(+), 38 deletions(-) create mode 100644 java-spring/accounts-command-side-service/Dockerfile create mode 100644 java-spring/accounts-query-side-service/Dockerfile create mode 100644 java-spring/api-gateway-service/Dockerfile create mode 100644 java-spring/customers-command-side-service/Dockerfile create mode 100644 java-spring/customers-query-side-service/Dockerfile create mode 100644 java-spring/transactions-command-side-service/Dockerfile diff --git a/java-spring/accounts-command-side-service/Dockerfile b/java-spring/accounts-command-side-service/Dockerfile new file mode 100644 index 0000000..deb6ed0 --- /dev/null +++ b/java-spring/accounts-command-side-service/Dockerfile @@ -0,0 +1,5 @@ +FROM java:openjdk-8u91-jdk +RUN mkdir /app +WORKDIR /app +COPY ./build/libs /app +CMD java ${JAVA_OPTS} -jar /app/accounts-command-side-service.jar diff --git a/java-spring/accounts-query-side-service/Dockerfile b/java-spring/accounts-query-side-service/Dockerfile new file mode 100644 index 0000000..204b9d1 --- /dev/null +++ b/java-spring/accounts-query-side-service/Dockerfile @@ -0,0 +1,5 @@ +FROM java:openjdk-8u91-jdk +RUN mkdir /app +WORKDIR /app +COPY ./build/libs /app +CMD java ${JAVA_OPTS} -jar /app/accounts-query-side-service.jar diff --git a/java-spring/api-gateway-service/Dockerfile b/java-spring/api-gateway-service/Dockerfile new file mode 100644 index 0000000..29f38f0 --- /dev/null +++ b/java-spring/api-gateway-service/Dockerfile @@ -0,0 +1,6 @@ +FROM java:openjdk-8u91-jdk +RUN mkdir /app +WORKDIR /app +COPY ./build/libs /app +CMD java ${JAVA_OPTS} -jar /app/api-gateway-service.jar --accounts.commandside.service.host=accountscommandside --transfers.commandside.service.host=transactionscommandside --accounts.queryside.service.host=accountsqueryside --customers.commandside.service.host=customerscommandside --customers.queryside.service.host=customersqueryside + diff --git a/java-spring/customers-command-side-service/Dockerfile b/java-spring/customers-command-side-service/Dockerfile new file mode 100644 index 0000000..4cea95e --- /dev/null +++ b/java-spring/customers-command-side-service/Dockerfile @@ -0,0 +1,5 @@ +FROM java:openjdk-8u91-jdk +RUN mkdir /app +WORKDIR /app +COPY ./build/libs /app +CMD java ${JAVA_OPTS} -jar /app/customers-command-side-service.jar diff --git a/java-spring/customers-query-side-service/Dockerfile b/java-spring/customers-query-side-service/Dockerfile new file mode 100644 index 0000000..4bb9024 --- /dev/null +++ b/java-spring/customers-query-side-service/Dockerfile @@ -0,0 +1,5 @@ +FROM java:openjdk-8u91-jdk +RUN mkdir /app +WORKDIR /app +COPY ./build/libs /app +CMD java ${JAVA_OPTS} -jar /app/customers-query-side-service.jar diff --git a/java-spring/docker-compose-common.yml b/java-spring/docker-compose-common.yml index 5116036..66956b6 100644 --- a/java-spring/docker-compose-common.yml +++ b/java-spring/docker-compose-common.yml @@ -1,40 +1,34 @@ apigateway: - image: java:openjdk-8u91-jdk - command: java ${JAVA_OPTS} -jar /app/api-gateway-service.jar --accounts.commandside.service.host=accountscommandside --transfers.commandside.service.host=transactionscommandside --accounts.queryside.service.host=accountsqueryside --customers.commandside.service.host=customerscommandside --customers.queryside.service.host=customersqueryside + build: ./api-gateway-service/ environment: SPRING_DATA_MONGODB_URI: mongodb://mongodb/mydb ports: - "8080:8080" accountscommandside: - image: java:openjdk-8u91-jdk - command: java ${JAVA_OPTS} -jar /app/accounts-command-side-service.jar + build: ./accounts-command-side-service/ ports: - "8085:8080" transactionscommandside: - image: java:openjdk-8u91-jdk - command: java ${JAVA_OPTS} -jar /app/transactions-command-side-service.jar + build: ./transactions-command-side-service/ ports: - "8082:8080" accountsqueryside: - image: java:openjdk-8u91-jdk - command: java ${JAVA_OPTS} -jar /app/accounts-query-side-service.jar + build: ./accounts-query-side-service/ environment: SPRING_DATA_MONGODB_URI: mongodb://mongodb/mydb ports: - "8081:8080" customerscommandside: - image: java:openjdk-8u91-jdk - command: java ${JAVA_OPTS} -jar /app/customers-command-side-service.jar + build: ./customers-command-side-service/ ports: - "8083:8080" customersqueryside: - image: java:openjdk-8u91-jdk - command: java ${JAVA_OPTS} -jar /app/customers-query-side-service.jar + build: ./customers-query-side-service/ ports: - "8084:8080" environment: diff --git a/java-spring/docker-compose-eventuate-local.yml b/java-spring/docker-compose-eventuate-local.yml index 7807871..4c07d2e 100644 --- a/java-spring/docker-compose-eventuate-local.yml +++ b/java-spring/docker-compose-eventuate-local.yml @@ -54,8 +54,6 @@ apigateway: extends: file: docker-compose-common.yml service: apigateway - volumes: - - ./api-gateway-service/build/libs:/app links: - accountscommandside - transactionscommandside @@ -68,8 +66,6 @@ accountscommandside: extends: file: docker-compose-common.yml service: accountscommandside - volumes: - - ./accounts-command-side-service/build/libs:/app links: - mysql - kafka @@ -89,8 +85,6 @@ transactionscommandside: extends: file: docker-compose-common.yml service: transactionscommandside - volumes: - - ./transactions-command-side-service/build/libs:/app links: - mysql - kafka @@ -105,14 +99,10 @@ transactionscommandside: EVENTUATELOCAL_CDC_DB_USER_NAME: root EVENTUATELOCAL_CDC_DB_PASSWORD: rootpassword - - accountsqueryside: extends: file: docker-compose-common.yml service: accountsqueryside - volumes: - - ./accounts-query-side-service/build/libs:/app links: - mongodb - mysql @@ -134,8 +124,6 @@ customerscommandside: extends: file: docker-compose-common.yml service: customerscommandside - volumes: - - ./customers-command-side-service/build/libs:/app links: - mysql - kafka @@ -154,8 +142,6 @@ customersqueryside: extends: file: docker-compose-common.yml service: customersqueryside - volumes: - - ./customers-query-side-service/build/libs:/app links: - mongodb - mysql diff --git a/java-spring/docker-compose.yml b/java-spring/docker-compose.yml index e5d3625..e64c3f8 100644 --- a/java-spring/docker-compose.yml +++ b/java-spring/docker-compose.yml @@ -2,8 +2,6 @@ apigateway: extends: file: docker-compose-common.yml service: apigateway - volumes: - - ./api-gateway-service/build/libs:/app links: - accountscommandside - transactionscommandside @@ -16,8 +14,6 @@ accountscommandside: extends: file: docker-compose-common.yml service: accountscommandside - volumes: - - ./accounts-command-side-service/build/libs:/app environment: EVENTUATE_API_KEY_ID: ${EVENTUATE_API_KEY_ID} EVENTUATE_API_KEY_SECRET: ${EVENTUATE_API_KEY_SECRET} @@ -26,8 +22,6 @@ transactionscommandside: extends: file: docker-compose-common.yml service: transactionscommandside - volumes: - - ./transactions-command-side-service/build/libs:/app environment: EVENTUATE_API_KEY_ID: ${EVENTUATE_API_KEY_ID} EVENTUATE_API_KEY_SECRET: ${EVENTUATE_API_KEY_SECRET} @@ -37,8 +31,6 @@ accountsqueryside: extends: file: docker-compose-common.yml service: accountsqueryside - volumes: - - ./accounts-query-side-service/build/libs:/app links: - mongodb environment: @@ -49,8 +41,6 @@ customerscommandside: extends: file: docker-compose-common.yml service: customerscommandside - volumes: - - ./customers-command-side-service/build/libs:/app environment: EVENTUATE_API_KEY_ID: ${EVENTUATE_API_KEY_ID} EVENTUATE_API_KEY_SECRET: ${EVENTUATE_API_KEY_SECRET} @@ -60,8 +50,6 @@ customersqueryside: file: docker-compose-common.yml service: customersqueryside image: java:openjdk-8u91-jdk - volumes: - - ./customers-query-side-service/build/libs:/app links: - mongodb environment: diff --git a/java-spring/transactions-command-side-service/Dockerfile b/java-spring/transactions-command-side-service/Dockerfile new file mode 100644 index 0000000..2a67c69 --- /dev/null +++ b/java-spring/transactions-command-side-service/Dockerfile @@ -0,0 +1,5 @@ +FROM java:openjdk-8u91-jdk +RUN mkdir /app +WORKDIR /app +COPY ./build/libs /app +CMD java ${JAVA_OPTS} -jar /app/transactions-command-side-service.jar From 106ee9ee54f63261ce02030a79cf8fd86ec71134 Mon Sep 17 00:00:00 2001 From: dartpopikyardo Date: Mon, 10 Oct 2016 21:21:16 +0300 Subject: [PATCH 04/13] fixed docker-compose script --- java-spring/docker-compose.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/java-spring/docker-compose.yml b/java-spring/docker-compose.yml index e64c3f8..306988c 100644 --- a/java-spring/docker-compose.yml +++ b/java-spring/docker-compose.yml @@ -49,7 +49,6 @@ customersqueryside: extends: file: docker-compose-common.yml service: customersqueryside - image: java:openjdk-8u91-jdk links: - mongodb environment: From c8b0185591d934e3ae18c5637bac833aa832c073 Mon Sep 17 00:00:00 2001 From: dartpopikyardo Date: Mon, 10 Oct 2016 21:36:31 +0300 Subject: [PATCH 05/13] fixed docker-compose script --- java-spring/docker-compose.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/java-spring/docker-compose.yml b/java-spring/docker-compose.yml index 306988c..6c1e7cb 100644 --- a/java-spring/docker-compose.yml +++ b/java-spring/docker-compose.yml @@ -36,6 +36,7 @@ accountsqueryside: environment: EVENTUATE_API_KEY_ID: ${EVENTUATE_API_KEY_ID} EVENTUATE_API_KEY_SECRET: ${EVENTUATE_API_KEY_SECRET} + SPRING_DATA_MONGODB_URI: mongodb://mongodb/mydb customerscommandside: extends: @@ -54,6 +55,7 @@ customersqueryside: environment: EVENTUATE_API_KEY_ID: ${EVENTUATE_API_KEY_ID} EVENTUATE_API_KEY_SECRET: ${EVENTUATE_API_KEY_SECRET} + SPRING_DATA_MONGODB_URI: mongodb://mongodb/mydb mongodb: extends: From f4a7dbe204304e26ee75f973c9d8ba6e4683ed39 Mon Sep 17 00:00:00 2001 From: dartpopikyardo Date: Mon, 10 Oct 2016 21:55:27 +0300 Subject: [PATCH 06/13] fixed docker-compose script --- java-spring/docker-compose.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/java-spring/docker-compose.yml b/java-spring/docker-compose.yml index 6c1e7cb..306988c 100644 --- a/java-spring/docker-compose.yml +++ b/java-spring/docker-compose.yml @@ -36,7 +36,6 @@ accountsqueryside: environment: EVENTUATE_API_KEY_ID: ${EVENTUATE_API_KEY_ID} EVENTUATE_API_KEY_SECRET: ${EVENTUATE_API_KEY_SECRET} - SPRING_DATA_MONGODB_URI: mongodb://mongodb/mydb customerscommandside: extends: @@ -55,7 +54,6 @@ customersqueryside: environment: EVENTUATE_API_KEY_ID: ${EVENTUATE_API_KEY_ID} EVENTUATE_API_KEY_SECRET: ${EVENTUATE_API_KEY_SECRET} - SPRING_DATA_MONGODB_URI: mongodb://mongodb/mydb mongodb: extends: From 623554b550dcf916642737e35753b0c732eac7b2 Mon Sep 17 00:00:00 2001 From: dartpopikyardo Date: Tue, 11 Oct 2016 22:03:17 +0300 Subject: [PATCH 07/13] - simplified Dockerfiles --- java-spring/accounts-command-side-service/Dockerfile | 7 +++---- java-spring/accounts-query-side-service/Dockerfile | 7 +++---- java-spring/api-gateway-service/Dockerfile | 8 +++----- java-spring/customers-command-side-service/Dockerfile | 7 +++---- java-spring/customers-query-side-service/Dockerfile | 7 +++---- java-spring/docker-compose-common.yml | 10 ++++++++-- .../transactions-command-side-service/Dockerfile | 7 +++---- 7 files changed, 26 insertions(+), 27 deletions(-) diff --git a/java-spring/accounts-command-side-service/Dockerfile b/java-spring/accounts-command-side-service/Dockerfile index deb6ed0..89c87f9 100644 --- a/java-spring/accounts-command-side-service/Dockerfile +++ b/java-spring/accounts-command-side-service/Dockerfile @@ -1,5 +1,4 @@ FROM java:openjdk-8u91-jdk -RUN mkdir /app -WORKDIR /app -COPY ./build/libs /app -CMD java ${JAVA_OPTS} -jar /app/accounts-command-side-service.jar +CMD java ${JAVA_OPTS} -jar accounts-command-side-service.jar +EXPOSE 8080 +COPY build/libs/accounts-command-side-service.jar . \ No newline at end of file diff --git a/java-spring/accounts-query-side-service/Dockerfile b/java-spring/accounts-query-side-service/Dockerfile index 204b9d1..d6db46b 100644 --- a/java-spring/accounts-query-side-service/Dockerfile +++ b/java-spring/accounts-query-side-service/Dockerfile @@ -1,5 +1,4 @@ FROM java:openjdk-8u91-jdk -RUN mkdir /app -WORKDIR /app -COPY ./build/libs /app -CMD java ${JAVA_OPTS} -jar /app/accounts-query-side-service.jar +CMD java ${JAVA_OPTS} -jar accounts-query-side-service.jar +EXPOSE 8080 +COPY build/libs/accounts-query-side-service.jar . diff --git a/java-spring/api-gateway-service/Dockerfile b/java-spring/api-gateway-service/Dockerfile index 29f38f0..21de9fd 100644 --- a/java-spring/api-gateway-service/Dockerfile +++ b/java-spring/api-gateway-service/Dockerfile @@ -1,6 +1,4 @@ FROM java:openjdk-8u91-jdk -RUN mkdir /app -WORKDIR /app -COPY ./build/libs /app -CMD java ${JAVA_OPTS} -jar /app/api-gateway-service.jar --accounts.commandside.service.host=accountscommandside --transfers.commandside.service.host=transactionscommandside --accounts.queryside.service.host=accountsqueryside --customers.commandside.service.host=customerscommandside --customers.queryside.service.host=customersqueryside - +CMD java ${JAVA_OPTS} -jar api-gateway-service.jar +EXPOSE 8080 +COPY build/libs/api-gateway-service.jar . diff --git a/java-spring/customers-command-side-service/Dockerfile b/java-spring/customers-command-side-service/Dockerfile index 4cea95e..ec276ae 100644 --- a/java-spring/customers-command-side-service/Dockerfile +++ b/java-spring/customers-command-side-service/Dockerfile @@ -1,5 +1,4 @@ FROM java:openjdk-8u91-jdk -RUN mkdir /app -WORKDIR /app -COPY ./build/libs /app -CMD java ${JAVA_OPTS} -jar /app/customers-command-side-service.jar +CMD java ${JAVA_OPTS} -jar customers-command-side-service.jar +EXPOSE 8080 +COPY build/libs/customers-command-side-service.jar . diff --git a/java-spring/customers-query-side-service/Dockerfile b/java-spring/customers-query-side-service/Dockerfile index 4bb9024..11abbc1 100644 --- a/java-spring/customers-query-side-service/Dockerfile +++ b/java-spring/customers-query-side-service/Dockerfile @@ -1,5 +1,4 @@ FROM java:openjdk-8u91-jdk -RUN mkdir /app -WORKDIR /app -COPY ./build/libs /app -CMD java ${JAVA_OPTS} -jar /app/customers-query-side-service.jar +CMD java ${JAVA_OPTS} -jar customers-query-side-service.jar +EXPOSE 8080 +COPY build/libs/customers-query-side-service.jar . \ No newline at end of file diff --git a/java-spring/docker-compose-common.yml b/java-spring/docker-compose-common.yml index 66956b6..1b548cd 100644 --- a/java-spring/docker-compose-common.yml +++ b/java-spring/docker-compose-common.yml @@ -1,9 +1,15 @@ apigateway: build: ./api-gateway-service/ - environment: - SPRING_DATA_MONGODB_URI: mongodb://mongodb/mydb ports: - "8080:8080" + environment: + SPRING_DATA_MONGODB_URI: mongodb://mongodb/mydb + ACCOUNTS_COMMANDSIDE_SERVICE_HOST: accountscommandside + TRANSFERS_COMMANDSIDE_SERVICE_HOST: transactionscommandside + ACCOUNTS_QUERYSIDE_SERVICE_HOST: accountsqueryside + CUSTOMERS_COMMANDSIDE_SERVICE_HOST: customerscommandside + CUSTOMERS_QUERYSIDE_SERVICE_HOST: customersqueryside + accountscommandside: build: ./accounts-command-side-service/ diff --git a/java-spring/transactions-command-side-service/Dockerfile b/java-spring/transactions-command-side-service/Dockerfile index 2a67c69..53031e0 100644 --- a/java-spring/transactions-command-side-service/Dockerfile +++ b/java-spring/transactions-command-side-service/Dockerfile @@ -1,5 +1,4 @@ FROM java:openjdk-8u91-jdk -RUN mkdir /app -WORKDIR /app -COPY ./build/libs /app -CMD java ${JAVA_OPTS} -jar /app/transactions-command-side-service.jar +CMD java ${JAVA_OPTS} -jar transactions-command-side-service.jar +EXPOSE 8080 +COPY build/libs/transactions-command-side-service.jar . \ No newline at end of file From 903a4b07a34e91d428bb74379b19a0725a11ada8 Mon Sep 17 00:00:00 2001 From: dartpopikyardo Date: Tue, 11 Oct 2016 22:35:33 +0300 Subject: [PATCH 08/13] - added docker-compose build --- _build-and-test-all.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/_build-and-test-all.sh b/_build-and-test-all.sh index 102d73f..2676f74 100755 --- a/_build-and-test-all.sh +++ b/_build-and-test-all.sh @@ -51,6 +51,7 @@ if [ -z "$EVENTUATE_LOCAL" ] && [ -z "$EVENTUATE_API_KEY_ID" -o -z "$EVENTUATE_A exit -1 fi +${DOCKER_COMPOSE?} build ${DOCKER_COMPOSE?} up -d From 5bd3f36bd8cfc4c76a66ac407085305dcb25c463 Mon Sep 17 00:00:00 2001 From: dartpopikyardo Date: Thu, 13 Oct 2016 21:15:14 +0300 Subject: [PATCH 09/13] fixed build-and-test-all script --- _build-and-test-all.sh | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/_build-and-test-all.sh b/_build-and-test-all.sh index 2676f74..7120f90 100755 --- a/_build-and-test-all.sh +++ b/_build-and-test-all.sh @@ -2,6 +2,17 @@ set -e +if [ -z "$DOCKER_HOST_IP" ] ; then + if [ -z "$DOCKER_HOST" ] ; then + export DOCKER_HOST_IP=`hostname` + else + echo using ${DOCKER_HOST?} + XX=${DOCKER_HOST%\:*} + export DOCKER_HOST_IP=${XX#tcp\:\/\/} + fi + echo set DOCKER_HOST_IP $DOCKER_HOST_IP +fi + DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" DOCKER_COMPOSE="docker-compose -p event-sourcing-examples" @@ -28,14 +39,6 @@ fi ${DOCKER_COMPOSE?} up -d mongodb $EXTRA_INFRASTRUCTURE_SERVICES -if [ -z "$DOCKER_HOST_IP" ] ; then - if which docker-machine >/dev/null; then - export DOCKER_HOST_IP=$(docker-machine ip default) - else - export DOCKER_HOST_IP=localhost - fi - echo set DOCKER_HOST_IP $DOCKER_HOST_IP -fi if [ -z "$SPRING_DATA_MONGODB_URI" ] ; then export SPRING_DATA_MONGODB_URI=mongodb://${DOCKER_HOST_IP?}/mydb From fd0a4355a75c9e66f3979aea4ac4bc39eb2cd6c5 Mon Sep 17 00:00:00 2001 From: dartpopikyardo Date: Fri, 21 Oct 2016 21:29:17 +0300 Subject: [PATCH 10/13] - updated eventuateClientVersion - updated Int128 usage --- .../accounts/AccountInfoUpdateService.java | 13 +++---------- .../queryside/accounts/AccountQueryWorkflow.java | 7 ++++--- java-spring/gradle.properties | 2 +- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/java-spring/accounts-query-side-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/queryside/accounts/AccountInfoUpdateService.java b/java-spring/accounts-query-side-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/queryside/accounts/AccountInfoUpdateService.java index 973e661..0ff9aaf 100644 --- a/java-spring/accounts-query-side-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/queryside/accounts/AccountInfoUpdateService.java +++ b/java-spring/accounts-query-side-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/queryside/accounts/AccountInfoUpdateService.java @@ -1,6 +1,7 @@ package net.chrisrichardson.eventstore.javaexamples.banking.backend.queryside.accounts; import com.mongodb.WriteResult; +import io.eventuate.Int128; import net.chrisrichardson.eventstore.javaexamples.banking.common.accounts.AccountChangeInfo; import net.chrisrichardson.eventstore.javaexamples.banking.common.accounts.AccountTransactionInfo; import net.chrisrichardson.eventstore.javaexamples.banking.common.transactions.TransferState; @@ -29,7 +30,7 @@ public AccountInfoUpdateService(AccountInfoRepository accountInfoRepository, Mon } - public void create(String accountId, String customerId, String title, BigDecimal initialBalance, String description, String version) { + public void create(String accountId, String customerId, String title, BigDecimal initialBalance, String description, Int128 version) { try { AccountChangeInfo ci = new AccountChangeInfo(); ci.setAmount(toIntegerRepr(initialBalance)); @@ -40,7 +41,7 @@ public void create(String accountId, String customerId, String title, BigDecimal .set("description", description) .set("balance", toIntegerRepr(initialBalance)) .push("changes", ci) - .set("creationDate", getFromEventId(version)) + .set("creationDate", new Date(version.getHi())) .set("version", version), AccountInfo.class); logger.info("Saved in mongo"); @@ -81,12 +82,4 @@ public void updateTransactionStatus(String accountId, String transactionId, Tran set("transactions." + transactionId + ".status", status), AccountInfo.class); } - - private Date getFromEventId(String eventId) { - String[] s = eventId.split("-"); - if (s.length != 2) { - return new Date(); - } - return new Date(Long.parseUnsignedLong(s[0], 16)); - } } diff --git a/java-spring/accounts-query-side-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/queryside/accounts/AccountQueryWorkflow.java b/java-spring/accounts-query-side-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/queryside/accounts/AccountQueryWorkflow.java index 6dd2217..5437c8e 100644 --- a/java-spring/accounts-query-side-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/queryside/accounts/AccountQueryWorkflow.java +++ b/java-spring/accounts-query-side-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/queryside/accounts/AccountQueryWorkflow.java @@ -3,6 +3,7 @@ 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; @@ -34,7 +35,7 @@ public AccountQueryWorkflow(AccountInfoUpdateService accountInfoUpdateService) { public void create(DispatchedEvent de) { AccountOpenedEvent event = de.getEvent(); String id = de.getEntityId(); - String eventId = de.getEventId().asString(); + Int128 eventId = de.getEventId(); logger.info("**************** account version=" + id + ", " + eventId); BigDecimal initialBalance = event.getInitialBalance(); @@ -57,8 +58,8 @@ public void recordTransfer(DispatchedEvent de) { String moneyTransferId = de.getEntityId(); String fromAccountId = de.getEvent().getDetails().getFromAccountId(); String toAccountId = de.getEvent().getDetails().getToAccountId(); - logger.info("**************** account version=" + fromAccountId + ", " + de.getEventId().asString()); - logger.info("**************** account version=" + toAccountId + ", " + de.getEventId().asString()); + logger.info("**************** account version=" + fromAccountId + ", " + eventId); + logger.info("**************** account version=" + toAccountId + ", " + eventId); AccountTransactionInfo ti = new AccountTransactionInfo(moneyTransferId, fromAccountId, diff --git a/java-spring/gradle.properties b/java-spring/gradle.properties index e93b4ed..9aa239b 100644 --- a/java-spring/gradle.properties +++ b/java-spring/gradle.properties @@ -5,5 +5,5 @@ eventuateMavenRepoUrl=http://mavenrepo.eventuate.io/release springBootVersion=1.3.5.RELEASE -eventuateClientVersion=0.10.0.RELEASE +eventuateClientVersion=0.12.0.RELEASE eventuateLocalVersion=0.4.0.RELEASE From c157ba572043210066e7d406a92ae493c1deea09 Mon Sep 17 00:00:00 2001 From: dartpopikyardo Date: Fri, 21 Oct 2016 21:34:21 +0300 Subject: [PATCH 11/13] - fixed AccountInfoUpdateServiceTest --- .../queryside/accounts/AccountInfoUpdateServiceTest.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/java-spring/accounts-query-side-backend/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/queryside/accounts/AccountInfoUpdateServiceTest.java b/java-spring/accounts-query-side-backend/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/queryside/accounts/AccountInfoUpdateServiceTest.java index 4a11089..a64c304 100644 --- a/java-spring/accounts-query-side-backend/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/queryside/accounts/AccountInfoUpdateServiceTest.java +++ b/java-spring/accounts-query-side-backend/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/queryside/accounts/AccountInfoUpdateServiceTest.java @@ -1,5 +1,6 @@ package net.chrisrichardson.eventstore.javaexamples.banking.backend.queryside.accounts; +import io.eventuate.Int128; import io.eventuate.javaclient.spring.jdbc.EventuateJdbcEventStoreConfiguration; import io.eventuate.javaclient.spring.jdbc.IdGenerator; import io.eventuate.javaclient.spring.jdbc.IdGeneratorImpl; @@ -46,7 +47,7 @@ public void shouldSaveAccountInfo() throws ExecutionException, InterruptedExcept IdGenerator x = new IdGeneratorImpl(); String accountId = x.genId().asString(); String customerId = x.genId().asString(); - String version = x.genId().asString(); + Int128 version = x.genId(); String title = "Checking account"; BigDecimal initialBalance = new BigDecimal("1345"); @@ -99,7 +100,7 @@ public void shouldHandleDuplicateSaveAccountInfo() throws ExecutionException, In IdGenerator x = new IdGeneratorImpl(); String accountId = x.genId().asString(); String customerId = x.genId().asString(); - String version = x.genId().asString(); + Int128 version = x.genId(); String title = "Checking account"; BigDecimal initialBalance = new BigDecimal("1345"); @@ -114,7 +115,7 @@ public void shouldUpdateTransactionStatus() { IdGenerator x = new IdGeneratorImpl(); String accountId = x.genId().asString(); String customerId = x.genId().asString(); - String version = x.genId().asString(); + Int128 version = x.genId(); String title = "Checking account"; BigDecimal initialBalance = new BigDecimal("1345"); From d30adea37ca3fa43b7fc5f13a40baa31d02d53ce Mon Sep 17 00:00:00 2001 From: dartpopikyardo Date: Fri, 21 Oct 2016 21:36:32 +0300 Subject: [PATCH 12/13] - fixed AccountInfoUpdateServiceTest --- .../queryside/accounts/AccountInfoUpdateServiceTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-spring/accounts-query-side-backend/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/queryside/accounts/AccountInfoUpdateServiceTest.java b/java-spring/accounts-query-side-backend/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/queryside/accounts/AccountInfoUpdateServiceTest.java index a64c304..220b97f 100644 --- a/java-spring/accounts-query-side-backend/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/queryside/accounts/AccountInfoUpdateServiceTest.java +++ b/java-spring/accounts-query-side-backend/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/queryside/accounts/AccountInfoUpdateServiceTest.java @@ -64,7 +64,7 @@ public void shouldSaveAccountInfo() throws ExecutionException, InterruptedExcept assertEquals(initialBalance.longValue() * 100, accountInfo.getBalance()); assertEquals(1, accountInfo.getChanges().size()); assertTrue(accountInfo.getTransactions().isEmpty()); - assertEquals(version, accountInfo.getVersion()); + assertEquals(version.asString(), accountInfo.getVersion()); String changeId = x.genId().asString(); From 56cadd3139d32d9c9ccc8990a39a444085c86e65 Mon Sep 17 00:00:00 2001 From: dartpopikyardo Date: Fri, 21 Oct 2016 21:43:31 +0300 Subject: [PATCH 13/13] - fixed AccountInfoUpdateService --- .../backend/queryside/accounts/AccountInfoUpdateService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-spring/accounts-query-side-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/queryside/accounts/AccountInfoUpdateService.java b/java-spring/accounts-query-side-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/queryside/accounts/AccountInfoUpdateService.java index 0ff9aaf..e86d57c 100644 --- a/java-spring/accounts-query-side-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/queryside/accounts/AccountInfoUpdateService.java +++ b/java-spring/accounts-query-side-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/queryside/accounts/AccountInfoUpdateService.java @@ -42,7 +42,7 @@ public void create(String accountId, String customerId, String title, BigDecimal .set("balance", toIntegerRepr(initialBalance)) .push("changes", ci) .set("creationDate", new Date(version.getHi())) - .set("version", version), + .set("version", version.asString()), AccountInfo.class); logger.info("Saved in mongo");