update Spring Cloud Contract blog example

Author: rieckpil

consumer-driven-contracts-with-spring-cloud-contract/README.md

@@ -4,5 +4,5 @@ Steps to run this project:
 
 1. Clone this Git repository
 2. Navigate to the folder `consumer-driven-contracts-with-spring-cloud-contract`
-3. Navigate to the `book-store-server` folder and build the project with `mvn install`
+3. Navigate to the `book-store-server` folder and build the project with `mvn install` (yes - `install` is required here)
 4. Navigate to the `book-store-client` folder and execute `mvn test`. The tests should pass and make use of the `book-store-server` stubs

consumer-driven-contracts-with-spring-cloud-contract/book-store-client/pom.xml

@@ -1,13 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns="http://maven.apache.org/POM/4.0.0"
+  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>
+
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>2.3.0.RELEASE</version>
+    <version>2.4.6</version>
     <relativePath/> <!-- lookup parent from repository -->
   </parent>
+
   <groupId>de.rieckpil.blog</groupId>
   <artifactId>book-store-client</artifactId>
   <version>0.0.1-SNAPSHOT</version>
@@ -16,7 +20,7 @@
 
   <properties>
     <java.version>11</java.version>
-    <spring-cloud.version>Hoxton.SR5</spring-cloud.version>
+    <spring-cloud.version>2020.0.2</spring-cloud.version>
   </properties>
 
   <dependencies>
@@ -59,6 +63,11 @@
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-maven-plugin</artifactId>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>3.0.0-M5</version>
+      </plugin>
     </plugins>
   </build>
 

consumer-driven-contracts-with-spring-cloud-contract/book-store-client/src/main/java/de/rieckpil/blog/BookClient.java

@@ -6,29 +6,29 @@
 import io.netty.handler.timeout.WriteTimeoutHandler;
 import org.springframework.http.MediaType;
 import org.springframework.http.client.reactive.ReactorClientHttpConnector;
+import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Service;
 import org.springframework.web.reactive.function.client.WebClient;
 import reactor.netty.http.client.HttpClient;
-import reactor.netty.tcp.TcpClient;
 
 import javax.annotation.PostConstruct;
 
-@Service
+@Component
 public class BookClient {
 
   private WebClient webClient;
 
   @PostConstruct
   public void setUpWebClient() {
-    var tcpClient = TcpClient.create()
+    var httpClient = HttpClient.create()
       .option(ChannelOption.CONNECT_TIMEOUT_MILLIS, 2_000)
       .doOnConnected(connection ->
         connection.addHandlerLast(new ReadTimeoutHandler(2))
           .addHandlerLast(new WriteTimeoutHandler(2)));
 
     this.webClient = WebClient.builder()
       .baseUrl("http://localhost:8080")
-      .clientConnector(new ReactorClientHttpConnector(HttpClient.from(tcpClient)))
+      .clientConnector(new ReactorClientHttpConnector(httpClient))
       .build();
   }
 

consumer-driven-contracts-with-spring-cloud-contract/book-store-client/src/test/java/de/rieckpil/blog/BookClientTest.java

@@ -9,15 +9,18 @@
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE)
-@AutoConfigureStubRunner(ids = {"de.rieckpil.blog:book-store-server:+:stubs:8080"}, stubsMode = StubRunnerProperties.StubsMode.LOCAL)
-public class BookClientTest {
+@SpringBootTest
+@AutoConfigureStubRunner(
+  ids = {"de.rieckpil.blog:book-store-server:+:stubs:8080"},
+  stubsMode = StubRunnerProperties.StubsMode.LOCAL
+)
+class BookClientTest {
 
   @Autowired
   private BookClient cut;
 
   @Test
-  public void testContractToBookStoreServer() {
+  void testContractToBookStoreServer() {
 
     JsonNode result = cut.getAllAvailableBooks();
 
@@ -32,5 +35,4 @@ public void testContractToBookStoreServer() {
     assertTrue(firstBook.get("genre").isTextual());
     assertTrue(firstBook.get("title").isTextual());
   }
-
 }

consumer-driven-contracts-with-spring-cloud-contract/book-store-client/src/test/java/de/rieckpil/blog/BookStoreClientApplicationTests.java

@@ -4,10 +4,10 @@
 import org.springframework.boot.test.context.SpringBootTest;
 
 @SpringBootTest
-public class BookStoreClientApplicationTests {
+class BookStoreClientApplicationTests {
 
   @Test
-  public void contextLoads() {
+  void contextLoads() {
   }
 
 }

consumer-driven-contracts-with-spring-cloud-contract/book-store-server/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>2.3.0.RELEASE</version>
+    <version>2.4.6</version>
     <relativePath/> <!-- lookup parent from repository -->
   </parent>
 
@@ -18,7 +18,7 @@
 
   <properties>
     <java.version>11</java.version>
-    <spring-cloud.version>Hoxton.SR5</spring-cloud.version>
+    <spring-cloud.version>2020.0.2</spring-cloud.version>
   </properties>
 
   <dependencies>
@@ -55,20 +55,25 @@
     </dependencies>
   </dependencyManagement>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-maven-plugin</artifactId>
-      </plugin>
+<build>
+  <plugins>
+    <plugin>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-maven-plugin</artifactId>
+    </plugin>
+    <plugin>
+      <groupId>org.springframework.cloud</groupId>
+      <artifactId>spring-cloud-contract-maven-plugin</artifactId>
+      <version>3.0.2</version>
+      <extensions>true</extensions>
+      <configuration>
+        <baseClassForTests>de.rieckpil.blog.BaseTest</baseClassForTests>
+      </configuration>
+    </plugin>
       <plugin>
-        <groupId>org.springframework.cloud</groupId>
-        <artifactId>spring-cloud-contract-maven-plugin</artifactId>
-        <version>2.2.2.RELEASE</version>
-        <extensions>true</extensions>
-        <configuration>
-          <baseClassForTests>de.rieckpil.blog.BaseTest</baseClassForTests>
-        </configuration>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>3.0.0-M5</version>
       </plugin>
     </plugins>
   </build>

consumer-driven-contracts-with-spring-cloud-contract/book-store-server/src/test/java/de/rieckpil/blog/BaseTest.java

@@ -1,24 +1,26 @@
 package de.rieckpil.blog;
 
 import io.restassured.module.mockmvc.RestAssuredMockMvc;
-import org.junit.Before;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 
 import java.util.List;
 
 import static org.mockito.Mockito.when;
 
-@RunWith(SpringRunner.class)
+@ExtendWith(MockitoExtension.class)
 public abstract class BaseTest {
 
   @Mock
   private BookService mockedBookService;
 
-  @Before
-  public void setup() {
-    when(mockedBookService.getBooks()).thenReturn(List.of(new Book("Java 11", "Technology", "42")));
+  @BeforeEach
+  void setup() {
+    when(mockedBookService.getBooks())
+      .thenReturn(List.of(new Book("Java 11", "Technology", "42")));
+
     RestAssuredMockMvc.standaloneSetup(new BookController(mockedBookService));
   }
 }

consumer-driven-contracts-with-spring-cloud-contract/book-store-server/src/test/java/de/rieckpil/blog/BookStoreServerApplicationTests.java

@@ -1,16 +1,13 @@
 package de.rieckpil.blog;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
 
-@RunWith(SpringRunner.class)
 @SpringBootTest
-public class BookStoreServerApplicationTests {
+class BookStoreServerApplicationTests {
 
   @Test
-  public void contextLoads() {
+  void contextLoads() {
   }
 
 }