chore: clean up code; initialize collections where applicable

MaggieKimani1 · MaggieKimani1 · commit 4e97803a50a6 · 2025-04-03T12:53:18.000+03:00
diff --git a/src/Microsoft.OpenApi/Models/OpenApiDiscriminator.cs b/src/Microsoft.OpenApi/Models/OpenApiDiscriminator.cs
@@ -81,7 +81,13 @@ private void SerializeInternal(IOpenApiWriter writer)
             writer.WriteProperty(OpenApiConstants.PropertyName, PropertyName);
 
             // mapping
-            writer.WriteOptionalMap(OpenApiConstants.Mapping, Mapping, (w, s) => w.WriteValue(s));
+            writer.WriteOptionalMap(OpenApiConstants.Mapping, Mapping, (w, s) =>
+            {
+                if (!string.IsNullOrEmpty(s.Reference.ReferenceV3) && s.Reference.ReferenceV3 is not null)
+                {
+                    w.WriteValue(s.Reference.ReferenceV3);
+                }
+            });
         }
 
         /// <summary>
diff --git a/src/Microsoft.OpenApi/Models/OpenApiDocument.cs b/src/Microsoft.OpenApi/Models/OpenApiDocument.cs
@@ -49,7 +49,7 @@ public void RegisterComponents()
         /// <summary>
         /// An array of Server Objects, which provide connectivity information to a target server.
         /// </summary>
-        public IList<OpenApiServer>? Servers { get; set; }
+        public IList<OpenApiServer>? Servers { get; set; } = [];
 
         /// <summary>
         /// REQUIRED. The available paths and operations for the API.
diff --git a/src/Microsoft.OpenApi/Reader/V2/OpenApiOperationDeserializer.cs b/src/Microsoft.OpenApi/Reader/V2/OpenApiOperationDeserializer.cs
@@ -10,6 +10,7 @@
 using Microsoft.OpenApi.Models.References;
 using Microsoft.OpenApi.Models.Interfaces;
 using System;
+using Microsoft.OpenApi.Interfaces;
 
 namespace Microsoft.OpenApi.Reader.V2
 {
@@ -238,8 +239,9 @@ internal static IOpenApiRequestBody CreateRequestBody(
                 Extensions = bodyParameter.Extensions
             };
 
-            if (requestBody.Extensions is not null && bodyParameter.Name is not null)
+            if (bodyParameter.Name is not null)
             {
+                requestBody.Extensions ??= new Dictionary<string, IOpenApiExtension>();
                 requestBody.Extensions[OpenApiConstants.BodyName] = new OpenApiAny(bodyParameter.Name);
             }            
             return requestBody;
diff --git a/src/Microsoft.OpenApi/Reader/V2/OpenApiResponseDeserializer.cs b/src/Microsoft.OpenApi/Reader/V2/OpenApiResponseDeserializer.cs
@@ -75,8 +75,7 @@ private static void ProcessProduces(MapNode mapNode, OpenApiResponse response, P
                 ?? context.DefaultContentType ?? new List<string> { "application/octet-stream" };
 
             var schema = context.GetFromTempStorage<IOpenApiSchema>(TempStorageKeys.ResponseSchema, response);
-            var examples = context.GetFromTempStorage<Dictionary<string, IOpenApiExample>>(TempStorageKeys.Examples, response)
-                ?? new Dictionary<string, IOpenApiExample>();
+            var examples = context.GetFromTempStorage<Dictionary<string, IOpenApiExample>>(TempStorageKeys.Examples, response);
 
             foreach (var produce in produces)
             {
diff --git a/src/Microsoft.OpenApi/Services/CopyReferences.cs b/src/Microsoft.OpenApi/Services/CopyReferences.cs
@@ -89,7 +89,8 @@ private void AddSchemaToComponents(IOpenApiSchema? schema, string? referenceId =
     {
         EnsureComponentsExist();
         EnsureSchemasExist();
-        if (Components.Schemas is not null && referenceId is not null && schema is not null && !Components.Schemas.ContainsKey(referenceId))
+        Components.Schemas ??= new Dictionary<string, IOpenApiSchema>();
+        if (referenceId is not null && schema is not null && !Components.Schemas.ContainsKey(referenceId))
         {
             Components.Schemas.Add(referenceId, schema);
         }
@@ -99,7 +100,8 @@ private void AddParameterToComponents(IOpenApiParameter? parameter, string? refe
     {
         EnsureComponentsExist();
         EnsureParametersExist();
-        if (Components.Parameters is not null && parameter is not null && referenceId is not null && !Components.Parameters.ContainsKey(referenceId))
+        Components.Parameters ??= new Dictionary<string, IOpenApiParameter>();
+        if (parameter is not null && referenceId is not null && !Components.Parameters.ContainsKey(referenceId))
         {
             Components.Parameters.Add(referenceId, parameter);
         }
@@ -109,7 +111,8 @@ private void AddResponseToComponents(IOpenApiResponse? response, string? referen
     {
         EnsureComponentsExist();
         EnsureResponsesExist();
-        if (Components.Responses is not null && referenceId is not null && response is not null && !Components.Responses.ContainsKey(referenceId))
+        Components.Responses ??= new Dictionary<string, IOpenApiResponse>();
+        if (referenceId is not null && response is not null && !Components.Responses.ContainsKey(referenceId))
         {
             Components.Responses.Add(referenceId, response);
         }
@@ -118,7 +121,8 @@ private void AddRequestBodyToComponents(IOpenApiRequestBody? requestBody, string
     {
         EnsureComponentsExist();
         EnsureRequestBodiesExist();
-        if (Components.RequestBodies is not null && requestBody is not null && referenceId is not null && !Components.RequestBodies.ContainsKey(referenceId))
+        Components.RequestBodies ??= new Dictionary<string, IOpenApiRequestBody>();
+        if (requestBody is not null && referenceId is not null && !Components.RequestBodies.ContainsKey(referenceId))
         {
             Components.RequestBodies.Add(referenceId, requestBody);
         }
@@ -127,7 +131,8 @@ private void AddLinkToComponents(IOpenApiLink? link, string? referenceId = null)
     {
         EnsureComponentsExist();
         EnsureLinksExist();
-        if (Components.Links is not null && link is not null && referenceId is not null && !Components.Links.ContainsKey(referenceId))
+        Components.Links ??= new Dictionary<string, IOpenApiLink>();
+        if (link is not null && referenceId is not null && !Components.Links.ContainsKey(referenceId))
         {
             Components.Links.Add(referenceId, link);
         }
@@ -136,7 +141,8 @@ private void AddCallbackToComponents(IOpenApiCallback? callback, string? referen
     {
         EnsureComponentsExist();
         EnsureCallbacksExist();
-        if (Components.Callbacks is not null && callback is not null && referenceId is not null && !Components.Callbacks.ContainsKey(referenceId))
+        Components.Callbacks ??= new Dictionary<string, IOpenApiCallback>();
+        if (callback is not null && referenceId is not null && !Components.Callbacks.ContainsKey(referenceId))
         {
             Components.Callbacks.Add(referenceId, callback);
         }
@@ -145,7 +151,8 @@ private void AddHeaderToComponents(IOpenApiHeader? header, string? referenceId =
     {
         EnsureComponentsExist();
         EnsureHeadersExist();
-        if (Components.Headers is not null && header is not null && referenceId is not null && !Components.Headers.ContainsKey(referenceId))
+        Components.Headers ??= new Dictionary<string, IOpenApiHeader>();
+        if (header is not null && referenceId is not null && !Components.Headers.ContainsKey(referenceId))
         {
             Components.Headers.Add(referenceId, header);
         }
@@ -154,7 +161,8 @@ private void AddExampleToComponents(IOpenApiExample? example, string? referenceI
     {
         EnsureComponentsExist();
         EnsureExamplesExist();
-        if (Components.Examples is not null && example is not null && referenceId is not null && !Components.Examples.ContainsKey(referenceId))
+        Components.Examples ??= new Dictionary<string, IOpenApiExample>();
+        if (example is not null && referenceId is not null && !Components.Examples.ContainsKey(referenceId))
         {
             Components.Examples.Add(referenceId, example);
         }
@@ -163,7 +171,8 @@ private void AddPathItemToComponents(IOpenApiPathItem? pathItem, string? referen
     {
         EnsureComponentsExist();
         EnsurePathItemsExist();
-        if (Components.PathItems is not null && pathItem is not null && referenceId is not null && !Components.PathItems.ContainsKey(referenceId))
+        Components.PathItems ??= new Dictionary<string, IOpenApiPathItem>();
+        if (pathItem is not null && referenceId is not null && !Components.PathItems.ContainsKey(referenceId))
         {
             Components.PathItems.Add(referenceId, pathItem);
         }
@@ -172,7 +181,8 @@ private void AddSecuritySchemeToComponents(IOpenApiSecurityScheme? securitySchem
     {
         EnsureComponentsExist();
         EnsureSecuritySchemesExist();
-        if (Components.SecuritySchemes is not null && securityScheme is not null && referenceId is not null && !Components.SecuritySchemes.ContainsKey(referenceId))
+        Components.SecuritySchemes ??= new Dictionary<string, IOpenApiSecurityScheme>();
+        if (securityScheme is not null && referenceId is not null && !Components.SecuritySchemes.ContainsKey(referenceId))
         {
             Components.SecuritySchemes.Add(referenceId, securityScheme);
         }
diff --git a/src/Microsoft.OpenApi/Services/OpenApiFilterService.cs b/src/Microsoft.OpenApi/Services/OpenApiFilterService.cs
@@ -109,17 +109,19 @@ public static OpenApiDocument CreateFilteredDocument(OpenApiDocument source, Fun
                     }
                 }
 
-                if (result.CurrentKeys?.Operation != null && result.Operation != null)
+                if (result.CurrentKeys?.Operation != null && result.Operation != null && pathItem is OpenApiPathItem openApiPathItem)
                 {
-                    pathItem?.Operations?.Add(result.CurrentKeys.Operation, result.Operation);
+                    openApiPathItem.Operations ??= new Dictionary<HttpMethod, OpenApiOperation>();
+                    openApiPathItem.Operations?.Add(result.CurrentKeys.Operation, result.Operation);
 
                     if (result.Parameters?.Any() ?? false)
                     {
+                        openApiPathItem.Parameters ??= [];
                         foreach (var parameter in result.Parameters)
                         {
-                            if (pathItem?.Parameters is not null && !pathItem.Parameters.Contains(parameter))
+                            if (openApiPathItem?.Parameters is not null && !openApiPathItem.Parameters.Contains(parameter))
                             {
-                                pathItem.Parameters.Add(parameter);
+                                openApiPathItem.Parameters.Add(parameter);
                             }
                         }
                     }
diff --git a/src/Microsoft.OpenApi/Validations/Rules/OpenApiContactRules.cs b/src/Microsoft.OpenApi/Validations/Rules/OpenApiContactRules.cs
@@ -21,13 +21,10 @@ public static class OpenApiContactRules
                 (context, item) =>
                 {
                     context.Enter("email");
-                    if (item is {Email: not null})
+                    if (item is {Email: not null} && !item.Email.IsEmailAddress())
                     {
-                        if (!item.Email.IsEmailAddress())
-                        {
-                            context.CreateError(nameof(EmailMustBeEmailFormat),
-                                String.Format(SRResource.Validation_StringMustBeEmailAddress, item.Email));
-                        }
+                        context.CreateError(nameof(EmailMustBeEmailFormat),
+                            String.Format(SRResource.Validation_StringMustBeEmailAddress, item.Email));
                     }
                     context.Exit();
                 });
diff --git a/src/Microsoft.OpenApi/Validations/Rules/OpenApiExtensionRules.cs b/src/Microsoft.OpenApi/Validations/Rules/OpenApiExtensionRules.cs
@@ -29,9 +29,9 @@ public static class OpenApiExtensibleRules
                         {
                             context.CreateError(nameof(ExtensionNameMustStartWithXDash),
                                 string.Format(SRResource.Validation_ExtensionNameMustBeginWithXDash, extensible, context.PathString));
-                        }
-                        context.Exit();
-                    }                    
+                        }                        
+                    }
+                    context.Exit();
                 });
     }
 }
diff --git a/src/Microsoft.OpenApi/Validations/Rules/OpenApiServerRules.cs b/src/Microsoft.OpenApi/Validations/Rules/OpenApiServerRules.cs
@@ -36,9 +36,9 @@ public static class OpenApiServerRules
                             context.Enter(variable.Key);
                             ValidateServerVariableRequiredFields(context, variable.Key, variable.Value);
                             context.Exit();
-                        }
-                        context.Exit();
-                    }                   
+                        }                        
+                    }
+                    context.Exit();
                 });
 
         // add more rules
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiHeaderReferenceTests.cs b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiHeaderReferenceTests.cs
@@ -12,6 +12,8 @@
 using Microsoft.OpenApi.Writers;
 using VerifyXunit;
 using Xunit;
+using System.Collections.Generic;
+using Microsoft.OpenApi.Models.Interfaces;
 
 namespace Microsoft.OpenApi.Tests.Models.References
 {
@@ -171,7 +173,7 @@ public void OpenApiHeaderTargetShouldResolveReference()
             {
                 Components = new OpenApiComponents
                 {
-                    Headers =
+                    Headers = new Dictionary<string, IOpenApiHeader>
                     {
                         { "header1", new OpenApiHeader
                             {
diff --git a/test/Microsoft.OpenApi.Tests/Validations/OpenApiOAuthFlowValidationTests.cs b/test/Microsoft.OpenApi.Tests/Validations/OpenApiOAuthFlowValidationTests.cs
@@ -19,6 +19,8 @@ public void ValidateFixedFieldsIsRequiredInResponse()
             // Arrange
             var authorizationUrlError = string.Format(SRResource.Validation_FieldIsRequired, "authorizationUrl", "OAuth Flow");
             var tokenUrlError = string.Format(SRResource.Validation_FieldIsRequired, "tokenUrl", "OAuth Flow");
+            var scopesError = string.Format(SRResource.Validation_FieldIsRequired, "scopes", "OAuth Flow");
+
             IEnumerable<OpenApiError> errors;
             var oAuthFlow = new OpenApiOAuthFlow();
 
@@ -33,8 +35,8 @@ public void ValidateFixedFieldsIsRequiredInResponse()
             // Assert
             Assert.False(result);
             Assert.NotNull(errors);
-            Assert.Equal(2, errors.Count());
-            Assert.Equal(new[] { authorizationUrlError, tokenUrlError }, errors.Select(e => e.Message));
+            Assert.Equal(3, errors.Count());
+            Assert.Equal(new[] { authorizationUrlError, tokenUrlError, scopesError }, errors.Select(e => e.Message));
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@`
`10`	`10`	`using Microsoft.OpenApi.Models.References;`
`11`	`11`	`using Microsoft.OpenApi.Models.Interfaces;`
`12`	`12`	`using System;`
	`13`	`+using Microsoft.OpenApi.Interfaces;`
`13`	`14`
`14`	`15`	`namespace Microsoft.OpenApi.Reader.V2`
`15`	`16`	`{`
`@@ -238,8 +239,9 @@ internal static IOpenApiRequestBody CreateRequestBody(`
`238`	`239`	`Extensions = bodyParameter.Extensions`
`239`	`240`	`};`
`240`	`241`
`241`		`- if (requestBody.Extensions is not null && bodyParameter.Name is not null)`
	`242`	`+ if (bodyParameter.Name is not null)`
`242`	`243`	`{`
	`244`	`+ requestBody.Extensions ??= new Dictionary<string, IOpenApiExtension>();`
`243`	`245`	`requestBody.Extensions[OpenApiConstants.BodyName] = new OpenApiAny(bodyParameter.Name);`
`244`	`246`	`}`
`245`	`247`	`return requestBody;`
Original file line number	Diff line number	Diff line change
`@@ -75,8 +75,7 @@ private static void ProcessProduces(MapNode mapNode, OpenApiResponse response, P`
`75`	`75`	`?? context.DefaultContentType ?? new List<string> { "application/octet-stream" };`
`76`	`76`
`77`	`77`	`var schema = context.GetFromTempStorage<IOpenApiSchema>(TempStorageKeys.ResponseSchema, response);`
`78`		`- var examples = context.GetFromTempStorage<Dictionary<string, IOpenApiExample>>(TempStorageKeys.Examples, response)`
`79`		`- ?? new Dictionary<string, IOpenApiExample>();`
	`78`	`+ var examples = context.GetFromTempStorage<Dictionary<string, IOpenApiExample>>(TempStorageKeys.Examples, response);`
`80`	`79`
`81`	`80`	`foreach (var produce in produces)`
`82`	`81`	`{`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,8 @@ private void AddSchemaToComponents(IOpenApiSchema? schema, string? referenceId =`
`89`	`89`	`{`
`90`	`90`	`EnsureComponentsExist();`
`91`	`91`	`EnsureSchemasExist();`
`92`		`- if (Components.Schemas is not null && referenceId is not null && schema is not null && !Components.Schemas.ContainsKey(referenceId))`
	`92`	`+ Components.Schemas ??= new Dictionary<string, IOpenApiSchema>();`
	`93`	`+ if (referenceId is not null && schema is not null && !Components.Schemas.ContainsKey(referenceId))`
`93`	`94`	`{`
`94`	`95`	`Components.Schemas.Add(referenceId, schema);`
`95`	`96`	`}`
`@@ -99,7 +100,8 @@ private void AddParameterToComponents(IOpenApiParameter? parameter, string? refe`
`99`	`100`	`{`
`100`	`101`	`EnsureComponentsExist();`
`101`	`102`	`EnsureParametersExist();`
`102`		`- if (Components.Parameters is not null && parameter is not null && referenceId is not null && !Components.Parameters.ContainsKey(referenceId))`
	`103`	`+ Components.Parameters ??= new Dictionary<string, IOpenApiParameter>();`
	`104`	`+ if (parameter is not null && referenceId is not null && !Components.Parameters.ContainsKey(referenceId))`
`103`	`105`	`{`
`104`	`106`	`Components.Parameters.Add(referenceId, parameter);`
`105`	`107`	`}`
`@@ -109,7 +111,8 @@ private void AddResponseToComponents(IOpenApiResponse? response, string? referen`
`109`	`111`	`{`
`110`	`112`	`EnsureComponentsExist();`
`111`	`113`	`EnsureResponsesExist();`
`112`		`- if (Components.Responses is not null && referenceId is not null && response is not null && !Components.Responses.ContainsKey(referenceId))`
	`114`	`+ Components.Responses ??= new Dictionary<string, IOpenApiResponse>();`
	`115`	`+ if (referenceId is not null && response is not null && !Components.Responses.ContainsKey(referenceId))`
`113`	`116`	`{`
`114`	`117`	`Components.Responses.Add(referenceId, response);`
`115`	`118`	`}`
`@@ -118,7 +121,8 @@ private void AddRequestBodyToComponents(IOpenApiRequestBody? requestBody, string`
`118`	`121`	`{`
`119`	`122`	`EnsureComponentsExist();`
`120`	`123`	`EnsureRequestBodiesExist();`
`121`		`- if (Components.RequestBodies is not null && requestBody is not null && referenceId is not null && !Components.RequestBodies.ContainsKey(referenceId))`
	`124`	`+ Components.RequestBodies ??= new Dictionary<string, IOpenApiRequestBody>();`
	`125`	`+ if (requestBody is not null && referenceId is not null && !Components.RequestBodies.ContainsKey(referenceId))`
`122`	`126`	`{`
`123`	`127`	`Components.RequestBodies.Add(referenceId, requestBody);`
`124`	`128`	`}`
`@@ -127,7 +131,8 @@ private void AddLinkToComponents(IOpenApiLink? link, string? referenceId = null)`
`127`	`131`	`{`
`128`	`132`	`EnsureComponentsExist();`
`129`	`133`	`EnsureLinksExist();`
`130`		`- if (Components.Links is not null && link is not null && referenceId is not null && !Components.Links.ContainsKey(referenceId))`
	`134`	`+ Components.Links ??= new Dictionary<string, IOpenApiLink>();`
	`135`	`+ if (link is not null && referenceId is not null && !Components.Links.ContainsKey(referenceId))`
`131`	`136`	`{`
`132`	`137`	`Components.Links.Add(referenceId, link);`
`133`	`138`	`}`
`@@ -136,7 +141,8 @@ private void AddCallbackToComponents(IOpenApiCallback? callback, string? referen`
`136`	`141`	`{`
`137`	`142`	`EnsureComponentsExist();`
`138`	`143`	`EnsureCallbacksExist();`
`139`		`- if (Components.Callbacks is not null && callback is not null && referenceId is not null && !Components.Callbacks.ContainsKey(referenceId))`
	`144`	`+ Components.Callbacks ??= new Dictionary<string, IOpenApiCallback>();`
	`145`	`+ if (callback is not null && referenceId is not null && !Components.Callbacks.ContainsKey(referenceId))`
`140`	`146`	`{`
`141`	`147`	`Components.Callbacks.Add(referenceId, callback);`
`142`	`148`	`}`
`@@ -145,7 +151,8 @@ private void AddHeaderToComponents(IOpenApiHeader? header, string? referenceId =`
`145`	`151`	`{`
`146`	`152`	`EnsureComponentsExist();`
`147`	`153`	`EnsureHeadersExist();`
`148`		`- if (Components.Headers is not null && header is not null && referenceId is not null && !Components.Headers.ContainsKey(referenceId))`
	`154`	`+ Components.Headers ??= new Dictionary<string, IOpenApiHeader>();`
	`155`	`+ if (header is not null && referenceId is not null && !Components.Headers.ContainsKey(referenceId))`
`149`	`156`	`{`
`150`	`157`	`Components.Headers.Add(referenceId, header);`
`151`	`158`	`}`
`@@ -154,7 +161,8 @@ private void AddExampleToComponents(IOpenApiExample? example, string? referenceI`
`154`	`161`	`{`
`155`	`162`	`EnsureComponentsExist();`
`156`	`163`	`EnsureExamplesExist();`
`157`		`- if (Components.Examples is not null && example is not null && referenceId is not null && !Components.Examples.ContainsKey(referenceId))`
	`164`	`+ Components.Examples ??= new Dictionary<string, IOpenApiExample>();`
	`165`	`+ if (example is not null && referenceId is not null && !Components.Examples.ContainsKey(referenceId))`
`158`	`166`	`{`
`159`	`167`	`Components.Examples.Add(referenceId, example);`
`160`	`168`	`}`
`@@ -163,7 +171,8 @@ private void AddPathItemToComponents(IOpenApiPathItem? pathItem, string? referen`
`163`	`171`	`{`
`164`	`172`	`EnsureComponentsExist();`
`165`	`173`	`EnsurePathItemsExist();`
`166`		`- if (Components.PathItems is not null && pathItem is not null && referenceId is not null && !Components.PathItems.ContainsKey(referenceId))`
	`174`	`+ Components.PathItems ??= new Dictionary<string, IOpenApiPathItem>();`
	`175`	`+ if (pathItem is not null && referenceId is not null && !Components.PathItems.ContainsKey(referenceId))`
`167`	`176`	`{`
`168`	`177`	`Components.PathItems.Add(referenceId, pathItem);`
`169`	`178`	`}`
`@@ -172,7 +181,8 @@ private void AddSecuritySchemeToComponents(IOpenApiSecurityScheme? securitySchem`
`172`	`181`	`{`
`173`	`182`	`EnsureComponentsExist();`
`174`	`183`	`EnsureSecuritySchemesExist();`
`175`		`- if (Components.SecuritySchemes is not null && securityScheme is not null && referenceId is not null && !Components.SecuritySchemes.ContainsKey(referenceId))`
	`184`	`+ Components.SecuritySchemes ??= new Dictionary<string, IOpenApiSecurityScheme>();`
	`185`	`+ if (securityScheme is not null && referenceId is not null && !Components.SecuritySchemes.ContainsKey(referenceId))`
`176`	`186`	`{`
`177`	`187`	`Components.SecuritySchemes.Add(referenceId, securityScheme);`
`178`	`188`	`}`
Original file line number	Diff line number	Diff line change
`@@ -109,17 +109,19 @@ public static OpenApiDocument CreateFilteredDocument(OpenApiDocument source, Fun`
`109`	`109`	`}`
`110`	`110`	`}`
`111`	`111`
`112`		`- if (result.CurrentKeys?.Operation != null && result.Operation != null)`
	`112`	`+ if (result.CurrentKeys?.Operation != null && result.Operation != null && pathItem is OpenApiPathItem openApiPathItem)`
`113`	`113`	`{`
`114`		`- pathItem?.Operations?.Add(result.CurrentKeys.Operation, result.Operation);`
	`114`	`+ openApiPathItem.Operations ??= new Dictionary<HttpMethod, OpenApiOperation>();`
	`115`	`+ openApiPathItem.Operations?.Add(result.CurrentKeys.Operation, result.Operation);`
`115`	`116`
`116`	`117`	`if (result.Parameters?.Any() ?? false)`
`117`	`118`	`{`
	`119`	`+ openApiPathItem.Parameters ??= [];`
`118`	`120`	`foreach (var parameter in result.Parameters)`
`119`	`121`	`{`
`120`		`- if (pathItem?.Parameters is not null && !pathItem.Parameters.Contains(parameter))`
	`122`	`+ if (openApiPathItem?.Parameters is not null && !openApiPathItem.Parameters.Contains(parameter))`
`121`	`123`	`{`
`122`		`- pathItem.Parameters.Add(parameter);`
	`124`	`+ openApiPathItem.Parameters.Add(parameter);`
`123`	`125`	`}`
`124`	`126`	`}`
`125`	`127`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,13 +21,10 @@ public static class OpenApiContactRules`
`21`	`21`	`(context, item) =>`
`22`	`22`	`{`
`23`	`23`	`context.Enter("email");`
`24`		`- if (item is {Email: not null})`
	`24`	`+ if (item is {Email: not null} && !item.Email.IsEmailAddress())`
`25`	`25`	`{`
`26`		`- if (!item.Email.IsEmailAddress())`
`27`		`- {`
`28`		`- context.CreateError(nameof(EmailMustBeEmailFormat),`
`29`		`- String.Format(SRResource.Validation_StringMustBeEmailAddress, item.Email));`
`30`		`- }`
	`26`	`+ context.CreateError(nameof(EmailMustBeEmailFormat),`
	`27`	`+ String.Format(SRResource.Validation_StringMustBeEmailAddress, item.Email));`
`31`	`28`	`}`
`32`	`29`	`context.Exit();`
`33`	`30`	`});`
Original file line number	Diff line number	Diff line change
`@@ -29,9 +29,9 @@ public static class OpenApiExtensibleRules`
`29`	`29`	`{`
`30`	`30`	`context.CreateError(nameof(ExtensionNameMustStartWithXDash),`
`31`	`31`	`string.Format(SRResource.Validation_ExtensionNameMustBeginWithXDash, extensible, context.PathString));`
`32`		`- }`
`33`		`- context.Exit();`
`34`		`- }`
	`32`	`+ }`
	`33`	`+ }`
	`34`	`+ context.Exit();`
`35`	`35`	`});`
`36`	`36`	`}`
`37`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,8 @@`
`12`	`12`	`using Microsoft.OpenApi.Writers;`
`13`	`13`	`using VerifyXunit;`
`14`	`14`	`using Xunit;`
	`15`	`+using System.Collections.Generic;`
	`16`	`+using Microsoft.OpenApi.Models.Interfaces;`
`15`	`17`
`16`	`18`	`namespace Microsoft.OpenApi.Tests.Models.References`
`17`	`19`	`{`
`@@ -171,7 +173,7 @@ public void OpenApiHeaderTargetShouldResolveReference()`
`171`	`173`	`{`
`172`	`174`	`Components = new OpenApiComponents`
`173`	`175`	`{`
`174`		`- Headers =`
	`176`	`+ Headers = new Dictionary<string, IOpenApiHeader>`
`175`	`177`	`{`
`176`	`178`	`{ "header1", new OpenApiHeader`
`177`	`179`	`{`