From e492dc86a132c3a56b6cbb0dd4c40f60258aaa7a Mon Sep 17 00:00:00 2001
From: Kai Moritz <kai@juplo.de>
Date: Sat, 21 May 2022 17:11:30 +0200
Subject: [PATCH] Migrated the example from the classic DSL to the Lambda-DSL

---
 .../de/juplo/demos/pact/ContractTest.java     | 19 +++++++++++--------
 .../SpringConsumer-Siren Order Provider.json  | 14 --------------
 2 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/spring-consumer/src/test/java/de/juplo/demos/pact/ContractTest.java b/spring-consumer/src/test/java/de/juplo/demos/pact/ContractTest.java
index d7358d8..8db0dbc 100644
--- a/spring-consumer/src/test/java/de/juplo/demos/pact/ContractTest.java
+++ b/spring-consumer/src/test/java/de/juplo/demos/pact/ContractTest.java
@@ -1,7 +1,9 @@
 package de.juplo.demos.pact;
 
 import au.com.dius.pact.consumer.MockServer;
+import au.com.dius.pact.consumer.dsl.LambdaDsl;
 import au.com.dius.pact.consumer.dsl.PactDslJsonBody;
+import au.com.dius.pact.consumer.dsl.PactDslJsonRootValue;
 import au.com.dius.pact.consumer.dsl.PactDslWithProvider;
 import au.com.dius.pact.consumer.junit5.PactConsumerTestExt;
 import au.com.dius.pact.consumer.junit5.PactTestFor;
@@ -24,13 +26,6 @@ public class ContractTest
   @Pact(consumer="SpringConsumer")
   public RequestResponsePact getOrders(PactDslWithProvider builder)
   {
-    PactDslJsonBody body = new PactDslJsonBody()
-        .stringType("name")
-        .booleanType("happy")
-        .hexValue("hexCode")
-        .id()
-        .ipAddress("localAddress")
-        .numberValue("age", 100);
     return builder
           .uponReceiving("get all orders")
             .path("/orders")
@@ -38,7 +33,15 @@ public class ContractTest
           .willRespondWith()
             .status(200)
             .headers(Map.of("Content-Type", "application/vnd.siren+json"))
-            .body(body)
+            .body(LambdaDsl.newJsonBody(body ->
+            {
+              body.stringType("name");
+              body.booleanType("happy");
+              // body.hexValue("hexCode");
+              body.id();
+              body.ipV4Address("localAddress");
+              body.numberValue("age", 100);
+            }).build())
         .toPact();
   }
 
diff --git a/spring-consumer/target/pacts/SpringConsumer-Siren Order Provider.json b/spring-consumer/target/pacts/SpringConsumer-Siren Order Provider.json
index 3d6d034..7b55f1e 100644
--- a/spring-consumer/target/pacts/SpringConsumer-Siren Order Provider.json	
+++ b/spring-consumer/target/pacts/SpringConsumer-Siren Order Provider.json	
@@ -13,17 +13,12 @@
         "body": {
           "age": 100,
           "happy": true,
-          "hexCode": "1234a",
           "id": 1234567890,
           "localAddress": "127.0.0.1",
           "name": "string"
         },
         "generators": {
           "body": {
-            "$.hexCode": {
-              "digits": 10,
-              "type": "RandomHexadecimal"
-            },
             "$.id": {
               "max": 2147483647,
               "min": 0,
@@ -48,15 +43,6 @@
                 }
               ]
             },
-            "$.hexCode": {
-              "combine": "AND",
-              "matchers": [
-                {
-                  "match": "regex",
-                  "regex": "[0-9a-fA-F]+"
-                }
-              ]
-            },
             "$.id": {
               "combine": "AND",
               "matchers": [
-- 
2.20.1