MatcherMapper : Always use Pattern (#716)

examples/WireMock.Net.Console.NET5/__admin/mappings/11111110-a633-40e8-a244-5cb80bc0ab66.json

@@ -1,22 +1,33 @@
-{
+{
     "Request": {
         "Path": {
             "Matchers": [
                 {
                     "Name": "WildcardMatcher",
-                    "Pattern": "/static/mapping"
+                    "Patterns": [ "/static/mapping", "/static/mapping2" ]
                 }
             ]
         },
+        "Body": {
+            "Matcher": {
+                "Name": "JsonMatcher",
+                "Pattern": {
+                    "post1": "value 1",
+                    "post2": "value 2"
+                },
+                "IgnoreCase": true
+            }
+        },
         "Methods": [
-            "get"
+            "get",
+            "post"
         ]
     },
     "Response": {
         "BodyAsJson": { "body": "static mapping" },
-      "Headers": {
+        "Headers": {
-        "Content-Type": "application/json",
+            "Content-Type": "application/json",
-        "Test-X": [ "test 1", "test 2" ]
+            "Test-X": [ "test 1", "test 2" ]
-      }
+        }
     }
 }

src/WireMock.Net/RequestBuilders/IBodyRequestBuilder.cs

@@ -1,4 +1,4 @@
-using JetBrains.Annotations;
+using JetBrains.Annotations;
 using System;
 using WireMock.Matchers;
 using WireMock.Matchers.Request;

src/WireMock.Net/Serialization/MatcherMapper.cs

@@ -161,12 +161,12 @@ namespace WireMock.Serialization
 
                 // If the matcher is a IValueMatcher, get the value (can be string or object).
                 case IValueMatcher valueMatcher:
-                    model.Patterns = new[] { valueMatcher.Value };
+                    model.Pattern = valueMatcher.Value;
                     break;
 
                 // If the matcher is a ExactObjectMatcher, get the ValueAsObject or ValueAsBytes.
                 case ExactObjectMatcher exactObjectMatcher:
-                    model.Patterns = new[] { exactObjectMatcher.ValueAsObject ?? exactObjectMatcher.ValueAsBytes };
+                    model.Pattern = exactObjectMatcher.ValueAsObject ?? exactObjectMatcher.ValueAsBytes;
                     break;
             }
 

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

@@ -164,7 +164,7 @@ namespace WireMock.Net.Tests.Serialization
         }
 
         [Fact]
-        public void ToMappingModel_WithTimeSetrtings_ReturnsCorrectTimeSettings()
+        public void ToMappingModel_WithTimeSettings_ReturnsCorrectTimeSettings()
         {
             // Assign
             var start = DateTime.Now;

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

@@ -187,16 +187,36 @@ namespace WireMock.Net.Tests.Serialization
         }
 
         [Fact]
-        public void MatcherMapper_Map_MatcherModel_JsonMatcher_Patterns_As_String()
+        public void MatcherMapper_Map_MatcherModel_JsonMatcher_Patterns_1_Value_As_String()
+        {
+            // Assign
+            var pattern = "{ \"post1\": \"value1\", \"post2\": \"value2\" }";
+            var patterns = new[] { pattern };
+            var model = new MatcherModel
+            {
+                Name = "JsonMatcher",
+                Patterns = patterns
+            };
+
+            // Act
+            var matcher = (JsonMatcher)_sut.Map(model);
+
+            // Assert
+            matcher.MatchBehaviour.Should().Be(MatchBehaviour.AcceptOnMatch);
+            matcher.Value.Should().BeEquivalentTo(patterns);
+        }
+
+        [Fact]
+        public void MatcherMapper_Map_MatcherModel_JsonMatcher_Patterns_2_Values_As_String()
         {
             // Assign
             var pattern1 = "{ \"AccountIds\": [ 1, 2, 3 ] }";
-            var pattern2 = "{ \"X\": \"x\" }";
+            var pattern2 = "{ \"post1\": \"value1\", \"post2\": \"value2\" }";
             var patterns = new[] { pattern1, pattern2 };
             var model = new MatcherModel
             {
                 Name = "JsonMatcher",
-                Pattern = patterns
+                Patterns = patterns
             };
 
             // Act
@@ -227,11 +247,31 @@ namespace WireMock.Net.Tests.Serialization
         }
 
         [Fact]
-        public void MatcherMapper_Map_MatcherModel_JsonMatcher_Patterns_As_Object()
+        public void MatcherMapper_Map_MatcherModel_JsonMatcher_Patterns_1_Value_As_Object()
+        {
+            // Assign
+            object pattern = new { post1 = "value1", post2 = "value2" };
+            var patterns = new[] { pattern };
+            var model = new MatcherModel
+            {
+                Name = "JsonMatcher",
+                Patterns = patterns
+            };
+
+            // Act
+            var matcher = (JsonMatcher)_sut.Map(model);
+
+            // Assert
+            matcher.MatchBehaviour.Should().Be(MatchBehaviour.AcceptOnMatch);
+            matcher.Value.Should().BeEquivalentTo(patterns);
+        }
+
+        [Fact]
+        public void MatcherMapper_Map_MatcherModel_JsonMatcher_Patterns_2_Values_As_Object()
         {
             // Assign
             object pattern1 = new { AccountIds = new[] { 1, 2, 3 } };
-            object pattern2 = new { X = "x" };
+            object pattern2 = new { post1 = "value1", post2 = "value2" };
             var patterns = new[] { pattern1, pattern2 };
             var model = new MatcherModel
             {