Complete OpenApiXml and revert to initial the extension dictionary

Author: xuzhg

src/Microsoft.OpenApi.Readers/YamlReaders/OpenApiV3Builder.cs

@@ -56,18 +56,7 @@ public static OpenApiDocument LoadOpenApi(RootNode rootNode)
 
         public static PatternFieldMap<OpenApiInfo> InfoPatternFields = new PatternFieldMap<OpenApiInfo>
         {
-            {
-                (s) => s.StartsWith("x-"),
-                (o,k,n) =>
-                {
-                    if (o.Extensions == null)
-                    {
-                        o.Extensions = new Dictionary<string, IOpenApiAny>();
-                    }
-
-                    o.Extensions.Add(k, new OpenApiString(n.GetScalarValue()));
-                }
-            }
+            { (s)=> s.StartsWith("x-"), (o,k,n)=> o.Extensions.Add(k, new OpenApiString(n.GetScalarValue())) }
         };
 
         public static OpenApiInfo LoadInfo(ParseNode node)
@@ -95,18 +84,7 @@ public static OpenApiInfo LoadInfo(ParseNode node)
 
         public static PatternFieldMap<OpenApiContact> ContactPatternFields = new PatternFieldMap<OpenApiContact>
         {
-            {
-                (s)=> s.StartsWith("x-"),
-                (o,k,n)=>
-                {
-                    if (o.Extensions == null)
-                    {
-                        o.Extensions = new Dictionary<string, IOpenApiAny>();
-                    }
-
-                    o.Extensions.Add(k, new OpenApiString(n.GetScalarValue()));
-                }
-            }
+            { (s)=> s.StartsWith("x-"), (o,k,n)=> o.Extensions.Add(k, new OpenApiString(n.GetScalarValue())) }
         };
 
         public static OpenApiContact LoadContact(ParseNode node)
@@ -130,18 +108,7 @@ public static OpenApiContact LoadContact(ParseNode node)
 
         public static PatternFieldMap<OpenApiLicense> LicensePatternFields = new PatternFieldMap<OpenApiLicense>
         {
-            {
-                (s) => s.StartsWith("x-"),
-                (o,k,n) =>
-                {
-                    if (o.Extensions == null)
-                    {
-                        o.Extensions = new Dictionary<string, IOpenApiAny>();
-                    }
-
-                    o.Extensions.Add(k, new OpenApiString(n.GetScalarValue()));
-                }
-            }
+            { (s)=> s.StartsWith("x-"), (o,k,n)=> o.Extensions.Add(k, new OpenApiString(n.GetScalarValue())) }
         };
 
         internal static OpenApiLicense LoadLicense(ParseNode node)

src/Microsoft.OpenApi/Models/OpenApiContact.cs

@@ -33,6 +33,6 @@ public class OpenApiContact : IOpenApiExtension
         /// <summary>
         /// This object MAY be extended with Specification Extensions.
         /// </summary>
-        public IDictionary<string, IOpenApiAny> Extensions { get; set; }
+        public IDictionary<string, IOpenApiAny> Extensions { get; set; } = new Dictionary<string, IOpenApiAny>();
     }
 }

src/Microsoft.OpenApi/Models/OpenApiInfo.cs

@@ -60,7 +60,7 @@ public string TermsOfService
         /// <summary>
         /// This object MAY be extended with Specification Extensions.
         /// </summary>
-        public IDictionary<string, IOpenApiAny> Extensions { get; set; }
+        public IDictionary<string, IOpenApiAny> Extensions { get; set; } = new Dictionary<string, IOpenApiAny>();
 
         private static Regex versionRegex = new Regex(@"\d+\.\d+\.\d+");
     }

src/Microsoft.OpenApi/Models/OpenApiLicense.cs

@@ -27,6 +27,6 @@ public class OpenApiLicense : IOpenApiExtension
         /// <summary>
         /// This object MAY be extended with Specification Extensions.
         /// </summary>
-        public IDictionary<string, IOpenApiAny> Extensions { get; set; }
+        public IDictionary<string, IOpenApiAny> Extensions { get; set; } = new Dictionary<string, IOpenApiAny>();
     }
 }

src/Microsoft.OpenApi/Models/OpenApiSchema.cs

@@ -49,6 +49,14 @@ public class OpenApiSchema : IOpenApiReference, IOpenApiExtension
         public OpenApiExternalDocs ExternalDocs { get; set; }
         public bool Deprecated { get; set; }
 
+        /// <summary>
+        /// Adds additional metadata to describe the XML representation of this property.
+        /// </summary>
+        public OpenApiXml Xml { get; set; }
+
+        /// <summary>
+        /// Specification Extensions.
+        /// </summary>
         public IDictionary<string, IOpenApiAny> Extensions { get; set; }
 
         public OpenApiReference Pointer

src/Microsoft.OpenApi/Models/OpenApiXml.cs

@@ -4,9 +4,46 @@
 // </copyright>
 //---------------------------------------------------------------------
 
+using System;
+using System.Collections.Generic;
+
 namespace Microsoft.OpenApi
 {
-    public class OpenApiXml : IOpenApiElement
+    /// <summary>
+    /// XML Object.
+    /// </summary>
+    public class OpenApiXml : IOpenApiExtension
     {
+        /// <summary>
+        /// Replaces the name of the element/attribute used for the described schema property.
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// The URI of the namespace definition.
+        /// </summary>
+        public Uri Namespace { get; set; }
+
+        /// <summary>
+        /// The prefix to be used for the name
+        /// </summary>
+        public string Prefix { get; set; }
+
+        /// <summary>
+        /// Declares whether the property definition translates to an attribute instead of an element.
+        /// Default value is false.
+        /// </summary>
+        public bool Attribute { get; set; }
+
+        /// <summary>
+        /// Signifies whether the array is wrapped.
+        /// Default value is false.
+        /// </summary>
+        public bool Wrapped { get; set; }
+
+        /// <summary>
+        /// Specification Extensions.
+        /// </summary>
+        public IDictionary<string, IOpenApiAny> Extensions { get; set; }
     }
 }