Merge pull request microservices-patterns#32 from dartartem/wip-unifi…

…ed-cdc Wip unified cdc
kcqv34 · Apr 26, 2019 · ea47123 · ea47123
2 parents d0ff174 + af27466
commit ea47123
Show file tree

Hide file tree

Showing 18 changed files with 33 additions and 21 deletions.
diff --git a/docker-compose-mysql-schema-per-service.yml b/docker-compose-mysql-schema-per-service.yml
@@ -1,13 +1,13 @@
 version: '3'
 services:
   zookeeper:
-    image: eventuateio/eventuateio-local-zookeeper:0.30.0.RC4
+    image: eventuateio/eventuateio-local-zookeeper:0.30.0.RC6
     ports:
       - 2181:2181
       - 2888:2888
       - 3888:3888
   kafka:
-    image: eventuateio/eventuateio-local-kafka:0.30.0.RC4
+    image: eventuateio/eventuateio-local-kafka:0.30.0.RC6
     ports:
       - 9092:9092
     depends_on:
@@ -25,7 +25,7 @@ services:
       - MYSQL_USER=mysqluser
       - MYSQL_PASSWORD=mysqlpw
   tram-cdc-service:
-    image: eventuateio/eventuate-tram-cdc-mysql-service:0.20.0.RC1
+    image: eventuateio/eventuate-tram-cdc-mysql-service:0.20.0.RC3
     ports:
       - "8099:8080"
     depends_on:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,13 +1,13 @@
 version: '3'
 services:
   zookeeper:
-    image: eventuateio/eventuateio-local-zookeeper:0.30.0.RC4
+    image: eventuateio/eventuateio-local-zookeeper:0.30.0.RC6
     ports:
       - 2181:2181
       - 2888:2888
       - 3888:3888
   kafka:
-    image: eventuateio/eventuateio-local-kafka:0.30.0.RC4
+    image: eventuateio/eventuateio-local-kafka:0.30.0.RC6
     ports:
       - 9092:9092
     depends_on:
@@ -25,7 +25,7 @@ services:
       - MYSQL_USER=mysqluser
       - MYSQL_PASSWORD=mysqlpw
   tram-cdc-service:
-    image: eventuateio/eventuate-tram-cdc-mysql-service:0.20.0.RC1
+    image: eventuateio/eventuate-tram-cdc-mysql-service:0.20.0.RC3
     ports:
       - "8099:8080"
     depends_on:

diff --git a/...va/net/chrisrichardson/ftgo/accountingservice/messaging/NoopDuplicateMessageDetector.java b/...va/net/chrisrichardson/ftgo/accountingservice/messaging/NoopDuplicateMessageDetector.java
@@ -1,11 +1,17 @@
 package net.chrisrichardson.ftgo.accountingservice.messaging;
 
 import io.eventuate.tram.consumer.common.DuplicateMessageDetector;
+import io.eventuate.tram.consumer.common.SubscriberIdAndMessage;
 
 public class NoopDuplicateMessageDetector implements DuplicateMessageDetector {
 
   @Override
   public boolean isDuplicate(String consumerId, String messageId) {
     return false;
   }
+
+  @Override
+  public void doWithMessage(SubscriberIdAndMessage subscriberIdAndMessage, Runnable callback) {
+    callback.run();
+  }
 }
diff --git a/ftgo-accounting-service/src/main/resources/application.properties b/ftgo-accounting-service/src/main/resources/application.properties
@@ -9,7 +9,7 @@ logging.level.io.eventuate.tram=TRACE
 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
+spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 spring.data.mongodb.uri=mongodb://${DOCKER_HOST_IP:localhost}/bankingexampledb
 
 eventuatelocal.kafka.bootstrap.servers=${DOCKER_HOST_IP:localhost}:9092

diff --git a/ftgo-common/src/main/resources/application.properties b/ftgo-common/src/main/resources/application.properties
@@ -7,7 +7,7 @@ logging.level.io.eventuate.tram=TRACE
 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
+spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 spring.data.mongodb.uri=mongodb://${DOCKER_HOST_IP:localhost}/bankingexampledb
 
 eventuatelocal.kafka.bootstrap.servers=${DOCKER_HOST_IP:localhost}:9092

diff --git a/ftgo-consumer-service/src/main/resources/application.properties b/ftgo-consumer-service/src/main/resources/application.properties
@@ -9,7 +9,7 @@ logging.level.io.eventuate.tram=TRACE
 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
+spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 
 eventuatelocal.kafka.bootstrap.servers=${DOCKER_HOST_IP:localhost}:9092
 eventuatelocal.cdc.db.user.name=root

diff --git a/ftgo-kitchen-service/src/main/resources/application.properties b/ftgo-kitchen-service/src/main/resources/application.properties
@@ -9,7 +9,7 @@ logging.level.io.eventuate.tram=TRACE
 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
+spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 spring.data.mongodb.uri=mongodb://${DOCKER_HOST_IP:localhost}/bankingexampledb
 
 eventuatelocal.kafka.bootstrap.servers=${DOCKER_HOST_IP:localhost}:9092

diff --git a/ftgo-kitchen-service/src/test/resources/application.properties b/ftgo-kitchen-service/src/test/resources/application.properties
@@ -8,7 +8,7 @@ stubrunner.integration.enabled=false
 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
+spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 spring.data.mongodb.uri=mongodb://${DOCKER_HOST_IP:localhost}/bankingexampledb
 
 eventuatelocal.kafka.bootstrap.servers=${DOCKER_HOST_IP:localhost}:9092

diff --git a/...va/net/chrisrichardson/ftgo/cqrs/orderhistory/messaging/NoopDuplicateMessageDetector.java b/...va/net/chrisrichardson/ftgo/cqrs/orderhistory/messaging/NoopDuplicateMessageDetector.java
@@ -1,6 +1,7 @@
 package net.chrisrichardson.ftgo.cqrs.orderhistory.messaging;
 
 import io.eventuate.tram.consumer.common.DuplicateMessageDetector;
+import io.eventuate.tram.consumer.common.SubscriberIdAndMessage;
 
 // TODO Duplicate
 public class NoopDuplicateMessageDetector implements DuplicateMessageDetector {
@@ -9,4 +10,9 @@ public class NoopDuplicateMessageDetector implements DuplicateMessageDetector {
   public boolean isDuplicate(String consumerId, String messageId) {
     return false;
   }
+
+  @Override
+  public void doWithMessage(SubscriberIdAndMessage subscriberIdAndMessage, Runnable callback) {
+    callback.run();
+  }
 }
diff --git a/ftgo-order-history-service/src/main/resources/application.properties b/ftgo-order-history-service/src/main/resources/application.properties
@@ -9,7 +9,7 @@ logging.level.io.eventuate.tram=TRACE
 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
+spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 spring.data.mongodb.uri=mongodb://${DOCKER_HOST_IP:localhost}/bankingexampledb
 
 eventuatelocal.kafka.bootstrap.servers=${DOCKER_HOST_IP:localhost}:9092

diff --git a/ftgo-order-history-service/src/test/resources/application.properties b/ftgo-order-history-service/src/test/resources/application.properties
@@ -8,7 +8,7 @@ stubrunner.integration.enabled=false
 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
+spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 spring.data.mongodb.uri=mongodb://${DOCKER_HOST_IP:localhost}/bankingexampledb
 
 eventuatelocal.kafka.bootstrap.servers=${DOCKER_HOST_IP:localhost}:9092

diff --git a/ftgo-order-service/src/component-test/resources/application.properties b/ftgo-order-service/src/component-test/resources/application.properties
@@ -13,7 +13,7 @@ stubrunner.integration.enabled=false
 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
+spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 spring.data.mongodb.uri=mongodb://${DOCKER_HOST_IP:localhost}/bankingexampledb
 
 eventuatelocal.kafka.bootstrap.servers=${DOCKER_HOST_IP:localhost}:9092

diff --git a/ftgo-order-service/src/integration-test/resources/application.properties b/ftgo-order-service/src/integration-test/resources/application.properties
@@ -13,7 +13,7 @@ stubrunner.integration.enabled=false
 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
+spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 spring.data.mongodb.uri=mongodb://${DOCKER_HOST_IP:localhost}/bankingexampledb
 
 eventuatelocal.kafka.bootstrap.servers=${DOCKER_HOST_IP:localhost}:9092

diff --git a/ftgo-order-service/src/main/resources/application.properties b/ftgo-order-service/src/main/resources/application.properties
@@ -15,7 +15,7 @@ logging.level.io.eventuate.tram=TRACE
 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
+spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 spring.data.mongodb.uri=mongodb://${DOCKER_HOST_IP:localhost}/bankingexampledb
 
 eventuatelocal.kafka.bootstrap.servers=${DOCKER_HOST_IP:localhost}:9092

diff --git a/ftgo-order-service/src/test/resources/application.properties b/ftgo-order-service/src/test/resources/application.properties
@@ -9,7 +9,7 @@ stubrunner.integration.enabled=false
 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
+spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 spring.data.mongodb.uri=mongodb://${DOCKER_HOST_IP:localhost}/bankingexampledb
 
 eventuatelocal.kafka.bootstrap.servers=${DOCKER_HOST_IP:localhost}:9092

diff --git a/ftgo-restaurant-service-aws-lambda/src/main/resources/application.properties b/ftgo-restaurant-service-aws-lambda/src/main/resources/application.properties
@@ -4,7 +4,7 @@ logging.level.org.springframework.jdbc.datasource.DataSourceUtils=DEBUG
 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
+spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 spring.data.mongodb.uri=mongodb://${DOCKER_HOST_IP:localhost}/bankingexampledb
 
 eventuatelocal.kafka.bootstrap.servers=${DOCKER_HOST_IP:localhost}:9092

diff --git a/ftgo-restaurant-service/src/main/resources/application.properties b/ftgo-restaurant-service/src/main/resources/application.properties
@@ -9,7 +9,7 @@ logging.level.io.eventuate.tram=TRACE
 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
+spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 spring.data.mongodb.uri=mongodb://${DOCKER_HOST_IP:localhost}/bankingexampledb
 
 eventuatelocal.kafka.bootstrap.servers=${DOCKER_HOST_IP:localhost}:9092

diff --git a/gradle.properties b/gradle.properties
@@ -11,9 +11,9 @@ springDependencyManagementPluginVersion=1.0.3.RELEASE
 #         springBootVersion = '1.5.6.RELEASE'
 
 eventuateClientVersion=0.20.1.RELEASE
-eventuateLocalVersion=0.30.0.RC4
+eventuateLocalVersion=0.30.0.RC6
 
-eventuateTramVersion=0.20.0.RC1
+eventuateTramVersion=0.20.0.RC3
 eventuateTramSagasVersion=0.10.0.RC2
 eventuateUtilVersion=0.2.0.RELEASE