fix: add ability to have 'false' as the value for 'additionalproperti…

…es' (#118) Co-authored-by: UlrikSandberg <[email protected]>
LEGO · Jun 29, 2023 · 9e4867f · 9e4867f
1 parent bc1569a
commit 9e4867f
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 4 deletions.
diff --git a/src/LEGO.AsyncAPI.Readers/V2/AsyncApiSchemaDeserializer.cs b/src/LEGO.AsyncAPI.Readers/V2/AsyncApiSchemaDeserializer.cs
@@ -123,7 +123,17 @@ public class JsonSchemaDeserializer
                 "properties", (a, n) => { a.Properties = n.CreateMap(LoadSchema); }
             },
             {
-                "additionalProperties", (a, n) => { a.AdditionalProperties = LoadSchema(n); }
+                "additionalProperties", (a, n) =>
+                {
+                    if (n.GetBooleanValueOrDefault(null) == false)
+                    {
+                        a.AdditionalProperties = new NoAdditionalProperties();
+                    }
+                    else
+                    {
+                        a.AdditionalProperties = LoadSchema(n);
+                    }
+                }
             },
             {
                 "items", (a, n) => { a.Items = LoadSchema(n); }

diff --git a/src/LEGO.AsyncAPI/Models/AsyncApiSchema.cs b/src/LEGO.AsyncAPI/Models/AsyncApiSchema.cs
@@ -356,7 +356,14 @@ public void SerializeV2WithoutReference(IAsyncApiWriter writer)
             writer.WriteOptionalProperty(AsyncApiConstants.MinProperties, this.MinProperties);
 
             // additionalProperties
-            writer.WriteOptionalObject(AsyncApiConstants.AdditionalProperties, this.AdditionalProperties, (w, s) => s.SerializeV2(w));
+            if (this.AdditionalProperties is NoAdditionalProperties)
+            {
+                writer.WriteOptionalProperty<bool>(AsyncApiConstants.AdditionalProperties, false);
+            }
+            else
+            {
+                writer.WriteOptionalObject(AsyncApiConstants.AdditionalProperties, this.AdditionalProperties, (w, s) => s.SerializeV2(w));
+            }
 
             // discriminator
             writer.WriteOptionalProperty(AsyncApiConstants.Discriminator, this.Discriminator);

diff --git a/src/LEGO.AsyncAPI/Models/JsonSchema/NoAdditionalProperties.cs b/src/LEGO.AsyncAPI/Models/JsonSchema/NoAdditionalProperties.cs
@@ -0,0 +1,12 @@
+// Copyright (c) The LEGO Group. All rights reserved.
+
+namespace LEGO.AsyncAPI.Models
+{
+    /// <summary>
+    /// An object representing 'false' for the 'additionalProperties' property of AsyncApiSchema.
+    /// </summary>
+    /// <seealso cref="AsyncApiSchema" />
+    public class NoAdditionalProperties : AsyncApiSchema
+    {
+    }
+}
diff --git a/test/LEGO.AsyncAPI.Tests/Models/AsyncApiSchema_Should.cs b/test/LEGO.AsyncAPI.Tests/Models/AsyncApiSchema_Should.cs
@@ -67,6 +67,7 @@ public class AsyncApiSchema_Should
                             MaxLength = 15,
                         },
                     },
+                    AdditionalProperties = new NoAdditionalProperties(),
                 },
                 ["property4"] = new AsyncApiSchema
                 {
@@ -78,7 +79,7 @@ public class AsyncApiSchema_Should
                             {
                                 ["property6"] = new AsyncApiSchema
                                 {
-                                    Type = SchemaType.Boolean ,
+                                    Type = SchemaType.Boolean,
                                 },
                             },
                         },
@@ -376,7 +377,8 @@ public void SerializeAsJson_WithAdvancedSchemaObject_V2Works()
           ""type"": ""string"",
           ""maxLength"": 15
         }
-      }
+      },
+      ""additionalProperties"": false
     },
     ""property4"": {
       ""properties"": {