Fixed issue with additionalProperties #196

Author: darrelmiller

src/Microsoft.OpenApi.Readers/V2/OpenApiSchemaDeserializer.cs

@@ -140,7 +140,14 @@ internal static partial class OpenApiV2Deserializer
             {
                 "additionalProperties", (o, n) =>
                 {
-                    o.AdditionalProperties = LoadSchema(n);
+                    if (n is ValueNode)
+                    {
+                        o.AdditionalPropertiesAllowed = bool.Parse(n.GetScalarValue());
+                    }
+                    else
+                    {
+                        o.AdditionalProperties = LoadSchema(n);
+                    }
                 }
             },
             {

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

@@ -109,8 +109,7 @@ internal static partial class OpenApiV3Deserializer
             {
                 "enum", (o, n) =>
                 {
-                    o.Enum = n.CreateSimpleList<IOpenApiAny>(s => new OpenApiString(s.GetScalarValue()));
-                }
+                    o.Enum = n.CreateListOfAny();                }
             },
             {
                 "type", (o, n) =>
@@ -157,7 +156,14 @@ internal static partial class OpenApiV3Deserializer
             {
                 "additionalProperties", (o, n) =>
                 {
-                    o.AdditionalProperties = LoadSchema(n);
+                    if (n is ValueNode)
+                    {
+                        o.AdditionalPropertiesAllowed = bool.Parse(n.GetScalarValue());
+                    }
+                    else
+                    {
+                        o.AdditionalProperties = LoadSchema(n);
+                    }
                 }
             },
             {

src/Microsoft.OpenApi/Models/OpenApiSchema.cs

@@ -173,13 +173,19 @@ public class OpenApiSchema : IOpenApiSerializable, IOpenApiReferenceable, IOpenA
         /// </summary>
         public int? MinProperties { get; set; }
 
+        /// <summary>
+        /// Indicates if the schema can contain properties other than those defined by the properties map.
+        /// </summary>
+        public bool AdditionalPropertiesAllowed { get; set; } = true;
+
         /// <summary>
         /// Follow JSON Schema definition: https://tools.ietf.org/html/draft-fge-json-schema-validation-00
         /// Value can be boolean or object. Inline or referenced schema
         /// MUST be of a Schema Object and not a standard JSON Schema.
         /// </summary>
         public OpenApiSchema AdditionalProperties { get; set; }
 
+
         /// <summary>
         /// Adds support for polymorphism. The discriminator is an object name that is used to differentiate
         /// between other schemas which may satisfy the payload description.
@@ -331,10 +337,17 @@ public void SerializeAsV3WithoutReference(IOpenApiWriter writer)
             writer.WriteOptionalMap(OpenApiConstants.Properties, Properties, (w, s) => s.SerializeAsV3(w));
 
             // additionalProperties
-            writer.WriteOptionalObject(
-                OpenApiConstants.AdditionalProperties,
-                AdditionalProperties,
-                (w, s) => s.SerializeAsV3(w));
+            if (AdditionalPropertiesAllowed)
+            {
+                writer.WriteOptionalObject(
+                    OpenApiConstants.AdditionalProperties,
+                    AdditionalProperties,
+                    (w, s) => s.SerializeAsV3(w));
+            }
+            else
+            {
+                writer.WriteProperty(OpenApiConstants.AdditionalProperties, AdditionalPropertiesAllowed);
+            }
 
             // description
             writer.WriteProperty(OpenApiConstants.Description, Description);

test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiSchemaTests.cs

@@ -91,7 +91,8 @@ public void ParseSimpleSchemaShouldSucceed()
                                 Format = "int32",
                                 Minimum = 0
                             }
-                        }
+                        },
+                        AdditionalPropertiesAllowed = false  
                     });
             }
         }

test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiSchema/simpleSchema.yaml

@@ -11,4 +11,5 @@ properties:
   age:
     type: integer
     format: int32
-    minimum: 0
+    minimum: 0
+additionalProperties: false