Refactor vocabulary object to represent a dictionary; implement serialization and deserialization

Author: MaggieKimani1

src/Microsoft.OpenApi/Models/OpenApiSchema.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;
@@ -43,7 +43,7 @@ public class OpenApiSchema : IOpenApiAnnotatable, IOpenApiExtensible, IOpenApiRe
         /// <summary>
         /// $vocabulary- used in meta-schemas to identify the vocabularies available for use in schemas described by that meta-schema.
         /// </summary>
-        public virtual string Vocabulary { get; set; }
+        public virtual IDictionary<string, bool> Vocabulary { get; set; }
 
         /// <summary>
         /// $dynamicRef - an applicator that allows for deferring the full resolution until runtime, at which point it is resolved each time it is encountered while evaluating an instance
@@ -348,7 +348,7 @@ public OpenApiSchema(OpenApiSchema schema)
             Id = schema?.Id ?? Id;
             Schema = schema?.Schema ?? Schema;
             Comment = schema?.Comment ?? Comment;
-            Vocabulary = schema?.Vocabulary ?? Vocabulary;
+            Vocabulary = schema?.Vocabulary != null ? new Dictionary<string, bool>(schema.Vocabulary) : null;
             DynamicAnchor = schema?.DynamicAnchor ?? DynamicAnchor;
             DynamicRef = schema?.DynamicRef ?? DynamicRef;
             Definitions = schema?.Definitions != null ? new Dictionary<string, OpenApiSchema>(schema.Definitions) : null;
@@ -562,8 +562,8 @@ internal void WriteV31Properties(IOpenApiWriter writer)
             writer.WriteProperty(OpenApiConstants.Id, Id);
             writer.WriteProperty(OpenApiConstants.DollarSchema, Schema);
             writer.WriteProperty(OpenApiConstants.Comment, Comment);
-            writer.WriteProperty(OpenApiConstants.Vocabulary, Vocabulary);
-            writer.WriteOptionalMap(OpenApiConstants.Defs, Definitions, (w, s) => s.SerializeAsV3(w));
+            writer.WriteOptionalMap(OpenApiConstants.Vocabulary, Vocabulary, (w, s) => w.WriteValue(s));
+            writer.WriteOptionalMap(OpenApiConstants.Defs, Definitions, (w, s) => s.SerializeAsV31(w));
             writer.WriteProperty(OpenApiConstants.DynamicRef, DynamicRef);
             writer.WriteProperty(OpenApiConstants.DynamicAnchor, DynamicAnchor);
             writer.WriteProperty(OpenApiConstants.V31ExclusiveMaximum, V31ExclusiveMaximum);

src/Microsoft.OpenApi/Models/References/OpenApiSchemaReference.cs

@@ -74,7 +74,7 @@ internal OpenApiSchemaReference(OpenApiSchema target, string referenceId)
         /// <inheritdoc/>
         public override string Comment { get => Target.Comment; set => Target.Comment = value; }
         /// <inheritdoc/>
-        public override string Vocabulary { get => Target.Vocabulary; set => Target.Vocabulary = value; }
+        public override IDictionary<string, bool> Vocabulary { get => Target.Vocabulary; set => Target.Vocabulary = value; }
         /// <inheritdoc/>
         public override string DynamicRef { get => Target.DynamicRef; set => Target.DynamicRef = value; }
         /// <inheritdoc/>

src/Microsoft.OpenApi/Reader/V31/OpenApiSchemaDeserializer.cs

@@ -32,7 +32,7 @@ internal static partial class OpenApiV31Deserializer
             },
             {
                 "$vocabulary",
-                (o, n, _) => o.Vocabulary = n.GetScalarValue()
+                (o, n, _) => o.Vocabulary = n.CreateSimpleMap(LoadBool)
             },
             {
                 "$dynamicRef",

src/Microsoft.OpenApi/Reader/V31/OpenApiV31Deserializer.cs

@@ -145,6 +145,11 @@ private static string LoadString(ParseNode node)
             return node.GetScalarValue();
         }
 
+        private static bool LoadBool(ParseNode node)
+        {
+            return bool.Parse(node.GetScalarValue());
+        }
+
         private static (string, string) GetReferenceIdAndExternalResource(string pointer)
         {
             /* Check whether the reference pointer is a URL

src/Microsoft.OpenApi/Writers/OpenApiWriterExtensions.cs

@@ -272,6 +272,25 @@ public static void WriteOptionalMap(
             }
         }
 
+        /// <summary>
+        /// Write the optional Open API element map (string to string mapping).
+        /// </summary>
+        /// <param name="writer">The Open API writer.</param>
+        /// <param name="name">The property name.</param>
+        /// <param name="elements">The map values.</param>
+        /// <param name="action">The map element writer action.</param>
+        public static void WriteOptionalMap(
+            this IOpenApiWriter writer,
+            string name,
+            IDictionary<string, bool> elements,
+            Action<IOpenApiWriter, bool> action)
+        {
+            if (elements != null && elements.Any())
+            {
+                writer.WriteMapInternal(name, elements, action);
+            }
+        }
+
         /// <summary>
         /// Write the optional Open API element map.
         /// </summary>