From 9b4a0ef2cdd444668c3ac84c5d98d41b89274ee3 Mon Sep 17 00:00:00 2001 From: Millicent Achieng Date: Thu, 8 Sep 2022 22:00:18 +0300 Subject: [PATCH 1/3] Separate warnings and errors in Open API YAML reader ReadAsync method --- .../OpenApiYamlDocumentReader.cs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Microsoft.OpenApi.Readers/OpenApiYamlDocumentReader.cs b/src/Microsoft.OpenApi.Readers/OpenApiYamlDocumentReader.cs index 3aedafbf1..b26c982fe 100644 --- a/src/Microsoft.OpenApi.Readers/OpenApiYamlDocumentReader.cs +++ b/src/Microsoft.OpenApi.Readers/OpenApiYamlDocumentReader.cs @@ -114,11 +114,15 @@ public async Task ReadAsync(YamlDocument input) // Validate the document if (_settings.RuleSet != null && _settings.RuleSet.Rules.Count > 0) { - var errors = document.Validate(_settings.RuleSet); - foreach (var item in errors) + var openApiErrors = document.Validate(_settings.RuleSet); + foreach (var item in openApiErrors.Where(e => e is OpenApiValidatorError)) { diagnostic.Errors.Add(item); } + foreach (var item in openApiErrors.Where(e => e is OpenApiValidatorWarning)) + { + diagnostic.Warnings.Add(item); + } } return new ReadResult() From 61fcb9ffc47f0aecd8f299cbd23481080f5411dd Mon Sep 17 00:00:00 2001 From: Millicent Achieng Date: Fri, 9 Sep 2022 00:24:45 +0300 Subject: [PATCH 2/3] Minor updates --- .../OpenApiYamlDocumentReader.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Microsoft.OpenApi.Readers/OpenApiYamlDocumentReader.cs b/src/Microsoft.OpenApi.Readers/OpenApiYamlDocumentReader.cs index b26c982fe..37113578a 100644 --- a/src/Microsoft.OpenApi.Readers/OpenApiYamlDocumentReader.cs +++ b/src/Microsoft.OpenApi.Readers/OpenApiYamlDocumentReader.cs @@ -71,11 +71,11 @@ public OpenApiDocument Read(YamlDocument input, out OpenApiDiagnostic diagnostic if (_settings.RuleSet != null && _settings.RuleSet.Rules.Count > 0) { var openApiErrors = document.Validate(_settings.RuleSet); - foreach (var item in openApiErrors.Where(e => e is OpenApiValidatorError)) + foreach (var item in openApiErrors.OfType()) { diagnostic.Errors.Add(item); } - foreach (var item in openApiErrors.Where(e => e is OpenApiValidatorWarning)) + foreach (var item in openApiErrors.OfType()) { diagnostic.Warnings.Add(item); } @@ -115,11 +115,11 @@ public async Task ReadAsync(YamlDocument input) if (_settings.RuleSet != null && _settings.RuleSet.Rules.Count > 0) { var openApiErrors = document.Validate(_settings.RuleSet); - foreach (var item in openApiErrors.Where(e => e is OpenApiValidatorError)) + foreach (var item in openApiErrors.OfType()) { diagnostic.Errors.Add(item); } - foreach (var item in openApiErrors.Where(e => e is OpenApiValidatorWarning)) + foreach (var item in openApiErrors.OfType()) { diagnostic.Warnings.Add(item); } From 6cdceb0e5e3e4ad4daa88b5fc7bc3bfd4ac6e390 Mon Sep 17 00:00:00 2001 From: Millicent Achieng Date: Fri, 9 Sep 2022 16:38:04 +0300 Subject: [PATCH 3/3] Bump the version of the Microsoft.OpenApi.Readers --- src/Microsoft.OpenApi.Readers/Microsoft.OpenApi.Readers.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Microsoft.OpenApi.Readers/Microsoft.OpenApi.Readers.csproj b/src/Microsoft.OpenApi.Readers/Microsoft.OpenApi.Readers.csproj index 3fdbf2b6d..a3227eac0 100644 --- a/src/Microsoft.OpenApi.Readers/Microsoft.OpenApi.Readers.csproj +++ b/src/Microsoft.OpenApi.Readers/Microsoft.OpenApi.Readers.csproj @@ -10,7 +10,7 @@ Microsoft Microsoft.OpenApi.Readers Microsoft.OpenApi.Readers - 1.4.0 + 1.4.1 OpenAPI.NET Readers for JSON and YAML documents © Microsoft Corporation. All rights reserved. OpenAPI .NET