Merge pull request #4274 from TouK/fix_additionalProperty

Fix additionalProperty when true/false
TouK · May 5, 2023 · 55e2ada · 55e2ada
2 parents 0900036 + 6f56a7e
commit 55e2ada
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/components/openapi/src/test/resources/swagger/swagger-20.json b/components/openapi/src/test/resources/swagger/swagger-20.json
@@ -78,8 +78,9 @@
                   "type": "integer",
                   "format": "int32"
                 }
-              }
-              }
+              },
+              "additionalProperties": false
+            }
           },
           "400": {
             "description": "Problem with request"

diff --git a/utils/json-utils/src/main/scala/pl/touk/nussknacker/engine/json/swagger/SwaggerTyped.scala b/utils/json-utils/src/main/scala/pl/touk/nussknacker/engine/json/swagger/SwaggerTyped.scala
@@ -232,6 +232,8 @@ object SwaggerObject {
       case null => AdditionalPropertiesEnabled(SwaggerAny)
       case schema: Schema[_] if schema.getBooleanSchemaValue == false => AdditionalPropertiesDisabled
       case schema: Schema[_] => AdditionalPropertiesEnabled(SwaggerTyped(schema, swaggerRefSchemas, usedRefs))
+      case additionalPropertyEnabled if additionalPropertyEnabled == true => AdditionalPropertiesEnabled(SwaggerAny)
+      case additionalPropertyEnabled if additionalPropertyEnabled == false => AdditionalPropertiesDisabled
     }
     SwaggerObject(properties, additionalProperties, patternProperties)
   }