From bb736091f336de070d0fdee4ad06fe0fc9c8b3dd Mon Sep 17 00:00:00 2001
From: schoetbi <schoetbi@users.noreply.github.com>
Date: Thu, 31 Aug 2017 17:56:04 +0200
Subject: [PATCH] Every type gets additionalProperties set to "false" (#4424)

#4423
---
 src/idl_gen_json_schema.cpp    |  11 +++++-----
 tests/monster_test.bfbs        | Bin 5400 -> 4480 bytes
 tests/monster_test.schema.json |  36 ++++++++++++++++++++++-----------
 3 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/src/idl_gen_json_schema.cpp b/src/idl_gen_json_schema.cpp
index e519415dd..7f98a6e6a 100644
--- a/src/idl_gen_json_schema.cpp
+++ b/src/idl_gen_json_schema.cpp
@@ -175,13 +175,14 @@ class JsonSchemaGenerator : public BaseGenerator {
         }          
         code_ += typeLine;
       }
+      code_ += "      },";  // close properties
+
       std::vector<FieldDef *> requiredProperties;
       std::copy_if(properties.begin(), properties.end(),
                    back_inserter(requiredProperties),
                    [](FieldDef const *prop) { return prop->required; });
       if (requiredProperties.size() > 0) {
-        code_ += "      },";  // close properties
-        std::string required_string("      \"required\" : [ ");
+        std::string required_string("      \"required\" : [");
         for (auto req_prop = requiredProperties.cbegin();
              req_prop != requiredProperties.cend();
              ++req_prop) {
@@ -190,12 +191,10 @@ class JsonSchemaGenerator : public BaseGenerator {
             required_string.append(", ");
           }
         }
-        required_string.append("]");
+        required_string.append("],");
         code_ += required_string;
-      } else {
-        code_ += "      }";  // close properties
       }
-
+      code_ += "      \"additionalProperties\" : false";
       std::string closeType("    }");
       if (*s != parser_.structs_.vec.back()) {
         closeType.append(",");
diff --git a/tests/monster_test.bfbs b/tests/monster_test.bfbs
index 843e308c5204d9c36bad66ae49ac2d37041b4cce..15d39986259c8ed21e12dd8f9d0b096784f54c48 100644
GIT binary patch
literal 4480
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
bs!$0FwHB3KZ?pCNe|G#J?sfRsO`rb)$qSBG

literal 5400
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

diff --git a/tests/monster_test.schema.json b/tests/monster_test.schema.json
index 578e89645..62880abbc 100644
--- a/tests/monster_test.schema.json
+++ b/tests/monster_test.schema.json
@@ -16,42 +16,49 @@
     "MyGame_OtherNameSpace_Unused" : {
       "type" : "object",
       "properties" : {
-      }
+      },
+      "additionalProperties" : false
     },
     "MyGame_OtherNameSpace_TableB" : {
       "type" : "object",
       "properties" : {
         "a" : { "$ref" : "#/definitions/TableA" }
-      }
+      },
+      "additionalProperties" : false
     },
     "TableA" : {
       "type" : "object",
       "properties" : {
         "b" : { "$ref" : "#/definitions/MyGame_OtherNameSpace_TableB" }
-      }
+      },
+      "additionalProperties" : false
     },
     "MyGame_InParentNamespace" : {
       "type" : "object",
       "properties" : {
-      }
+      },
+      "additionalProperties" : false
     },
     "MyGame_Example2_Monster" : {
       "type" : "object",
       "properties" : {
-      }
+      },
+      "additionalProperties" : false
     },
     "MyGame_Example_Test" : {
       "type" : "object",
       "properties" : {
         "a" : { "type" : "number" },
         "b" : { "type" : "number" }
-      }
+      },
+      "additionalProperties" : false
     },
     "MyGame_Example_TestSimpleTableWithEnum" : {
       "type" : "object",
       "properties" : {
         "color" : { "$ref" : "#/definitions/MyGame_Example_Color" }
-      }
+      },
+      "additionalProperties" : false
     },
     "MyGame_Example_Vec3" : {
       "type" : "object",
@@ -62,14 +69,16 @@
         "test1" : { "type" : "number" },
         "test2" : { "$ref" : "#/definitions/MyGame_Example_Color" },
         "test3" : { "$ref" : "#/definitions/MyGame_Example_Test" }
-      }
+      },
+      "additionalProperties" : false
     },
     "MyGame_Example_Ability" : {
       "type" : "object",
       "properties" : {
         "id" : { "type" : "number" },
         "distance" : { "type" : "number" }
-      }
+      },
+      "additionalProperties" : false
     },
     "MyGame_Example_Stat" : {
       "type" : "object",
@@ -77,7 +86,8 @@
         "id" : { "type" : "string" },
         "val" : { "type" : "number" },
         "count" : { "type" : "number" }
-      }
+      },
+      "additionalProperties" : false
     },
     "MyGame_Example_Monster" : {
       "type" : "object",
@@ -119,7 +129,8 @@
         "vector_of_doubles" : { "type" : "array", "items" : { "type" : "number" } },
         "parent_namespace_test" : { "$ref" : "#/definitions/MyGame_InParentNamespace" }
       },
-      "required" : [ "name"]
+      "required" : ["name"],
+      "additionalProperties" : false
     },
     "MyGame_Example_TypeAliases" : {
       "type" : "object",
@@ -136,7 +147,8 @@
         "f64" : { "type" : "number" },
         "v8" : { "type" : "array", "items" : { "type" : "number" } },
         "vf64" : { "type" : "array", "items" : { "type" : "number" } }
-      }
+      },
+      "additionalProperties" : false
     }
   },
   "$ref" : "#/definitions/MyGame_Example_Monster"