Map array matcher configs

Author: tommysitu

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

@@ -0,0 +1,65 @@
+package io.specto.hoverfly.junit.core.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class ArrayMatcherConfig implements MatcherConfig {
+
+    private boolean ignoreUnknown;
+    private boolean ignoreOrder;
+    private boolean ignoreOccurrences;
+
+    public ArrayMatcherConfig() {
+    }
+
+    public ArrayMatcherConfig(boolean ignoreUnknown, boolean ignoreOrder, boolean ignoreOccurrences) {
+        this.ignoreUnknown = ignoreUnknown;
+        this.ignoreOrder = ignoreOrder;
+        this.ignoreOccurrences = ignoreOccurrences;
+    }
+
+    public boolean isIgnoreUnknown() {
+        return ignoreUnknown;
+    }
+
+    public void setIgnoreUnknown(boolean ignoreUnknown) {
+        this.ignoreUnknown = ignoreUnknown;
+    }
+
+    public boolean isIgnoreOrder() {
+        return ignoreOrder;
+    }
+
+    public void setIgnoreOrder(boolean ignoreOrder) {
+        this.ignoreOrder = ignoreOrder;
+    }
+
+    public boolean isIgnoreOccurrences() {
+        return ignoreOccurrences;
+    }
+
+    public void setIgnoreOccurrences(boolean ignoreOccurrences) {
+        this.ignoreOccurrences = ignoreOccurrences;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        return EqualsBuilder.reflectionEquals(this, obj);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this);
+    }
+
+}

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

@@ -0,0 +1,7 @@
+package io.specto.hoverfly.junit.core.model;
+
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+
+@JsonDeserialize(as = ArrayMatcherConfig.class)
+public interface MatcherConfig {
+}

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

@@ -15,16 +15,22 @@ public class RequestFieldMatcher<T> {
 
     private MatcherType matcher;
     private T value;
+    private MatcherConfig config;
 
     public RequestFieldMatcher() {
     }
 
-    public RequestFieldMatcher(MatcherType matcher,
-                               T value) {
+    public RequestFieldMatcher(MatcherType matcher, T value) {
         this.matcher = matcher;
         this.value = value;
     }
 
+    public RequestFieldMatcher(MatcherType matcher, T value, MatcherConfig config) {
+        this.matcher = matcher;
+        this.value = value;
+        this.config = config;
+    }
+
     public MatcherType getMatcher() {
         return matcher;
     }
@@ -41,6 +47,14 @@ public void setValue(T value) {
         this.value = value;
     }
 
+    public MatcherConfig getConfig() {
+        return config;
+    }
+
+    public void setConfig(MatcherConfig config) {
+        this.config = config;
+    }
+
     public static RequestFieldMatcher<String> newExactMatcher(String value) {
         return new RequestFieldMatcher<>(EXACT, value);
     }
@@ -57,6 +71,10 @@ public static RequestFieldMatcher<List<String>> newArrayMatcher(List<String> val
         return new RequestFieldMatcher<>(ARRAY, value);
     }
 
+    public static RequestFieldMatcher<List<String>> newArrayMatcher(List<String> value, ArrayMatcherConfig arrayMatcherConfig) {
+        return new RequestFieldMatcher<>(ARRAY, value, arrayMatcherConfig);
+    }
+
     public static RequestFieldMatcher<String> newJwtMatcher(String value) {
         return new RequestFieldMatcher<>(JWT, value);
     }

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

@@ -121,7 +121,7 @@ public void shouldNotIncludeNullGlobalActionsFieldWhenSerialize() throws Excepti
     private Simulation getSimulationWithV5_2Matchers() {
         Request.Builder requestBuilder = getTestRequestBuilder()
                 // Array Matcher
-                .query(ImmutableMap.of("key", singletonList(RequestFieldMatcher.newArrayMatcher(Arrays.asList("value1", "value2")))))
+                .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\"}}"))))
                 .requiresState(ImmutableMap.of("requiresStateKey", "requiresStateValue"));

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

@@ -45,7 +45,12 @@
 						"key": [
 							{
 								"matcher": "array",
-								"value": ["value1", "value2"]
+								"value": ["value1", "value2"],
+								"config": {
+									"ignoreUnknown": true,
+									"ignoreOrder": true,
+									"ignoreOccurrences": false
+								}
 							}
 						]
 					},