From 7c07f4387061e874ffbf11f856b40f1c127e99de Mon Sep 17 00:00:00 2001
From: Stef Heyenrath <Stef.Heyenrath@gmail.com>
Date: Tue, 20 Feb 2018 21:53:32 +0100
Subject: [PATCH 1/3] Fixes for JsonPath

---
 src/WireMock.Net/Matchers/ExactMatcher.cs     |  20 +---
 .../Matchers/ExactObjectMatcher.cs            |  34 ++++++
 src/WireMock.Net/Matchers/IMatcher.cs         |  13 ---
 src/WireMock.Net/Matchers/IObjectMatcher.cs   |  15 +++
 src/WireMock.Net/Matchers/IStringMatcher.cs   |  21 ++++
 src/WireMock.Net/Matchers/JSONPathMatcher.cs  |  48 ++++++---
 src/WireMock.Net/Matchers/RegexMatcher.cs     |  26 ++---
 .../Request/RequestMessageBodyMatcher.cs      | 101 +++++++++++-------
 .../Request/RequestMessageClientIPMatcher.cs  |   6 +-
 .../Request/RequestMessageCookieMatcher.cs    |  14 ++-
 .../Request/RequestMessageHeaderMatcher.cs    |  16 ++-
 .../Request/RequestMessagePathMatcher.cs      |  10 +-
 .../Request/RequestMessageUrlMatcher.cs       |  10 +-
 .../Matchers/SimMetricsMatcher.cs             |  20 +---
 src/WireMock.Net/Matchers/WildcardMatcher.cs  |  14 +--
 src/WireMock.Net/Matchers/XPathMatcher.cs     |  22 ++--
 .../Owin/WireMockMiddlewareOptions.cs         |   2 +-
 .../IClientIPRequestBuilder.cs                |   2 +-
 .../IHeadersAndCookiesRequestBuilder.cs       |   4 +-
 .../IUrlAndPathRequestBuilder.cs              |   4 +-
 src/WireMock.Net/RequestBuilders/Request.cs   |  10 +-
 .../Serialization/MappingConverter.cs         |   5 +-
 .../Server/FluentMockServer.Admin.cs          |  10 +-
 .../RequestWithBodyTests.cs                   |  23 ++++
 .../StatefulBehaviorTests.cs                  |   8 +-
 25 files changed, 283 insertions(+), 175 deletions(-)
 create mode 100644 src/WireMock.Net/Matchers/ExactObjectMatcher.cs
 create mode 100644 src/WireMock.Net/Matchers/IObjectMatcher.cs
 create mode 100644 src/WireMock.Net/Matchers/IStringMatcher.cs

diff --git a/src/WireMock.Net/Matchers/ExactMatcher.cs b/src/WireMock.Net/Matchers/ExactMatcher.cs
index fb5354e4e..5923140e2 100644
--- a/src/WireMock.Net/Matchers/ExactMatcher.cs
+++ b/src/WireMock.Net/Matchers/ExactMatcher.cs
@@ -7,8 +7,8 @@ namespace WireMock.Matchers
     /// <summary>
     /// ExactMatcher
     /// </summary>
-    /// <seealso cref="IMatcher" />
-    public class ExactMatcher : IMatcher
+    /// <seealso cref="IStringMatcher" />
+    public class ExactMatcher : IStringMatcher
     {
         private readonly string[] _values;
 
@@ -23,29 +23,19 @@ public ExactMatcher([NotNull] params string[] values)
             _values = values;
         }
 
-        /// <summary>
-        /// Determines whether the specified input is match.
-        /// </summary>
-        /// <param name="input">The input.</param>
-        /// <returns>A value between 0.0 - 1.0 of the similarity.</returns>
+        /// <inheritdoc cref="IStringMatcher.IsMatch"/>
         public double IsMatch(string input)
         {
             return MatchScores.ToScore(_values.Select(value => value.Equals(input)));
         }
 
-        /// <summary>
-        /// Gets the value.
-        /// </summary>
-        /// <returns>Patterns</returns>
+        /// <inheritdoc cref="IStringMatcher.GetPatterns"/>
         public string[] GetPatterns()
         {
             return _values;
         }
 
-        /// <summary>
-        /// Gets the name.
-        /// </summary>
-        /// <returns>Name</returns>
+        /// <inheritdoc cref="IMatcher.GetName"/>
         public string GetName()
         {
             return "ExactMatcher";
diff --git a/src/WireMock.Net/Matchers/ExactObjectMatcher.cs b/src/WireMock.Net/Matchers/ExactObjectMatcher.cs
new file mode 100644
index 000000000..f7cb66352
--- /dev/null
+++ b/src/WireMock.Net/Matchers/ExactObjectMatcher.cs
@@ -0,0 +1,34 @@
+using JetBrains.Annotations;
+
+namespace WireMock.Matchers
+{
+    /// <summary>
+    /// ExactMatcher
+    /// </summary>
+    /// <seealso cref="IObjectMatcher" />
+    public class ExactObjectMatcher : IObjectMatcher
+    {
+        private readonly object _value;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ExactMatcher"/> class.
+        /// </summary>
+        /// <param name="value">The value.</param>
+        public ExactObjectMatcher([NotNull] object value)
+        {
+            _value = value;
+        }
+
+        /// <inheritdoc cref="IObjectMatcher.IsMatch"/>
+        public double IsMatch(object input)
+        {
+            return MatchScores.ToScore(Equals(_value, input));
+        }
+
+        /// <inheritdoc cref="IMatcher.GetName"/>
+        public string GetName()
+        {
+            return "ExactObjectMatcher";
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WireMock.Net/Matchers/IMatcher.cs b/src/WireMock.Net/Matchers/IMatcher.cs
index 4bcd2cff6..7462c1554 100644
--- a/src/WireMock.Net/Matchers/IMatcher.cs
+++ b/src/WireMock.Net/Matchers/IMatcher.cs
@@ -5,19 +5,6 @@
     /// </summary>
     public interface IMatcher
     {
-        /// <summary>
-        /// Determines whether the specified input is match.
-        /// </summary>
-        /// <param name="input">The input.</param>
-        /// <returns>A value between 0.0 - 1.0 of the similarity.</returns>
-        double IsMatch(string input);
-
-        /// <summary>
-        /// Gets the patterns.
-        /// </summary>
-        /// <returns>Patterns</returns>
-        string[] GetPatterns();
-
         /// <summary>
         /// Gets the name.
         /// </summary>
diff --git a/src/WireMock.Net/Matchers/IObjectMatcher.cs b/src/WireMock.Net/Matchers/IObjectMatcher.cs
new file mode 100644
index 000000000..883e246d9
--- /dev/null
+++ b/src/WireMock.Net/Matchers/IObjectMatcher.cs
@@ -0,0 +1,15 @@
+namespace WireMock.Matchers
+{
+    /// <summary>
+    /// IObjectMatcher
+    /// </summary>
+    public interface IObjectMatcher : IMatcher
+    {
+        /// <summary>
+        /// Determines whether the specified input is match.
+        /// </summary>
+        /// <param name="input">The input.</param>
+        /// <returns>A value between 0.0 - 1.0 of the similarity.</returns>
+        double IsMatch(object input);
+    }
+}
\ No newline at end of file
diff --git a/src/WireMock.Net/Matchers/IStringMatcher.cs b/src/WireMock.Net/Matchers/IStringMatcher.cs
new file mode 100644
index 000000000..7d1ab3fdb
--- /dev/null
+++ b/src/WireMock.Net/Matchers/IStringMatcher.cs
@@ -0,0 +1,21 @@
+namespace WireMock.Matchers
+{
+    /// <summary>
+    /// IStringMatcher
+    /// </summary>
+    public interface IStringMatcher : IMatcher
+    {
+        /// <summary>
+        /// Determines whether the specified input is match.
+        /// </summary>
+        /// <param name="input">The input.</param>
+        /// <returns>A value between 0.0 - 1.0 of the similarity.</returns>
+        double IsMatch(string input);
+
+        /// <summary>
+        /// Gets the patterns.
+        /// </summary>
+        /// <returns>Patterns</returns>
+        string[] GetPatterns();
+    }
+}
\ No newline at end of file
diff --git a/src/WireMock.Net/Matchers/JSONPathMatcher.cs b/src/WireMock.Net/Matchers/JSONPathMatcher.cs
index c92b01890..aab0b86cc 100644
--- a/src/WireMock.Net/Matchers/JSONPathMatcher.cs
+++ b/src/WireMock.Net/Matchers/JSONPathMatcher.cs
@@ -10,8 +10,9 @@ namespace WireMock.Matchers
     /// JSONPathMatcher
     /// </summary>
     /// <seealso cref="IMatcher" />
-    public class JsonPathMatcher : IMatcher
+    public class JsonPathMatcher : IStringMatcher, IObjectMatcher
     {
+        // private readonly object _jsonPattern;
         private readonly string[] _patterns;
 
         /// <summary>
@@ -25,15 +26,20 @@ public JsonPathMatcher([NotNull] params string[] patterns)
             _patterns = patterns;
         }
 
-        /// <summary>
-        /// Determines whether the specified input is match.
-        /// </summary>
-        /// <param name="input">The input string</param>
-        /// <returns>A value between 0.0 - 1.0 of the similarity.</returns>
+        //public JsonPathMatcher([NotNull] object jsonPattern)
+        //{
+        //    Check.NotNull(jsonPattern, nameof(jsonPattern));
+
+        //    _jsonPattern = jsonPattern;
+        //}
+
+        /// <inheritdoc cref="IStringMatcher.IsMatch"/>
         public double IsMatch(string input)
         {
             if (input == null)
+            {
                 return MatchScores.Mismatch;
+            }
 
             try
             {
@@ -47,19 +53,33 @@ public double IsMatch(string input)
             }
         }
 
-        /// <summary>
-        /// Gets the patterns.
-        /// </summary>
-        /// <returns>Pattern</returns>
+        /// <inheritdoc cref="IObjectMatcher.IsMatch"/>
+        public double IsMatch(object input)
+        {
+            if (input == null)
+            {
+                return MatchScores.Mismatch;
+            }
+
+            try
+            {
+                var o = input as JObject ?? JObject.FromObject(input);
+
+                return MatchScores.ToScore(_patterns.Select(p => o.SelectToken(p) != null));
+            }
+            catch (Exception)
+            {
+                return MatchScores.Mismatch;
+            }
+        }
+
+        /// <inheritdoc cref="IStringMatcher.GetPatterns"/>
         public string[] GetPatterns()
         {
             return _patterns;
         }
 
-        /// <summary>
-        /// Gets the name.
-        /// </summary>
-        /// <returns>Name</returns>
+        /// <inheritdoc cref="IMatcher.GetName"/>
         public string GetName()
         {
             return "JsonPathMatcher";
diff --git a/src/WireMock.Net/Matchers/RegexMatcher.cs b/src/WireMock.Net/Matchers/RegexMatcher.cs
index 918f0e9a2..004c69d92 100644
--- a/src/WireMock.Net/Matchers/RegexMatcher.cs
+++ b/src/WireMock.Net/Matchers/RegexMatcher.cs
@@ -9,8 +9,8 @@ namespace WireMock.Matchers
     /// <summary>
     /// Regular Expression Matcher
     /// </summary>
-    /// <seealso cref="IMatcher" />
-    public class RegexMatcher : IMatcher
+    /// <seealso cref="IStringMatcher" />
+    public class RegexMatcher : IStringMatcher
     {
         private readonly string[] _patterns;
         private readonly Regex[] _expressions;
@@ -37,20 +37,20 @@ public RegexMatcher([NotNull, RegexPattern] string[] patterns, bool ignoreCase =
 
             RegexOptions options = RegexOptions.Compiled;
             if (ignoreCase)
+            {
                 options |= RegexOptions.IgnoreCase;
+            }
 
             _expressions = patterns.Select(p => new Regex(p, options)).ToArray();
         }
 
-        /// <summary>
-        /// Determines whether the specified input is match.
-        /// </summary>
-        /// <param name="input">The input string</param>
-        /// <returns>A value between 0.0 - 1.0 of the similarity.</returns>
+        /// <inheritdoc cref="IStringMatcher.IsMatch"/>
         public double IsMatch(string input)
         {
             if (input == null)
+            {
                 return MatchScores.Mismatch;
+            }
 
             try
             {
@@ -62,21 +62,13 @@ public double IsMatch(string input)
             }
         }
 
-        /// <summary>
-        /// Gets the patterns.
-        /// </summary>
-        /// <returns>Pattern</returns>
+        /// <inheritdoc cref="IStringMatcher.GetPatterns"/>
         public virtual string[] GetPatterns()
         {
             return _patterns;
         }
 
-        /// <summary>
-        /// Gets the name.
-        /// </summary>
-        /// <returns>
-        /// Name
-        /// </returns>
+        /// <inheritdoc cref="IMatcher.GetName"/>
         public virtual string GetName()
         {
             return "RegexMatcher";
diff --git a/src/WireMock.Net/Matchers/Request/RequestMessageBodyMatcher.cs b/src/WireMock.Net/Matchers/Request/RequestMessageBodyMatcher.cs
index 2e0891b45..427510e3c 100644
--- a/src/WireMock.Net/Matchers/Request/RequestMessageBodyMatcher.cs
+++ b/src/WireMock.Net/Matchers/Request/RequestMessageBodyMatcher.cs
@@ -9,21 +9,21 @@ namespace WireMock.Matchers.Request
     /// </summary>
     public class RequestMessageBodyMatcher : IRequestMatcher
     {
-        /// <summary>
-        /// The body as byte[].
-        /// </summary>
-        private readonly byte[] _bodyData;
-
         /// <summary>
         /// The body function
         /// </summary>
         public Func<string, bool> Func { get; }
 
         /// <summary>
-        /// The body data function
+        /// The body data function for byte[]
         /// </summary>
         public Func<byte[], bool> DataFunc { get; }
 
+        /// <summary>
+        /// The body data function for json
+        /// </summary>
+        public Func<object, bool> JsonFunc { get; }
+
         /// <summary>
         /// The matcher.
         /// </summary>
@@ -32,9 +32,7 @@ public class RequestMessageBodyMatcher : IRequestMatcher
         /// <summary>
         /// Initializes a new instance of the <see cref="RequestMessageBodyMatcher"/> class.
         /// </summary>
-        /// <param name="body">
-        /// The body Regex pattern.
-        /// </param>
+        /// <param name="body">The body.</param>
         public RequestMessageBodyMatcher([NotNull] string body) : this(new SimMetricsMatcher(body))
         {
         }
@@ -42,21 +40,23 @@ public RequestMessageBodyMatcher([NotNull] string body) : this(new SimMetricsMat
         /// <summary>
         /// Initializes a new instance of the <see cref="RequestMessageBodyMatcher"/> class.
         /// </summary>
-        /// <param name="body">
-        /// The body Regex pattern.
-        /// </param>
-        public RequestMessageBodyMatcher([NotNull] byte[] body)
+        /// <param name="body">The body.</param>
+        public RequestMessageBodyMatcher([NotNull] byte[] body) : this(new ExactObjectMatcher(body))
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RequestMessageBodyMatcher"/> class.
+        /// </summary>
+        /// <param name="body">The body.</param>
+        public RequestMessageBodyMatcher([NotNull] object body) : this(new ExactObjectMatcher(body))
         {
-            Check.NotNull(body, nameof(body));
-            _bodyData = body;
         }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="RequestMessageBodyMatcher"/> class.
         /// </summary>
-        /// <param name="func">
-        /// The body func.
-        /// </param>
+        /// <param name="func">The function.</param>
         public RequestMessageBodyMatcher([NotNull] Func<string, bool> func)
         {
             Check.NotNull(func, nameof(func));
@@ -66,9 +66,7 @@ public RequestMessageBodyMatcher([NotNull] Func<string, bool> func)
         /// <summary>
         /// Initializes a new instance of the <see cref="RequestMessageBodyMatcher"/> class.
         /// </summary>
-        /// <param name="func">
-        /// The body func.
-        /// </param>
+        /// <param name="func">The function.</param>
         public RequestMessageBodyMatcher([NotNull] Func<byte[], bool> func)
         {
             Check.NotNull(func, nameof(func));
@@ -78,23 +76,24 @@ public RequestMessageBodyMatcher([NotNull] Func<byte[], bool> func)
         /// <summary>
         /// Initializes a new instance of the <see cref="RequestMessageBodyMatcher"/> class.
         /// </summary>
-        /// <param name="matcher">
-        /// The body matcher.
-        /// </param>
+        /// <param name="func">The function.</param>
+        public RequestMessageBodyMatcher([NotNull] Func<object, bool> func)
+        {
+            Check.NotNull(func, nameof(func));
+            JsonFunc = func;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RequestMessageBodyMatcher"/> class.
+        /// </summary>
+        /// <param name="matcher">The matcher.</param>
         public RequestMessageBodyMatcher([NotNull] IMatcher matcher)
         {
             Check.NotNull(matcher, nameof(matcher));
             Matcher = matcher;
         }
 
-        /// <summary>
-        /// Determines whether the specified RequestMessage is match.
-        /// </summary>
-        /// <param name="requestMessage">The RequestMessage.</param>
-        /// <param name="requestMatchResult">The RequestMatchResult.</param>
-        /// <returns>
-        /// A value between 0.0 - 1.0 of the similarity.
-        /// </returns>
+        /// <see cref="IRequestMatcher.GetMatchingScore"/>
         public double GetMatchingScore(RequestMessage requestMessage, RequestMatchResult requestMatchResult)
         {
             double score = IsMatch(requestMessage);
@@ -103,17 +102,43 @@ public double GetMatchingScore(RequestMessage requestMessage, RequestMatchResult
 
         private double IsMatch(RequestMessage requestMessage)
         {
-            if (Matcher != null)
-                return Matcher.IsMatch(requestMessage.Body);
+            if (requestMessage.Body != null)
+            {
+                var stringMatcher = Matcher as IStringMatcher;
+                if (stringMatcher != null)
+                {
+                    return stringMatcher.IsMatch(requestMessage.Body);
+                }
+            }
 
-            if (_bodyData != null)
-                return MatchScores.ToScore(requestMessage.BodyAsBytes == _bodyData);
+            var objectMatcher = Matcher as IObjectMatcher;
+            if (objectMatcher != null)
+            {
+                if (requestMessage.BodyAsJson != null)
+                {
+                    return objectMatcher.IsMatch(requestMessage.BodyAsJson);
+                }
+
+                if (requestMessage.BodyAsBytes != null)
+                {
+                    return objectMatcher.IsMatch(requestMessage.BodyAsBytes);
+                }
+            }
 
             if (Func != null)
-                return MatchScores.ToScore(requestMessage.Body != null && Func(requestMessage.Body));
+            {
+                return MatchScores.ToScore(Func(requestMessage.Body));
+            }
 
-            if (DataFunc != null && requestMessage.BodyAsBytes != null)
+            if (DataFunc != null)
+            {
                 return MatchScores.ToScore(requestMessage.BodyAsBytes != null && DataFunc(requestMessage.BodyAsBytes));
+            }
+
+            if (JsonFunc != null)
+            {
+                return MatchScores.ToScore(requestMessage.BodyAsJson != null && JsonFunc(requestMessage.BodyAsJson));
+            }
 
             return MatchScores.Mismatch;
         }
diff --git a/src/WireMock.Net/Matchers/Request/RequestMessageClientIPMatcher.cs b/src/WireMock.Net/Matchers/Request/RequestMessageClientIPMatcher.cs
index ddd283cb2..718326b47 100644
--- a/src/WireMock.Net/Matchers/Request/RequestMessageClientIPMatcher.cs
+++ b/src/WireMock.Net/Matchers/Request/RequestMessageClientIPMatcher.cs
@@ -14,7 +14,7 @@ public class RequestMessageClientIPMatcher : IRequestMatcher
         /// <summary>
         /// The matchers.
         /// </summary>
-        public IReadOnlyList<IMatcher> Matchers { get; }
+        public IReadOnlyList<IStringMatcher> Matchers { get; }
 
         /// <summary>
         /// The ClientIP functions.
@@ -25,7 +25,7 @@ public class RequestMessageClientIPMatcher : IRequestMatcher
         /// Initializes a new instance of the <see cref="RequestMessageClientIPMatcher"/> class.
         /// </summary>
         /// <param name="clientIPs">The clientIPs.</param>
-        public RequestMessageClientIPMatcher([NotNull] params string[] clientIPs) : this(clientIPs.Select(ip => new WildcardMatcher(ip)).Cast<IMatcher>().ToArray())
+        public RequestMessageClientIPMatcher([NotNull] params string[] clientIPs) : this(clientIPs.Select(ip => new WildcardMatcher(ip)).Cast<IStringMatcher>().ToArray())
         {
         }
 
@@ -33,7 +33,7 @@ public class RequestMessageClientIPMatcher : IRequestMatcher
         /// Initializes a new instance of the <see cref="RequestMessageClientIPMatcher"/> class.
         /// </summary>
         /// <param name="matchers">The matchers.</param>
-        public RequestMessageClientIPMatcher([NotNull] params IMatcher[] matchers)
+        public RequestMessageClientIPMatcher([NotNull] params IStringMatcher[] matchers)
         {
             Check.NotNull(matchers, nameof(matchers));
             Matchers = matchers;
diff --git a/src/WireMock.Net/Matchers/Request/RequestMessageCookieMatcher.cs b/src/WireMock.Net/Matchers/Request/RequestMessageCookieMatcher.cs
index d814c0546..f2b0b2e9f 100644
--- a/src/WireMock.Net/Matchers/Request/RequestMessageCookieMatcher.cs
+++ b/src/WireMock.Net/Matchers/Request/RequestMessageCookieMatcher.cs
@@ -24,7 +24,7 @@ public class RequestMessageCookieMatcher : IRequestMatcher
         /// <value>
         /// The matchers.
         /// </value>
-        public IMatcher[] Matchers { get; }
+        public IStringMatcher[] Matchers { get; }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="RequestMessageCookieMatcher"/> class.
@@ -38,7 +38,7 @@ public RequestMessageCookieMatcher([NotNull] string name, [NotNull] string patte
             Check.NotNull(pattern, nameof(pattern));
 
             Name = name;
-            Matchers = new IMatcher[] { new WildcardMatcher(pattern, ignoreCase) };
+            Matchers = new IStringMatcher[] { new WildcardMatcher(pattern, ignoreCase) };
         }
 
         /// <summary>
@@ -46,7 +46,7 @@ public RequestMessageCookieMatcher([NotNull] string name, [NotNull] string patte
         /// </summary>
         /// <param name="name">The name.</param>
         /// <param name="matchers">The matchers.</param>
-        public RequestMessageCookieMatcher([NotNull] string name, [NotNull] params IMatcher[] matchers)
+        public RequestMessageCookieMatcher([NotNull] string name, [NotNull] params IStringMatcher[] matchers)
         {
             Check.NotNull(name, nameof(name));
             Check.NotNull(matchers, nameof(matchers));
@@ -83,16 +83,24 @@ public double GetMatchingScore(RequestMessage requestMessage, RequestMatchResult
         private double IsMatch(RequestMessage requestMessage)
         {
             if (requestMessage.Cookies == null)
+            {
                 return MatchScores.Mismatch;
+            }
 
             if (Funcs != null)
+            {
                 return MatchScores.ToScore(Funcs.Any(f => f(requestMessage.Cookies)));
+            }
 
             if (Matchers == null)
+            {
                 return MatchScores.Mismatch;
+            }
 
             if (!requestMessage.Cookies.ContainsKey(Name))
+            {
                 return MatchScores.Mismatch;
+            }
 
             string value = requestMessage.Cookies[Name];
             return Matchers.Max(m => m.IsMatch(value));
diff --git a/src/WireMock.Net/Matchers/Request/RequestMessageHeaderMatcher.cs b/src/WireMock.Net/Matchers/Request/RequestMessageHeaderMatcher.cs
index 6774168f4..94800509c 100644
--- a/src/WireMock.Net/Matchers/Request/RequestMessageHeaderMatcher.cs
+++ b/src/WireMock.Net/Matchers/Request/RequestMessageHeaderMatcher.cs
@@ -26,7 +26,7 @@ public class RequestMessageHeaderMatcher : IRequestMatcher
         /// <value>
         /// The matchers.
         /// </value>
-        public IMatcher[] Matchers { get; }
+        public IStringMatcher[] Matchers { get; }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="RequestMessageHeaderMatcher"/> class.
@@ -40,7 +40,7 @@ public RequestMessageHeaderMatcher([NotNull] string name, [NotNull] string patte
             Check.NotNull(pattern, nameof(pattern));
 
             Name = name;
-            Matchers = new IMatcher[] { new WildcardMatcher(pattern, ignoreCase) };
+            Matchers = new IStringMatcher[] { new WildcardMatcher(pattern, ignoreCase) };
         }
 
         /// <summary>
@@ -55,7 +55,7 @@ public RequestMessageHeaderMatcher([NotNull] string name, [NotNull] string[] pat
             Check.NotNull(patterns, nameof(patterns));
 
             Name = name;
-            Matchers = patterns.Select(pattern => new WildcardMatcher(pattern, ignoreCase)).Cast<IMatcher>().ToArray();
+            Matchers = patterns.Select(pattern => new WildcardMatcher(pattern, ignoreCase)).Cast<IStringMatcher>().ToArray();
         }
 
         /// <summary>
@@ -63,7 +63,7 @@ public RequestMessageHeaderMatcher([NotNull] string name, [NotNull] string[] pat
         /// </summary>
         /// <param name="name">The name.</param>
         /// <param name="matchers">The matchers.</param>
-        public RequestMessageHeaderMatcher([NotNull] string name, [NotNull] params IMatcher[] matchers)
+        public RequestMessageHeaderMatcher([NotNull] string name, [NotNull] params IStringMatcher[] matchers)
         {
             Check.NotNull(name, nameof(name));
             Check.NotNull(matchers, nameof(matchers));
@@ -93,16 +93,24 @@ public double GetMatchingScore(RequestMessage requestMessage, RequestMatchResult
         private double IsMatch(RequestMessage requestMessage)
         {
             if (requestMessage.Headers == null)
+            {
                 return MatchScores.Mismatch;
+            }
 
             if (Funcs != null)
+            {
                 return MatchScores.ToScore(Funcs.Any(f => f(requestMessage.Headers.ToDictionary(entry => entry.Key, entry => entry.Value.ToArray()))));
+            }
 
             if (Matchers == null)
+            {
                 return MatchScores.Mismatch;
+            }
 
             if (!requestMessage.Headers.ContainsKey(Name))
+            {
                 return MatchScores.Mismatch;
+            }
 
             WireMockList<string> list = requestMessage.Headers[Name];
             return Matchers.Max(m => list.Max(value => m.IsMatch(value))); // TODO : is this correct ?
diff --git a/src/WireMock.Net/Matchers/Request/RequestMessagePathMatcher.cs b/src/WireMock.Net/Matchers/Request/RequestMessagePathMatcher.cs
index 692916546..cec66a6af 100644
--- a/src/WireMock.Net/Matchers/Request/RequestMessagePathMatcher.cs
+++ b/src/WireMock.Net/Matchers/Request/RequestMessagePathMatcher.cs
@@ -14,7 +14,7 @@ public class RequestMessagePathMatcher : IRequestMatcher
         /// <summary>
         /// The matcher.
         /// </summary>
-        public IReadOnlyList<IMatcher> Matchers { get; }
+        public IReadOnlyList<IStringMatcher> Matchers { get; }
 
         /// <summary>
         /// The path functions
@@ -25,7 +25,7 @@ public class RequestMessagePathMatcher : IRequestMatcher
         /// Initializes a new instance of the <see cref="RequestMessagePathMatcher"/> class.
         /// </summary>
         /// <param name="paths">The paths.</param>
-        public RequestMessagePathMatcher([NotNull] params string[] paths) : this(paths.Select(path => new WildcardMatcher(path)).Cast<IMatcher>().ToArray())
+        public RequestMessagePathMatcher([NotNull] params string[] paths) : this(paths.Select(path => new WildcardMatcher(path)).Cast<IStringMatcher>().ToArray())
         {
         }
 
@@ -33,7 +33,7 @@ public class RequestMessagePathMatcher : IRequestMatcher
         /// Initializes a new instance of the <see cref="RequestMessagePathMatcher"/> class.
         /// </summary>
         /// <param name="matchers">The matchers.</param>
-        public RequestMessagePathMatcher([NotNull] params IMatcher[] matchers)
+        public RequestMessagePathMatcher([NotNull] params IStringMatcher[] matchers)
         {
             Check.NotNull(matchers, nameof(matchers));
             Matchers = matchers;
@@ -59,10 +59,14 @@ public double GetMatchingScore(RequestMessage requestMessage, RequestMatchResult
         private double IsMatch(RequestMessage requestMessage)
         {
             if (Matchers != null)
+            {
                 return Matchers.Max(m => m.IsMatch(requestMessage.Path));
+            }
 
             if (Funcs != null)
+            {
                 return MatchScores.ToScore(requestMessage.Path != null && Funcs.Any(func => func(requestMessage.Path)));
+            }
 
             return MatchScores.Mismatch;
         }
diff --git a/src/WireMock.Net/Matchers/Request/RequestMessageUrlMatcher.cs b/src/WireMock.Net/Matchers/Request/RequestMessageUrlMatcher.cs
index 46f73cb20..ea256ddcc 100644
--- a/src/WireMock.Net/Matchers/Request/RequestMessageUrlMatcher.cs
+++ b/src/WireMock.Net/Matchers/Request/RequestMessageUrlMatcher.cs
@@ -14,7 +14,7 @@ public class RequestMessageUrlMatcher : IRequestMatcher
         /// <summary>
         /// The matchers.
         /// </summary>
-        public IReadOnlyList<IMatcher> Matchers { get; }
+        public IReadOnlyList<IStringMatcher> Matchers { get; }
 
         /// <summary>
         /// The url functions.
@@ -25,7 +25,7 @@ public class RequestMessageUrlMatcher : IRequestMatcher
         /// Initializes a new instance of the <see cref="RequestMessageUrlMatcher"/> class.
         /// </summary>
         /// <param name="urls">The urls.</param>
-        public RequestMessageUrlMatcher([NotNull] params string[] urls) : this(urls.Select(url => new WildcardMatcher(url)).Cast<IMatcher>().ToArray())
+        public RequestMessageUrlMatcher([NotNull] params string[] urls) : this(urls.Select(url => new WildcardMatcher(url)).Cast<IStringMatcher>().ToArray())
         {
         }
 
@@ -33,7 +33,7 @@ public class RequestMessageUrlMatcher : IRequestMatcher
         /// Initializes a new instance of the <see cref="RequestMessageUrlMatcher"/> class.
         /// </summary>
         /// <param name="matchers">The matchers.</param>
-        public RequestMessageUrlMatcher([NotNull] params IMatcher[] matchers)
+        public RequestMessageUrlMatcher([NotNull] params IStringMatcher[] matchers)
         {
             Check.NotNull(matchers, nameof(matchers));
             Matchers = matchers;
@@ -59,10 +59,14 @@ public double GetMatchingScore(RequestMessage requestMessage, RequestMatchResult
         private double IsMatch(RequestMessage requestMessage)
         {
             if (Matchers != null)
+            {
                 return Matchers.Max(matcher => matcher.IsMatch(requestMessage.Url));
+            }
 
             if (Funcs != null)
+            {
                 return MatchScores.ToScore(requestMessage.Url != null && Funcs.Any(func => func(requestMessage.Url)));
+            }
 
             return MatchScores.Mismatch;
         }
diff --git a/src/WireMock.Net/Matchers/SimMetricsMatcher.cs b/src/WireMock.Net/Matchers/SimMetricsMatcher.cs
index 81789f482..13e6ee028 100644
--- a/src/WireMock.Net/Matchers/SimMetricsMatcher.cs
+++ b/src/WireMock.Net/Matchers/SimMetricsMatcher.cs
@@ -10,8 +10,8 @@ namespace WireMock.Matchers
     /// <summary>
     /// SimMetricsMatcher
     /// </summary>
-    /// <seealso cref="IMatcher" />
-    public class SimMetricsMatcher : IMatcher
+    /// <seealso cref="IStringMatcher" />
+    public class SimMetricsMatcher : IStringMatcher
     {
         private readonly string[] _patterns;
         private readonly SimMetricType _simMetricType;
@@ -38,11 +38,7 @@ public SimMetricsMatcher([NotNull] string[] patterns, SimMetricType simMetricTyp
             _simMetricType = simMetricType;
         }
 
-        /// <summary>
-        /// Determines whether the specified input is match.
-        /// </summary>
-        /// <param name="input">The input string</param>
-        /// <returns>A value between 0.0 - 1.0 of the similarity.</returns>
+        /// <inheritdoc cref="IStringMatcher.IsMatch"/>
         public double IsMatch(string input)
         {
             IStringMetric m = GetStringMetricType();
@@ -93,19 +89,13 @@ private IStringMetric GetStringMetricType()
             }
         }
 
-        /// <summary>
-        /// Gets the pattern.
-        /// </summary>
-        /// <returns>Pattern</returns>
+        /// <inheritdoc cref="IStringMatcher.GetPatterns"/>
         public string[] GetPatterns()
         {
             return _patterns;
         }
 
-        /// <summary>
-        /// Gets the name.
-        /// </summary>
-        /// <returns>Name</returns>
+        /// <inheritdoc cref="IMatcher.GetName"/>
         public string GetName()
         {
             return $"SimMetricsMatcher.{_simMetricType}";
diff --git a/src/WireMock.Net/Matchers/WildcardMatcher.cs b/src/WireMock.Net/Matchers/WildcardMatcher.cs
index 1ecbe6476..caed77eca 100644
--- a/src/WireMock.Net/Matchers/WildcardMatcher.cs
+++ b/src/WireMock.Net/Matchers/WildcardMatcher.cs
@@ -7,7 +7,7 @@ namespace WireMock.Matchers
     /// <summary>
     /// WildcardMatcher
     /// </summary>
-    /// <seealso cref="IMatcher" />
+    /// <seealso cref="RegexMatcher" />
     public class WildcardMatcher : RegexMatcher
     {
         private readonly string[] _patterns;
@@ -31,21 +31,13 @@ public WildcardMatcher([NotNull] string[] patterns, bool ignoreCase = false) : b
             _patterns = patterns;
         }
 
-        /// <summary>
-        /// Gets the pattern.
-        /// </summary>
-        /// <returns>Pattern</returns>
+        /// <inheritdoc cref="IStringMatcher.GetPatterns"/>
         public override string[] GetPatterns()
         {
             return _patterns;
         }
 
-        /// <summary>
-        /// Gets the name.
-        /// </summary>
-        /// <returns>
-        /// Name
-        /// </returns>
+        /// <inheritdoc cref="IMatcher.GetName"/>
         public override string GetName()
         {
             return "WildcardMatcher";
diff --git a/src/WireMock.Net/Matchers/XPathMatcher.cs b/src/WireMock.Net/Matchers/XPathMatcher.cs
index ddf4c1f36..6586da898 100644
--- a/src/WireMock.Net/Matchers/XPathMatcher.cs
+++ b/src/WireMock.Net/Matchers/XPathMatcher.cs
@@ -12,8 +12,8 @@ namespace WireMock.Matchers
     /// <summary>
     /// XPath2Matcher
     /// </summary>
-    /// <seealso cref="WireMock.Matchers.IMatcher" />
-    public class XPathMatcher : IMatcher
+    /// <seealso cref="IStringMatcher" />
+    public class XPathMatcher : IStringMatcher
     {
         private readonly string[] _patterns;
 
@@ -28,15 +28,13 @@ public XPathMatcher([NotNull] params string[] patterns)
             _patterns = patterns;
         }
 
-        /// <summary>
-        /// Determines whether the specified input is match.
-        /// </summary>
-        /// <param name="input">The input string</param>
-        /// <returns>A value between 0.0 - 1.0 of the similarity.</returns>
+        /// <inheritdoc cref="IStringMatcher.IsMatch"/>
         public double IsMatch(string input)
         {
             if (input == null)
+            {
                 return MatchScores.Mismatch;
+            }
 
             try
             {
@@ -53,19 +51,13 @@ public double IsMatch(string input)
             }
         }
 
-        /// <summary>
-        /// Gets the patterns.
-        /// </summary>
-        /// <returns>Patterns</returns>
+        /// <inheritdoc cref="IStringMatcher.GetPatterns"/>
         public string[] GetPatterns()
         {
             return _patterns;
         }
 
-        /// <summary>
-        /// Gets the name.
-        /// </summary>
-        /// <returns>Name</returns>
+        /// <inheritdoc cref="IMatcher.GetName"/>
         public string GetName()
         {
             return "XPathMatcher";
diff --git a/src/WireMock.Net/Owin/WireMockMiddlewareOptions.cs b/src/WireMock.Net/Owin/WireMockMiddlewareOptions.cs
index cbf515a44..05c475162 100644
--- a/src/WireMock.Net/Owin/WireMockMiddlewareOptions.cs
+++ b/src/WireMock.Net/Owin/WireMockMiddlewareOptions.cs
@@ -17,7 +17,7 @@ internal class WireMockMiddlewareOptions
     {
         public TimeSpan? RequestProcessingDelay { get; set; }
 
-        public IMatcher AuthorizationMatcher { get; set; }
+        public IStringMatcher AuthorizationMatcher { get; set; }
 
         public bool AllowPartialMapping { get; set; }
 
diff --git a/src/WireMock.Net/RequestBuilders/IClientIPRequestBuilder.cs b/src/WireMock.Net/RequestBuilders/IClientIPRequestBuilder.cs
index c3257f843..a830ba68a 100644
--- a/src/WireMock.Net/RequestBuilders/IClientIPRequestBuilder.cs
+++ b/src/WireMock.Net/RequestBuilders/IClientIPRequestBuilder.cs
@@ -14,7 +14,7 @@ public interface IClientIPRequestBuilder : IUrlAndPathRequestBuilder
         /// </summary>
         /// <param name="matchers">The matchers.</param>
         /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithClientIP([NotNull] params IMatcher[] matchers);
+        IRequestBuilder WithClientIP([NotNull] params IStringMatcher[] matchers);
 
         /// <summary>
         /// The with ClientIP.
diff --git a/src/WireMock.Net/RequestBuilders/IHeadersAndCookiesRequestBuilder.cs b/src/WireMock.Net/RequestBuilders/IHeadersAndCookiesRequestBuilder.cs
index 55657aed2..78b210eda 100644
--- a/src/WireMock.Net/RequestBuilders/IHeadersAndCookiesRequestBuilder.cs
+++ b/src/WireMock.Net/RequestBuilders/IHeadersAndCookiesRequestBuilder.cs
@@ -35,7 +35,7 @@ public interface IHeadersAndCookiesRequestBuilder : IBodyRequestBuilder, IReques
         /// <param name="name">The name.</param>
         /// <param name="matchers">The matchers.</param>
         /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithHeader([NotNull] string name, [NotNull] params IMatcher[] matchers);
+        IRequestBuilder WithHeader([NotNull] string name, [NotNull] params IStringMatcher[] matchers);
 
         /// <summary>
         /// The with header.
@@ -59,7 +59,7 @@ public interface IHeadersAndCookiesRequestBuilder : IBodyRequestBuilder, IReques
         /// <param name="name">The name.</param>
         /// <param name="matchers">The matchers.</param>
         /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithCookie([NotNull] string name, [NotNull] params IMatcher[] matchers);
+        IRequestBuilder WithCookie([NotNull] string name, [NotNull] params IStringMatcher[] matchers);
 
         /// <summary>
         /// The with cookie.
diff --git a/src/WireMock.Net/RequestBuilders/IUrlAndPathRequestBuilder.cs b/src/WireMock.Net/RequestBuilders/IUrlAndPathRequestBuilder.cs
index 1751b1a7f..1f760fa37 100644
--- a/src/WireMock.Net/RequestBuilders/IUrlAndPathRequestBuilder.cs
+++ b/src/WireMock.Net/RequestBuilders/IUrlAndPathRequestBuilder.cs
@@ -14,7 +14,7 @@ public interface IUrlAndPathRequestBuilder : IMethodRequestBuilder
         /// </summary>
         /// <param name="matchers">The matchers.</param>
         /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithPath([NotNull] params IMatcher[] matchers);
+        IRequestBuilder WithPath([NotNull] params IStringMatcher[] matchers);
 
         /// <summary>
         /// The with path.
@@ -35,7 +35,7 @@ public interface IUrlAndPathRequestBuilder : IMethodRequestBuilder
         /// </summary>
         /// <param name="matchers">The matchers.</param>
         /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithUrl([NotNull] params IMatcher[] matchers);
+        IRequestBuilder WithUrl([NotNull] params IStringMatcher[] matchers);
 
         /// <summary>
         /// The with url.
diff --git a/src/WireMock.Net/RequestBuilders/Request.cs b/src/WireMock.Net/RequestBuilders/Request.cs
index b65bdee45..c67acf069 100644
--- a/src/WireMock.Net/RequestBuilders/Request.cs
+++ b/src/WireMock.Net/RequestBuilders/Request.cs
@@ -59,7 +59,7 @@ public T GetRequestMessageMatcher<T>() where T : IRequestMatcher
         /// </summary>
         /// <param name="matchers">The matchers.</param>
         /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        public IRequestBuilder WithClientIP(params IMatcher[] matchers)
+        public IRequestBuilder WithClientIP(params IStringMatcher[] matchers)
         {
             Check.NotNullOrEmpty(matchers, nameof(matchers));
 
@@ -98,7 +98,7 @@ public IRequestBuilder WithClientIP(params Func<string, bool>[] funcs)
         /// </summary>
         /// <param name="matchers">The matchers.</param>
         /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        public IRequestBuilder WithPath(params IMatcher[] matchers)
+        public IRequestBuilder WithPath(params IStringMatcher[] matchers)
         {
             Check.NotNullOrEmpty(matchers, nameof(matchers));
 
@@ -137,7 +137,7 @@ public IRequestBuilder WithPath(params Func<string, bool>[] funcs)
         /// </summary>
         /// <param name="matchers">The matchers.</param>
         /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        public IRequestBuilder WithUrl(params IMatcher[] matchers)
+        public IRequestBuilder WithUrl(params IStringMatcher[] matchers)
         {
             Check.NotNullOrEmpty(matchers, nameof(matchers));
 
@@ -360,7 +360,7 @@ public IRequestBuilder WithHeader(string name, string[] patterns, bool ignoreCas
         /// <param name="name">The name.</param>
         /// <param name="matchers">The matchers.</param>
         /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        public IRequestBuilder WithHeader(string name, params IMatcher[] matchers)
+        public IRequestBuilder WithHeader(string name, params IStringMatcher[] matchers)
         {
             Check.NotNull(name, nameof(name));
             Check.NotNullOrEmpty(matchers, nameof(matchers));
@@ -401,7 +401,7 @@ public IRequestBuilder WithCookie(string name, string pattern, bool ignoreCase =
         /// <param name="name">The name.</param>
         /// <param name="matchers">The matchers.</param>
         /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        public IRequestBuilder WithCookie(string name, params IMatcher[] matchers)
+        public IRequestBuilder WithCookie(string name, params IStringMatcher[] matchers)
         {
             Check.NotNullOrEmpty(matchers, nameof(matchers));
 
diff --git a/src/WireMock.Net/Serialization/MappingConverter.cs b/src/WireMock.Net/Serialization/MappingConverter.cs
index d65c365b9..3c4b0a834 100644
--- a/src/WireMock.Net/Serialization/MappingConverter.cs
+++ b/src/WireMock.Net/Serialization/MappingConverter.cs
@@ -166,7 +166,8 @@ private static MatcherModel Map([CanBeNull] IMatcher matcher)
                 return null;
             }
 
-            var patterns = matcher.GetPatterns();
+            IStringMatcher stringMatcher = matcher as IStringMatcher;
+            string[] patterns = stringMatcher != null ? stringMatcher.GetPatterns() : new string[0];
 
             return new MatcherModel
             {
@@ -192,7 +193,9 @@ private static string Map<T>([CanBeNull] Func<T, bool> func)
         public static IMatcher Map([CanBeNull] MatcherModel matcher)
         {
             if (matcher == null)
+            {
                 return null;
+            }
 
             var parts = matcher.Name.Split('.');
             string matcherName = parts[0];
diff --git a/src/WireMock.Net/Server/FluentMockServer.Admin.cs b/src/WireMock.Net/Server/FluentMockServer.Admin.cs
index ad37a16fd..a2b64adab 100644
--- a/src/WireMock.Net/Server/FluentMockServer.Admin.cs
+++ b/src/WireMock.Net/Server/FluentMockServer.Admin.cs
@@ -606,7 +606,7 @@ private IRequestBuilder InitRequestBuilder(RequestModel requestModel)
                     var clientIPModel = JsonUtils.ParseJTokenToObject<ClientIPModel>(requestModel.ClientIP);
                     if (clientIPModel?.Matchers != null)
                     {
-                        requestBuilder = requestBuilder.WithPath(clientIPModel.Matchers.Select(MappingConverter.Map).ToArray());
+                        requestBuilder = requestBuilder.WithPath(clientIPModel.Matchers.Select(MappingConverter.Map).Cast<IStringMatcher>().ToArray());
                     }
                 }
             }
@@ -623,7 +623,7 @@ private IRequestBuilder InitRequestBuilder(RequestModel requestModel)
                     var pathModel = JsonUtils.ParseJTokenToObject<PathModel>(requestModel.Path);
                     if (pathModel?.Matchers != null)
                     {
-                        requestBuilder = requestBuilder.WithPath(pathModel.Matchers.Select(MappingConverter.Map).ToArray());
+                        requestBuilder = requestBuilder.WithPath(pathModel.Matchers.Select(MappingConverter.Map).Cast<IStringMatcher>().ToArray());
                     }
                 }
             }
@@ -640,7 +640,7 @@ private IRequestBuilder InitRequestBuilder(RequestModel requestModel)
                     var urlModel = JsonUtils.ParseJTokenToObject<UrlModel>(requestModel.Url);
                     if (urlModel?.Matchers != null)
                     {
-                        requestBuilder = requestBuilder.WithUrl(urlModel.Matchers.Select(MappingConverter.Map).ToArray());
+                        requestBuilder = requestBuilder.WithUrl(urlModel.Matchers.Select(MappingConverter.Map).Cast<IStringMatcher>().ToArray());
                     }
                 }
             }
@@ -654,7 +654,7 @@ private IRequestBuilder InitRequestBuilder(RequestModel requestModel)
             {
                 foreach (var headerModel in requestModel.Headers.Where(h => h.Matchers != null))
                 {
-                    requestBuilder = requestBuilder.WithHeader(headerModel.Name, headerModel.Matchers.Select(MappingConverter.Map).ToArray());
+                    requestBuilder = requestBuilder.WithHeader(headerModel.Name, headerModel.Matchers.Select(MappingConverter.Map).Cast<IStringMatcher>().ToArray());
                 }
             }
 
@@ -662,7 +662,7 @@ private IRequestBuilder InitRequestBuilder(RequestModel requestModel)
             {
                 foreach (var cookieModel in requestModel.Cookies.Where(c => c.Matchers != null))
                 {
-                    requestBuilder = requestBuilder.WithCookie(cookieModel.Name, cookieModel.Matchers.Select(MappingConverter.Map).ToArray());
+                    requestBuilder = requestBuilder.WithCookie(cookieModel.Name, cookieModel.Matchers.Select(MappingConverter.Map).Cast<IStringMatcher>().ToArray());
                 }
             }
 
diff --git a/test/WireMock.Net.Tests/RequestWithBodyTests.cs b/test/WireMock.Net.Tests/RequestWithBodyTests.cs
index 6942e6b56..b9a06b8d9 100644
--- a/test/WireMock.Net.Tests/RequestWithBodyTests.cs
+++ b/test/WireMock.Net.Tests/RequestWithBodyTests.cs
@@ -1,10 +1,12 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using Newtonsoft.Json;
 using NFluent;
 using WireMock.Matchers;
 using WireMock.Matchers.Request;
 using WireMock.RequestBuilders;
+using WireMock.Util;
 using Xunit;
 
 namespace WireMock.Net.Tests
@@ -198,5 +200,26 @@ public void Request_WithBodyJsonPathMatcher_false()
             var requestMatchResult = new RequestMatchResult();
             Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsNotEqualTo(1.0);
         }
+
+        [Fact]
+        public void Request_WithBodyAsJson_JsonPathMatcher_true()
+        {
+            // given
+            var spec = Request.Create().UsingAnyVerb().WithBody(new JsonPathMatcher("$.things[?(@.name == 'RequiredThing')]"));
+
+            // when
+            string jsonString = "{ \"things\": [ { \"name\": \"RequiredThing\" }, { \"name\": \"Wiremock\" } ] }";
+            var bodyData = new BodyData
+            {
+                BodyAsJson = JsonConvert.DeserializeObject(jsonString),
+                Encoding = Encoding.UTF8
+            };
+
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", ClientIp, bodyData);
+
+            // then
+            var requestMatchResult = new RequestMatchResult();
+            Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
+        }
     }
 }
\ No newline at end of file
diff --git a/test/WireMock.Net.Tests/StatefulBehaviorTests.cs b/test/WireMock.Net.Tests/StatefulBehaviorTests.cs
index 6437f1d22..ab0c539ca 100644
--- a/test/WireMock.Net.Tests/StatefulBehaviorTests.cs
+++ b/test/WireMock.Net.Tests/StatefulBehaviorTests.cs
@@ -159,16 +159,16 @@ public async Task Should_process_request_if_equals_state_and_multiple_state_defi
             // when / then
             string url = "http://localhost:" + _server.Ports[0];
             var http = new HttpClient();
-            var responseNoState1 = await http.GetStringAsync(url + "/state1");
+            var responseNoState1 = http.GetStringAsync(url + "/state1").Result;
             Check.That(responseNoState1).Equals("No state msg 1");
 
-            var responseNoState2 = await http.GetStringAsync(url + "/state2");
+            var responseNoState2 = http.GetStringAsync(url + "/state2").Result;
             Check.That(responseNoState2).Equals("No state msg 2");
 
-            var responseWithState1 = await http.GetStringAsync(url + "/foo");
+            var responseWithState1 = http.GetStringAsync(url + "/foo").Result;
             Check.That(responseWithState1).Equals("Test state msg 1");
 
-            var responseWithState2 = await http.GetStringAsync(url + "/foo");
+            var responseWithState2 = http.GetStringAsync(url + "/foo").Result;
             Check.That(responseWithState2).Equals("Test state msg 2");
         }
 

From ec190ebb4b37df38e1dca2a135415ddb4c0db3c8 Mon Sep 17 00:00:00 2001
From: Stef Heyenrath <Stef.Heyenrath@gmail.com>
Date: Wed, 21 Feb 2018 13:17:31 +0100
Subject: [PATCH 2/3] More tests

---
 .../Matchers/ExactObjectMatcher.cs            | 20 +++++++--
 .../RequestWithBodyTests.cs                   | 43 ++++++++++++++++++-
 .../StatefulBehaviorTests.cs                  | 19 ++++----
 3 files changed, 67 insertions(+), 15 deletions(-)

diff --git a/src/WireMock.Net/Matchers/ExactObjectMatcher.cs b/src/WireMock.Net/Matchers/ExactObjectMatcher.cs
index f7cb66352..8963bb5da 100644
--- a/src/WireMock.Net/Matchers/ExactObjectMatcher.cs
+++ b/src/WireMock.Net/Matchers/ExactObjectMatcher.cs
@@ -1,4 +1,5 @@
-using JetBrains.Annotations;
+using System.Linq;
+using JetBrains.Annotations;
 
 namespace WireMock.Matchers
 {
@@ -8,7 +9,8 @@ namespace WireMock.Matchers
     /// <seealso cref="IObjectMatcher" />
     public class ExactObjectMatcher : IObjectMatcher
     {
-        private readonly object _value;
+        private readonly object _object;
+        private readonly byte[] _bytes;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ExactMatcher"/> class.
@@ -16,13 +18,23 @@ public class ExactObjectMatcher : IObjectMatcher
         /// <param name="value">The value.</param>
         public ExactObjectMatcher([NotNull] object value)
         {
-            _value = value;
+            _object = value;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ExactMatcher"/> class.
+        /// </summary>
+        /// <param name="value">The value.</param>
+        public ExactObjectMatcher([NotNull] byte[] value)
+        {
+            _bytes = value;
         }
 
         /// <inheritdoc cref="IObjectMatcher.IsMatch"/>
         public double IsMatch(object input)
         {
-            return MatchScores.ToScore(Equals(_value, input));
+            bool equals = _object != null ? Equals(_object, input) : _bytes.SequenceEqual((byte[])input);
+            return MatchScores.ToScore(equals);
         }
 
         /// <inheritdoc cref="IMatcher.GetName"/>
diff --git a/test/WireMock.Net.Tests/RequestWithBodyTests.cs b/test/WireMock.Net.Tests/RequestWithBodyTests.cs
index b9a06b8d9..5af9aa354 100644
--- a/test/WireMock.Net.Tests/RequestWithBodyTests.cs
+++ b/test/WireMock.Net.Tests/RequestWithBodyTests.cs
@@ -202,7 +202,7 @@ public void Request_WithBodyJsonPathMatcher_false()
         }
 
         [Fact]
-        public void Request_WithBodyAsJson_JsonPathMatcher_true()
+        public void Request_WithBodyAsJson_Object_JsonPathMatcher_true()
         {
             // given
             var spec = Request.Create().UsingAnyVerb().WithBody(new JsonPathMatcher("$.things[?(@.name == 'RequiredThing')]"));
@@ -221,5 +221,46 @@ public void Request_WithBodyAsJson_JsonPathMatcher_true()
             var requestMatchResult = new RequestMatchResult();
             Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
         }
+        [Fact]
+        public void Request_WithBodyAsJson_Array_JsonPathMatcher_true()
+        {
+            // given
+            var spec = Request.Create().UsingAnyVerb().WithBody(new JsonPathMatcher("$.books[?(@.price < 10)]"));
+
+            // when
+            string jsonString = "{ \"books\": [ { \"category\": \"test1\", \"price\": 8.95 }, { \"category\": \"test2\", \"price\": 20 } ] }";
+            var bodyData = new BodyData
+            {
+                BodyAsJson = JsonConvert.DeserializeObject(jsonString),
+                Encoding = Encoding.UTF8
+            };
+
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", ClientIp, bodyData);
+
+            // then
+            var requestMatchResult = new RequestMatchResult();
+            Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
+        }
+
+
+        [Fact]
+        public void Request_WithBodyAsBytes_ExactObjectMatcher_true()
+        {
+            // Assign
+            byte[] body = { 123 };
+            var requestBuilder = Request.Create().UsingAnyVerb().WithBody(body);
+
+            var bodyData = new BodyData
+            {
+                BodyAsBytes = new byte[] { 123 }
+            };
+
+            // Act
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", ClientIp, bodyData);
+
+            // Assert
+            var requestMatchResult = new RequestMatchResult();
+            Check.That(requestBuilder.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
+        }
     }
 }
\ No newline at end of file
diff --git a/test/WireMock.Net.Tests/StatefulBehaviorTests.cs b/test/WireMock.Net.Tests/StatefulBehaviorTests.cs
index ab0c539ca..2e0830c14 100644
--- a/test/WireMock.Net.Tests/StatefulBehaviorTests.cs
+++ b/test/WireMock.Net.Tests/StatefulBehaviorTests.cs
@@ -69,7 +69,7 @@ public async Task Should_process_request_if_equals_state_and_single_state_define
         }
 
         [Fact]
-        public async Task Scenario_and_State_TodoList_Example()
+        public void Scenario_and_State_TodoList_Example()
         {
             // Assign
             _server = FluentMockServer.Start();
@@ -104,18 +104,18 @@ public async Task Scenario_and_State_TodoList_Example()
 
             // Act and Assert
             string url = "http://localhost:" + _server.Ports[0];
-            string getResponse1 = await new HttpClient().GetStringAsync(url + "/todo/items");
+            string getResponse1 = new HttpClient().GetStringAsync(url + "/todo/items").Result;
             Check.That(getResponse1).Equals("Buy milk");
 
-            var postResponse = await new HttpClient().PostAsync(url + "/todo/items", new StringContent("Cancel newspaper subscription"));
+            var postResponse = new HttpClient().PostAsync(url + "/todo/items", new StringContent("Cancel newspaper subscription")).Result;
             Check.That(postResponse.StatusCode).Equals(HttpStatusCode.Created);
 
-            string getResponse2 = await new HttpClient().GetStringAsync(url + "/todo/items");
+            string getResponse2 = new HttpClient().GetStringAsync(url + "/todo/items").Result;
             Check.That(getResponse2).Equals("Buy milk;Cancel newspaper subscription");
         }
 
         [Fact]
-        public async Task Should_process_request_if_equals_state_and_multiple_state_defined()
+        public void Should_process_request_if_equals_state_and_multiple_state_defined()
         {
             // given
             _server = FluentMockServer.Start();
@@ -158,17 +158,16 @@ public async Task Should_process_request_if_equals_state_and_multiple_state_defi
 
             // when / then
             string url = "http://localhost:" + _server.Ports[0];
-            var http = new HttpClient();
-            var responseNoState1 = http.GetStringAsync(url + "/state1").Result;
+            var responseNoState1 = new HttpClient().GetStringAsync(url + "/state1").Result;
             Check.That(responseNoState1).Equals("No state msg 1");
 
-            var responseNoState2 = http.GetStringAsync(url + "/state2").Result;
+            var responseNoState2 = new HttpClient().GetStringAsync(url + "/state2").Result;
             Check.That(responseNoState2).Equals("No state msg 2");
 
-            var responseWithState1 = http.GetStringAsync(url + "/foo").Result;
+            var responseWithState1 = new HttpClient().GetStringAsync(url + "/foo").Result;
             Check.That(responseWithState1).Equals("Test state msg 1");
 
-            var responseWithState2 = http.GetStringAsync(url + "/foo").Result;
+            var responseWithState2 = new HttpClient().GetStringAsync(url + "/foo").Result;
             Check.That(responseWithState2).Equals("Test state msg 2");
         }
 

From d2b24a00c0f294aa4d39cdfdd1c0cb1f6642be47 Mon Sep 17 00:00:00 2001
From: Stef Heyenrath <Stef.Heyenrath@gmail.com>
Date: Wed, 21 Feb 2018 19:35:12 +0100
Subject: [PATCH 3/3] Fixes + added tests

---
 .../MainApp.cs                                |  9 +++
 .../Request/RequestMessageBodyMatcher.cs      |  2 +-
 .../Request/RequestMessageClientIPMatcher.cs  |  4 +
 .../RequestBuilders/IBodyRequestBuilder.cs    | 34 +++++---
 src/WireMock.Net/RequestBuilders/Request.cs   | 77 +++++++------------
 .../RequestWithBodyTests.cs                   | 19 +++++
 .../StatefulBehaviorTests.cs                  |  3 +
 7 files changed, 86 insertions(+), 62 deletions(-)

diff --git a/examples/WireMock.Net.ConsoleApplication/MainApp.cs b/examples/WireMock.Net.ConsoleApplication/MainApp.cs
index 09e4e290c..0627c0207 100644
--- a/examples/WireMock.Net.ConsoleApplication/MainApp.cs
+++ b/examples/WireMock.Net.ConsoleApplication/MainApp.cs
@@ -41,6 +41,15 @@ public static void Run()
             //    .RespondWith(Response.Create()
             //    .WithProxy("http://restcountries.eu"));
 
+            server
+                .Given(Request
+                    .Create()
+                    .WithPath("/jsonthings")
+                    .WithBody(new JsonPathMatcher("$.things[?(@.name == 'RequiredThing')]"))
+                    .UsingPut())
+                .RespondWith(Response.Create()
+                    .WithBody(@"{ ""result"": ""JsonPathMatcher !!!""}"));
+
             server
                 .Given(Request
                     .Create()
diff --git a/src/WireMock.Net/Matchers/Request/RequestMessageBodyMatcher.cs b/src/WireMock.Net/Matchers/Request/RequestMessageBodyMatcher.cs
index 427510e3c..c3cad3090 100644
--- a/src/WireMock.Net/Matchers/Request/RequestMessageBodyMatcher.cs
+++ b/src/WireMock.Net/Matchers/Request/RequestMessageBodyMatcher.cs
@@ -127,7 +127,7 @@ private double IsMatch(RequestMessage requestMessage)
 
             if (Func != null)
             {
-                return MatchScores.ToScore(Func(requestMessage.Body));
+                return MatchScores.ToScore(requestMessage.Body != null && Func(requestMessage.Body));
             }
 
             if (DataFunc != null)
diff --git a/src/WireMock.Net/Matchers/Request/RequestMessageClientIPMatcher.cs b/src/WireMock.Net/Matchers/Request/RequestMessageClientIPMatcher.cs
index 718326b47..6b2d5d695 100644
--- a/src/WireMock.Net/Matchers/Request/RequestMessageClientIPMatcher.cs
+++ b/src/WireMock.Net/Matchers/Request/RequestMessageClientIPMatcher.cs
@@ -59,10 +59,14 @@ public double GetMatchingScore(RequestMessage requestMessage, RequestMatchResult
         private double IsMatch(RequestMessage requestMessage)
         {
             if (Matchers != null)
+            {
                 return Matchers.Max(matcher => matcher.IsMatch(requestMessage.ClientIP));
+            }
 
             if (Funcs != null)
+            {
                 return MatchScores.ToScore(requestMessage.ClientIP != null && Funcs.Any(func => func(requestMessage.ClientIP)));
+            }
 
             return MatchScores.Mismatch;
         }
diff --git a/src/WireMock.Net/RequestBuilders/IBodyRequestBuilder.cs b/src/WireMock.Net/RequestBuilders/IBodyRequestBuilder.cs
index c979b91e3..49c4f78f4 100644
--- a/src/WireMock.Net/RequestBuilders/IBodyRequestBuilder.cs
+++ b/src/WireMock.Net/RequestBuilders/IBodyRequestBuilder.cs
@@ -10,38 +10,52 @@ namespace WireMock.RequestBuilders
     public interface IBodyRequestBuilder
     {
         /// <summary>
-        /// The with body.
+        /// WithBody: IMatcher
         /// </summary>
         /// <param name="matcher">The matcher.</param>
         /// <returns>The <see cref="IRequestBuilder"/>.</returns>
         IRequestBuilder WithBody([NotNull] IMatcher matcher);
 
         /// <summary>
-        /// The with body.
+        /// WithBody: Body as string
         /// </summary>
         /// <param name="body">The body.</param>
         /// <returns>The <see cref="IRequestBuilder"/>.</returns>
         IRequestBuilder WithBody(string body);
 
         /// <summary>
-        /// The with body byte[].
+        /// WithBody: Body as byte[]
         /// </summary>
-        /// <param name="body">The body as byte[].</param>
+        /// <param name="body">The body.</param>
         /// <returns>The <see cref="IRequestBuilder"/>.</returns>
         IRequestBuilder WithBody(byte[] body);
 
         /// <summary>
-        /// The with body string func.
+        /// WithBody: Body as object
+        /// </summary>
+        /// <param name="body">The body.</param>
+        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        IRequestBuilder WithBody(object body);
+
+        /// <summary>
+        ///WithBody: func (string)
+        /// </summary>
+        /// <param name="func">The function.</param>
+        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        IRequestBuilder WithBody([NotNull] Func<string, bool> func);
+
+        /// <summary>
+        ///WithBody: func (byte[])
         /// </summary>
-        /// <param name="body">The body string function.</param>
+        /// <param name="func">The function.</param>
         /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithBody([NotNull] Func<string, bool> body);
+        IRequestBuilder WithBody([NotNull] Func<byte[], bool> func);
 
         /// <summary>
-        /// The with body byte[] func.
+        ///WithBody: func (object)
         /// </summary>
-        /// <param name="body">The body byte[] function.</param>
+        /// <param name="func">The function.</param>
         /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithBody([NotNull] Func<byte[], bool> body);
+        IRequestBuilder WithBody([NotNull] Func<object, bool> func);
     }
 }
\ No newline at end of file
diff --git a/src/WireMock.Net/RequestBuilders/Request.cs b/src/WireMock.Net/RequestBuilders/Request.cs
index c67acf069..8d527935e 100644
--- a/src/WireMock.Net/RequestBuilders/Request.cs
+++ b/src/WireMock.Net/RequestBuilders/Request.cs
@@ -234,39 +234,37 @@ public IRequestBuilder UsingVerb(params string[] verbs)
             return this;
         }
 
-        /// <summary>
-        /// The with body.
-        /// </summary>
-        /// <param name="body">
-        /// The body.
-        /// </param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        /// <inheritdoc cref="IBodyRequestBuilder.WithBody(string)"/>
         public IRequestBuilder WithBody(string body)
         {
             _requestMatchers.Add(new RequestMessageBodyMatcher(body));
             return this;
         }
 
-        /// <summary>
-        /// The with body byte[].
-        /// </summary>
-        /// <param name="body">
-        /// The body as byte[].
-        /// </param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        /// <inheritdoc cref="IBodyRequestBuilder.WithBody(byte[])"/>
         public IRequestBuilder WithBody(byte[] body)
         {
             _requestMatchers.Add(new RequestMessageBodyMatcher(body));
             return this;
         }
 
-        /// <summary>
-        /// The with body.
-        /// </summary>
-        /// <param name="func">
-        /// The body function.
-        /// </param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        /// <inheritdoc cref="IBodyRequestBuilder.WithBody(object)"/>
+        public IRequestBuilder WithBody(object body)
+        {
+            _requestMatchers.Add(new RequestMessageBodyMatcher(body));
+            return this;
+        }
+
+        /// <inheritdoc cref="IBodyRequestBuilder.WithBody(IMatcher)"/>
+        public IRequestBuilder WithBody(IMatcher matcher)
+        {
+            Check.NotNull(matcher, nameof(matcher));
+
+            _requestMatchers.Add(new RequestMessageBodyMatcher(matcher));
+            return this;
+        }
+
+        /// <inheritdoc cref="IBodyRequestBuilder.WithBody(Func{string, bool})"/>
         public IRequestBuilder WithBody(Func<string, bool> func)
         {
             Check.NotNull(func, nameof(func));
@@ -275,13 +273,7 @@ public IRequestBuilder WithBody(Func<string, bool> func)
             return this;
         }
 
-        /// <summary>
-        /// The with body.
-        /// </summary>
-        /// <param name="func">
-        /// The body function.
-        /// </param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        /// <inheritdoc cref="IBodyRequestBuilder.WithBody(Func{byte[], bool})"/>
         public IRequestBuilder WithBody(Func<byte[], bool> func)
         {
             Check.NotNull(func, nameof(func));
@@ -290,29 +282,16 @@ public IRequestBuilder WithBody(Func<byte[], bool> func)
             return this;
         }
 
-        /// <summary>
-        /// The with body.
-        /// </summary>
-        /// <param name="matcher">The matcher.</param>
-        /// <returns>The <see cref="IRequestBuilder" />.</returns>
-        public IRequestBuilder WithBody(IMatcher matcher)
+        /// <inheritdoc cref="IBodyRequestBuilder.WithBody(Func{object, bool})"/>
+        public IRequestBuilder WithBody(Func<object, bool> func)
         {
-            Check.NotNull(matcher, nameof(matcher));
+            Check.NotNull(func, nameof(func));
 
-            _requestMatchers.Add(new RequestMessageBodyMatcher(matcher));
+            _requestMatchers.Add(new RequestMessageBodyMatcher(func));
             return this;
         }
 
-        /// <summary>
-        /// The with parameters.
-        /// </summary>
-        /// <param name="key">
-        /// The key.
-        /// </param>
-        /// <param name="values">
-        /// The values.
-        /// </param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        /// <inheritdoc cref="IParamsRequestBuilder.WithParam(string, string[])"/>
         public IRequestBuilder WithParam(string key, params string[] values)
         {
             Check.NotNull(key, nameof(key));
@@ -321,11 +300,7 @@ public IRequestBuilder WithParam(string key, params string[] values)
             return this;
         }
 
-        /// <summary>
-        /// The with parameters.
-        /// </summary>
-        /// <param name="funcs">The funcs.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        /// <inheritdoc cref="IParamsRequestBuilder.WithParam(Func{IDictionary{string, WireMockList{string}}, bool}[])"/>
         public IRequestBuilder WithParam(params Func<IDictionary<string, WireMockList<string>>, bool>[] funcs)
         {
             Check.NotNullOrEmpty(funcs, nameof(funcs));
diff --git a/test/WireMock.Net.Tests/RequestWithBodyTests.cs b/test/WireMock.Net.Tests/RequestWithBodyTests.cs
index 5af9aa354..3287824f2 100644
--- a/test/WireMock.Net.Tests/RequestWithBodyTests.cs
+++ b/test/WireMock.Net.Tests/RequestWithBodyTests.cs
@@ -242,6 +242,25 @@ public void Request_WithBodyAsJson_Array_JsonPathMatcher_true()
             Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
         }
 
+        [Fact]
+        public void Request_WithBodyAsObject_ExactObjectMatcher_true()
+        {
+            // Assign
+            object body = DateTime.MinValue;
+            var requestBuilder = Request.Create().UsingAnyVerb().WithBody(body);
+
+            var bodyData = new BodyData
+            {
+                BodyAsJson = DateTime.MinValue
+            };
+
+            // Act
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", ClientIp, bodyData);
+
+            // Assert
+            var requestMatchResult = new RequestMatchResult();
+            Check.That(requestBuilder.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
+        }
 
         [Fact]
         public void Request_WithBodyAsBytes_ExactObjectMatcher_true()
diff --git a/test/WireMock.Net.Tests/StatefulBehaviorTests.cs b/test/WireMock.Net.Tests/StatefulBehaviorTests.cs
index 2e0830c14..e0e463c51 100644
--- a/test/WireMock.Net.Tests/StatefulBehaviorTests.cs
+++ b/test/WireMock.Net.Tests/StatefulBehaviorTests.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Net;
 using System.Net.Http;
+using System.Threading;
 using System.Threading.Tasks;
 using NFluent;
 using WireMock.RequestBuilders;
@@ -156,6 +157,8 @@ public void Should_process_request_if_equals_state_and_multiple_state_defined()
                 .RespondWith(Response.Create()
                     .WithBody("Test state msg 2"));
 
+            Thread.Sleep(500);
+
             // when / then
             string url = "http://localhost:" + _server.Ports[0];
             var responseNoState1 = new HttpClient().GetStringAsync(url + "/state1").Result;