Upgraded to the latest version of Eventuate + Spring Boot 2.6, etc

Author: cer

.circleci/config.yml

@@ -16,26 +16,20 @@ jobs:
     steps:
       - checkout
 
-      # Download and cache dependencies
       - restore_cache:
           keys:
-          - eventuate-examples-java-spring-todo-list-{{ checksum "single-module/gradle.properties" }}
-          # fallback to using the latest cache if no exact match is found
+          - eventuate-examples-java-spring-todo-list-{{ checksum "single-module/gradle.properties" }}-{{ checksum "single-module/gradle/wrapper/gradle-wrapper.properties" }}
           - eventuate-examples-java-spring-todo-list-
 
-      - run: cd single-module && ./gradlew dependencies
-      - run: cd multi-module && ./gradlew dependencies
+      - run: ./gradlew testClasses
 
       - save_cache:
           paths:
             - ~/.m2
             - ~/.gradle
-          key: eventuate-examples-java-spring-todo-list-{{ checksum "single-module/gradle.properties" }}
+          key: eventuate-examples-java-spring-todo-list-{{ checksum "single-module/gradle.properties" }}-{{ checksum "single-module/gradle/wrapper/gradle-wrapper.properties" }}
 
       # run tests!
-      - run: cd single-module && ./build-and-test-all-eventuate-local-mysql.sh
-      - run: cd single-module && ./build-and-test-all-eventuate-local-postgres-polling.sh
-      - run: cd single-module && ./build-and-test-all-eventuate-local-postgres-wal.sh
-      - run: cd multi-module && ./build-and-test-all-eventuate-local-mysql.sh
-      - run: cd multi-module && ./build-and-test-all-eventuate-local-postgres-polling.sh
-      - run: cd multi-module && ./build-and-test-all-eventuate-local-postgres-wal.sh
+      - run: ./build-and-test-all-mysql.sh
+      - run: ./build-and-test-all-postgres-polling.sh
+      - run: ./build-and-test-all-postgres-wal.sh

README.md

@@ -1,6 +1,6 @@
 # Todo List example application
 
-The Todo List application is the hello world application for the [Eventuate™ Platform](http://eventuate.io).
+The Todo List application is the hello world application for the [Eventuate™ event sourcing](http://eventuate.io).
 It illustrates how you can use the platform to write an application with a [microservices architecture](http://microservices.io/patterns/microservices.html) that uses [Event Sourcing](http://microservices.io/patterns/data/event-sourcing.html) and [Command Query Responsibility Segregation (CQRS)](http://microservices.io/patterns/data/cqrs.html).
 The Todo List application lets users maintain a todo list.
 
@@ -39,27 +39,13 @@ MySQL is kept up to date by subscribing to events produced by the Todo service.
 
 Note: for simplicity, the Todo list application can be deployed as a monolithic application.
 
-# Two versions of the source code
-
-There are two versions of the source code:
-
-* `single-module` - a single module Gradle project for a monolithic version of the application.
-It is the easiest to get started with.
-* `multi-module` - a multi-module Gradle project for the microservices-based version of the application.
-
-Note: you do not need to install Gradle since it will be downloaded automatically.
-You just need to have Java 8 installed.
 
 # Building and running the application
 
-The steps for building both versions of the application are identical.
-
-## Building and running using Eventuate Local
-
 First, build the application
 
 ```
-./gradlew assemble -P eventuateDriver=local
+./gradlew assemble
 ```
 
 Next, launch the services using [Docker Compose](https://docs.docker.com/compose/):
@@ -85,20 +71,9 @@ See this [guide to setting `DOCKER_HOST_IP`](http://eventuate.io/docs/usingdocke
 
 Once the application has started, you can use the application via the Swagger UI.
 
-If you are running the `multi-module` version:
-
 * `http://${DOCKER_HOST_IP}:8081/swagger-ui.html` - the command-side service
 * `http://${DOCKER_HOST_IP}:8082/swagger-ui.html` - the query-side service
 
-If you are running the `single-module` version:
-
-* `http://${DOCKER_HOST_IP}:8080/swagger-ui.html` - the monolithic application
-
-# Using the Eventuate Local console
-
-You can also use the Eventuate Local console to view aggregates and watch the stream of events.
-Visit the URL `http://${DOCKER_HOST_IP}:8085`
-
 # Got questions?
 
 Don't hesitate to create an issue or see

multi-module/_build-and-test-all.sh _build-and-test-all.sh

@@ -2,6 +2,8 @@
 
 set -e
 
+./gradlew $BUILD_AND_TEST_ALL_EXTRA_GRADLE_ARGS testClasses
+
 if [ -z "$DOCKER_HOST_IP" ] ; then
   if [ -z "$DOCKER_HOST" ] ; then
     export DOCKER_HOST_IP=`hostname`
@@ -27,6 +29,7 @@ if [ "$1" = "--no-rm" ] ; then
   shift
 fi
 
+
 if [ ! -z "$EXTRA_INFRASTRUCTURE_SERVICES" ]; then
     ./gradlew ${EXTRA_INFRASTRUCTURE_SERVICES}ComposeBuild
     ./gradlew ${EXTRA_INFRASTRUCTURE_SERVICES}ComposeUp

multi-module/_set-env.sh _set-env.sh

@@ -3,12 +3,9 @@
 set -e
 set -o pipefail
 
-SCRIPTS="single-module/build-and-test-all-eventuate-local-mysql.sh
-single-module/build-and-test-all-eventuate-local-postgres-polling.sh
-single-module/build-and-test-all-eventuate-local-postgres-wal.sh
-multi-module/build-and-test-all-eventuate-local-mysql.sh
-multi-module/build-and-test-all-eventuate-local-postgres-polling.sh
-multi-module/build-and-test-all-eventuate-local-postgres-wal.sh
+SCRIPTS="build-and-test-all-mysql.sh
+build-and-test-all-postgres-polling.sh
+build-and-test-all-postgres-wal.sh
 "
 
 date > build-and-test-everything.log

multi-module/build-and-test-all-eventuate-local-mysql.sh build-and-test-all-mysql.sh

@@ -5,32 +5,38 @@ buildscript {
     }
     dependencies {
         classpath("org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion")
-        classpath "com.avast.gradle:gradle-docker-compose-plugin:0.9.2"
+        classpath "com.avast.gradle:gradle-docker-compose-plugin:$dockerComposePluginVersion"
     }
 }
 
 apply plugin: 'docker-compose'
 
-task wrapper(type: Wrapper) {
-    gradleVersion = '3.5'
-}
-
 subprojects {
     apply plugin: 'java'
     sourceCompatibility = 1.8
     targetCompatibility = 1.8
 
     repositories {
         mavenCentral()
-        jcenter()
         eventuateMavenRepoUrl.split(',').each { repoUrl -> maven { url repoUrl } }
     }
+
+    dependencies {
+      implementation(platform("io.eventuate.platform:eventuate-platform-dependencies:$eventuatePlatformVersion"))
+      implementation(platform("org.springframework.boot:spring-boot-dependencies:$springBootVersion"))
+      constraints {
+          implementation "org.springdoc:springdoc-openapi-ui:$springDocOpenApiUiVersion"
+      }
+    }
+
 }
 
 dockerCompose {
     environment.put "EVENTUATE_COMMON_VERSION", eventuateCommonImageVersion
-    environment.put "EVENTUATE_KAFKA_VERSION", eventuateMessagingKafkaImageVersion
+    environment.put "EVENTUATE_MESSAGING_KAFKA_IMAGE_VERSION", eventuateMessagingKafkaImageVersion
     environment.put "EVENTUATE_CDC_VERSION", eventuateCdcImageVersion
+    environment.put "EVENTUATE_MESSAGING_KAFKA_IMAGE_VERSION", eventuateMessagingKafkaImageVersion
+    environment.put "EVENTUATE_JAVA_BASE_IMAGE_VERSION", eventuateExamplesBaseImageVersion
 
     mysqlbinlog {
         projectName = null
@@ -64,4 +70,4 @@ dockerCompose {
         useComposeFiles = ["docker-compose-eventuate-local-postgres-wal.yml"]
         startedServices = ["cdcservice"]
     }
-}
+}

multi-module/build-and-test-all-eventuate-local-postgres-polling.sh build-and-test-all-postgres-polling.sh

@@ -0,0 +1,14 @@
+apply plugin: 'java'
+
+dependencies {
+    compile project(":common")
+
+    compile "io.eventuate.local.java:eventuate-client-java-spring"
+
+    compile("org.springframework.boot:spring-boot-starter-data-jpa")
+    compile("org.springframework.boot:spring-boot-starter-web")
+    compile "org.springframework.boot:spring-boot-starter-actuator"
+    compile("org.springframework.hateoas:spring-hateoas")
+
+    testCompile 'junit:junit:4.12'
+}

multi-module/build-and-test-all-eventuate-local-postgres-wal.sh build-and-test-all-postgres-wal.sh

@@ -4,19 +4,15 @@
 import net.chrisrichardson.eventstore.examples.todolist.common.model.ResourceWithUrl;
 import net.chrisrichardson.eventstore.examples.todolist.model.Todo;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.concurrent.CompletableFuture;
-
-import static org.springframework.hateoas.mvc.ControllerLinkBuilder.linkTo;
-import static org.springframework.hateoas.mvc.ControllerLinkBuilder.methodOn;
+import static org.springframework.hateoas.server.mvc.WebMvcLinkBuilder.linkTo;
+import static org.springframework.hateoas.server.mvc.WebMvcLinkBuilder.methodOn;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
 
-/**
- * Created by popikyardo on 23.03.16.
- */
 @RestController
 @RequestMapping(value = "/todos")
 public class TodoHateoasController extends BaseController {
@@ -25,8 +21,10 @@ public class TodoHateoasController extends BaseController {
     private TodoUpdateService queryService;
 
     @RequestMapping(value = "/{todo-id}", method = GET)
-    public CompletableFuture<ResourceWithUrl> getTodo(@PathVariable("todo-id") String id) {
-        return queryService.findById(id).thenApply(this::toResource);
+    public ResponseEntity<ResourceWithUrl> getTodo(@PathVariable("todo-id") String id) {
+        return queryService.findById(id)
+                .map(todo -> ResponseEntity.ok(toResource(todo)))
+                .orElseGet(() -> ResponseEntity.notFound().build());
     }
 
     public ResourceWithUrl toResource(Todo todo) {

build-and-test-everything.sh

@@ -3,14 +3,12 @@
 import net.chrisrichardson.eventstore.examples.todolist.model.Todo;
 
 import java.util.List;
-import java.util.concurrent.CompletableFuture;
+import java.util.Optional;
+
 
-/**
- * Created by popikyardo on 23.03.16.
- */
 public interface TodoUpdateService {
 
     List<Todo> getAll();
 
-    CompletableFuture<Todo> findById(String todoId);
+    Optional<Todo> findById(String todoId);
 }

multi-module/build.gradle build.gradle

@@ -0,0 +1,12 @@
+apply plugin: 'java'
+
+dependencies {
+    compile "io.eventuate.local.java:eventuate-client-java-spring"
+    compile "org.springframework.boot:spring-boot-starter-web"
+    compile("org.springframework.boot:spring-boot-starter-data-jpa")
+
+    compile 'jakarta.xml.bind:jakarta.xml.bind-api:2.3.3'
+    compile 'com.sun.xml.bind:jaxb-impl:2.3.3'
+
+    testCompile 'junit:junit:4.12'
+}

multi-module/buildSrc/src/main/groovy/VerifyEventStoreEnvironmentPlugin.groovy buildSrc/src/main/groovy/VerifyEventStoreEnvironmentPlugin.groovy

@@ -7,15 +7,20 @@ services:
 
 
   kafka:
-    image: eventuateio/eventuate-kafka:$EVENTUATE_KAFKA_VERSION
+    image: "eventuateio/eventuate-kafka:${EVENTUATE_MESSAGING_KAFKA_IMAGE_VERSION?}"
     ports:
       - 9092:9092
+      - 29092:29092
     depends_on:
       - zookeeper
     environment:
-      - ADVERTISED_HOST_NAME=${DOCKER_HOST_IP}
-      - KAFKA_HEAP_OPTS=-Xmx320m -Xms320m
-      - ZOOKEEPER_SERVERS=zookeeper:2181
+      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
 
 
   cdcservice:
@@ -30,15 +35,16 @@ services:
       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
+      SPRING_DATASOURCE_DRIVER_CLASS_NAME: com.mysql.cj.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_READ_OLD_DEBEZIUM_DB_OFFSET_STORAGE_TOPIC: "false"
       EVENTUATELOCAL_CDC_READER_NAME: MySqlReader
       EVENTUATELOCAL_CDC_OFFSET_STORE_KEY: MySqlBinlog
       EVENTUATELOCAL_CDC_MYSQL_BINLOG_CLIENT_UNIQUE_ID: 1234567890
+      EVENTUATE_OUTBOX_ID: 1
       EVENTUATE_CDC_TYPE: EventuateLocal
 
   mysql:
@@ -55,8 +61,10 @@ services:
 
 
   commandsideservice:
-    build: ./todo-service/
-    restart: unless-stopped
+    build:
+      context: ./todo-service/
+      args:
+        baseImageVersion: ${EVENTUATE_JAVA_BASE_IMAGE_VERSION}
     ports:
       - "8081:8080"
     depends_on:
@@ -67,15 +75,15 @@ services:
       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
+      SPRING_DATASOURCE_DRIVER_CLASS_NAME: com.mysql.cj.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
 
   querysideservice:
-    build: ./todo-view-service/
-    restart: unless-stopped
+    build:
+      context: ./todo-view-service/
+      args:
+        baseImageVersion: ${EVENTUATE_JAVA_BASE_IMAGE_VERSION}
     ports:
       - "8082:8080"
     depends_on:
@@ -86,22 +94,6 @@ services:
       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
-
-  consoleserver:
-    image: eventuateio/eventuateio-local-console:0.15.0
-    depends_on:
-      - mysql
-      - zookeeper
-    ports:
-      - "8085:8080"
-    environment:
-      SPRING_DATASOURCE_URL: jdbc:mysql://mysql/eventuate
-      SPRING_DATASOURCE_USERNAME: mysqluser
-      SPRING_DATASOURCE_PASSWORD: mysqlpw
+      SPRING_DATASOURCE_DRIVER_CLASS_NAME: com.mysql.cj.jdbc.Driver
+      EVENTUATELOCAL_KAFKA_BOOTSTRAP_SERVERS: kafka:29092
       EVENTUATELOCAL_ZOOKEEPER_CONNECTION_STRING: zookeeper:2181
-      DEBUG: kafka-node:*