Added context to validators and removed required check from reader

Author: darrelmiller

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

@@ -125,11 +125,8 @@ public static OpenApiDocument LoadOpenApi(RootNode rootNode)
 
             var openApiNode = rootNode.GetMap();
 
-            var required = new List<string> {"info", "swagger", "paths"};
+            ParseMap(openApiNode, openApidoc, _openApiFixedFields, _openApiPatternFields);
 
-            ParseMap(openApiNode, openApidoc, _openApiFixedFields, _openApiPatternFields, required);
-
-            ReportMissing(openApiNode, required);
 
             // Post Process OpenApi Object
             if (openApidoc.Servers == null)

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

@@ -65,11 +65,8 @@ public static OpenApiInfo LoadInfo(ParseNode node)
             var mapNode = node.CheckMapNode("Info");
 
             var info = new OpenApiInfo();
-            var required = new List<string> {"title", "version"};
 
-            ParseMap(mapNode, info, _infoFixedFields, _infoPatternFields, required);
-
-            ReportMissing(node, required);
+            ParseMap(mapNode, info, _infoFixedFields, _infoPatternFields);
 
             return info;
         }

src/Microsoft.OpenApi.Readers/V2/OpenApiV2Deserializer.cs

@@ -32,17 +32,6 @@ private static void ParseMap<T>(
             }
         }
 
-        private static void ReportMissing(ParseNode node, IList<string> required)
-        {
-            foreach (var error in required.Select(
-                    r => new OpenApiError(
-                        node.Context.GetLocation(),
-                        $"{r} is a required property"))
-                .ToList())
-            {
-                node.Diagnostic.Errors.Add(error);
-            }
-        }
 
         private static string LoadString(ParseNode node)
         {

src/Microsoft.OpenApi.Readers/V3/OpenApiDocumentDeserializer.cs

@@ -46,8 +46,6 @@ public static OpenApiDocument LoadOpenApi(RootNode rootNode)
 
             ParseMap(openApiNode, openApidoc, _openApiFixedFields, _openApiPatternFields, required);
 
-            //ReportMissing(openApiNode, required);
-
             return openApidoc;
         }
     }

src/Microsoft.OpenApi.Readers/V3/OpenApiV3Deserializer.cs

@@ -33,7 +33,6 @@ private static void ParseMap<T>(
                 requiredFields?.Remove(propertyNode.Name);
             }
 
-            //ReportMissing(mapNode, requiredFields);
         }
 
         private static RuntimeExpression LoadRuntimeExpression(ParseNode node)
@@ -60,22 +59,7 @@ private static RuntimeExpressionAnyWrapper LoadRuntimeExpressionAnyWrapper(Parse
             };
         }
 
-        private static void ReportMissing(ParseNode node, IList<string> required)
-        {
-            if (required == null || !required.Any())
-            {
-                return;
-            }
 
-            foreach (var error in required.Select(
-                    r => new OpenApiError(
-                        node.Context.GetLocation(),
-                        $"{r} is a required property"))
-                .ToList())
-            {
-                node.Diagnostic.Errors.Add(error);
-            }
-        }
 
         private static string LoadString(ParseNode node)
         {

src/Microsoft.OpenApi/Validations/OpenApiValidator.cs

@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. 
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.OpenApi.Exceptions;
@@ -49,19 +50,19 @@ public OpenApiValidator(ValidationContext context)
         /// Execute validation rules against an <see cref="OpenApiInfo"/>
         /// </summary>
         /// <param name="item">The object to be validated</param>
-        public override void Visit(OpenApiInfo item) => Validate(item);
+        public override void Visit(OpenApiInfo item) => Validate("info",item);
 
         /// <summary>
         /// Execute validation rules against an <see cref="OpenApiContact"/>
         /// </summary>
         /// <param name="item">The object to be validated</param>
-        public override void Visit(OpenApiContact item) => Validate(item);
+        public override void Visit(OpenApiContact item) => Validate("contact",item);
 
         /// <summary>
         /// Execute validation rules against an <see cref="OpenApiComponents"/>
         /// </summary>
         /// <param name="item">The object to be validated</param>
-        public override void Visit(OpenApiComponents item) => Validate(item);
+        public override void Visit(OpenApiComponents item) => Validate("components", item);
 
         /// <summary>
         /// Execute validation rules against an <see cref="OpenApiResponse"/>
@@ -73,19 +74,19 @@ public OpenApiValidator(ValidationContext context)
         /// Execute validation rules against an <see cref="OpenApiResponses"/>
         /// </summary>
         /// <param name="item">The object to be validated</param>
-        public override void Visit(OpenApiResponses item) => Validate(item);
+        public override void Visit(OpenApiResponses item) => Validate("responses",item);
 
         /// <summary>
         /// Execute validation rules against an <see cref="OpenApiExternalDocs"/>
         /// </summary>
         /// <param name="item">The object to be validated</param>
-        public override void Visit(OpenApiExternalDocs item) => Validate(item);
+        public override void Visit(OpenApiExternalDocs item) => Validate("externalDocs",item);
 
         /// <summary>
         /// Execute validation rules against an <see cref="OpenApiLicense"/>
         /// </summary>
         /// <param name="item">The object to be validated</param>
-        public override void Visit(OpenApiLicense item) => Validate(item);
+        public override void Visit(OpenApiLicense item) => Validate("license",item);
 
         /// <summary>
         /// Execute validation rules against an <see cref="OpenApiOAuthFlow"/>
@@ -103,14 +104,14 @@ public OpenApiValidator(ValidationContext context)
         /// Execute validation rules against an <see cref="OpenApiSchema"/>
         /// </summary>
         /// <param name="item">The object to be validated</param>
-        public override void Visit(OpenApiSchema item) => Validate(item);
+        public override void Visit(OpenApiSchema item) => Validate("schema",item);
 
 
         /// <summary>
         /// Execute validation rules against an <see cref="OpenApiServer"/>
         /// </summary>
         /// <param name="item">The object to be validated</param>
-        public override void Visit(OpenApiServer item) => Validate(item);
+        public override void Visit(OpenApiServer item) => Validate("server",item);
 
         /// <summary>
         /// Execute validation rules against an <see cref="OpenApiEncoding"/>
@@ -136,6 +137,13 @@ public OpenApiValidator(ValidationContext context)
         /// </summary>
         public IEnumerable<ValidationError> Errors => _context.Errors;
 
+        private void Validate<T>(string contextToken, T item)
+        {
+            _context.Push(contextToken);
+            Validate(item);
+            _context.Pop();
+        }
+
         private void Validate<T>(T item)
         {
             if (item == null) return;  // Required fields should be checked by higher level objects

src/Microsoft.OpenApi/Validations/Rules/OpenApiContactRules.cs

@@ -20,6 +20,7 @@ internal static class OpenApiContactRules
             new ValidationRule<OpenApiContact>(
                 (context, item) =>
                 {
+
                     context.Push("email");
                     if (item != null && item.Email != null)
                     {

src/Microsoft.OpenApi/Validations/Rules/OpenApiInfoRules.cs

@@ -20,7 +20,6 @@ internal static class OpenApiInfoRules
             new ValidationRule<OpenApiInfo>(
                 (context, item) =>
                 {
-                    context.Push("info");
 
                     // title
                     context.Push("title");
@@ -42,7 +41,6 @@ internal static class OpenApiInfoRules
                     }
                     context.Pop();
 
-                    context.Pop();
                 });
 
         // add more rule.