1.0.4.2

* JsonMatcher (#154)

* small update in example code

CHANGELOG.md

@@ -1,3 +1,19 @@
+# 1.0.4.2 (26 June 2018)
+
+ - [#157](https://github.com/WireMock-Net/WireMock.Net/pull/157) - Support for string and object in JsonMatcher. contributed by Stef Heyenrath ([StefH](https://github.com/StefH)) +feature
+ - [#155](https://github.com/WireMock-Net/WireMock.Net/pull/155) - Replace JsonMatcher with JsonObjectMatcher and directly support JSON body matching. contributed by ([DavidKorn](https://github.com/DavidKorn))
+ - [#154](https://github.com/WireMock-Net/WireMock.Net/issues/154) - Feature: support BodyAsJson for Request in static mapping files. +feature
+
+Commits: 9470130d65...4283732b6c
+
+
+# 1.0.4.1 (25 June 2018)
+
+ - [#153](https://github.com/WireMock-Net/WireMock.Net/issues/153) - Feature: Add JsonMatcher to support Json mapping
+
+Commits: f61a814ab5...2eff243a96
+
+
 # 1.0.4.0 (23 June 2018)
 
  - [#151](https://github.com/WireMock-Net/WireMock.Net/issues/151) - Feature: Add logging of incoming request and body for tracability

GitReleaseNotes.txt

@@ -1,5 +1,5 @@
 https://github.com/GitTools/GitReleaseNotes
 
-GitReleaseNotes.exe . /OutputFile CHANGELOG.md /Version 1.0.4.0
+GitReleaseNotes.exe . /OutputFile CHANGELOG.md /Version 1.0.4.2
 
 GitReleaseNotes.exe . /OutputFile CHANGELOG.md /allTags

README.md

@@ -1,9 +1,10 @@
 # WireMock.Net
 A C# .NET version based on [mock4net](https://github.com/alexvictoor/mock4net) which mimics the functionality from the JAVA based http://WireMock.org
 
+[![Gitter](https://img.shields.io/gitter/room/wiremock_dotnet/Lobby.svg)](https://gitter.im/wiremock_dotnet/Lobby)
+[![GitHub issues](https://img.shields.io/github/issues/WireMock-Net/WireMock.Net.svg)](https://github.com/WireMock-Net/WireMock.Net/issues)
 [![Build status](https://ci.appveyor.com/api/projects/status/b3n6q3ygbww4lyls?svg=true)](https://ci.appveyor.com/project/StefH/wiremock-net)
 [![Coverage Status](https://coveralls.io/repos/github/WireMock-Net/WireMock.Net/badge.svg?branch=master)](https://coveralls.io/github/WireMock-Net/WireMock.Net?branch=master)
-[![GitHub issues](https://img.shields.io/github/issues/WireMock-Net/WireMock.Net.svg)](https://github.com/WireMock-Net/WireMock.Net/issues)
 [![GitHub stars](https://img.shields.io/github/stars/WireMock-Net/WireMock.Net.svg)](https://github.com/WireMock-Net/WireMock.Net/stargazers)
 
 | Name | NuGet |

appveyor.yml

@@ -1,6 +1,6 @@
 os: Visual Studio 2017
 
-version: 1.0.2.{build}
+version: 1.0.4.{build}
 
 configuration:
 - Debug
@@ -35,9 +35,9 @@ build_script:
 
 test_script:
   - nuget.exe install OpenCover -ExcludeVersion
-  - nuget.exe install coveralls.net -ExcludeVersion
+  - nuget.exe install coveralls.net -ExcludeVersion -Version 0.7.0
   - pip install codecov
 
   - cmd: '"OpenCover\tools\OpenCover.Console.exe" -target:dotnet.exe -targetargs:"test test\WireMock.Net.Tests\WireMock.Net.Tests.csproj --no-build" -output:coverage.xml -returntargetcode -register:user -filter:"+[WireMock.Net]* -[WireMock.Net.Tests*]*" -nodefaultfilters -returntargetcode -oldstyle -searchdirs:".\test\WireMock.Net.Tests\bin\%CONFIGURATION%\net452"'
   - codecov -f "coverage.xml"
-  - coveralls.net\tools\csmacnz.Coveralls.exe --opencover -i .\coverage.xml
+  - coveralls.net\tools\csmacnz.Coveralls.exe --opencover -i .\coverage.xml

examples/WireMock.Net.ConsoleApplication/MainApp.cs

@@ -38,11 +38,12 @@ namespace WireMock.Net.ConsoleApplication
 
             server.AllowPartialMapping();
 
-            // .WithHeader("Stef", "Stef")
-            //server
-            //    .Given(Request.Create().WithPath("*"))
-            //    .RespondWith(Response.Create()
-            //    .WithProxy("http://restcountries.eu"));
+            server
+                .Given(Request.Create()
+                    .WithPath("/xpath").UsingPost()
+                    .WithBody(new XPathMatcher("/todo-list[count(todo-item) = 3]"))
+                )
+                .RespondWith(Response.Create().WithBody("XPathMatcher!"));
 
             server
                 .Given(Request
@@ -53,6 +54,26 @@ namespace WireMock.Net.ConsoleApplication
                 .RespondWith(Response.Create()
                     .WithBody(@"{ ""result"": ""JsonPathMatcher !!!""}"));
 
+            server
+                .Given(Request
+                    .Create()
+                    .WithPath("/jsonbodytest1")
+                    .WithBody(new JsonMatcher("{ \"x\": 42, \"s\": \"s\" }"))
+                    .UsingPost())
+                .WithGuid("debaf408-3b23-4c04-9d18-ef1c020e79f2")
+                .RespondWith(Response.Create()
+                    .WithBody(@"{ ""result"": ""jsonbodytest1"" }"));
+
+            server
+                .Given(Request
+                    .Create()
+                    .WithPath("/jsonbodytest2")
+                    .WithBody(new JsonMatcher(new { x = 42, s = "s" }))
+                    .UsingPost())
+                .WithGuid("debaf408-3b23-4c04-9d18-ef1c020e79f3")
+                .RespondWith(Response.Create()
+                    .WithBody(@"{ ""result"": ""jsonbodytest2"" }"));
+
             server
                 .Given(Request
                     .Create()
@@ -66,7 +87,6 @@ namespace WireMock.Net.ConsoleApplication
                 .Given(Request.Create().WithPath("/headers", "/headers_test").UsingPost().WithHeader("Content-Type", "application/json*"))
                 .RespondWith(Response.Create()
                     .WithStatusCode(201)
-                    //.WithHeader("MyHeader", "application/json", "application/json2")
                     .WithHeader("Content-Type", "application/json")
                     .WithBodyAsJson(new { result = "data:headers posted with 201" }));
 
@@ -173,8 +193,6 @@ namespace WireMock.Net.ConsoleApplication
                     .WithStatusCode(HttpStatusCode.Unauthorized)
                     .WithBody(@"{ ""result"": ""api-key missing""}"));
 
-
-
             server
                 .Given(Request.Create().WithPath("/nobody").UsingGet())
                 .RespondWith(Response.Create().WithDelay(TimeSpan.FromSeconds(1))
@@ -184,7 +202,7 @@ namespace WireMock.Net.ConsoleApplication
                 .Given(Request.Create().WithPath("/partial").UsingPost().WithBody(new SimMetricsMatcher(new[] { "cat", "dog" })))
                 .RespondWith(Response.Create().WithStatusCode(200).WithBody("partial = 200"));
 
-            // http://localhost:8080/any/any?start=1000&stop=1&stop=2
+            // http://localhost:8080/trans?start=1000&stop=1&stop=2
             server
                 .Given(Request.Create().WithPath("/trans").UsingGet())
                 .WithGuid("90356dba-b36c-469a-a17e-669cd84f1f05")
@@ -192,6 +210,7 @@ namespace WireMock.Net.ConsoleApplication
                     .WithStatusCode(200)
                     .WithHeader("Content-Type", "application/json")
                     .WithHeader("Transformed-Postman-Token", "token is {{request.headers.Postman-Token}}")
+                    .WithHeader("xyz_{{request.headers.Postman-Token}}", "token is {{request.headers.Postman-Token}}")
                     .WithBody(@"{""msg"": ""Hello world CATCH-ALL on /*, {{request.path}}, bykey={{request.query.start}}, bykey={{request.query.stop}}, byidx0={{request.query.stop.[0]}}, byidx1={{request.query.stop.[1]}}"" }")
                     .WithTransformer()
                     .WithDelay(TimeSpan.FromMilliseconds(100))

examples/WireMock.Net.StandAlone.Net452/WireMock.Net.StandAlone.Net452.csproj

@@ -42,8 +42,18 @@
     <Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
       <HintPath>..\..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.Owin.Host.HttpListener, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Owin.Host.HttpListener.4.0.0\lib\net451\Microsoft.Owin.Host.HttpListener.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Net.Http.Formatting, Version=5.2.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.4\lib\net45\System.Net.Http.Formatting.dll</HintPath>
+    </Reference>
     <Reference Include="System.Numerics" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />
@@ -53,6 +63,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="log4net.config">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

examples/WireMock.Net.StandAlone.Net452/app.config

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>

examples/WireMock.Net.StandAlone.Net452/packages.config

@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="log4net" version="2.0.8" targetFramework="net452" />
+  <package id="Microsoft.AspNet.WebApi.Client" version="5.2.4" targetFramework="net452" />
+  <package id="Microsoft.Owin.Host.HttpListener" version="4.0.0" targetFramework="net452" />
+  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net452" />
 </packages>

src/WireMock.Net.StandAlone/WireMock.Net.StandAlone.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Description>Lightweight StandAlone Http Mocking Server for .Net.</Description>
     <AssemblyTitle>WireMock.Net.StandAlone</AssemblyTitle>
-    <Version>1.0.4.0</Version>
+    <Version>1.0.4.2</Version>
     <Authors>Stef Heyenrath</Authors>
     <TargetFrameworks>net452;net46;netstandard1.3;netstandard2.0</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>

src/WireMock.Net/Admin/Mappings/MatcherModel.cs

@@ -11,14 +11,14 @@
         public string Name { get; set; }
 
         /// <summary>
-        /// Gets or sets the pattern.
+        /// Gets or sets the pattern. Can be a string (default) or an object;
         /// </summary>
-        public string Pattern { get; set; }
+        public object Pattern { get; set; }
 
         /// <summary>
-        /// Gets or sets the patterns.
+        /// Gets or sets the patterns. Can be array of strings (default) or an array of objects;
         /// </summary>
-        public string[] Patterns { get; set; }
+        public object[] Patterns { get; set; }
 
         /// <summary>
         /// Gets or sets the ignore case.

src/WireMock.Net/Matchers/ExactObjectMatcher.cs

@@ -5,7 +5,7 @@ using WireMock.Validation;
 namespace WireMock.Matchers
 {
     /// <summary>
-    /// ExactMatcher
+    /// ExactObjectMatcher
     /// </summary>
     /// <seealso cref="IObjectMatcher" />
     public class ExactObjectMatcher : IObjectMatcher
@@ -17,7 +17,7 @@ namespace WireMock.Matchers
         public MatchBehaviour MatchBehaviour { get; }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="ExactMatcher"/> class.
+        /// Initializes a new instance of the <see cref="ExactObjectMatcher"/> class.
         /// </summary>
         /// <param name="value">The value.</param>
         public ExactObjectMatcher([NotNull] object value) : this(MatchBehaviour.AcceptOnMatch, value)
@@ -25,7 +25,7 @@ namespace WireMock.Matchers
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="ExactMatcher"/> class.
+        /// Initializes a new instance of the <see cref="ExactObjectMatcher"/> class.
         /// </summary>
         /// <param name="matchBehaviour">The match behaviour.</param>
         /// <param name="value">The value.</param>
@@ -38,7 +38,7 @@ namespace WireMock.Matchers
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="ExactMatcher"/> class.
+        /// Initializes a new instance of the <see cref="ExactObjectMatcher"/> class.
         /// </summary>
         /// <param name="value">The value.</param>
         public ExactObjectMatcher([NotNull] byte[] value) : this(MatchBehaviour.AcceptOnMatch, value)
@@ -46,7 +46,7 @@ namespace WireMock.Matchers
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="ExactMatcher"/> class.
+        /// Initializes a new instance of the <see cref="ExactObjectMatcher"/> class.
         /// </summary>
         /// <param name="matchBehaviour">The match behaviour.</param>
         /// <param name="value">The value.</param>

src/WireMock.Net/Matchers/IMatcher.cs

@@ -10,7 +10,6 @@
         /// </summary>
         string Name { get; }
 
-
         /// <summary>
         /// Gets the match behaviour.
         /// </summary>

src/WireMock.Net/Matchers/IValueMatcher.cs

@@ -0,0 +1,15 @@
+namespace WireMock.Matchers
+{
+    /// <summary>
+    /// IValueMatcher
+    /// </summary>
+    /// <seealso cref="IObjectMatcher" />
+    public interface IValueMatcher: IObjectMatcher
+    {
+        /// <summary>
+        /// Gets the value (can be a string or an obejct).
+        /// </summary>
+        /// <returns>Value</returns>
+        object Value { get; }
+    }
+}

src/WireMock.Net/Matchers/JSONPathMatcher.cs

@@ -10,6 +10,7 @@ namespace WireMock.Matchers
     /// JsonPathMatcher
     /// </summary>
     /// <seealso cref="IMatcher" />
+    /// <seealso cref="IObjectMatcher" />
     public class JsonPathMatcher : IStringMatcher, IObjectMatcher
     {
         private readonly string[] _patterns;
@@ -91,9 +92,9 @@ namespace WireMock.Matchers
         private double IsMatch(JToken jtoken)
         {
             // Wrap in array if needed
-            JToken jarray = jtoken is JArray ? jtoken : new JArray(jtoken);
+            JToken tokenOrArray = jtoken is JArray ? jtoken : new JArray(jtoken);
 
-            return MatchScores.ToScore(_patterns.Select(pattern => jarray.SelectToken(pattern) != null));
+            return MatchScores.ToScore(_patterns.Select(pattern => tokenOrArray.SelectToken(pattern) != null));
         }
     }
 }

src/WireMock.Net/Matchers/JsonMatcher.cs

@@ -0,0 +1,92 @@
+using JetBrains.Annotations;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using WireMock.Validation;
+
+namespace WireMock.Matchers
+{
+    /// <summary>
+    /// JsonMatcher
+    /// </summary>
+    public class JsonMatcher : IValueMatcher
+    {
+        /// <inheritdoc cref="IValueMatcher.Value"/>
+        public object Value { get; }
+
+        /// <inheritdoc cref="IMatcher.Name"/>
+        public string Name => "JsonMatcher";
+
+        /// <inheritdoc cref="IMatcher.MatchBehaviour"/>
+        public MatchBehaviour MatchBehaviour { get; }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="JsonMatcher"/> class.
+        /// </summary>
+        /// <param name="value">The string value to check for equality.</param>
+        public JsonMatcher([NotNull] string value) : this(MatchBehaviour.AcceptOnMatch, value)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="JsonMatcher"/> class.
+        /// </summary>
+        /// <param name="value">The object value to check for equality.</param>
+        public JsonMatcher([NotNull] object value) : this(MatchBehaviour.AcceptOnMatch, value)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="JsonMatcher"/> class.
+        /// </summary>
+        /// <param name="matchBehaviour">The match behaviour.</param>
+        /// <param name="value">The string value to check for equality.</param>
+        public JsonMatcher(MatchBehaviour matchBehaviour, [NotNull] string value)
+        {
+            Check.NotNull(value, nameof(value));
+
+            MatchBehaviour = matchBehaviour;
+            Value = value;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="JsonMatcher"/> class.
+        /// </summary>
+        /// <param name="matchBehaviour">The match behaviour.</param>
+        /// <param name="value">The object value to check for equality.</param>
+        public JsonMatcher(MatchBehaviour matchBehaviour, [NotNull] object value)
+        {
+            Check.NotNull(value, nameof(value));
+
+            MatchBehaviour = matchBehaviour;
+            Value = value;
+        }
+
+        /// <inheritdoc cref="IObjectMatcher.IsMatch"/>
+        public double IsMatch(object input)
+        {
+            bool match = false;
+            if (input != null)
+            {
+                try
+                {
+                    // Check if JToken or object
+                    JToken jtokenInput = input is JToken tokenInput ? tokenInput : JObject.FromObject(input);
+
+                    // Check if JToken or string or object
+                    JToken jtokenValue =
+                        Value is JToken tokenValue ? tokenValue :
+                        Value is string stringValue ? JToken.Parse(stringValue) :
+                        JObject.FromObject(input);
+
+                    match = JToken.DeepEquals(jtokenValue, jtokenInput);
+                }
+                catch (JsonException)
+                {
+                    // just ignore JsonException
+                }
+            }
+
+            return MatchBehaviourHelper.Convert(MatchBehaviour, MatchScores.ToScore(match));
+        }
+    }
+}

src/WireMock.Net/Serialization/MappingConverter.cs

@@ -116,7 +116,7 @@ namespace WireMock.Serialization
                 mappingModel.Response.BodyAsFileIsCached = response.ResponseMessage.BodyAsFileIsCached;
                 mappingModel.Response.UseTransformer = response.UseTransformer;
 
-                if (response.ResponseMessage.BodyEncoding != null)
+                if (response.ResponseMessage.BodyEncoding != null && response.ResponseMessage.BodyEncoding.WebName != "utf-8")
                 {
                     mappingModel.Response.BodyEncoding = new EncodingModel
                     {
@@ -132,7 +132,7 @@ namespace WireMock.Serialization
 
         private static IDictionary<string, object> Map(IDictionary<string, WireMockList<string>> dictionary)
         {
-            if (dictionary == null)
+            if (dictionary == null || dictionary.Count == 0)
             {
                 return null;
             }

src/WireMock.Net/Serialization/MatcherMapper.cs

@@ -1,6 +1,8 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using JetBrains.Annotations;
+using SimMetrics.Net;
 using WireMock.Admin.Mappings;
 using WireMock.Matchers;
 
@@ -8,6 +10,54 @@ namespace WireMock.Serialization
 {
     internal static class MatcherMapper
     {
+        public static IMatcher Map([CanBeNull] MatcherModel matcher)
+        {
+            if (matcher == null)
+            {
+                return null;
+            }
+
+            string[] parts = matcher.Name.Split('.');
+            string matcherName = parts[0];
+            string matcherType = parts.Length > 1 ? parts[1] : null;
+
+            string[] stringPatterns = matcher.Patterns != null ? matcher.Patterns.Cast<string>().ToArray() : new [] { matcher.Pattern as string };
+            MatchBehaviour matchBehaviour = matcher.RejectOnMatch == true ? MatchBehaviour.RejectOnMatch : MatchBehaviour.AcceptOnMatch;
+
+            switch (matcherName)
+            {
+                case "ExactMatcher":
+                    return new ExactMatcher(matchBehaviour, stringPatterns);
+
+                case "RegexMatcher":
+                    return new RegexMatcher(matchBehaviour, stringPatterns, matcher.IgnoreCase == true);
+
+                case "JsonMatcher":
+                    return new JsonMatcher(matchBehaviour, matcher.Pattern);
+
+                case "JsonPathMatcher":
+                    return new JsonPathMatcher(matchBehaviour, stringPatterns);
+
+                case "XPathMatcher":
+                    return new XPathMatcher(matchBehaviour, (string) matcher.Pattern);
+
+                case "WildcardMatcher":
+                    return new WildcardMatcher(matchBehaviour, stringPatterns, matcher.IgnoreCase == true);
+
+                case "SimMetricsMatcher":
+                    SimMetricType type = SimMetricType.Levenstein;
+                    if (!string.IsNullOrEmpty(matcherType) && !Enum.TryParse(matcherType, out type))
+                    {
+                        throw new NotSupportedException($"Matcher '{matcherName}' with Type '{matcherType}' is not supported.");
+                    }
+
+                    return new SimMetricsMatcher(matchBehaviour, (string) matcher.Pattern, type);
+
+                default:
+                    throw new NotSupportedException($"Matcher '{matcherName}' is not supported.");
+            }
+        }
+
         public static MatcherModel[] Map([CanBeNull] IEnumerable<IMatcher> matchers)
         {
             return matchers?.Select(Map).Where(x => x != null).ToArray();
@@ -20,9 +70,15 @@ namespace WireMock.Serialization
                 return null;
             }
 
-            string[] patterns = matcher is IStringMatcher stringMatcher ? stringMatcher.GetPatterns() : new string[0];
+            // If the matcher is a IStringMatcher, get the patterns.
+            // If the matcher is a IValueMatcher, get the value (can be string or object).
+            // Else empty array
+            object[] patterns = matcher is IStringMatcher stringMatcher ?
+                stringMatcher.GetPatterns().Cast<object>().ToArray() :
+                matcher is IValueMatcher valueMatcher ? new[] { valueMatcher.Value } :
+                new object[0];
             bool? ignorecase = matcher is IIgnoreCaseMatcher ignoreCaseMatcher ? ignoreCaseMatcher.IgnoreCase : (bool?)null;
-            bool? rejectOnMatch = matcher.MatchBehaviour == MatchBehaviour.RejectOnMatch ? true : (bool?) null;
+            bool? rejectOnMatch = matcher.MatchBehaviour == MatchBehaviour.RejectOnMatch ? true : (bool?)null;
 
             return new MatcherModel
             {

src/WireMock.Net/Serialization/MatcherModelMapper.cs

@@ -1,56 +0,0 @@
-using System;
-using JetBrains.Annotations;
-using SimMetrics.Net;
-using WireMock.Admin.Mappings;
-using WireMock.Matchers;
-
-namespace WireMock.Serialization
-{
-    internal static class MatcherModelMapper
-    {
-        public static IMatcher Map([CanBeNull] MatcherModel matcher)
-        {
-            if (matcher == null)
-            {
-                return null;
-            }
-
-            string[] parts = matcher.Name.Split('.');
-            string matcherName = parts[0];
-            string matcherType = parts.Length > 1 ? parts[1] : null;
-
-            string[] patterns = matcher.Patterns ?? new[] { matcher.Pattern };
-            MatchBehaviour matchBehaviour = matcher.RejectOnMatch == true ? MatchBehaviour.RejectOnMatch : MatchBehaviour.AcceptOnMatch;
-
-            switch (matcherName)
-            {
-                case "ExactMatcher":
-                    return new ExactMatcher(matchBehaviour, patterns);
-
-                case "RegexMatcher":
-                    return new RegexMatcher(matchBehaviour, patterns, matcher.IgnoreCase == true);
-
-                case "JsonPathMatcher":
-                    return new JsonPathMatcher(matchBehaviour, patterns);
-
-                case "XPathMatcher":
-                    return new XPathMatcher(matchBehaviour, matcher.Pattern);
-
-                case "WildcardMatcher":
-                    return new WildcardMatcher(matchBehaviour, patterns, matcher.IgnoreCase == true);
-
-                case "SimMetricsMatcher":
-                    SimMetricType type = SimMetricType.Levenstein;
-                    if (!string.IsNullOrEmpty(matcherType) && !Enum.TryParse(matcherType, out type))
-                    {
-                        throw new NotSupportedException($"Matcher '{matcherName}' with Type '{matcherType}' is not supported.");
-                    }
-
-                    return new SimMetricsMatcher(matchBehaviour, matcher.Pattern, type);
-
-                default:
-                    throw new NotSupportedException($"Matcher '{matcherName}' is not supported.");
-            }
-        }
-    }
-}

src/WireMock.Net/Server/FluentMockServer.Admin.cs

@@ -9,7 +9,6 @@ using JetBrains.Annotations;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using WireMock.Admin.Mappings;
-using WireMock.Admin.Requests;
 using WireMock.Admin.Settings;
 using WireMock.Http;
 using WireMock.Logging;
@@ -239,7 +238,11 @@ namespace WireMock.Server
                 }
             });
 
-            if (requestMessage.Body != null)
+            if (requestMessage.BodyAsJson != null)
+            {
+                request.WithBody(new JsonMatcher(MatchBehaviour.AcceptOnMatch, requestMessage.BodyAsJson));
+            }
+            else if (requestMessage.Body != null)
             {
                 request.WithBody(new ExactMatcher(MatchBehaviour.AcceptOnMatch, requestMessage.Body));
             }
@@ -549,7 +552,7 @@ namespace WireMock.Server
                     var clientIPModel = JsonUtils.ParseJTokenToObject<ClientIPModel>(requestModel.ClientIP);
                     if (clientIPModel?.Matchers != null)
                     {
-                        requestBuilder = requestBuilder.WithPath(clientIPModel.Matchers.Select(MatcherModelMapper.Map).Cast<IStringMatcher>().ToArray());
+                        requestBuilder = requestBuilder.WithPath(clientIPModel.Matchers.Select(MatcherMapper.Map).Cast<IStringMatcher>().ToArray());
                     }
                 }
             }
@@ -565,7 +568,7 @@ namespace WireMock.Server
                     var pathModel = JsonUtils.ParseJTokenToObject<PathModel>(requestModel.Path);
                     if (pathModel?.Matchers != null)
                     {
-                        requestBuilder = requestBuilder.WithPath(pathModel.Matchers.Select(MatcherModelMapper.Map).Cast<IStringMatcher>().ToArray());
+                        requestBuilder = requestBuilder.WithPath(pathModel.Matchers.Select(MatcherMapper.Map).Cast<IStringMatcher>().ToArray());
                     }
                 }
             }
@@ -581,7 +584,7 @@ namespace WireMock.Server
                     var urlModel = JsonUtils.ParseJTokenToObject<UrlModel>(requestModel.Url);
                     if (urlModel?.Matchers != null)
                     {
-                        requestBuilder = requestBuilder.WithUrl(urlModel.Matchers.Select(MatcherModelMapper.Map).Cast<IStringMatcher>().ToArray());
+                        requestBuilder = requestBuilder.WithUrl(urlModel.Matchers.Select(MatcherMapper.Map).Cast<IStringMatcher>().ToArray());
                     }
                 }
             }
@@ -595,7 +598,7 @@ namespace WireMock.Server
             {
                 foreach (var headerModel in requestModel.Headers.Where(h => h.Matchers != null))
                 {
-                    requestBuilder = requestBuilder.WithHeader(headerModel.Name, headerModel.Matchers.Select(MatcherModelMapper.Map).Cast<IStringMatcher>().ToArray());
+                    requestBuilder = requestBuilder.WithHeader(headerModel.Name, headerModel.Matchers.Select(MatcherMapper.Map).Cast<IStringMatcher>().ToArray());
                 }
             }
 
@@ -603,7 +606,7 @@ namespace WireMock.Server
             {
                 foreach (var cookieModel in requestModel.Cookies.Where(c => c.Matchers != null))
                 {
-                    requestBuilder = requestBuilder.WithCookie(cookieModel.Name, cookieModel.Matchers.Select(MatcherModelMapper.Map).Cast<IStringMatcher>().ToArray());
+                    requestBuilder = requestBuilder.WithCookie(cookieModel.Name, cookieModel.Matchers.Select(MatcherMapper.Map).Cast<IStringMatcher>().ToArray());
                 }
             }
 
@@ -617,7 +620,7 @@ namespace WireMock.Server
 
             if (requestModel.Body?.Matcher != null)
             {
-                var bodyMatcher = MatcherModelMapper.Map(requestModel.Body.Matcher);
+                var bodyMatcher = MatcherMapper.Map(requestModel.Body.Matcher);
                 requestBuilder = requestBuilder.WithBody(bodyMatcher);
             }
 

src/WireMock.Net/WireMock.Net.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Description>Lightweight Http Mocking Server for .Net, inspired by WireMock from the Java landscape.</Description>
     <AssemblyTitle>WireMock.Net</AssemblyTitle>
-    <Version>1.0.4.0</Version>
+    <Version>1.0.4.2</Version>
     <Authors>Stef Heyenrath</Authors>
     <TargetFrameworks>net452;net46;netstandard1.3;netstandard2.0</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>

test/WireMock.Net.Tests/FluentMockServerTests.cs

@@ -88,7 +88,7 @@ namespace WireMock.Net.Tests
             string folder = Path.Combine(GetCurrentFolder(), "__admin", "mappings", guid + ".json");
             string json = File.ReadAllText(folder);
 
-            string responseBodyFilePath = Path.Combine(GetCurrentFolder(), "ResponseBodyFiles", "responsebody.json");
+            string responseBodyFilePath = Path.Combine(GetCurrentFolder(), "responsebody.json");
 
             dynamic jsonObj = JsonConvert.DeserializeObject(json);
             jsonObj["Response"]["BodyAsFile"] = responseBodyFilePath;

test/WireMock.Net.Tests/Matchers/ExactObjectMatcherTests.cs

@@ -38,11 +38,11 @@ namespace WireMock.Net.Tests.Matchers
         public void ExactObjectMatcher_IsMatch_AcceptOnMatch()
         {
             // Assign
-            object obj = 1;
+            object obj = new { x = 500, s = "s" };
 
             // Act
             var matcher = new ExactObjectMatcher(obj);
-            double result = matcher.IsMatch(1);
+            double result = matcher.IsMatch(new { x = 500, s = "s" });
 
             // Assert
             Check.That(result).IsEqualTo(1.0);
@@ -52,11 +52,11 @@ namespace WireMock.Net.Tests.Matchers
         public void ExactObjectMatcher_IsMatch_RejectOnMatch()
         {
             // Assign
-            object obj = 1;
+            object obj = new { x = 500, s = "s" };
 
             // Act
             var matcher = new ExactObjectMatcher(MatchBehaviour.RejectOnMatch, obj);
-            double result = matcher.IsMatch(1);
+            double result = matcher.IsMatch(new { x = 500, s = "s" });
 
             // Assert
             Check.That(result).IsEqualTo(0.0);

test/WireMock.Net.Tests/Matchers/JsonMatcherTests.cs

@@ -0,0 +1,132 @@
+using Newtonsoft.Json.Linq;
+using NFluent;
+using WireMock.Matchers;
+using Xunit;
+
+namespace WireMock.Net.Tests.Matchers
+{
+    public class JsonMatcherTests
+    {
+        [Fact]
+        public void JsonMatcher_GetName()
+        {
+            // Assign
+            var matcher = new JsonMatcher("{}");
+
+            // Act
+            string name = matcher.Name;
+
+            // Assert
+            Check.That(name).Equals("JsonMatcher");
+        }
+
+        [Fact]
+        public void JsonMatcher_GetValue()
+        {
+            // Assign
+            var matcher = new JsonMatcher("{}");
+
+            // Act
+            object value = matcher.Value;
+
+            // Assert
+            Check.That(value).Equals("{}");
+        }
+
+        [Fact]
+        public void JsonMatcher_IsMatch_NullString()
+        {
+            // Assign
+            string s = null;
+            var matcher = new JsonMatcher("");
+
+            // Act 
+            double match = matcher.IsMatch(s);
+
+            // Assert 
+            Check.That(match).IsEqualTo(0);
+        }
+
+        [Fact]
+        public void JsonMatcher_IsMatch_NullObject()
+        {
+            // Assign
+            object o = null;
+            var matcher = new JsonMatcher("");
+
+            // Act 
+            double match = matcher.IsMatch(o);
+
+            // Assert 
+            Check.That(match).IsEqualTo(0);
+        }
+
+        [Fact]
+        public void JsonMatcher_IsMatch_JObject1()
+        {
+            // Assign 
+            var matcher = new JsonMatcher(new { Id = 1, Name = "test" });
+
+            // Act 
+            var jobject = new JObject
+            {
+                { "Id", new JValue(1) },
+                { "Name", new JValue("Test") }
+            };
+            double match = matcher.IsMatch(jobject);
+
+            // Assert 
+            Assert.Equal(1.0, match);
+        }
+
+        [Fact]
+        public void JsonMatcher_IsMatch_JObject2()
+        {
+            // Assign 
+            var matcher = new JsonMatcher(new { Id = 1, Name = "test" });
+
+            // Act 
+            var jobject = JObject.Parse("{ \"Id\" : 1, \"Name\" : \"Test\" }");
+            double match = matcher.IsMatch(jobject);
+
+            // Assert 
+            Assert.Equal(1.0, match);
+        }
+
+        [Fact]
+        public void JsonMatcher_IsMatch_JObjectAsString()
+        {
+            // Assign 
+            var matcher = new JsonMatcher("{ \"Id\" : 1, \"Name\" : \"Test\" }");
+
+            // Act 
+            var jobject = new JObject
+            {
+                { "Id", new JValue(1) },
+                { "Name", new JValue("Test") }
+            };
+            double match = matcher.IsMatch(jobject);
+
+            // Assert 
+            Assert.Equal(1.0, match);
+        }
+
+        [Fact]
+        public void JsonMatcher_IsMatch_JObjectAsString_RejectOnMatch()
+        {
+            // Assign 
+            var matcher = new JsonMatcher(MatchBehaviour.RejectOnMatch, "{ \"Id\" : 1, \"Name\" : \"Test\" }");
+
+            // Act 
+            var jobject = new JObject
+            {
+                { "Id", new JValue(1) },
+                { "Name", new JValue("Test") }
+            };
+            double match = matcher.IsMatch(jobject);
+
+            // Assert 
+            Assert.Equal(0.0, match);
+        }
+    }
+}

test/WireMock.Net.Tests/Serialization/MatcherModelMapperTests.cs

@@ -13,7 +13,7 @@ namespace WireMock.Net.Tests.Serialization
         public void MatcherModelMapper_Map_Null()
         {
             // Act
-            IMatcher matcher = MatcherModelMapper.Map(null);
+            IMatcher matcher = MatcherMapper.Map((MatcherModel)null);
 
             // Assert
             Check.That(matcher).IsNull();
@@ -30,7 +30,7 @@ namespace WireMock.Net.Tests.Serialization
             };
 
             // Act
-            var matcher = (ExactMatcher)MatcherModelMapper.Map(model);
+            var matcher = (ExactMatcher)MatcherMapper.Map(model);
 
             // Assert
             Check.That(matcher.GetPatterns()).ContainsExactly("x");
@@ -47,7 +47,7 @@ namespace WireMock.Net.Tests.Serialization
             };
 
             // Act
-            var matcher = (ExactMatcher)MatcherModelMapper.Map(model);
+            var matcher = (ExactMatcher)MatcherMapper.Map(model);
 
             // Assert
             Check.That(matcher.GetPatterns()).ContainsExactly("x", "y");
@@ -65,7 +65,7 @@ namespace WireMock.Net.Tests.Serialization
             };
 
             // Act
-            var matcher = (RegexMatcher)MatcherModelMapper.Map(model);
+            var matcher = (RegexMatcher)MatcherMapper.Map(model);
 
             // Assert
             Check.That(matcher.GetPatterns()).ContainsExactly("x", "y");
@@ -84,7 +84,7 @@ namespace WireMock.Net.Tests.Serialization
             };
 
             // Act
-            var matcher = (WildcardMatcher)MatcherModelMapper.Map(model);
+            var matcher = (WildcardMatcher)MatcherMapper.Map(model);
 
             // Assert
             Check.That(matcher.GetPatterns()).ContainsExactly("x", "y");
@@ -102,7 +102,7 @@ namespace WireMock.Net.Tests.Serialization
             };
 
             // Act
-            var matcher = (SimMetricsMatcher)MatcherModelMapper.Map(model);
+            var matcher = (SimMetricsMatcher)MatcherMapper.Map(model);
 
             // Assert
             Check.That(matcher.GetPatterns()).ContainsExactly("x");
@@ -119,7 +119,7 @@ namespace WireMock.Net.Tests.Serialization
             };
 
             // Act
-            var matcher = (SimMetricsMatcher)MatcherModelMapper.Map(model);
+            var matcher = (SimMetricsMatcher)MatcherMapper.Map(model);
 
             // Assert
             Check.That(matcher.GetPatterns()).ContainsExactly("x");
@@ -136,7 +136,7 @@ namespace WireMock.Net.Tests.Serialization
             };
 
             // Act
-            Check.ThatCode(() => MatcherModelMapper.Map(model)).Throws<NotSupportedException>();
+            Check.ThatCode(() => MatcherMapper.Map(model)).Throws<NotSupportedException>();
         }
 
         [Fact]
@@ -150,7 +150,7 @@ namespace WireMock.Net.Tests.Serialization
             };
 
             // Act
-            Check.ThatCode(() => MatcherModelMapper.Map(model)).Throws<NotSupportedException>();
+            Check.ThatCode(() => MatcherMapper.Map(model)).Throws<NotSupportedException>();
         }
     }
 }

test/WireMock.Net.Tests/WireMock.Net.Tests.csproj

@@ -16,23 +16,23 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
     <PackageReference Include="Microsoft.Owin.Host.HttpListener" Version="3.1.0" />
-    <PackageReference Include="Moq" Version="4.8.2" />
+    <PackageReference Include="Moq" Version="4.8.3" />
     <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
     <PackageReference Include="NFluent" Version="2.2.0" />
     <PackageReference Include="OpenCover" Version="4.6.519" />
     <PackageReference Include="ReportGenerator" Version="3.1.2" />
     <PackageReference Include="SimMetrics.Net" Version="1.0.4" />
     <PackageReference Include="System.Threading" Version="4.3.0" />
-	  <PackageReference Include="xunit" Version="2.3.0-beta1-build3642" /> 
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-beta1-build1309" /> 
+	  <PackageReference Include="xunit" Version="2.3.1" /> 
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" /> 
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
   </ItemGroup>
 
   <ItemGroup>
-    <None Update="ResponseBodyFiles\responsebody.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    <None Update="responsebody.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
     <None Update="__admin\mappings\00000002-ee28-4f29-ae63-1ac9b0802d86.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>