Update simulation DTO to support matcher chaining with builder pattern

Author: tommysitu

src/main/java/io/specto/hoverfly/junit/core/model/RequestFieldMatcher.java

@@ -17,6 +17,7 @@ public class RequestFieldMatcher<T> {
     private MatcherType matcher;
     private T value;
     private MatcherConfig config;
+    private RequestFieldMatcher<?> doMatch;
 
     public RequestFieldMatcher() {
     }
@@ -56,6 +57,14 @@ public void setConfig(MatcherConfig config) {
         this.config = config;
     }
 
+    public RequestFieldMatcher<?> getDoMatch() {
+        return doMatch;
+    }
+
+    public void setDoMatch(RequestFieldMatcher<?> doMatch) {
+        this.doMatch = doMatch;
+    }
+
     public static RequestFieldMatcher<String> newExactMatcher(String value) {
         return new RequestFieldMatcher<>(EXACT, value);
     }
@@ -105,6 +114,31 @@ public static RequestFieldMatcher<String> newJsonPathMatch(String value) {
         return new RequestFieldMatcher<>(MatcherType.JSONPATH, value);
     }
 
+    public static class MatcherChainingBuilder {
+
+        private final RequestFieldMatcher<?> rootMatcher;
+        private RequestFieldMatcher<?> currentMatcher;
+
+        private MatcherChainingBuilder(RequestFieldMatcher<?> rootMatcher) {
+            this.rootMatcher = rootMatcher;
+            this.currentMatcher = rootMatcher;
+        }
+
+        public static MatcherChainingBuilder root(RequestFieldMatcher<?> matcher) {
+            return new MatcherChainingBuilder(matcher);
+        }
+
+        public MatcherChainingBuilder next(RequestFieldMatcher<?> matcher) {
+            currentMatcher.setDoMatch(matcher);
+            currentMatcher = matcher;
+            return this;
+        }
+
+        public RequestFieldMatcher<?> build() {
+            return rootMatcher;
+        }
+
+    }
 
     public enum MatcherType {
         EXACT,

src/test/java/io/specto/hoverfly/junit/core/model/SimulationTest.java

@@ -11,6 +11,7 @@
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 import com.google.common.io.Resources;
+import io.specto.hoverfly.junit.core.model.RequestFieldMatcher.MatcherChainingBuilder;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
@@ -122,7 +123,12 @@ private Simulation getSimulationWithV5_2Matchers() {
                 // Array Matcher
                 .query(ImmutableMap.of("key", singletonList(RequestFieldMatcher.newArrayMatcher(Arrays.asList("value1", "value2"), new ArrayMatcherConfig(true, true, false)))))
                 // JWT Matcher
-                .headers(ImmutableMap.of("Authorization", singletonList(RequestFieldMatcher.newJwtMatcher("{\"header\":{\"alg\":\"HS256\"},\"payload\":{\"sub\":\"1234567890\",\"name\":\"John Doe\"}}"))))
+                .headers(ImmutableMap.of("Authorization", singletonList(
+                    MatcherChainingBuilder.root(RequestFieldMatcher.newJwtMatcher("{\"header\":{\"alg\":\"HS256\"},\"payload\":{\"sub\":\"1234567890\",\"name\":\"John Doe\"}}"))
+                        .next(RequestFieldMatcher.newJsonPathMatch("$.payload.name"))
+                        .next(RequestFieldMatcher.newExactMatcher("John Doe"))
+                        .build()
+                )))
                 .body(singletonList(RequestFieldMatcher.newFormMatcher(ImmutableMap.of(
                     "grant_type", singletonList(RequestFieldMatcher.newExactMatcher("authorization_code")),
                     "client_assertion", singletonList(RequestFieldMatcher.newJwtMatcher("{\"header\":{\"alg\":\"HS256\"},\"payload\":{\"sub\":\"1234567890\",\"name\":\"John Doe\"}}"))

src/test/resources/simulations/v5_2-simulation.json

@@ -50,7 +50,15 @@
 						"Authorization": [
 							{
 								"matcher": "jwt",
-								"value": "{\"header\":{\"alg\":\"HS256\"},\"payload\":{\"sub\":\"1234567890\",\"name\":\"John Doe\"}}"
+								"value": "{\"header\":{\"alg\":\"HS256\"},\"payload\":{\"sub\":\"1234567890\",\"name\":\"John Doe\"}}",
+								"doMatch": {
+									"matcher": "jsonpath",
+									"value": "$.payload.name",
+									"doMatch": {
+										"matcher": "exact",
+										"value": "John Doe"
+									}
+								}
 							}
 						]
 					},