Merge branch 'step11'

Author: Ronald Holshausen

.gitignore

@@ -16,7 +16,7 @@ provider/src/test/resources/pacts
 .sts4-cache
 
 ### IntelliJ IDEA ###
-.idea
+.idea/
 *.iws
 *.iml
 *.ipr

.idea/.gitignore

@@ -10,12 +10,12 @@ buildscript {
 plugins {
 	id 'org.springframework.boot' version '2.3.4.RELEASE'
 	id 'io.spring.dependency-management' version '1.0.10.RELEASE'
-	id 'au.com.dius.pact' version '4.1.6'
+	id 'au.com.dius.pact' version '4.1.7'
 }
 
 group = 'au.com.dius.pactworkshop'
 version = '0.0.1-SNAPSHOT'
-sourceCompatibility = '11'
+sourceCompatibility = '8'
 
 
 

.idea/misc.xml

@@ -13,6 +13,8 @@
 import org.springframework.web.client.RestTemplate;
 
 import java.util.Collections;
+import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -33,7 +35,7 @@ RequestResponsePact getAllProducts(PactDslWithProvider builder) {
                 .matchHeader("Authorization", "Bearer (19|20)\\d\\d-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])T([01][1-9]|2[0123]):[0-5][0-9]")
                 .willRespondWith()
                 .status(200)
-                .headers(Map.of("Content-Type", "application/json; charset=utf-8"))
+                .headers(headers())
                 .body(newJsonArrayMinLike(2, array ->
                         array.object(object -> {
                             object.stringType("id", "09");
@@ -53,7 +55,7 @@ RequestResponsePact noProductsExist(PactDslWithProvider builder) {
                 .matchHeader("Authorization", "Bearer (19|20)\\d\\d-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])T([01][1-9]|2[0123]):[0-5][0-9]")
                 .willRespondWith()
                 .status(200)
-                .headers(Map.of("Content-Type", "application/json; charset=utf-8"))
+                .headers(headers())
                 .body("[]")
                 .toPact();
     }
@@ -78,7 +80,7 @@ RequestResponsePact getOneProduct(PactDslWithProvider builder) {
                 .matchHeader("Authorization", "Bearer (19|20)\\d\\d-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])T([01][1-9]|2[0123]):[0-5][0-9]")
                 .willRespondWith()
                 .status(200)
-                .headers(Map.of("Content-Type", "application/json; charset=utf-8"))
+                .headers(headers())
                 .body(newJsonBody(object -> {
                     object.stringType("id", "10");
                     object.stringType("type", "CREDIT_CARD");
@@ -117,7 +119,7 @@ void getAllProducts_whenProductsExist(MockServer mockServer) {
         product.setId("09");
         product.setType("CREDIT_CARD");
         product.setName("Gem Visa");
-        List<Product> expected = List.of(product, product);
+        List<Product> expected = Arrays.asList(product, product);
 
         RestTemplate restTemplate = new RestTemplateBuilder()
                 .rootUri(mockServer.getUrl())
@@ -189,4 +191,10 @@ void getProductById_whenNoAuth(MockServer mockServer) {
                 () -> new ProductService(restTemplate).getProduct("10"));
         assertEquals(401, e.getRawStatusCode());
     }
+
+    private Map<String, String> headers() {
+      Map<String, String> headers = new HashMap<>();
+      headers.put("Content-Type", "application/json; charset=utf-8");
+      return headers;
+    }
 }

.idea/vcs.xml

@@ -7,6 +7,7 @@
 import org.springframework.boot.web.client.RestTemplateBuilder;
 import org.springframework.web.client.RestTemplate;
 
+import java.util.Arrays;
 import java.util.List;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
@@ -49,7 +50,7 @@ void getAllProducts() {
                                 "{\"id\":\"10\",\"type\":\"CREDIT_CARD\",\"name\":\"28 Degrees\",\"version\":\"v1\"}"+
                                 "]")));
 
-        List<Product> expected = List.of(new Product("9", "CREDIT_CARD", "GEM Visa", "v2"),
+        List<Product> expected = Arrays.asList(new Product("9", "CREDIT_CARD", "GEM Visa", "v2"),
                 new Product("10", "CREDIT_CARD", "28 Degrees", "v1"));
 
         List<Product> products = productService.getAllProducts();

README.md

@@ -5,7 +5,7 @@ plugins {
 
 group = 'au.com.dius.pactworkshop'
 version = '0.0.1-SNAPSHOT'
-sourceCompatibility = '11'
+sourceCompatibility = '8'
 
 dependencies {
     implementation 'org.springframework.boot:spring-boot-starter'

consumer/build.gradle

@@ -2,25 +2,32 @@
 
 import org.springframework.stereotype.Repository;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
 @Repository
 public class ProductRepository {
 
-    private final Map<String, Product> PRODUCTS = Map.of(
-            "09", new Product("09", "CREDIT_CARD", "Gem Visa", "v1"),
-            "10", new Product("10", "CREDIT_CARD", "28 Degrees", "v1"),
-            "11", new Product("11", "PERSONAL_LOAN", "MyFlexiPay", "v2")
-    );
+    private final Map<String, Product> PRODUCTS = new HashMap<>();
 
     public List<Product> fetchAll() {
-        return List.copyOf(PRODUCTS.values());
+        initProducts();
+
+        return new ArrayList<>(PRODUCTS.values());
     }
 
     public Optional<Product> getById(String id) {
+        initProducts();
+
         return Optional.ofNullable(PRODUCTS.get(id));
     }
 
+    private void initProducts() {
+        PRODUCTS.put("09", new Product("09", "CREDIT_CARD", "Gem Visa", "v1"));
+        PRODUCTS.put("10", new Product("10", "CREDIT_CARD", "28 Degrees", "v1"));
+        PRODUCTS.put("11", new Product("11", "PERSONAL_LOAN", "MyFlexiPay", "v2"));
+    }
 }

consumer/src/test/java/au/com/dius/pactworkshop/consumer/ProductConsumerPactTest.java

@@ -18,6 +18,7 @@
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import java.text.SimpleDateFormat;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
@@ -65,7 +66,7 @@ private void replaceAuthHeader(HttpRequest request) {
     @State("products exist")
     void toProductsExistState() {
         when(productRepository.fetchAll()).thenReturn(
-                List.of(new Product("09", "CREDIT_CARD", "Gem Visa", "v1"),
+                Arrays.asList(new Product("09", "CREDIT_CARD", "Gem Visa", "v1"),
                         new Product("10", "CREDIT_CARD", "28 Degrees", "v1")));
     }