Body Encoding - admin interface

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

@@ -0,0 +1,23 @@
+using System.Text;
+
+namespace WireMock.Admin.Mappings
+{
+    /// <summary>
+    /// EncodingModel
+    /// </summary>
+    public class EncodingModel
+    {
+        /// <summary>
+        /// Encoding CodePage
+        /// </summary>
+        public int CodePage { get; set; }
+        /// <summary>
+        /// Encoding EncodingName
+        /// </summary>
+        public string EncodingName { get; set; }
+        /// <summary>
+        /// Encoding WebName
+        /// </summary>
+        public string WebName { get; set; }
+    }
+}

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

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Text;
 
 namespace WireMock.Admin.Mappings
 {
@@ -39,6 +40,14 @@ namespace WireMock.Admin.Mappings
         /// </value>
         public object BodyAsJson { get; set; }
 
+        /// <summary>
+        /// Gets or sets the body encoding.
+        /// </summary>
+        /// <value>
+        /// The body encoding.
+        /// </value>
+        public EncodingModel BodyEncoding { get; set; }
+
         /// <summary>
         /// Gets or sets a value indicating whether [use transformer].
         /// </summary>

src/WireMock.Net/Admin/Requests/LogRequestModel.cs

@@ -1,5 +1,7 @@
 using System;
 using System.Collections.Generic;
+using System.Text;
+using WireMock.Admin.Mappings;
 using WireMock.Util;
 
 namespace WireMock.Admin.Requests
@@ -66,5 +68,13 @@ namespace WireMock.Admin.Requests
         /// The body.
         /// </value>
         public string Body { get; set; }
+
+        /// <summary>
+        /// Gets or sets the body encoding.
+        /// </summary>
+        /// <value>
+        /// The body encoding.
+        /// </value>
+        public EncodingModel BodyEncoding { get; set; }
     }
 }

src/WireMock.Net/Admin/Requests/LogResponseModel.cs

@@ -1,4 +1,6 @@
 using System.Collections.Generic;
+using System.Text;
+using WireMock.Admin.Mappings;
 
 namespace WireMock.Admin.Requests
 {
@@ -26,5 +28,10 @@ namespace WireMock.Admin.Requests
         /// Gets or sets the original body.
         /// </summary>
         public string BodyOriginal { get; set; }
+
+        /// <summary>
+        /// Gets or sets the body.
+        /// </summary>
+        public EncodingModel BodyEncoding { get; set; }
     }
 }

src/WireMock.Net/HttpListenerRequestMapper.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Net;
+using System.Text;
 
 namespace WireMock
 {
@@ -18,11 +19,11 @@ namespace WireMock
         /// <returns>The <see cref="RequestMessage"/>.</returns>
         public RequestMessage Map(HttpListenerRequest listenerRequest)
         {
-            var url = listenerRequest.Url;
+            Uri url = listenerRequest.Url;
-            var verb = listenerRequest.HttpMethod;
+            string verb = listenerRequest.HttpMethod;
-            var body = GetRequestBody(listenerRequest);
+            byte[] body = GetRequestBody(listenerRequest);
-            var bodyEncoding = body != null ? listenerRequest.ContentEncoding : null;
+            Encoding bodyEncoding = body != null ? listenerRequest.ContentEncoding : null;
-            var bodyAsString = bodyEncoding?.GetString(body);
+            string bodyAsString = bodyEncoding?.GetString(body);
             var listenerHeaders = listenerRequest.Headers;
             var headers = listenerHeaders.AllKeys.ToDictionary(k => k, k => listenerHeaders[k]);
             var cookies = new Dictionary<string, string>();

src/WireMock.Net/HttpListenerResponseMapper.cs

@@ -28,7 +28,7 @@ namespace WireMock
                 return;
 
             var encoding = responseMessage.BodyEncoding ?? _utf8NoBom;
-            var buffer = encoding.GetBytes(responseMessage.Body);
+            byte[] buffer = encoding.GetBytes(responseMessage.Body);
 
             listenerResponse.ContentEncoding = encoding;
             listenerResponse.ContentLength64 = buffer.Length;

src/WireMock.Net/ResponseBuilders/Response.cs

@@ -165,7 +165,7 @@ namespace WireMock.ResponseBuilders
         {
             Check.NotNull(body, nameof(body));
 
-            var jsonBody = JsonConvert.SerializeObject(body, new JsonSerializerSettings { Formatting = Formatting.None, NullValueHandling = NullValueHandling.Ignore });
+            string jsonBody = JsonConvert.SerializeObject(body, new JsonSerializerSettings { Formatting = Formatting.None, NullValueHandling = NullValueHandling.Ignore });
 
             if (encoding != null && !encoding.Equals(Encoding.UTF8))
             {

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

@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Text;
 using JetBrains.Annotations;
 using Newtonsoft.Json;
 using SimMetrics.Net;
@@ -292,14 +293,26 @@ namespace WireMock.Server
                     Method = logEntry.RequestMessage.Method,
                     Body = logEntry.RequestMessage.Body,
                     Headers = logEntry.RequestMessage.Headers,
-                    Cookies = logEntry.RequestMessage.Cookies
+                    Cookies = logEntry.RequestMessage.Cookies,
+                    BodyEncoding = logEntry.RequestMessage.BodyEncoding != null ? new EncodingModel
+                    {
+                        EncodingName = logEntry.RequestMessage.BodyEncoding.EncodingName,
+                        CodePage = logEntry.RequestMessage.BodyEncoding.CodePage,
+                        WebName = logEntry.RequestMessage.BodyEncoding.WebName
+                    } : null
                 },
                 Response = new LogResponseModel
                 {
                     StatusCode = logEntry.ResponseMessage.StatusCode,
                     Body = logEntry.ResponseMessage.Body,
                     BodyOriginal = logEntry.ResponseMessage.BodyOriginal,
-                    Headers = logEntry.ResponseMessage.Headers
+                    Headers = logEntry.ResponseMessage.Headers,
+                    BodyEncoding = logEntry.ResponseMessage.BodyEncoding != null ? new EncodingModel
+                    {
+                        EncodingName = logEntry.ResponseMessage.BodyEncoding.EncodingName,
+                        CodePage = logEntry.ResponseMessage.BodyEncoding.CodePage,
+                        WebName = logEntry.ResponseMessage.BodyEncoding.WebName
+                    } : null
                 },
                 MappingGuid = logEntry.MappingGuid,
                 RequestMatchResult = logEntry.RequestMatchResult != null ? new LogRequestMatchModel
@@ -418,11 +431,11 @@ namespace WireMock.Server
                 responseBuilder = responseBuilder.WithHeaders(responseModel.Headers);
 
             if (responseModel.Body != null)
-                responseBuilder = responseBuilder.WithBody(responseModel.Body);
+                responseBuilder = responseBuilder.WithBody(responseModel.Body, ToEncoding(responseModel.BodyEncoding));
             else if (responseModel.BodyAsJson != null)
-                responseBuilder = responseBuilder.WithBodyAsJson(responseModel.BodyAsJson);
+                responseBuilder = responseBuilder.WithBodyAsJson(responseModel.BodyAsJson, ToEncoding(responseModel.BodyEncoding));
             else if (responseModel.BodyAsBase64 != null)
-                responseBuilder = responseBuilder.WithBodyAsBase64(responseModel.BodyAsBase64);
+                responseBuilder = responseBuilder.WithBodyAsBase64(responseModel.BodyAsBase64, ToEncoding(responseModel.BodyEncoding));
 
             if (responseModel.UseTransformer)
                 responseBuilder = responseBuilder.WithTransformer();
@@ -500,7 +513,14 @@ namespace WireMock.Server
                     Headers = response.ResponseMessage.Headers,
                     Body = response.ResponseMessage.Body,
                     UseTransformer = response.UseTransformer,
-                    Delay = response.Delay?.Milliseconds
+                    Delay = response.Delay?.Milliseconds,
+
+                    BodyEncoding = response.ResponseMessage.BodyEncoding != null ? new EncodingModel
+                    {
+                        EncodingName = response.ResponseMessage.BodyEncoding.EncodingName,
+                        CodePage = response.ResponseMessage.BodyEncoding.CodePage,
+                        WebName = response.ResponseMessage.BodyEncoding.WebName
+                    } : null
                 }
             };
         }
@@ -590,5 +610,10 @@ namespace WireMock.Server
                 Headers = new Dictionary<string, string> { { "Content-Type", "application/json" } }
             };
         }
+
+        private Encoding ToEncoding(EncodingModel encodingModel)
+        {
+            return encodingModel != null ? Encoding.GetEncoding(encodingModel.CodePage) : null;
+        }
     }
 }

test/WireMock.Net.Tests/RequestMessageTests.cs

@@ -22,8 +22,8 @@ namespace WireMock.Net.Tests
         public void Should_parse_query_params()
         {
             // given
-            var bodyAsString = "whatever";
+            string bodyAsString = "whatever";
-            var body = Encoding.UTF8.GetBytes(bodyAsString);
+            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
             var request = new RequestMessage(new Uri("http://localhost?foo=bar&multi=1&multi=2"), "POST", body, bodyAsString, Encoding.UTF8);
 
             // then

test/WireMock.Net.Tests/RequestTests.cs

@@ -144,8 +144,8 @@ namespace WireMock.Net.Tests
             var spec = Request.Create().WithPath("/foo").UsingDelete();
 
             // when
-            var bodyAsString = "whatever";
+            string bodyAsString = "whatever";
-            var body = Encoding.UTF8.GetBytes(bodyAsString);
+            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
             var request = new RequestMessage(new Uri("http://localhost/foo"), "Delete", body, bodyAsString, Encoding.UTF8);
 
             // then
@@ -202,8 +202,8 @@ namespace WireMock.Net.Tests
             var spec = Request.Create().WithPath("/foo").UsingAnyVerb().WithHeader("X-toto", "tata");
 
             // when
-            var bodyAsString = "whatever";
+            string bodyAsString = "whatever";
-            var body = Encoding.UTF8.GetBytes(bodyAsString);
+            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
             var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", body, bodyAsString, Encoding.UTF8, new Dictionary <string, string> { { "X-toto", "tata" } });
 
             // then
@@ -218,8 +218,8 @@ namespace WireMock.Net.Tests
             var spec = Request.Create().UsingAnyVerb().WithHeader("X-toto", "tatata");
 
             // when
-            var bodyAsString = "whatever";
+            string bodyAsString = "whatever";
-            var body = Encoding.UTF8.GetBytes(bodyAsString);
+            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
             var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", body, bodyAsString, Encoding.UTF8, new Dictionary <string, string> { { "X-toto", "tata" } });
 
             // then
@@ -234,8 +234,8 @@ namespace WireMock.Net.Tests
             var spec = Request.Create().UsingAnyVerb().WithHeader("X-toto", "abc", false);
 
             // when
-            var bodyAsString = "whatever";
+            string bodyAsString = "whatever";
-            var body = Encoding.UTF8.GetBytes(bodyAsString);
+            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
             var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", body, bodyAsString, Encoding.UTF8, new Dictionary <string, string> { { "X-toto", "ABC" } });
 
             // then
@@ -250,8 +250,8 @@ namespace WireMock.Net.Tests
             var spec = Request.Create().UsingAnyVerb().WithHeader("X-toto", "tata*");
 
             // when
-            var bodyAsString = "whatever";
+            string bodyAsString = "whatever";
-            var body = Encoding.UTF8.GetBytes(bodyAsString);
+            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
             var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", body, bodyAsString, Encoding.UTF8, new Dictionary<string, string> { { "X-toto", "TaTa" } });
 
             // then
@@ -280,8 +280,8 @@ namespace WireMock.Net.Tests
             var spec = Request.Create().UsingAnyVerb().WithBody("Hello world!");
 
             // when
-            var bodyAsString = "Hello world!";
+            string bodyAsString = "Hello world!";
-            var body = Encoding.UTF8.GetBytes(bodyAsString);
+            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
             var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", body, bodyAsString, Encoding.UTF8);
 
             // then
@@ -296,8 +296,8 @@ namespace WireMock.Net.Tests
             var requestBuilder = Request.Create().UsingAnyVerb().WithBody(new ExactMatcher("cat"));
 
             // when
-            var bodyAsString = "cat";
+            string bodyAsString = "cat";
-            var body = Encoding.UTF8.GetBytes(bodyAsString);
+            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
             var request = new RequestMessage(new Uri("http://localhost/foo"), "POST", body, bodyAsString, Encoding.UTF8);
 
             // then
@@ -312,8 +312,8 @@ namespace WireMock.Net.Tests
             var requestBuilder = Request.Create().UsingAnyVerb().WithBody(new ExactMatcher("cat", "dog"));
 
             // when
-            var bodyAsString = "cat";
+            string bodyAsString = "cat";
-            var body = Encoding.UTF8.GetBytes(bodyAsString);
+            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
             var request = new RequestMessage(new Uri("http://localhost/foo"), "POST", body, bodyAsString, Encoding.UTF8);
 
             // then
@@ -328,8 +328,8 @@ namespace WireMock.Net.Tests
             var requestBuilder = Request.Create().UsingAnyVerb().WithBody(new ExactMatcher("cat"));
 
             // when
-            var bodyAsString = "caR";
+            string bodyAsString = "caR";
-            var body = Encoding.UTF8.GetBytes(bodyAsString);
+            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
             var request = new RequestMessage(new Uri("http://localhost/foo"), "POST", body, bodyAsString, Encoding.UTF8);
 
             // then
@@ -344,8 +344,8 @@ namespace WireMock.Net.Tests
             var requestBuilder = Request.Create().UsingAnyVerb().WithBody(new SimMetricsMatcher("The cat walks in the street."));
 
             // when
-            var bodyAsString = "The car drives in the street.";
+            string bodyAsString = "The car drives in the street.";
-            var body = Encoding.UTF8.GetBytes(bodyAsString);
+            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
             var request = new RequestMessage(new Uri("http://localhost/foo"), "POST", body, bodyAsString, Encoding.UTF8);
 
             // then
@@ -360,8 +360,8 @@ namespace WireMock.Net.Tests
             var requestBuilder = Request.Create().UsingAnyVerb().WithBody(new SimMetricsMatcher("The cat walks in the street."));
 
             // when
-            var bodyAsString = "Hello";
+            string bodyAsString = "Hello";
-            var body = Encoding.UTF8.GetBytes(bodyAsString);
+            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
             var request = new RequestMessage(new Uri("http://localhost/foo"), "POST", body, bodyAsString, Encoding.UTF8);
 
             // then
@@ -376,8 +376,8 @@ namespace WireMock.Net.Tests
             var spec = Request.Create().WithPath("/foo").UsingAnyVerb().WithBody(new WildcardMatcher("H*o*"));
 
             // when
-            var bodyAsString = "Hello world!";
+            string bodyAsString = "Hello world!";
-            var body = Encoding.UTF8.GetBytes(bodyAsString);
+            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
             var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", body, bodyAsString, Encoding.UTF8, new Dictionary<string, string> { { "X-toto", "tatata" } });
 
             // then
@@ -392,8 +392,8 @@ namespace WireMock.Net.Tests
             var spec = Request.Create().UsingAnyVerb().WithBody(new RegexMatcher("H.*o"));
 
             // when
-            var bodyAsString = "Hello world!";
+            string bodyAsString = "Hello world!";
-            var body = Encoding.UTF8.GetBytes(bodyAsString);
+            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
             var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", body, bodyAsString, Encoding.UTF8);
 
             // then
@@ -414,7 +414,7 @@ namespace WireMock.Net.Tests
                         <todo-item id='a2'>def</todo-item>
                         <todo-item id='a3'>xyz</todo-item>
                     </todo-list>";
-            var body = Encoding.UTF8.GetBytes(xmlBodyAsString);
+            byte[] body = Encoding.UTF8.GetBytes(xmlBodyAsString);
             var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", body, xmlBodyAsString, Encoding.UTF8);
 
             // then
@@ -435,7 +435,7 @@ namespace WireMock.Net.Tests
                         <todo-item id='a2'>def</todo-item>
                         <todo-item id='a3'>xyz</todo-item>
                     </todo-list>";
-            var body = Encoding.UTF8.GetBytes(xmlBodyAsString);
+            byte[] body = Encoding.UTF8.GetBytes(xmlBodyAsString);
             var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", body, xmlBodyAsString, Encoding.UTF8);
 
             // then
@@ -450,8 +450,8 @@ namespace WireMock.Net.Tests
             var spec = Request.Create().UsingAnyVerb().WithBody(new JsonPathMatcher("$.things[?(@.name == 'RequiredThing')]"));
 
             // when
-            var bodyAsString = "{ \"things\": [ { \"name\": \"RequiredThing\" }, { \"name\": \"Wiremock\" } ] }";
+            string bodyAsString = "{ \"things\": [ { \"name\": \"RequiredThing\" }, { \"name\": \"Wiremock\" } ] }";
-            var body = Encoding.UTF8.GetBytes(bodyAsString);
+            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
             var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", body, bodyAsString, Encoding.UTF8);
 
             // then
@@ -466,8 +466,8 @@ namespace WireMock.Net.Tests
             var spec = Request.Create().UsingAnyVerb().WithBody(new JsonPathMatcher("$.things[?(@.name == 'RequiredThing')]"));
 
             // when
-            var bodyAsString = "{ \"things\": { \"name\": \"Wiremock\" } }";
+            string bodyAsString = "{ \"things\": { \"name\": \"Wiremock\" } }";
-            var body = Encoding.UTF8.GetBytes(bodyAsString);
+            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
             var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", body, bodyAsString, Encoding.UTF8);
 
             // then
@@ -482,8 +482,8 @@ namespace WireMock.Net.Tests
             var spec = Request.Create().UsingAnyVerb().WithBody("      Hello world!   ");
 
             // when
-            var bodyAsString = "xxx";
+            string bodyAsString = "xxx";
-            var body = Encoding.UTF8.GetBytes(bodyAsString);
+            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
             var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", body, bodyAsString, Encoding.UTF8, new Dictionary<string, string> { { "X-toto", "tatata" } });
 
             // then

test/WireMock.Net.Tests/ResponseTests.cs

@@ -15,8 +15,8 @@ namespace WireMock.Net.Tests
         public async Task Response_ProvideResponse_Handlebars_UrlPathVerb()
         {
             // given
-            var bodyAsString = "abc";
+            string bodyAsString = "abc";
-            var body = Encoding.UTF8.GetBytes(bodyAsString);
+            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
             var request = new RequestMessage(new Uri("http://localhost/foo"), "POST", body, bodyAsString, Encoding.UTF8);
 
             var response = Response.Create()
@@ -34,8 +34,8 @@ namespace WireMock.Net.Tests
         public async Task Response_ProvideResponse_Handlebars_Query()
         {
             // given
-            var bodyAsString = "abc";
+            string bodyAsString = "abc";
-            var body = Encoding.UTF8.GetBytes(bodyAsString);
+            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
             var request = new RequestMessage(new Uri("http://localhost/foo?a=1&a=2&b=5"), "POST", body, bodyAsString, Encoding.UTF8);
 
             var response = Response.Create()
@@ -53,8 +53,8 @@ namespace WireMock.Net.Tests
         public async Task Response_ProvideResponse_Handlebars_Headers()
         {
             // given
-            var bodyAsString = "abc";
+            string bodyAsString = "abc";
-            var body = Encoding.UTF8.GetBytes(bodyAsString);
+            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
             var request = new RequestMessage(new Uri("http://localhost/foo"), "POST", body, bodyAsString, Encoding.UTF8, new Dictionary<string, string> { { "Content-Type", "text/plain" } });
 
             var response = Response.Create().WithHeader("x", "{{request.headers.Content-Type}}").WithBody("test").WithTransformer();
@@ -71,8 +71,8 @@ namespace WireMock.Net.Tests
         public async Task Response_ProvideResponse_Encoding_Body()
         {
             // given
-            var bodyAsString = "abc";
+            string bodyAsString = "abc";
-            var body = Encoding.UTF8.GetBytes(bodyAsString);
+            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
             var request = new RequestMessage(new Uri("http://localhost/foo"), "POST", body, bodyAsString, Encoding.UTF8);
 
             var response = Response.Create().WithBody("test", Encoding.ASCII);
@@ -89,8 +89,8 @@ namespace WireMock.Net.Tests
         public async Task Response_ProvideResponse_Encoding_JsonBody()
         {
             // given
-            var bodyAsString = "abc";
+            string bodyAsString = "abc";
-            var body = Encoding.UTF8.GetBytes(bodyAsString);
+            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
             var request = new RequestMessage(new Uri("http://localhost/foo"), "POST", body, bodyAsString, Encoding.UTF8);
 
             var response = Response.Create().WithBodyAsJson(new { value = "test" }, Encoding.ASCII);