Body Encoding

src/WireMock.Net/HttpListenerRequestMapper.cs

@@ -18,19 +18,19 @@ namespace WireMock
         /// <returns>The <see cref="RequestMessage"/>.</returns>
         public RequestMessage Map(HttpListenerRequest listenerRequest)
         {
-            Uri url = listenerRequest.Url;
-            string verb = listenerRequest.HttpMethod;
-            byte[] body = GetRequestBody(listenerRequest);
-            string bodyAsString = body != null ? listenerRequest.ContentEncoding.GetString(body) : null;
+            var url = listenerRequest.Url;
+            var verb = listenerRequest.HttpMethod;
+            var body = GetRequestBody(listenerRequest);
+            var bodyEncoding = body != null ? listenerRequest.ContentEncoding : null;
+            var bodyAsString = bodyEncoding?.GetString(body);
             var listenerHeaders = listenerRequest.Headers;
             var headers = listenerHeaders.AllKeys.ToDictionary(k => k, k => listenerHeaders[k]);
             var cookies = new Dictionary<string, string>();
+
             foreach (Cookie cookie in listenerRequest.Cookies)
                 cookies.Add(cookie.Name, cookie.Value);
 
-            var message = new RequestMessage(url, verb, body, bodyAsString, headers, cookies) { DateTime = DateTime.Now };
-
-            return message;
+            return new RequestMessage(url, verb, body, bodyAsString, bodyEncoding, headers, cookies) { DateTime = DateTime.Now };
         }
 
         /// <summary>

src/WireMock.Net/HttpListenerResponseMapper.cs

@@ -24,14 +24,16 @@ namespace WireMock
 
             responseMessage.Headers.ToList().ForEach(pair => listenerResponse.AddHeader(pair.Key, pair.Value));
 
-            if (responseMessage.Body != null)
-            {
-                byte[] buffer = _utf8NoBom.GetBytes(responseMessage.Body);
-                listenerResponse.ContentEncoding = _utf8NoBom;
-                listenerResponse.ContentLength64 = buffer.Length;
-                listenerResponse.OutputStream.Write(buffer, 0, buffer.Length);
-                listenerResponse.OutputStream.Flush();
-            }
+            if (responseMessage.Body == null)
+                return;
+
+            var encoding = responseMessage.BodyEncoding ?? _utf8NoBom;
+            var buffer = encoding.GetBytes(responseMessage.Body);
+
+            listenerResponse.ContentEncoding = encoding;
+            listenerResponse.ContentLength64 = buffer.Length;
+            listenerResponse.OutputStream.Write(buffer, 0, buffer.Length);
+            listenerResponse.OutputStream.Flush();
         }
     }
 }

src/WireMock.Net/RequestMessage.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using JetBrains.Annotations;
 using WireMock.Util;
 using WireMock.Validation;
+using System.Text;
 
 namespace WireMock
 {
@@ -57,6 +58,11 @@ namespace WireMock
         /// </summary>
         public string Body { get; }
 
+        /// <summary>
+        /// Gets the body encoding.
+        /// </summary>
+        public Encoding BodyEncoding { get; }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="RequestMessage"/> class.
         /// </summary>
@@ -64,9 +70,10 @@ namespace WireMock
         /// <param name="verb">The verb.</param>
         /// <param name="bodyAsBytes">The bodyAsBytes byte[].</param>
         /// <param name="body">The body string.</param>
+        /// <param name="bodyEncoding">The body encoding</param>
         /// <param name="headers">The headers.</param>
         /// <param name="cookies">The cookies.</param>
-        public RequestMessage([NotNull] Uri url, [NotNull] string verb, [CanBeNull] byte[] bodyAsBytes = null, [CanBeNull] string body = null, [CanBeNull] IDictionary<string, string> headers = null, [CanBeNull] IDictionary<string, string> cookies = null)
+        public RequestMessage([NotNull] Uri url, [NotNull] string verb, [CanBeNull] byte[] bodyAsBytes = null, [CanBeNull] string body = null, [CanBeNull] Encoding bodyEncoding = null, [CanBeNull] IDictionary<string, string> headers = null, [CanBeNull] IDictionary<string, string> cookies = null)
         {
             Check.NotNull(url, nameof(url));
             Check.NotNull(verb, nameof(verb));
@@ -76,6 +83,7 @@ namespace WireMock
             Method = verb.ToLower();
             BodyAsBytes = bodyAsBytes;
             Body = body;
+            BodyEncoding = bodyEncoding;
             Headers = headers;
             Cookies = cookies;
 

src/WireMock.Net/ResponseBuilders/IBodyResponseBuilder.cs

@@ -12,15 +12,17 @@ namespace WireMock.ResponseBuilders
         /// The with body.
         /// </summary>
         /// <param name="body">The body.</param>
+        /// <param name="encoding">The body encoding.</param>
         /// <returns>A <see cref="IResponseBuilder"/>.</returns>
-        IResponseBuilder WithBody([NotNull] string body);
+        IResponseBuilder WithBody([NotNull] string body, [CanBeNull] Encoding encoding = null);
 
         /// <summary>
         /// The with body.
         /// </summary>
         /// <param name="body">The body.</param>
+        /// <param name="encoding">The body encoding.</param>
         /// <returns>A <see cref="IResponseBuilder"/>.</returns>
-        IResponseBuilder WithBodyAsJson([NotNull] object body);
+        IResponseBuilder WithBodyAsJson([NotNull] object body, [CanBeNull] Encoding encoding = null);
 
         /// <summary>
         /// The with body as base64.

src/WireMock.Net/ResponseBuilders/Response.cs

@@ -143,12 +143,15 @@ namespace WireMock.ResponseBuilders
         /// The with body.
         /// </summary>
         /// <param name="body">The body.</param>
+        /// <param name="encoding">The body encoding.</param>
         /// <returns>A <see cref="IResponseBuilder"/>.</returns>
-        public IResponseBuilder WithBody(string body)
+        public IResponseBuilder WithBody(string body, Encoding encoding = null)
         {
             Check.NotNull(body, nameof(body));
 
             ResponseMessage.Body = body;
+            ResponseMessage.BodyEncoding = encoding ?? Encoding.UTF8;
+
             return this;
         }
 
@@ -156,12 +159,22 @@ namespace WireMock.ResponseBuilders
         /// The with body (AsJson object).
         /// </summary>
         /// <param name="body">The body.</param>
+        /// <param name="encoding">The body encoding.</param>
         /// <returns>A <see cref="IResponseBuilder"/>.</returns>
-        public IResponseBuilder WithBodyAsJson(object body)
+        public IResponseBuilder WithBodyAsJson(object body, Encoding encoding = null)
         {
             Check.NotNull(body, nameof(body));
 
-            ResponseMessage.Body = JsonConvert.SerializeObject(body, new JsonSerializerSettings { Formatting = Formatting.None, NullValueHandling = NullValueHandling.Ignore });
+            var jsonBody = JsonConvert.SerializeObject(body, new JsonSerializerSettings { Formatting = Formatting.None, NullValueHandling = NullValueHandling.Ignore });
+
+            if (encoding != null && !encoding.Equals(Encoding.UTF8))
+            {
+                jsonBody = encoding.GetString(Encoding.UTF8.GetBytes(jsonBody));
+                ResponseMessage.BodyEncoding = encoding;
+            }
+
+            ResponseMessage.Body = jsonBody;
+
             return this;
         }
 
@@ -175,7 +188,11 @@ namespace WireMock.ResponseBuilders
         {
             Check.NotNull(bodyAsbase64, nameof(bodyAsbase64));
 
-            ResponseMessage.Body = (encoding ?? Encoding.UTF8).GetString(Convert.FromBase64String(bodyAsbase64));
+            encoding = encoding ?? Encoding.UTF8;
+
+            ResponseMessage.Body = encoding.GetString(Convert.FromBase64String(bodyAsbase64));
+            ResponseMessage.BodyEncoding = encoding;
+
             return this;
         }
 

src/WireMock.Net/ResponseMessage.cs

@@ -1,5 +1,7 @@
 using System.Collections.Concurrent;
 using System.Collections.Generic;
+using System.Text;
+
 namespace WireMock
 {
     /// <summary>
@@ -27,6 +29,11 @@ namespace WireMock
         /// </summary>
         public string Body { get; set; }
 
+        /// <summary>
+        /// Gets or sets the body encoding.
+        /// </summary>
+        public Encoding BodyEncoding { get; set; } = new UTF8Encoding(false);
+
         /// <summary>
         /// The add header.
         /// </summary>