Merged validation code

Author: darrelmiller

src/Microsoft.OpenApi.Readers/OpenApiStreamReader.cs

@@ -3,8 +3,11 @@
 
 using System.IO;
 using System.Linq;
+using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Readers.Interface;
+using Microsoft.OpenApi.Services;
+using Microsoft.OpenApi.Validations;
 using SharpYaml;
 using SharpYaml.Serialization;
 
@@ -38,6 +41,7 @@ public OpenApiDocument Read(Stream input, out OpenApiDiagnostic diagnostic)
             YamlDocument yamlDocument;
             diagnostic = new OpenApiDiagnostic();
 
+            // Parse the YAML/JSON
             try
             {
                 yamlDocument = LoadYamlDocument(input);
@@ -52,7 +56,18 @@ public OpenApiDocument Read(Stream input, out OpenApiDiagnostic diagnostic)
             {
                 ExtensionParsers = _settings.ExtensionParsers
             };
-            return context.Parse(yamlDocument, diagnostic);
+
+            // Parse the OpenAPI Document
+            var document = context.Parse(yamlDocument, diagnostic);
+
+            // Validate the document
+            var errors = document.Validate();
+            foreach (var item in errors)
+            {
+                diagnostic.Errors.Add(new OpenApiError(item.ErrorPath, item.ErrorMessage));
+            } 
+
+            return document;
         }
 
         /// <summary>

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

@@ -44,11 +44,7 @@ public static OpenApiDocument LoadOpenApi(RootNode rootNode)
 
             var openApiNode = rootNode.GetMap();
 
-            var required = new List<string> {"info", "openapi", "paths"};
-
-            ParseMap(openApiNode, openApidoc, _openApiFixedFields, _openApiPatternFields, required);
-
-            ReportMissing(openApiNode, required);
+            ParseMap(openApiNode, openApidoc, _openApiFixedFields, _openApiPatternFields);
 
             return openApidoc;
         }

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

@@ -67,7 +67,7 @@ public static OpenApiInfo LoadInfo(ParseNode node)
             var info = new OpenApiInfo();
             var required = new List<string> {"title", "version"};
 
-            ParseMap(mapNode, info, InfoFixedFields, InfoPatternFields, required);
+            ParseMap(mapNode, info, InfoFixedFields, InfoPatternFields);
 
             return info;
         }

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

@@ -117,7 +117,7 @@ public static OpenApiParameter LoadParameter(ParseNode node)
             var parameter = new OpenApiParameter();
             var required = new List<string> {"name", "in"};
 
-            ParseMap(mapNode, parameter, _parameterFixedFields, _parameterPatternFields, required);
+            ParseMap(mapNode, parameter, _parameterFixedFields, _parameterPatternFields);
 
             return parameter;
         }

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

@@ -60,7 +60,7 @@ public static OpenApiResponse LoadResponse(ParseNode node)
 
             var requiredFields = new List<string> {"description"};
             var response = new OpenApiResponse();
-            ParseMap(mapNode, response, _responseFixedFields, _responsePatternFields, requiredFields);
+            ParseMap(mapNode, response, _responseFixedFields, _responsePatternFields);
 
             return response;
         }

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

@@ -19,8 +19,7 @@ private static void ParseMap<T>(
             MapNode mapNode,
             T domainObject,
             FixedFieldMap<T> fixedFieldMap,
-            PatternFieldMap<T> patternFieldMap,
-            List<string> requiredFields = null)
+            PatternFieldMap<T> patternFieldMap)
         {
             if (mapNode == null)
             {
@@ -30,10 +29,8 @@ private static void ParseMap<T>(
             foreach (var propertyNode in mapNode)
             {
                 propertyNode.ParseField(domainObject, fixedFieldMap, patternFieldMap);
-                requiredFields?.Remove(propertyNode.Name);
             }
 
-            ReportMissing(mapNode, requiredFields);
         }
 
         private static RuntimeExpression LoadRuntimeExpression(ParseNode node)
@@ -60,22 +57,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/Extensions/OpenApiElementExtensions.cs

@@ -0,0 +1,31 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. 
+
+using System;
+using System.Collections.Generic;
+using Microsoft.OpenApi.Interfaces;
+using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi.Services;
+using Microsoft.OpenApi.Validations;
+
+namespace Microsoft.OpenApi.Extensions
+{
+    /// <summary>
+    /// Extension methods that apply across all OpenAPIElements
+    /// </summary>
+    public static class OpenApiElementExtensions
+    {
+        /// <summary>
+        /// Validate element and all child elements
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="element"></param>
+        /// <returns>An IEnumerable of errors.  This function will never return null.</returns>
+        public static IEnumerable<ValidationError> Validate(this IOpenApiElement element)         {
+            var validator = new OpenApiValidator();
+            var walker = new OpenApiWalker(validator);
+            walker.Walk(element);
+            return validator.Errors;
+        }
+    }
+}