Merge branch 'dev' into chore/reduce-fluent-assertions-dependency

Author: baywet

src/Microsoft.OpenApi/Reader/ParseNodes/ListNode.cs

@@ -21,7 +21,7 @@ public ListNode(ParsingContext context, JsonArray jsonArray) : base(
             _nodeList = jsonArray;
         }
 
-        public override List<T> CreateList<T>(Func<MapNode, OpenApiDocument, T> map, OpenApiDocument hostDocument = null)
+        public override List<T> CreateList<T>(Func<MapNode, OpenApiDocument, T> map, OpenApiDocument hostDocument)
         {
             if (_nodeList == null)
             {

src/Microsoft.OpenApi/Reader/ParseNodes/MapNode.cs

@@ -48,7 +48,7 @@ public PropertyNode this[string key]
             }
         }
 
-        public override Dictionary<string, T> CreateMap<T>(Func<MapNode, OpenApiDocument, T> map, OpenApiDocument hostDocument = null)
+        public override Dictionary<string, T> CreateMap<T>(Func<MapNode, OpenApiDocument, T> map, OpenApiDocument hostDocument)
         {
             var jsonMap = _node ?? throw new OpenApiReaderException($"Expected map while parsing {typeof(T).Name}", Context);
             var nodes = jsonMap.Select(

src/Microsoft.OpenApi/Reader/ParseNodes/ParseNode.cs

@@ -46,12 +46,12 @@ public static ParseNode Create(ParsingContext context, JsonNode node)
             return new ValueNode(context, node as JsonValue);
         }
 
-        public virtual List<T> CreateList<T>(Func<MapNode, OpenApiDocument, T> map, OpenApiDocument hostDocument = null)
+        public virtual List<T> CreateList<T>(Func<MapNode, OpenApiDocument, T> map, OpenApiDocument hostDocument)
         {
             throw new OpenApiReaderException("Cannot create list from this type of node.", Context);
         }
 
-        public virtual Dictionary<string, T> CreateMap<T>(Func<MapNode, OpenApiDocument, T> map, OpenApiDocument hostDocument = null)
+        public virtual Dictionary<string, T> CreateMap<T>(Func<MapNode, OpenApiDocument, T> map, OpenApiDocument hostDocument)
         {
             throw new OpenApiReaderException("Cannot create map from this type of node.", Context);
         }

src/Microsoft.OpenApi/Reader/ParseNodes/PropertyNode.cs

@@ -27,7 +27,7 @@ public void ParseField<T>(
             T parentInstance,
             IDictionary<string, Action<T, ParseNode, OpenApiDocument>> fixedFields,
             IDictionary<Func<string, bool>, Action<T, string, ParseNode, OpenApiDocument>> patternFields,
-            OpenApiDocument hostDocument = null)
+            OpenApiDocument hostDocument)
         {
             if (fixedFields.TryGetValue(Name, out var fixedFieldMap))
             {

src/Microsoft.OpenApi/Reader/V2/OpenApiContactDeserializer.cs

@@ -35,7 +35,7 @@ internal static partial class OpenApiV2Deserializer
             {s => s.StartsWith("x-"), (o, p, n, _) => o.AddExtension(p, LoadExtension(p, n))}
         };
 
-        public static OpenApiContact LoadContact(ParseNode node, OpenApiDocument hostDocument = null)
+        public static OpenApiContact LoadContact(ParseNode node, OpenApiDocument hostDocument)
         {
             var mapNode = node as MapNode;
             var contact = new OpenApiContact();

src/Microsoft.OpenApi/Reader/V2/OpenApiDocumentDeserializer.cs

@@ -64,20 +64,18 @@ internal static partial class OpenApiV2Deserializer
             },
             {
                 "parameters",
-                (o, n, _) =>
+                (o, n, doc) =>
                 {
-                    if (o.Components == null)
-                    {
-                        o.Components = new();
-                    }
+                    o.Components ??= new();
 
                     o.Components.Parameters = n.CreateMap(LoadParameter, o);
 
                     o.Components.RequestBodies = n.CreateMap((p, d) =>
                             {
                                 var parameter = LoadParameter(node: p, loadRequestBody: true, hostDocument: d);
                                 return parameter != null ? CreateRequestBody(p.Context, parameter) : null;
-                            }
+                            },
+                            doc
                       );
                 }
             },

src/Microsoft.OpenApi/Reader/V2/OpenApiExternalDocsDeserializer.cs

@@ -33,7 +33,7 @@ internal static partial class OpenApiV2Deserializer
                     {s => s.StartsWith("x-"), (o, p, n, _) => o.AddExtension(p, LoadExtension(p, n))}
                     };
 
-        public static OpenApiExternalDocs LoadExternalDocs(ParseNode node, OpenApiDocument hostDocument = null)
+        public static OpenApiExternalDocs LoadExternalDocs(ParseNode node, OpenApiDocument hostDocument)
         {
             var mapNode = node.CheckMapNode("externalDocs");
 

src/Microsoft.OpenApi/Reader/V2/OpenApiHeaderDeserializer.cs

@@ -32,7 +32,7 @@ internal static partial class OpenApiV2Deserializer
             },
             {
                 "items",
-                (o, n, _) => GetOrCreateSchema(o).Items = LoadSchema(n)
+                (o, n, doc) => GetOrCreateSchema(o).Items = LoadSchema(n, doc)
             },
             {
                 "collectionFormat",
@@ -102,14 +102,14 @@ private static OpenApiSchema GetOrCreateSchema(OpenApiHeader p)
             return p.Schema ??= new();
         }
 
-        public static OpenApiHeader LoadHeader(ParseNode node, OpenApiDocument hostDocument = null)
+        public static OpenApiHeader LoadHeader(ParseNode node, OpenApiDocument hostDocument)
         {
             var mapNode = node.CheckMapNode("header");
             var header = new OpenApiHeader();
 
             foreach (var property in mapNode)
             {
-                property.ParseField(header, _headerFixedFields, _headerPatternFields);
+                property.ParseField(header, _headerFixedFields, _headerPatternFields, hostDocument);
             }
 
             var schema = node.Context.GetFromTempStorage<OpenApiSchema>("schema");

src/Microsoft.OpenApi/Reader/V2/OpenApiInfoDeserializer.cs

@@ -47,7 +47,7 @@ internal static partial class OpenApiV2Deserializer
             {s => s.StartsWith("x-"), (o, p, n, _) => o.AddExtension(p, LoadExtension(p, n))}
         };
 
-        public static OpenApiInfo LoadInfo(ParseNode node, OpenApiDocument hostDocument = null)
+        public static OpenApiInfo LoadInfo(ParseNode node, OpenApiDocument hostDocument)
         {
             var mapNode = node.CheckMapNode("Info");
 

src/Microsoft.OpenApi/Reader/V2/OpenApiLicenseDeserializer.cs

@@ -31,7 +31,7 @@ internal static partial class OpenApiV2Deserializer
             {s => s.StartsWith("x-"), (o, p, n, _) => o.AddExtension(p, LoadExtension(p, n))}
         };
 
-        public static OpenApiLicense LoadLicense(ParseNode node, OpenApiDocument hostDocument = null)
+        public static OpenApiLicense LoadLicense(ParseNode node, OpenApiDocument hostDocument)
         {
             var mapNode = node.CheckMapNode("OpenApiLicense");