SaveMappingToFile #27

examples/WireMock.Net.Console.NETCoreApp/WireMock.Net.Console.NETCoreApp.csproj

@@ -6,10 +6,17 @@
     <ApplicationIcon>../../WireMock.Net-Logo.ico</ApplicationIcon>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Remove="__admin\mappings\826aff7c-6208-4a3c-923d-575248907db4.json" />
+  </ItemGroup>
+
   <ItemGroup>
     <Content Include="__admin\mappings\11111110-a633-40e8-a244-5cb80bc0ab66.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="__admin\mappings\826aff7c-6208-4a3c-923d-575248907db4.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
   </ItemGroup>
 
   <ItemGroup>

src/WireMock.Net/Http/HttpClientHelper.cs

@@ -7,47 +7,46 @@ namespace WireMock.Http
 {
     internal static class HttpClientHelper
     {
+        private static HttpClient client = new HttpClient();
+
         public static async Task<ResponseMessage> SendAsync(RequestMessage requestMessage, string url)
         {
-            using (var client = new HttpClient())
+            var httpRequestMessage = new HttpRequestMessage(new HttpMethod(requestMessage.Method), url);
+
+            // Overwrite the host header
+            httpRequestMessage.Headers.Host = new Uri(url).Authority;
+
+            // Set headers if present
+            if (requestMessage.Headers != null)
             {
-                var httpRequestMessage = new HttpRequestMessage(new HttpMethod(requestMessage.Method), url);
+                foreach (var headerName in requestMessage.Headers.Keys.Where(k => k.ToUpper() != "HOST"))
-
-                // Overwrite the host header
-                httpRequestMessage.Headers.Host = new Uri(url).Authority;
-
-                // Set headers if present
-                if (requestMessage.Headers != null)
                 {
-                    foreach (var headerName in requestMessage.Headers.Keys.Where(k => k.ToUpper() != "HOST"))
+                    httpRequestMessage.Headers.Add(headerName, new[] { requestMessage.Headers[headerName] });
-                    {
-                        httpRequestMessage.Headers.Add(headerName, new[] { requestMessage.Headers[headerName] });
-                    }
                 }
-
-                // Set Body if present
-                if (requestMessage.BodyAsBytes != null && requestMessage.BodyAsBytes.Length > 0)
-                {
-                    httpRequestMessage.Content = new ByteArrayContent(requestMessage.BodyAsBytes);
-                }
-
-                // Call the URL
-                var httpResponseMessage = await client.SendAsync(httpRequestMessage, HttpCompletionOption.ResponseContentRead);
-
-                // Transform response
-                var responseMessage = new ResponseMessage
-                {
-                    StatusCode = (int)httpResponseMessage.StatusCode,
-                    Body = await httpResponseMessage.Content.ReadAsStringAsync()
-                };
-
-                foreach (var header in httpResponseMessage.Headers)
-                {
-                    responseMessage.AddHeader(header.Key, header.Value.FirstOrDefault());
-                }
-
-                return responseMessage;
             }
+
+            // Set Body if present
+            if (requestMessage.BodyAsBytes != null && requestMessage.BodyAsBytes.Length > 0)
+            {
+                httpRequestMessage.Content = new ByteArrayContent(requestMessage.BodyAsBytes);
+            }
+
+            // Call the URL
+            var httpResponseMessage = await client.SendAsync(httpRequestMessage, HttpCompletionOption.ResponseContentRead);
+
+            // Transform response
+            var responseMessage = new ResponseMessage
+            {
+                StatusCode = (int)httpResponseMessage.StatusCode,
+                Body = await httpResponseMessage.Content.ReadAsStringAsync()
+            };
+
+            foreach (var header in httpResponseMessage.Headers)
+            {
+                responseMessage.AddHeader(header.Key, header.Value.FirstOrDefault());
+            }
+
+            return responseMessage;
         }
     }
 }

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

@@ -130,8 +130,22 @@ namespace WireMock.Server
         {
             var responseMessage = await HttpClientHelper.SendAsync(requestMessage, settings.Url);
 
+            var mapping = ToMapping(requestMessage, responseMessage);
+            SaveMappingToFile(mapping);
+
             return responseMessage;
         }
+
+        private Mapping ToMapping(RequestMessage requestMessage, ResponseMessage responseMessage)
+        {
+            var request = (Request)Request.Create();
+            request.WithPath(requestMessage.Path);
+            request.UsingVerb(requestMessage.Method);
+
+            var response = (Response)Response.Create(responseMessage);
+
+            return new Mapping(Guid.NewGuid(), string.Empty, request, response, 0);
+        }
         #endregion
 
         #region Settings
@@ -211,21 +225,26 @@ namespace WireMock.Server
 
         #region Mappings
         private ResponseMessage MappingsSave(RequestMessage requestMessage)
+        {
+            foreach (var mapping in Mappings.Where(m => !m.IsAdminInterface))
+            {
+                SaveMappingToFile(mapping);
+            }
+
+            return new ResponseMessage { Body = "Mappings saved to disk" };
+        }
+
+        private void SaveMappingToFile(Mapping mapping)
         {
             string folder = Path.Combine(Directory.GetCurrentDirectory(), AdminMappingsFolder);
             if (!Directory.Exists(folder))
                 Directory.CreateDirectory(folder);
 
-            foreach (var mapping in Mappings.Where(m => !m.IsAdminInterface))
+            var model = ToMappingModel(mapping);
-            {
+            string json = JsonConvert.SerializeObject(model, _settings);
-                var model = ToMappingModel(mapping);
+            string filename = !string.IsNullOrEmpty(mapping.Title) ? SanitizeFileName(mapping.Title) : mapping.Guid.ToString();
-                string json = JsonConvert.SerializeObject(model, _settings);
-                string filename = !string.IsNullOrEmpty(mapping.Title) ? SanitizeFileName(mapping.Title) : mapping.Guid.ToString();
 
-                File.WriteAllText(Path.Combine(folder, filename + ".json"), json);
+            File.WriteAllText(Path.Combine(folder, filename + ".json"), json);
-            }
-
-            return new ResponseMessage { Body = "Mappings saved to disk" };
         }
 
         private static string SanitizeFileName(string name, char replaceChar = '_')