Fix WithBody when using Pact and added more nullable annotations (#783)

* More nullable annotations * . * . * FIX * pact * . * p * xxx * ... * auth * array * ...
2026-04-10 03:13:53 +02:00 · 2022-08-11 10:57:33 +02:00
parent b1af37f044
commit d2a1d0f069
87 changed files with 2578 additions and 2455 deletions
--- a/src/WireMock.Net/Serialization/WebhookMapper.cs
+++ b/src/WireMock.Net/Serialization/WebhookMapper.cs
@@ -1,112 +1,109 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Stef.Validation;
 using WireMock.Admin.Mappings;
 using WireMock.Http;
 using WireMock.Models;
 using WireMock.Types;
 using WireMock.Util;

-namespace WireMock.Serialization
+namespace WireMock.Serialization;
+
+internal static class WebhookMapper
 {
-    internal static class WebhookMapper
+    public static IWebhook Map(WebhookModel model)
    {
-        public static IWebhook Map(WebhookModel model)
+        var webhook = new Webhook
        {
-            var webhook = new Webhook
+            Request = new WebhookRequest
            {
-                Request = new WebhookRequest
-                {
-                    Url = model.Request.Url,
-                    Method = model.Request.Method,
-                    Headers = model.Request.Headers?.ToDictionary(x => x.Key, x => new WireMockList<string>(x.Value)) ?? new Dictionary<string, WireMockList<string>>()
-                }
-            };
+                Url = model.Request.Url,
+                Method = model.Request.Method,
+                Headers = model.Request.Headers?.ToDictionary(x => x.Key, x => new WireMockList<string>(x.Value)) ?? new Dictionary<string, WireMockList<string>>()
+            }
+        };

-            if (model.Request.UseTransformer == true)
+        if (model.Request.UseTransformer == true)
+        {
+            webhook.Request.UseTransformer = true;
+            if (!Enum.TryParse<TransformerType>(model.Request.TransformerType, out var transformerType))
            {
-                webhook.Request.UseTransformer = true;
-                if (!Enum.TryParse<TransformerType>(model.Request.TransformerType, out var transformerType))
-                {
-                    transformerType = TransformerType.Handlebars;
-                }
-                webhook.Request.TransformerType = transformerType;
+                transformerType = TransformerType.Handlebars;
+            }
+            webhook.Request.TransformerType = transformerType;

-                if (!Enum.TryParse<ReplaceNodeOptions>(model.Request.TransformerReplaceNodeOptions, out var option))
-                {
-                    option = ReplaceNodeOptions.None;
-                }
-
-                webhook.Request.TransformerReplaceNodeOptions = option;
+            if (!Enum.TryParse<ReplaceNodeOptions>(model.Request.TransformerReplaceNodeOptions, out var option))
+            {
+                option = ReplaceNodeOptions.None;
            }

-            IEnumerable<string> contentTypeHeader = null;
-            if (webhook.Request.Headers.Any(header => string.Equals(header.Key, HttpKnownHeaderNames.ContentType, StringComparison.OrdinalIgnoreCase)))
-            {
-                contentTypeHeader = webhook.Request.Headers.First(header => string.Equals(header.Key, HttpKnownHeaderNames.ContentType, StringComparison.OrdinalIgnoreCase)).Value;
-            }
-
-            if (model.Request.Body != null)
-            {
-                webhook.Request.BodyData = new BodyData
-                {
-                    BodyAsString = model.Request.Body,
-                    DetectedBodyType = BodyType.String,
-                    DetectedBodyTypeFromContentType = BodyParser.DetectBodyTypeFromContentType(contentTypeHeader?.FirstOrDefault())
-                };
-            }
-            else if (model.Request.BodyAsJson != null)
-            {
-                webhook.Request.BodyData = new BodyData
-                {
-                    BodyAsJson = model.Request.BodyAsJson,
-                    DetectedBodyType = BodyType.Json,
-                    DetectedBodyTypeFromContentType = BodyParser.DetectBodyTypeFromContentType(contentTypeHeader?.FirstOrDefault())
-                };
-            }
-
-            return webhook;
+            webhook.Request.TransformerReplaceNodeOptions = option;
        }

-        public static WebhookModel Map(IWebhook webhook)
+        IEnumerable<string>? contentTypeHeader = null;
+        if (webhook.Request.Headers != null && webhook.Request.Headers.Any(header => string.Equals(header.Key, HttpKnownHeaderNames.ContentType, StringComparison.OrdinalIgnoreCase)))
        {
-            if (webhook?.Request == null)
-            {
-                return null;
-            }
-
-            var model = new WebhookModel
-            {
-                Request = new WebhookRequestModel
-                {
-                    Url = webhook.Request.Url,
-                    Method = webhook.Request.Method,
-                    Headers = webhook.Request.Headers?.ToDictionary(x => x.Key, x => x.Value.ToString()),
-                    UseTransformer = webhook.Request.UseTransformer,
-                    TransformerType = webhook.Request.UseTransformer == true ? webhook.Request.TransformerType.ToString() : null,
-                    TransformerReplaceNodeOptions = webhook.Request.TransformerReplaceNodeOptions.ToString()
-                }
-            };
-
-            if (webhook.Request.BodyData != null)
-            {
-                switch (webhook.Request.BodyData.DetectedBodyType)
-                {
-                    case BodyType.String:
-                        model.Request.Body = webhook.Request.BodyData.BodyAsString;
-                        break;
-
-                    case BodyType.Json:
-                        model.Request.BodyAsJson = webhook.Request.BodyData.BodyAsJson;
-                        break;
-
-                    default:
-                        // Empty
-                        break;
-                }
-            }
-
-            return model;
+            contentTypeHeader = webhook.Request.Headers.First(header => string.Equals(header.Key, HttpKnownHeaderNames.ContentType, StringComparison.OrdinalIgnoreCase)).Value;
        }
+
+        if (model.Request.Body != null)
+        {
+            webhook.Request.BodyData = new BodyData
+            {
+                BodyAsString = model.Request.Body,
+                DetectedBodyType = BodyType.String,
+                DetectedBodyTypeFromContentType = BodyParser.DetectBodyTypeFromContentType(contentTypeHeader?.FirstOrDefault())
+            };
+        }
+        else if (model.Request.BodyAsJson != null)
+        {
+            webhook.Request.BodyData = new BodyData
+            {
+                BodyAsJson = model.Request.BodyAsJson,
+                DetectedBodyType = BodyType.Json,
+                DetectedBodyTypeFromContentType = BodyParser.DetectBodyTypeFromContentType(contentTypeHeader?.FirstOrDefault())
+            };
+        }
+
+        return webhook;
+    }
+
+    public static WebhookModel Map(IWebhook webhook)
+    {
+        Guard.NotNull(webhook);
+        
+        var model = new WebhookModel
+        {
+            Request = new WebhookRequestModel
+            {
+                Url = webhook.Request.Url,
+                Method = webhook.Request.Method,
+                Headers = webhook.Request.Headers?.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                UseTransformer = webhook.Request.UseTransformer,
+                TransformerType = webhook.Request.UseTransformer == true ? webhook.Request.TransformerType.ToString() : null,
+                TransformerReplaceNodeOptions = webhook.Request.TransformerReplaceNodeOptions.ToString()
+            }
+        };
+
+        if (webhook.Request.BodyData != null)
+        {
+            switch (webhook.Request.BodyData.DetectedBodyType)
+            {
+                case BodyType.String:
+                    model.Request.Body = webhook.Request.BodyData.BodyAsString;
+                    break;
+
+                case BodyType.Json:
+                    model.Request.BodyAsJson = webhook.Request.BodyData.BodyAsJson;
+                    break;
+
+                default:
+                    // Empty
+                    break;
+            }
+        }
+
+        return model;
    }
 }