Merge pull request #1009 from microsoft/vnext

Merges `vnext` into `master`
microsoft · Sep 12, 2022 · 103ea84 · 103ea84
2 parents 512c795 + 307d569
commit 103ea84
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 10 deletions.
diff --git a/src/Microsoft.OpenApi.Readers/Microsoft.OpenApi.Readers.csproj b/src/Microsoft.OpenApi.Readers/Microsoft.OpenApi.Readers.csproj
@@ -10,7 +10,7 @@
         <Company>Microsoft</Company>
         <Title>Microsoft.OpenApi.Readers</Title>
         <PackageId>Microsoft.OpenApi.Readers</PackageId>
-        <Version>1.4.0</Version>
+        <Version>1.4.1</Version>
         <Description>OpenAPI.NET Readers for JSON and YAML documents</Description>
         <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
         <PackageTags>OpenAPI .NET</PackageTags>

diff --git 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<OpenApiValidatorError>())
                 {
                     diagnostic.Errors.Add(item);
                 }
-                foreach (var item in openApiErrors.Where(e => e is OpenApiValidatorWarning))
+                foreach (var item in openApiErrors.OfType<OpenApiValidatorWarning>())
                 {
                     diagnostic.Warnings.Add(item);
                 }
@@ -114,11 +114,15 @@ public async Task<ReadResult> 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.OfType<OpenApiValidatorError>())
                 {
                     diagnostic.Errors.Add(item);
                 }
+                foreach (var item in openApiErrors.OfType<OpenApiValidatorWarning>())
+                {
+                    diagnostic.Warnings.Add(item);
+                }
             }
 
             return new ReadResult()

diff --git a/src/Microsoft.OpenApi/Microsoft.OpenApi.csproj b/src/Microsoft.OpenApi/Microsoft.OpenApi.csproj
@@ -11,7 +11,7 @@
         <Company>Microsoft</Company>
         <Title>Microsoft.OpenApi</Title>
         <PackageId>Microsoft.OpenApi</PackageId>
-        <Version>1.4.1</Version>
+        <Version>1.4.2</Version>
         <Description>.NET models with JSON and YAML writers for OpenAPI specification</Description>
         <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
         <PackageTags>OpenAPI .NET</PackageTags>

diff --git a/src/Microsoft.OpenApi/Models/OpenApiDocument.cs b/src/Microsoft.OpenApi/Models/OpenApiDocument.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;

diff --git a/src/Microsoft.OpenApi/Models/OpenApiExtensibleDictionary.cs b/src/Microsoft.OpenApi/Models/OpenApiExtensibleDictionary.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT license. 
 
 using System.Collections.Generic;
-using Microsoft.OpenApi.Any;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Writers;
 
@@ -17,6 +16,23 @@ public abstract class OpenApiExtensibleDictionary<T> : Dictionary<string, T>,
         IOpenApiExtensible
         where T : IOpenApiSerializable
     {
+        /// <summary>
+        /// Parameterless constructor
+        /// </summary>
+        protected OpenApiExtensibleDictionary() { }
+
+        /// <summary>
+        /// Initializes a copy of <see cref="OpenApiExtensibleDictionary{T}"/> class.
+        /// </summary>
+        /// <param name="dictionary">The generic dictionary.</param>
+        /// <param name="extensions">The dictionary of <see cref="IOpenApiExtension"/>.</param>
+        protected OpenApiExtensibleDictionary(
+            Dictionary<string, T> dictionary = null,
+            IDictionary<string, IOpenApiExtension> extensions = null) : base (dictionary)
+        {
+            Extensions = extensions != null ? new Dictionary<string, IOpenApiExtension>(extensions) : null;
+        }       
+
         /// <summary>
         /// This object MAY be extended with Specification Extensions.
         /// </summary>

diff --git a/src/Microsoft.OpenApi/Models/OpenApiPaths.cs b/src/Microsoft.OpenApi/Models/OpenApiPaths.cs
@@ -16,7 +16,7 @@ public OpenApiPaths() {}
         /// <summary>
         /// Initializes a copy of <see cref="OpenApiPaths"/> object
         /// </summary>
-        public OpenApiPaths(OpenApiPaths paths) {}
-
+        /// <param name="paths">The <see cref="OpenApiPaths"/>.</param>
+        public OpenApiPaths(OpenApiPaths paths) : base(dictionary: paths) {}
     }
 }
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.cs
@@ -1342,5 +1342,19 @@ private static OpenApiDocument ParseInputFile(string filePath)
 
             return openApiDoc;
         }
+
+        [Fact]
+        public void CopyConstructorForAdvancedDocumentWorks()
+        {
+            // Arrange & Act
+            var doc = new OpenApiDocument(AdvancedDocument);
+
+            // Assert
+            Assert.NotNull(doc.Info);
+            Assert.NotNull(doc.Servers);
+            Assert.NotNull(doc.Paths);
+            Assert.Equal(2, doc.Paths.Count);
+            Assert.NotNull(doc.Components);
+        }
     }
 }
diff --git a/test/Microsoft.OpenApi.Tests/PublicApi/PublicApi.approved.txt b/test/Microsoft.OpenApi.Tests/PublicApi/PublicApi.approved.txt
@@ -581,6 +581,7 @@ namespace Microsoft.OpenApi.Models
         where T : Microsoft.OpenApi.Interfaces.IOpenApiSerializable
     {
         protected OpenApiExtensibleDictionary() { }
+        protected OpenApiExtensibleDictionary(System.Collections.Generic.Dictionary<string, T> dictionary = null, System.Collections.Generic.IDictionary<string, Microsoft.OpenApi.Interfaces.IOpenApiExtension> extensions = null) { }
         public System.Collections.Generic.IDictionary<string, Microsoft.OpenApi.Interfaces.IOpenApiExtension> Extensions { get; set; }
         public void SerializeAsV2(Microsoft.OpenApi.Writers.IOpenApiWriter writer) { }
         public void SerializeAsV3(Microsoft.OpenApi.Writers.IOpenApiWriter writer) { }