Spring boot 2

.gitignore

@@ -3,3 +3,4 @@ build/
 *.idea/
 *.iml
 *.log
+out/

multi-module/build.gradle

@@ -1,5 +1,8 @@
 buildscript {
     repositories {
+        maven {
+            url "http://repo.spring.io/milestone/"
+        }
         mavenCentral()
     }
     dependencies {
@@ -8,7 +11,7 @@ buildscript {
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '2.0'
+    gradleVersion = '4.4'
 }
 
 subprojects {
@@ -17,6 +20,9 @@ subprojects {
     targetCompatibility = 1.8
 
     repositories {
+        maven {
+            url "http://repo.spring.io/milestone/"
+        }
         mavenCentral()
         jcenter()
         eventuateMavenRepoUrl.split(',').each { repoUrl -> maven { url repoUrl } }

multi-module/common-hateoas/build.gradle

@@ -8,7 +8,7 @@ dependencies {
     compile("org.springframework.boot:spring-boot-starter-data-jpa:$springBootVersion")
     compile("org.springframework.boot:spring-boot-starter-web:$springBootVersion")
     compile "org.springframework.boot:spring-boot-starter-actuator:$springBootVersion"
-    compile("org.springframework.hateoas:spring-hateoas:$springHateoasVersion")
+    compile "org.springframework.boot:spring-boot-starter-hateoas:$springBootVersion"
 
     testCompile 'junit:junit:4.11'
 }

multi-module/common/build.gradle

@@ -1,6 +1,7 @@
 apply plugin: 'java'
 
 dependencies {
+    compile 'org.apache.commons:commons-io:1.3.2'
     compile "io.eventuate.client.java:eventuate-client-java-spring:$eventuateClientVersion"
     compile "org.springframework.boot:spring-boot-starter-web:$springBootVersion"
     compile("org.springframework.boot:spring-boot-starter-data-jpa:$springBootVersion")

multi-module/docker-compose-eventuate-local-postgres.yml

@@ -1,12 +1,12 @@
 zookeeper:
-  image: eventuateio/eventuateio-local-zookeeper:0.15.0
+  image: eventuateio/eventuateio-local-zookeeper:0.17.0.RELEASE
   ports:
     - 2181:2181
     - 2888:2888
     - 3888:3888
 
 kafka:
-  image: eventuateio/eventuateio-local-kafka:0.15.0
+  image: eventuateio/eventuateio-local-kafka:0.17.0.RELEASE
   ports:
     - 9092:9092
   links:
@@ -25,7 +25,9 @@ postgres:
     POSTGRES_PASSWORD: eventuate
 
 cdcservice:
-  image: eventuateio/eventuateio-local-cdc-service:0.15.0
+  image: eventuateio/eventuateio-local-cdc-service:0.17.0.RELEASE
+  ports:
+    - "8099:8080"
   links:
     - postgres
     - kafka

multi-module/docker-compose-eventuate-local.yml

@@ -1,13 +1,13 @@
 zookeeper:
-  image: eventuateio/eventuateio-local-zookeeper:0.15.0
+  image: eventuateio/eventuateio-local-zookeeper:0.17.0.RELEASE
   ports:
     - 2181:2181
     - 2888:2888
     - 3888:3888
 
 
 kafka:
-  image: eventuateio/eventuateio-local-kafka:0.15.0
+  image: eventuateio/eventuateio-local-kafka:0.17.0.RELEASE
   ports:
     - 9092:9092
   links:
@@ -18,7 +18,7 @@ kafka:
     - ZOOKEEPER_SERVERS=zookeeper:2181
 
 cdcservice:
-  image: eventuateio/eventuateio-local-cdc-service:0.15.0
+  image: eventuateio/eventuateio-local-cdc-service:0.17.0.RELEASE
   ports:
     - "8099:8080"
   links:

multi-module/e2etest/src/test/java/net/chrisrichardson/eventstore/examples/todolist/e2etests/EndToEndTest.java

@@ -2,12 +2,10 @@
 
 import net.chrisrichardson.eventstore.examples.todolist.AbstractTodoRestAPITest;
 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;
 
 
-@SpringApplicationConfiguration(classes = {E2ETestConfiguration.class})
-@IntegrationTest
+@SpringBootTest(classes = E2ETestConfiguration.class, webEnvironment = SpringBootTest.WebEnvironment.NONE)
 public class EndToEndTest extends AbstractTodoRestAPITest {
 
     @Value("#{systemEnvironment['DOCKER_HOST_IP']}")

multi-module/gradle.properties

@@ -3,9 +3,7 @@ org.gradle.jvmargs=-XX:MaxPermSize=512m
 
 eventuateMavenRepoUrl=
 
-springHateoasVersion=0.17.0.RELEASE
+springBootVersion=2.0.0.RELEASE
 
-springBootVersion=1.3.5.RELEASE
-
-eventuateClientVersion=0.19.0.RELEASE
-eventuateLocalVersion=0.15.0.RELEASE
+eventuateClientVersion=0.20.1.RELEASE
+eventuateLocalVersion=0.17.0.RELEASE

multi-module/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip

multi-module/mysql/Dockerfile

@@ -1,2 +1,2 @@
-FROM eventuateio/eventuateio-local-mysql:0.15.0
+FROM eventuateio/eventuateio-local-mysql:0.17.0.RELEASE
 COPY schema-mysql.sql /docker-entrypoint-initdb.d

multi-module/postgres/Dockerfile

@@ -1,2 +1,2 @@
-FROM eventuateio/eventuateio-local-postgres:0.14.0
+FROM eventuateio/eventuateio-local-postgres:0.17.0.RELEASE
 COPY schema-postgres.sql /docker-entrypoint-initdb.d

multi-module/settings.gradle

@@ -4,7 +4,6 @@ include 'common-swagger'
 include 'todo-service'
 include 'todo-view-service'
 include 'test-utils'
-include 'rest-api-integration-tests'
 include 'e2etest'
 
 rootProject.name = 'eventuate-examples-java-spring-todo-list-multi-module'

multi-module/test-utils/src/main/java/net/chrisrichardson/eventstore/examples/todolist/AbstractTodoRestAPITest.java

@@ -6,7 +6,6 @@
 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.http.HttpEntity;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
@@ -15,16 +14,13 @@
 import org.springframework.web.client.RestTemplate;
 
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.List;
 
 import static net.chrisrichardson.eventstore.examples.todolist.testutil.TestUtil.awaitSuccessfulRequest;
 import static net.chrisrichardson.eventstore.examples.todolist.testutil.TestUtil.awaitNotFoundResponse;
-import static net.chrisrichardson.eventstore.examples.todolist.testutil.TestUtil.awaitSuccessfulRequest;
 
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@IntegrationTest({"server.port=0"})
 public abstract class AbstractTodoRestAPITest {
 
     protected int port;

multi-module/test-utils/src/main/java/net/chrisrichardson/eventstore/examples/todolist/testutil/BasicWebTestConfiguration.java

@@ -5,7 +5,7 @@
 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.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.MediaType;
@@ -14,6 +14,7 @@
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 import org.springframework.web.client.RestTemplate;
 
+import java.util.Arrays;
 import java.util.Collections;
 
 
@@ -26,7 +27,7 @@ public RestTemplate restTemplate(HttpMessageConverters converters) {
 
         // we have to define Apache HTTP client to use the PATCH verb
         MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter();
-        converter.setSupportedMediaTypes(MediaType.parseMediaTypes("application/json"));
+        converter.setSupportedMediaTypes(Arrays.asList(MediaType.APPLICATION_JSON, MediaType.APPLICATION_OCTET_STREAM));
         converter.setObjectMapper(new ObjectMapper());
 
         HttpClient httpClient = HttpClients.createDefault();

multi-module/todo-service/build.gradle

@@ -1,8 +1,7 @@
+apply plugin: 'org.springframework.boot'
 apply plugin: VerifyEventStoreEnvironmentPlugin
 apply plugin: EventuateDependencyPlugin
 
-apply plugin: 'spring-boot'
-
 dependencies {
     compile project(":common")
     compile project(":common-hateoas")
@@ -13,7 +12,5 @@ dependencies {
     compile("org.springframework.boot:spring-boot-starter-data-jpa:$springBootVersion")
     compile("org.springframework.boot:spring-boot-starter-web:$springBootVersion")
     compile "org.springframework.boot:spring-boot-starter-actuator:$springBootVersion"
-    compile("org.springframework.hateoas:spring-hateoas:$springHateoasVersion")
-
-    testCompile project(":test-utils")
+    compile "org.springframework.boot:spring-boot-starter-hateoas:$springBootVersion"
 }

multi-module/todo-service/src/main/java/net/chrisrichardson/eventstore/examples/todolist/todoservice/backend/TodoBackendConfiguration.java

@@ -9,9 +9,8 @@
 import net.chrisrichardson.eventstore.examples.todolist.todoservice.backend.domain.TodoBulkDeleteAggregate;
 import net.chrisrichardson.eventstore.examples.todolist.todoservice.backend.domain.TodoEventSubscriber;
 import net.chrisrichardson.eventstore.examples.todolist.todoservice.backend.domain.TodoService;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.autoconfigure.web.HttpMessageConverters;
-import org.springframework.boot.orm.jpa.EntityScan;
+import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;

multi-module/todo-service/src/main/java/net/chrisrichardson/eventstore/examples/todolist/todoservice/backend/TodoViewServiceImpl.java

@@ -9,6 +9,7 @@
 
 import javax.persistence.EntityNotFoundException;
 import java.util.List;
+import java.util.NoSuchElementException;
 import java.util.concurrent.CompletableFuture;
 
 
@@ -27,11 +28,10 @@ public List<Todo> getAll() {
 
     @Override
     public CompletableFuture<Todo> findById(String todoId) {
-        Todo res = repository.findOne(todoId);
-        if (res != null) {
-            return CompletableFuture.completedFuture(res);
-        }
-        return CompletableFutureUtil.failedFuture(new EntityNotFoundException("No todo found for given id"));
+        return repository
+                .findById(todoId)
+                .map(CompletableFuture::completedFuture)
+                .orElse(CompletableFutureUtil.failedFuture(new NoSuchElementException("No todo with given id found")));
     }
 
 }

multi-module/todo-service/src/main/java/net/chrisrichardson/eventstore/examples/todolist/todoservice/web/TodoWebConfiguration.java

@@ -1,24 +1,14 @@
 package net.chrisrichardson.eventstore.examples.todolist.todoservice.web;
 
 import net.chrisrichardson.eventstore.examples.todolist.todoservice.backend.TodoBackendConfiguration;
-import org.springframework.boot.context.embedded.ServletListenerRegistrationBean;
-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.web.context.request.RequestContextListener;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 
 @Configuration
 @Import({TodoBackendConfiguration.class})
 @ComponentScan({ "net.chrisrichardson.eventstore.examples.todolist.common",
         "net.chrisrichardson.eventstore.examples.todolist.todoservice.web",
         "net.chrisrichardson.eventstore.examples.todolist.hateoas"})
-public class TodoWebConfiguration extends WebMvcConfigurerAdapter {
-
-  @Bean
-  public ServletListenerRegistrationBean<RequestContextListener> httpRequestContextListener() {
-    return new ServletListenerRegistrationBean<RequestContextListener>(new RequestContextListener());
-  }
-
+public class TodoWebConfiguration {
 }

multi-module/todo-view-service/build.gradle

@@ -1,6 +1,6 @@
+apply plugin: 'org.springframework.boot'
 apply plugin: VerifyEventStoreEnvironmentPlugin
 apply plugin: EventuateDependencyPlugin
-apply plugin: 'spring-boot'
 
 dependencies {
     compile project(":common")
@@ -12,7 +12,5 @@ dependencies {
     compile("org.springframework.boot:spring-boot-starter-data-jpa:$springBootVersion")
     compile("org.springframework.boot:spring-boot-starter-web:$springBootVersion")
     compile "org.springframework.boot:spring-boot-starter-actuator:$springBootVersion"
-    compile("org.springframework.hateoas:spring-hateoas:$springHateoasVersion")
-
-    testCompile project(":test-utils")
+    compile "org.springframework.boot:spring-boot-starter-hateoas:$springBootVersion"
 }