Update to spring 2

api-gateway/pom.xml

@@ -74,19 +74,19 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-eureka</artifactId>
+			<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-config-client</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-hystrix</artifactId>
+			<artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-turbine</artifactId>
+			<artifactId>spring-cloud-starter-netflix-turbine</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.jolokia</groupId>
@@ -119,7 +119,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-zuul</artifactId>
+			<artifactId>spring-cloud-starter-netflix-zuul</artifactId>
 		</dependency>
 	</dependencies>
 	<build>

authserver/pom.xml

@@ -41,11 +41,6 @@
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-config-client</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.mockito</groupId>
-			<artifactId>mockito-core</artifactId>
-			<version>2.18.0</version>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>

circuit-breaker/pom.xml

@@ -15,7 +15,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-hystrix-dashboard</artifactId>
+			<artifactId>spring-cloud-starter-netflix-hystrix-dashboard</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>

command-side-blog-service/pom.xml

@@ -76,19 +76,19 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-eureka</artifactId>
+			<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-config-client</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-hystrix</artifactId>
+			<artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-turbine</artifactId>
+			<artifactId>spring-cloud-starter-netflix-turbine</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>

command-side-project-service/pom.xml

@@ -77,19 +77,19 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-eureka</artifactId>
+			<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-config-client</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-hystrix</artifactId>
+			<artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-turbine</artifactId>
+			<artifactId>spring-cloud-starter-netflix-turbine</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>

monolithic/pom.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
 	<modelVersion>4.0.0</modelVersion>
@@ -123,6 +124,18 @@
 			<artifactId>jaxb-runtime</artifactId>
 			<version>2.3.2</version>
 		</dependency>
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-core</artifactId>
+			<version>5.13.0</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>net.bytebuddy</groupId>
+			<artifactId>byte-buddy</artifactId>
+			<version>1.15.1</version>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 
 

monolithic/src/main/java/com/idugalic/configuration/RestConfiguration.java

@@ -5,10 +5,13 @@
 
 import java.lang.reflect.Method;
 
-import org.springframework.boot.autoconfigure.web.WebMvcRegistrationsAdapter;
+import org.springframework.beans.factory.ObjectFactory;
+import org.springframework.boot.autoconfigure.web.servlet.WebMvcRegistrations;
+import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.annotation.AnnotationUtils;
+import org.springframework.core.convert.ConversionService;
 import org.springframework.data.rest.core.config.RepositoryRestConfiguration;
 import org.springframework.data.rest.webmvc.config.RepositoryRestConfigurerAdapter;
 import org.springframework.data.rest.webmvc.config.RepositoryRestMvcConfiguration;
@@ -26,9 +29,13 @@
 @Configuration
 public class RestConfiguration extends RepositoryRestMvcConfiguration {
 
+    public RestConfiguration(ApplicationContext context, ObjectFactory<ConversionService> conversionService) {
+		super(context, conversionService);
+	}
+
     @Bean
-    public WebMvcRegistrationsAdapter webMvcRegistrationsHandlerMapping() {
-        return new WebMvcRegistrationsAdapter() {
+    public WebMvcRegistrations webMvcRegistrationsHandlerMapping() {
+        return new WebMvcRegistrations() {
             @Override
             public RequestMappingHandlerMapping getRequestMappingHandlerMapping() {
                 return new RequestMappingHandlerMapping() {

monolithic/src/test/java/com/idugalic/commandside/blog/web/BlogControllerTest.java

@@ -11,7 +11,7 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-
+import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
 import org.springframework.boot.test.json.JacksonTester;
@@ -23,7 +23,6 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 import static org.mockito.BDDMockito.given;
-import static org.mockito.Matchers.any;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
@@ -60,7 +59,7 @@ public void setup() {
     public void createBlogPostWithValidationErrorTest() throws Exception {
 
         CreateBlogPostRequest request = new CreateBlogPostRequest();
-        given(this.commandGateway.sendAndWait(any(CreateBlogPostCommand.class))).willThrow(new CommandExecutionException("Test", new JSR303ViolationException(new HashSet())));
+        given(this.commandGateway.sendAndWait(Mockito.any(CreateBlogPostCommand.class))).willThrow(new CommandExecutionException("Test", new JSR303ViolationException(new HashSet())));
 
         this.mvc.perform(post("/api/blogpostcommands")
                 .content(this.jsonCreate.write(request).getJson())
@@ -71,7 +70,7 @@ public void createBlogPostWithValidationErrorTest() throws Exception {
     public void createBlogPostWithSuccessTest() throws Exception {
 
         CreateBlogPostRequest request = new CreateBlogPostRequest();
-        given(this.commandGateway.sendAndWait(any(CreateBlogPostCommand.class))).willReturn("Success");
+        given(this.commandGateway.sendAndWait(Mockito.any(CreateBlogPostCommand.class))).willReturn("Success");
 
         this.mvc.perform(post("/api/blogpostcommands")
                 .content(this.jsonCreate.write(request).getJson())

monolithic/src/test/java/com/idugalic/commandside/project/web/ProjectControllerTest.java

@@ -11,7 +11,7 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-
+import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
 import org.springframework.boot.test.json.JacksonTester;
@@ -23,7 +23,6 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 import static org.mockito.BDDMockito.given;
-import static org.mockito.Matchers.any;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
@@ -60,7 +59,7 @@ public void setup() {
     public void createProjectWithValidationErrorTest() throws Exception {
 
         CreateProjectRequest request = new CreateProjectRequest();
-        given(this.commandGateway.sendAndWait(any(CreateProjectCommand.class))).willThrow(new CommandExecutionException("Test", new JSR303ViolationException(new HashSet())));
+        given(this.commandGateway.sendAndWait(Mockito.any(CreateProjectCommand.class))).willThrow(new CommandExecutionException("Test", new JSR303ViolationException(new HashSet())));
 
         this.mvc.perform(post("/api/projectcommands")
                 .content(this.jsonCreate.write(request).getJson())
@@ -71,7 +70,7 @@ public void createProjectWithValidationErrorTest() throws Exception {
     public void createProjectWithSuccessTest() throws Exception {
 
         CreateProjectRequest request = new CreateProjectRequest();
-        given(this.commandGateway.sendAndWait(any(CreateProjectCommand.class))).willReturn("Success");
+        given(this.commandGateway.sendAndWait(Mockito.any(CreateProjectCommand.class))).willReturn("Success");
 
         this.mvc.perform(post("/api/projectcommands")
                 .content(this.jsonCreate.write(request).getJson())

pom.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="https://maven.apache.org/POM/4.0.0" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="https://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
@@ -37,9 +38,8 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>11</java.version>
 		<axon.version>3.4.4</axon.version>
-		<spring-cloud.version>Dalston.RELEASE</spring-cloud.version>
-		<spring-boot.version>1.5.22.RELEASE</spring-boot.version>
-		<spring-data-releasetrain.version>Ingalls-SR3</spring-data-releasetrain.version>
+		<spring-cloud.version>Finchley.RELEASE</spring-cloud.version>
+		<spring-boot.version>2.0.9.RELEASE</spring-boot.version>
 		<docker.image.prefix>idugalic</docker.image.prefix>
 		<docker.plugin.version>0.4.9</docker.plugin.version>
 	</properties>
@@ -53,14 +53,6 @@
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
-			<!-- Override Spring Data release train provided by Spring Boot -->
-			<dependency>
-				<groupId>org.springframework.data</groupId>
-				<artifactId>spring-data-releasetrain</artifactId>
-				<version>${spring-data-releasetrain.version}</version>
-				<scope>import</scope>
-				<type>pom</type>
-			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-dependencies</artifactId>
@@ -73,6 +65,17 @@
 				<artifactId>spring-boot-starter-test</artifactId>
 				<version>${spring-boot.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.springframework.security.oauth</groupId>
+				<artifactId>spring-security-oauth2</artifactId>
+				<version>2.5.2.RELEASE</version>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework.security</groupId>
+				<artifactId>spring-security-jwt</artifactId>
+				<version>1.1.1.RELEASE</version>
+			</dependency>
+
 
 			<dependency>
 				<groupId>commons-lang</groupId>
@@ -104,12 +107,17 @@
 				<groupId>org.hsqldb</groupId>
 				<artifactId>hsqldb</artifactId>
 				<scope>runtime</scope>
-				<version>2.0.0</version>
+				<version>2.7.3</version>
 			</dependency>
 			<dependency>
 				<groupId>joda-time</groupId>
 				<artifactId>joda-time</artifactId>
-				<version>2.9.4</version>
+				<version>2.13.0</version>
+			</dependency>
+			<dependency>
+				<groupId>org.javassist</groupId>
+				<artifactId>javassist</artifactId>
+				<version>3.30.2-GA</version>
 			</dependency>
 		</dependencies>
 	</dependencyManagement>
@@ -156,7 +164,7 @@
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
-				<version>1.5.22.RELEASE</version>
+				<version>2.0.9.RELEASE</version>
 			</plugin>
 			<plugin>
 				<groupId>com.spotify</groupId>

query-side-blog-service/pom.xml

@@ -66,19 +66,19 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-eureka</artifactId>
+			<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-config-client</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-hystrix</artifactId>
+			<artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-turbine</artifactId>
+			<artifactId>spring-cloud-starter-netflix-turbine</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.jolokia</groupId>

query-side-blog-service/src/main/java/com/idugalic/queryside/blog/Application.java

@@ -1,5 +1,7 @@
 package com.idugalic.queryside.blog;
 
+import java.util.Optional;
+
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
@@ -18,14 +20,14 @@ public static void main(String... args) {
     @Bean
     public AuditorAware<String> auditorAware() {
         return new AuditorAware<String>() {
-            public String getCurrentAuditor() {
+            public Optional<String> getCurrentAuditor() {
                 Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
 
                 if (authentication == null || !authentication.isAuthenticated()) {
-                    return null;
+                    return Optional.empty();
                 }
 
-                return authentication.getName();
+                return Optional.of(authentication.getName());
             }
         };
     }

query-side-blog/src/main/java/com/idugalic/queryside/blog/handler/BlogPostViewEventHandler.java

@@ -38,7 +38,7 @@ public void handle(BlogPostCreatedEvent event, @SequenceNumber Long version) {
     @EventHandler
     public void handle(BlogPostPublishedEvent event, @SequenceNumber Long version) {
         LOG.info("BlogPostCreatedEvent: [{}] ", event.getId());
-        BlogPost post = blogPostRepository.findOne(event.getId());
+        BlogPost post = blogPostRepository.findById(event.getId()).get();
         post.setDraft(false);
         post.setPublishAt(event.getPublishAt());
         post.setVersion(version);

query-side-blog/src/main/java/com/idugalic/queryside/blog/repository/ReadOnlyPagingAndSortingRepository.java

@@ -20,10 +20,6 @@ public interface ReadOnlyPagingAndSortingRepository extends PagingAndSortingRepo
     @RestResource(exported = false)
     BlogPost save(BlogPost entity);
 
-    @Override
-    @RestResource(exported = false)
-    void delete(String aLong);
-
     @Override
     @RestResource(exported = false)
     void delete(BlogPost entity);