Merge remote-tracking branch 'origin/mk/integrate-json-schema-library' into mk/integrate-json-schema-library

MaggieKimani1 · MaggieKimani1 · commit 8b4cc043ab65 · 2023-10-23T17:51:25.000+03:00
diff --git a/src/Microsoft.OpenApi.Readers/SchemaTypeConverter.cs b/src/Microsoft.OpenApi.Readers/SchemaTypeConverter.cs
@@ -1,4 +1,4 @@
-﻿// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. 
 
 using System;
@@ -13,13 +13,12 @@ internal static SchemaValueType ConvertToSchemaValueType(string value)
             return value.ToLowerInvariant() switch
             {
                 "string" => SchemaValueType.String,
-                "number" => SchemaValueType.Number,
+                "number" or "double" => SchemaValueType.Number,
                 "integer" => SchemaValueType.Integer,
                 "boolean" => SchemaValueType.Boolean,
                 "array" => SchemaValueType.Array,
                 "object" => SchemaValueType.Object,
                 "null" => SchemaValueType.Null,
-                "double" => SchemaValueType.Number,
                 _ => throw new NotSupportedException(),
             };
         }
diff --git a/src/Microsoft.OpenApi.Readers/V2/OpenApiContactDeserializer.cs b/src/Microsoft.OpenApi.Readers/V2/OpenApiContactDeserializer.cs
@@ -14,7 +14,7 @@ namespace Microsoft.OpenApi.Readers.V2
     /// </summary>
     internal static partial class OpenApiV2Deserializer
     {
-        private static FixedFieldMap<OpenApiContact> _contactFixedFields = new FixedFieldMap<OpenApiContact>
+        private static readonly FixedFieldMap<OpenApiContact> _contactFixedFields = new FixedFieldMap<OpenApiContact>
         {
             {
                 "name", (o, n) =>
@@ -36,7 +36,7 @@ internal static partial class OpenApiV2Deserializer
             },
         };
 
-        private static PatternFieldMap<OpenApiContact> _contactPatternFields = new PatternFieldMap<OpenApiContact>
+        private static readonly PatternFieldMap<OpenApiContact> _contactPatternFields = new PatternFieldMap<OpenApiContact>
         {
             {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p, n))}
         };
diff --git a/src/Microsoft.OpenApi.Readers/V2/OpenApiDocumentDeserializer.cs b/src/Microsoft.OpenApi.Readers/V2/OpenApiDocumentDeserializer.cs
@@ -19,7 +19,7 @@ namespace Microsoft.OpenApi.Readers.V2
     /// </summary>
     internal static partial class OpenApiV2Deserializer
     {
-        private static FixedFieldMap<OpenApiDocument> _openApiFixedFields = new FixedFieldMap<OpenApiDocument>
+        private static readonly FixedFieldMap<OpenApiDocument> _openApiFixedFields = new FixedFieldMap<OpenApiDocument>
         {
             {
                 "swagger", (o, n) =>
@@ -125,7 +125,7 @@ internal static partial class OpenApiV2Deserializer
             {"externalDocs", (o, n) => o.ExternalDocs = LoadExternalDocs(n)}
         };
 
-        private static PatternFieldMap<OpenApiDocument> _openApiPatternFields = new PatternFieldMap<OpenApiDocument>
+        private static readonly PatternFieldMap<OpenApiDocument> _openApiPatternFields = new PatternFieldMap<OpenApiDocument>
         {
             // We have no semantics to verify X- nodes, therefore treat them as just values.
             {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p, n))}
diff --git a/src/Microsoft.OpenApi.Readers/V2/OpenApiInfoDeserializer.cs b/src/Microsoft.OpenApi.Readers/V2/OpenApiInfoDeserializer.cs
@@ -14,7 +14,7 @@ namespace Microsoft.OpenApi.Readers.V2
     /// </summary>
     internal static partial class OpenApiV2Deserializer
     {
-        private static FixedFieldMap<OpenApiInfo> _infoFixedFields = new FixedFieldMap<OpenApiInfo>
+        private static readonly FixedFieldMap<OpenApiInfo> _infoFixedFields = new FixedFieldMap<OpenApiInfo>
         {
             {
                 "title", (o, n) =>
@@ -54,7 +54,7 @@ internal static partial class OpenApiV2Deserializer
             }
         };
 
-        private static PatternFieldMap<OpenApiInfo> _infoPatternFields = new PatternFieldMap<OpenApiInfo>
+        private static readonly PatternFieldMap<OpenApiInfo> _infoPatternFields = new PatternFieldMap<OpenApiInfo>
         {
             {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p, n))}
         };
diff --git a/src/Microsoft.OpenApi.Readers/V2/OpenApiLicenseDeserializer.cs b/src/Microsoft.OpenApi.Readers/V2/OpenApiLicenseDeserializer.cs
@@ -14,7 +14,7 @@ namespace Microsoft.OpenApi.Readers.V2
     /// </summary>
     internal static partial class OpenApiV2Deserializer
     {
-        private static FixedFieldMap<OpenApiLicense> _licenseFixedFields = new FixedFieldMap<OpenApiLicense>
+        private static readonly FixedFieldMap<OpenApiLicense> _licenseFixedFields = new FixedFieldMap<OpenApiLicense>
         {
             {
                 "name", (o, n) =>
@@ -30,7 +30,7 @@ internal static partial class OpenApiV2Deserializer
             },
         };
 
-        private static PatternFieldMap<OpenApiLicense> _licensePatternFields = new PatternFieldMap<OpenApiLicense>
+        private static readonly PatternFieldMap<OpenApiLicense> _licensePatternFields = new PatternFieldMap<OpenApiLicense>
         {
             {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p, n))}
         };
diff --git a/src/Microsoft.OpenApi.Readers/V2/OpenApiParameterDeserializer.cs b/src/Microsoft.OpenApi.Readers/V2/OpenApiParameterDeserializer.cs
@@ -20,7 +20,7 @@ namespace Microsoft.OpenApi.Readers.V2
     internal static partial class OpenApiV2Deserializer
     {
         private static JsonSchemaBuilder _parameterJsonSchemaBuilder;
-        private static FixedFieldMap<OpenApiParameter> _parameterFixedFields =
+        private static readonly FixedFieldMap<OpenApiParameter> _parameterFixedFields =
             new FixedFieldMap<OpenApiParameter>
             {
                 {
diff --git a/src/Microsoft.OpenApi.Readers/V2/OpenApiPathsDeserializer.cs b/src/Microsoft.OpenApi.Readers/V2/OpenApiPathsDeserializer.cs
@@ -13,9 +13,9 @@ namespace Microsoft.OpenApi.Readers.V2
     /// </summary>
     internal static partial class OpenApiV2Deserializer
     {
-        private static FixedFieldMap<OpenApiPaths> _pathsFixedFields = new FixedFieldMap<OpenApiPaths>();
+        private static readonly FixedFieldMap<OpenApiPaths> _pathsFixedFields = new FixedFieldMap<OpenApiPaths>();
 
-        private static PatternFieldMap<OpenApiPaths> _pathsPatternFields = new PatternFieldMap<OpenApiPaths>
+        private static readonly PatternFieldMap<OpenApiPaths> _pathsPatternFields = new PatternFieldMap<OpenApiPaths>
         {
             {s => s.StartsWith("/"), (o, k, n) => o.Add(k, LoadPathItem(n))},
             {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p, n))}
diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiComponentsDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiComponentsDeserializer.cs
@@ -18,7 +18,7 @@ namespace Microsoft.OpenApi.Readers.V3
     /// </summary>
     internal static partial class OpenApiV3Deserializer
     {
-        private static FixedFieldMap<OpenApiComponents> _componentsFixedFields = new FixedFieldMap<OpenApiComponents>
+        private static readonly FixedFieldMap<OpenApiComponents> _componentsFixedFields = new FixedFieldMap<OpenApiComponents>
         {
             {"schemas", (o, n) => o.Schemas = n.CreateMap(LoadSchema)},
             {"responses", (o, n) => o.Responses = n.CreateMapWithReference(ReferenceType.Response, LoadResponse)},
@@ -32,7 +32,7 @@ internal static partial class OpenApiV3Deserializer
             {"pathItems", (o, n) => o.PathItems = n.CreateMapWithReference(ReferenceType.PathItem, LoadPathItem)}
         };
 
-        private static PatternFieldMap<OpenApiComponents> _componentsPatternFields =
+        private static readonly PatternFieldMap<OpenApiComponents> _componentsPatternFields =
             new PatternFieldMap<OpenApiComponents>
             {
                 {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p, n))}
diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiContactDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiContactDeserializer.cs
@@ -14,7 +14,7 @@ namespace Microsoft.OpenApi.Readers.V3
     /// </summary>
     internal static partial class OpenApiV3Deserializer
     {
-        private static FixedFieldMap<OpenApiContact> _contactFixedFields = new FixedFieldMap<OpenApiContact>
+        private static readonly FixedFieldMap<OpenApiContact> _contactFixedFields = new FixedFieldMap<OpenApiContact>
         {
             {
                 "name", (o, n) =>
@@ -36,7 +36,7 @@ internal static partial class OpenApiV3Deserializer
             },
         };
 
-        private static PatternFieldMap<OpenApiContact> _contactPatternFields = new PatternFieldMap<OpenApiContact>
+        private static readonly PatternFieldMap<OpenApiContact> _contactPatternFields = new PatternFieldMap<OpenApiContact>
         {
             {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p,n))}
         };
diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiDocumentDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiDocumentDeserializer.cs
@@ -13,7 +13,7 @@ namespace Microsoft.OpenApi.Readers.V3
     /// </summary>
     internal static partial class OpenApiV3Deserializer
     {
-        private static FixedFieldMap<OpenApiDocument> _openApiFixedFields = new FixedFieldMap<OpenApiDocument>
+        private static readonly FixedFieldMap<OpenApiDocument> _openApiFixedFields = new FixedFieldMap<OpenApiDocument>
         {
             {
                 "openapi", (o, n) =>
@@ -38,7 +38,7 @@ internal static partial class OpenApiV3Deserializer
             {"security", (o, n) => o.SecurityRequirements = n.CreateList(LoadSecurityRequirement)}
         };
 
-        private static PatternFieldMap<OpenApiDocument> _openApiPatternFields = new PatternFieldMap<OpenApiDocument>
+        private static readonly PatternFieldMap<OpenApiDocument> _openApiPatternFields = new PatternFieldMap<OpenApiDocument>
         {
             // We have no semantics to verify X- nodes, therefore treat them as just values.
             {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p, n))}
diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiInfoDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiInfoDeserializer.cs
@@ -54,7 +54,7 @@ internal static partial class OpenApiV3Deserializer
             }
         };
 
-        public static PatternFieldMap<OpenApiInfo> InfoPatternFields = new PatternFieldMap<OpenApiInfo>
+        public static readonly PatternFieldMap<OpenApiInfo> InfoPatternFields = new PatternFieldMap<OpenApiInfo>
         {
             {s => s.StartsWith("x-"), (o, k, n) => o.AddExtension(k,LoadExtension(k, n))}
         };
diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiLicenseDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiLicenseDeserializer.cs
@@ -14,7 +14,7 @@ namespace Microsoft.OpenApi.Readers.V3
     /// </summary>
     internal static partial class OpenApiV3Deserializer
     {
-        private static FixedFieldMap<OpenApiLicense> _licenseFixedFields = new FixedFieldMap<OpenApiLicense>
+        private static readonly FixedFieldMap<OpenApiLicense> _licenseFixedFields = new FixedFieldMap<OpenApiLicense>
         {
             {
                 "name", (o, n) =>
@@ -30,7 +30,7 @@ internal static partial class OpenApiV3Deserializer
             },
         };
 
-        private static PatternFieldMap<OpenApiLicense> _licensePatternFields = new PatternFieldMap<OpenApiLicense>
+        private static readonly PatternFieldMap<OpenApiLicense> _licensePatternFields = new PatternFieldMap<OpenApiLicense>
         {
             {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p,n))}
         };
diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiPathsDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiPathsDeserializer.cs
@@ -13,9 +13,9 @@ namespace Microsoft.OpenApi.Readers.V3
     /// </summary>
     internal static partial class OpenApiV3Deserializer
     {
-        private static FixedFieldMap<OpenApiPaths> _pathsFixedFields = new FixedFieldMap<OpenApiPaths>();
+        private static readonly FixedFieldMap<OpenApiPaths> _pathsFixedFields = new FixedFieldMap<OpenApiPaths>();
 
-        private static PatternFieldMap<OpenApiPaths> _pathsPatternFields = new PatternFieldMap<OpenApiPaths>
+        private static readonly PatternFieldMap<OpenApiPaths> _pathsPatternFields = new PatternFieldMap<OpenApiPaths>
         {
             {s => s.StartsWith("/"), (o, k, n) => o.Add(k, LoadPathItem(n))},
             {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p,n))}
diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiResponsesDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiResponsesDeserializer.cs
@@ -13,9 +13,9 @@ namespace Microsoft.OpenApi.Readers.V3
     /// </summary>
     internal static partial class OpenApiV3Deserializer
     {
-        public static FixedFieldMap<OpenApiResponses> ResponsesFixedFields = new FixedFieldMap<OpenApiResponses>();
+        public static readonly FixedFieldMap<OpenApiResponses> ResponsesFixedFields = new FixedFieldMap<OpenApiResponses>();
 
-        public static PatternFieldMap<OpenApiResponses> ResponsesPatternFields = new PatternFieldMap<OpenApiResponses>
+        public static readonly PatternFieldMap<OpenApiResponses> ResponsesPatternFields = new PatternFieldMap<OpenApiResponses>
         {
             {s => !s.StartsWith("x-"), (o, p, n) => o.Add(p, LoadResponse(n))},
             {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p,n))}
diff --git a/src/Microsoft.OpenApi.Readers/V31/JsonSchemaDeserializer.cs b/src/Microsoft.OpenApi.Readers/V31/JsonSchemaDeserializer.cs
@@ -22,8 +22,7 @@ public static JsonSchema LoadSchema(ParseNode node)
             var builder = new JsonSchemaBuilder();
 
             // check for a $ref and if present, add it to the builder as a Ref keyword
-            var pointer = mapNode.GetReferencePointer();
-            if (pointer != null)
+            if (mapNode.GetReferencePointer() is {} pointer)
             {
                 builder = builder.Ref(pointer);
 
diff --git a/src/Microsoft.OpenApi.Readers/V31/OpenApiCallbackDeserializer.cs b/src/Microsoft.OpenApi.Readers/V31/OpenApiCallbackDeserializer.cs
@@ -1,4 +1,5 @@
 ﻿using Microsoft.OpenApi.Expressions;
+using System;
 using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Readers.ParseNodes;
@@ -17,16 +18,15 @@ internal static partial class OpenApiV31Deserializer
         private static readonly PatternFieldMap<OpenApiCallback> _callbackPatternFields =
             new PatternFieldMap<OpenApiCallback>
             {
-            {s => !s.StartsWith("x-"), (o, p, n) => o.AddPathItem(RuntimeExpression.Build(p), LoadPathItem(n))},
-            {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p,n))},
+            {s => !s.StartsWith("x-", StringComparison.OrdinalIgnoreCase), (o, p, n) => o.AddPathItem(RuntimeExpression.Build(p), LoadPathItem(n))},
+            {s => s.StartsWith("x-", StringComparison.OrdinalIgnoreCase), (o, p, n) => o.AddExtension(p, LoadExtension(p,n))},
             };
 
         public static OpenApiCallback LoadCallback(ParseNode node)
         {
             var mapNode = node.CheckMapNode("callback");
 
-            var pointer = mapNode.GetReferencePointer();
-            if (pointer != null)
+            if (mapNode.GetReferencePointer() is {} pointer)
             {
                 return mapNode.GetReferencedObject<OpenApiCallback>(ReferenceType.Callback, pointer);
             }
diff --git a/src/Microsoft.OpenApi.Readers/V31/OpenApiComponentsDeserializer.cs b/src/Microsoft.OpenApi.Readers/V31/OpenApiComponentsDeserializer.cs
@@ -15,7 +15,7 @@ namespace Microsoft.OpenApi.Readers.V31
     /// </summary>
     internal static partial class OpenApiV31Deserializer
     {
-        private static FixedFieldMap<OpenApiComponents> _componentsFixedFields = new FixedFieldMap<OpenApiComponents>
+        private static readonly FixedFieldMap<OpenApiComponents> _componentsFixedFields = new FixedFieldMap<OpenApiComponents>
     {
         {"schemas", (o, n) => o.Schemas = n.CreateMap(LoadSchema)},
         {"responses", (o, n) => o.Responses = n.CreateMapWithReference(ReferenceType.Response, LoadResponse)},
@@ -29,10 +29,10 @@ internal static partial class OpenApiV31Deserializer
         {"pathItems", (o, n) => o.PathItems = n.CreateMapWithReference(ReferenceType.PathItem, LoadPathItem)}
     };
 
-        private static PatternFieldMap<OpenApiComponents> _componentsPatternFields =
+        private static readonly PatternFieldMap<OpenApiComponents> _componentsPatternFields =
             new PatternFieldMap<OpenApiComponents>
             {
-            {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p, n))}
+            {s => s.StartsWith("x-", StringComparison.OrdinalIgnoreCase), (o, p, n) => o.AddExtension(p, LoadExtension(p, n))}
             };
 
         public static OpenApiComponents LoadComponents(ParseNode node)
diff --git a/src/Microsoft.OpenApi.Readers/V31/OpenApiContactDeserializer.cs b/src/Microsoft.OpenApi.Readers/V31/OpenApiContactDeserializer.cs
@@ -11,7 +11,7 @@ namespace Microsoft.OpenApi.Readers.V31
     /// </summary>
     internal static partial class OpenApiV31Deserializer
     {
-        private static FixedFieldMap<OpenApiContact> _contactFixedFields = new FixedFieldMap<OpenApiContact>
+        private static readonly FixedFieldMap<OpenApiContact> _contactFixedFields = new FixedFieldMap<OpenApiContact>
         {
             {
                 "name", (o, n) =>
@@ -33,7 +33,7 @@ internal static partial class OpenApiV31Deserializer
             },
         };
 
-        private static PatternFieldMap<OpenApiContact> _contactPatternFields = new PatternFieldMap<OpenApiContact>
+        private static readonly PatternFieldMap<OpenApiContact> _contactPatternFields = new PatternFieldMap<OpenApiContact>
         {
             {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p,n))}
         };
diff --git a/src/Microsoft.OpenApi.Readers/V31/OpenApiDocumentDeserializer.cs b/src/Microsoft.OpenApi.Readers/V31/OpenApiDocumentDeserializer.cs
@@ -10,7 +10,7 @@ namespace Microsoft.OpenApi.Readers.V31
     /// </summary>
     internal static partial class OpenApiV31Deserializer
     {
-        private static FixedFieldMap<OpenApiDocument> _openApiFixedFields = new FixedFieldMap<OpenApiDocument>
+        private static readonly FixedFieldMap<OpenApiDocument> _openApiFixedFields = new FixedFieldMap<OpenApiDocument>
         {
             {
                 "openapi", (o, n) =>
@@ -37,7 +37,7 @@ internal static partial class OpenApiV31Deserializer
             {"security", (o, n) => o.SecurityRequirements = n.CreateList(LoadSecurityRequirement)}
         };
 
-        private static PatternFieldMap<OpenApiDocument> _openApiPatternFields = new PatternFieldMap<OpenApiDocument>
+        private static readonly PatternFieldMap<OpenApiDocument> _openApiPatternFields = new PatternFieldMap<OpenApiDocument>
         {
             // We have no semantics to verify X- nodes, therefore treat them as just values.
             {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p, n))}
diff --git a/src/Microsoft.OpenApi.Readers/V31/OpenApiLicenseDeserializer.cs b/src/Microsoft.OpenApi.Readers/V31/OpenApiLicenseDeserializer.cs
@@ -11,7 +11,7 @@ namespace Microsoft.OpenApi.Readers.V31
     /// </summary>
     internal static partial class OpenApiV31Deserializer
     {
-        private static FixedFieldMap<OpenApiLicense> _licenseFixedFields = new FixedFieldMap<OpenApiLicense>
+        private static readonly FixedFieldMap<OpenApiLicense> _licenseFixedFields = new FixedFieldMap<OpenApiLicense>
         {
             {
                 "name", (o, n) =>
@@ -33,7 +33,7 @@ internal static partial class OpenApiV31Deserializer
             },
         };
 
-        private static PatternFieldMap<OpenApiLicense> _licensePatternFields = new PatternFieldMap<OpenApiLicense>
+        private static readonly PatternFieldMap<OpenApiLicense> _licensePatternFields = new PatternFieldMap<OpenApiLicense>
         {
             {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p,n))}
         };
diff --git a/src/Microsoft.OpenApi.Readers/V31/OpenApiPathsDeserializer.cs b/src/Microsoft.OpenApi.Readers/V31/OpenApiPathsDeserializer.cs
@@ -10,9 +10,9 @@ namespace Microsoft.OpenApi.Readers.V31
     /// </summary>
     internal static partial class OpenApiV31Deserializer
     {
-        private static FixedFieldMap<OpenApiPaths> _pathsFixedFields = new FixedFieldMap<OpenApiPaths>();
+        private static readonly FixedFieldMap<OpenApiPaths> _pathsFixedFields = new FixedFieldMap<OpenApiPaths>();
 
-        private static PatternFieldMap<OpenApiPaths> _pathsPatternFields = new PatternFieldMap<OpenApiPaths>
+        private static readonly PatternFieldMap<OpenApiPaths> _pathsPatternFields = new PatternFieldMap<OpenApiPaths>
         {
             {s => s.StartsWith("/"), (o, k, n) => o.Add(k, LoadPathItem(n))},
             {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p,n))}
diff --git a/test/Microsoft.OpenApi.Tests/Validations/OpenApiReferenceValidationTests.cs b/test/Microsoft.OpenApi.Tests/Validations/OpenApiReferenceValidationTests.cs
@@ -70,35 +70,6 @@ public void ReferencedSchemaShouldOnlyBeValidatedOnce()
             Assert.True(errors.Count() == 1);
         }
 
-        [Fact]
-        public void UnresolvedReferenceSchemaShouldNotBeValidated()
-        {
-            //// Arrange
-            //var sharedSchema = new JsonSchemaBuilder().Type(SchemaValueType.String).Ref("test").Build();
-
-            //OpenApiDocument document = new OpenApiDocument();
-            //document.Components = new OpenApiComponents()
-            //{
-            //    Schemas = new Dictionary<string, JsonSchema>()
-            //    {
-            //        ["test"] = sharedSchema
-            //    }
-            //};
-
-            //// Act
-            //var rules = new Dictionary<string, IList<ValidationRule>>()
-            //{
-            //    { typeof(JsonSchema).Name,
-            //        new List<ValidationRule>() { new AlwaysFailRule<JsonSchema>() }
-            //    }
-            //};
-
-            //var errors = document.Validate(new ValidationRuleSet(rules));
-
-            //// Assert
-            //Assert.True(!errors.Any());
-        }
-
         [Fact]
         public void UnresolvedSchemaReferencedShouldNotBeValidated()
         {

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ namespace Microsoft.OpenApi.Readers.V2`
`14`	`14`	`/// </summary>`
`15`	`15`	`internal static partial class OpenApiV2Deserializer`
`16`	`16`	`{`
`17`		`- private static FixedFieldMap<OpenApiContact> _contactFixedFields = new FixedFieldMap<OpenApiContact>`
	`17`	`+ private static readonly FixedFieldMap<OpenApiContact> _contactFixedFields = new FixedFieldMap<OpenApiContact>`
`18`	`18`	`{`
`19`	`19`	`{`
`20`	`20`	`"name", (o, n) =>`
`@@ -36,7 +36,7 @@ internal static partial class OpenApiV2Deserializer`
`36`	`36`	`},`
`37`	`37`	`};`
`38`	`38`
`39`		`- private static PatternFieldMap<OpenApiContact> _contactPatternFields = new PatternFieldMap<OpenApiContact>`
	`39`	`+ private static readonly PatternFieldMap<OpenApiContact> _contactPatternFields = new PatternFieldMap<OpenApiContact>`
`40`	`40`	`{`
`41`	`41`	`{s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p, n))}`
`42`	`42`	`};`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ namespace Microsoft.OpenApi.Readers.V2`
`19`	`19`	`/// </summary>`
`20`	`20`	`internal static partial class OpenApiV2Deserializer`
`21`	`21`	`{`
`22`		`- private static FixedFieldMap<OpenApiDocument> _openApiFixedFields = new FixedFieldMap<OpenApiDocument>`
	`22`	`+ private static readonly FixedFieldMap<OpenApiDocument> _openApiFixedFields = new FixedFieldMap<OpenApiDocument>`
`23`	`23`	`{`
`24`	`24`	`{`
`25`	`25`	`"swagger", (o, n) =>`
`@@ -125,7 +125,7 @@ internal static partial class OpenApiV2Deserializer`
`125`	`125`	`{"externalDocs", (o, n) => o.ExternalDocs = LoadExternalDocs(n)}`
`126`	`126`	`};`
`127`	`127`
`128`		`- private static PatternFieldMap<OpenApiDocument> _openApiPatternFields = new PatternFieldMap<OpenApiDocument>`
	`128`	`+ private static readonly PatternFieldMap<OpenApiDocument> _openApiPatternFields = new PatternFieldMap<OpenApiDocument>`
`129`	`129`	`{`
`130`	`130`	`// We have no semantics to verify X- nodes, therefore treat them as just values.`
`131`	`131`	`{s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p, n))}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ namespace Microsoft.OpenApi.Readers.V2`
`20`	`20`	`internal static partial class OpenApiV2Deserializer`
`21`	`21`	`{`
`22`	`22`	`private static JsonSchemaBuilder _parameterJsonSchemaBuilder;`
`23`		`- private static FixedFieldMap<OpenApiParameter> _parameterFixedFields =`
	`23`	`+ private static readonly FixedFieldMap<OpenApiParameter> _parameterFixedFields =`
`24`	`24`	`new FixedFieldMap<OpenApiParameter>`
`25`	`25`	`{`
`26`	`26`	`{`
Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,9 @@ namespace Microsoft.OpenApi.Readers.V2`
`13`	`13`	`/// </summary>`
`14`	`14`	`internal static partial class OpenApiV2Deserializer`
`15`	`15`	`{`
`16`		`- private static FixedFieldMap<OpenApiPaths> _pathsFixedFields = new FixedFieldMap<OpenApiPaths>();`
	`16`	`+ private static readonly FixedFieldMap<OpenApiPaths> _pathsFixedFields = new FixedFieldMap<OpenApiPaths>();`
`17`	`17`
`18`		`- private static PatternFieldMap<OpenApiPaths> _pathsPatternFields = new PatternFieldMap<OpenApiPaths>`
	`18`	`+ private static readonly PatternFieldMap<OpenApiPaths> _pathsPatternFields = new PatternFieldMap<OpenApiPaths>`
`19`	`19`	`{`
`20`	`20`	`{s => s.StartsWith("/"), (o, k, n) => o.Add(k, LoadPathItem(n))},`
`21`	`21`	`{s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p, n))}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ namespace Microsoft.OpenApi.Readers.V3`
`18`	`18`	`/// </summary>`
`19`	`19`	`internal static partial class OpenApiV3Deserializer`
`20`	`20`	`{`
`21`		`- private static FixedFieldMap<OpenApiComponents> _componentsFixedFields = new FixedFieldMap<OpenApiComponents>`
	`21`	`+ private static readonly FixedFieldMap<OpenApiComponents> _componentsFixedFields = new FixedFieldMap<OpenApiComponents>`
`22`	`22`	`{`
`23`	`23`	`{"schemas", (o, n) => o.Schemas = n.CreateMap(LoadSchema)},`
`24`	`24`	`{"responses", (o, n) => o.Responses = n.CreateMapWithReference(ReferenceType.Response, LoadResponse)},`
`@@ -32,7 +32,7 @@ internal static partial class OpenApiV3Deserializer`
`32`	`32`	`{"pathItems", (o, n) => o.PathItems = n.CreateMapWithReference(ReferenceType.PathItem, LoadPathItem)}`
`33`	`33`	`};`
`34`	`34`
`35`		`- private static PatternFieldMap<OpenApiComponents> _componentsPatternFields =`
	`35`	`+ private static readonly PatternFieldMap<OpenApiComponents> _componentsPatternFields =`
`36`	`36`	`new PatternFieldMap<OpenApiComponents>`
`37`	`37`	`{`
`38`	`38`	`{s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p, n))}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ namespace Microsoft.OpenApi.Readers.V3`
`13`	`13`	`/// </summary>`
`14`	`14`	`internal static partial class OpenApiV3Deserializer`
`15`	`15`	`{`
`16`		`- private static FixedFieldMap<OpenApiDocument> _openApiFixedFields = new FixedFieldMap<OpenApiDocument>`
	`16`	`+ private static readonly FixedFieldMap<OpenApiDocument> _openApiFixedFields = new FixedFieldMap<OpenApiDocument>`
`17`	`17`	`{`
`18`	`18`	`{`
`19`	`19`	`"openapi", (o, n) =>`
`@@ -38,7 +38,7 @@ internal static partial class OpenApiV3Deserializer`
`38`	`38`	`{"security", (o, n) => o.SecurityRequirements = n.CreateList(LoadSecurityRequirement)}`
`39`	`39`	`};`
`40`	`40`
`41`		`- private static PatternFieldMap<OpenApiDocument> _openApiPatternFields = new PatternFieldMap<OpenApiDocument>`
	`41`	`+ private static readonly PatternFieldMap<OpenApiDocument> _openApiPatternFields = new PatternFieldMap<OpenApiDocument>`
`42`	`42`	`{`
`43`	`43`	`// We have no semantics to verify X- nodes, therefore treat them as just values.`
`44`	`44`	`{s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p, n))}`