From ffac26facef90e304767eec7ad925c8b33f4bc62 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Wed, 8 Jul 2020 16:45:30 +0800 Subject: [PATCH] replace x-additional-properties with isAdditionalPropertiesTrue (#6886) --- .../languages/PowerShellClientCodegen.java | 5 ----- .../resources/powershell/model_simple.mustache | 16 ++++++++-------- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PowerShellClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PowerShellClientCodegen.java index 7f166b6a241..9c92c878aee 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PowerShellClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PowerShellClientCodegen.java @@ -953,11 +953,6 @@ public class PowerShellClientCodegen extends DefaultCodegen implements CodegenCo model.isNullable = true; model.anyOf.remove("ModelNull"); } - - // add vendor extension for additonalProperties: true - if ("null".equals(model.parent)) { - model.vendorExtensions.put("x-additional-properties", true); - } } return objs; diff --git a/modules/openapi-generator/src/main/resources/powershell/model_simple.mustache b/modules/openapi-generator/src/main/resources/powershell/model_simple.mustache index 95310597e61..8e013e386d9 100644 --- a/modules/openapi-generator/src/main/resources/powershell/model_simple.mustache +++ b/modules/openapi-generator/src/main/resources/powershell/model_simple.mustache @@ -223,24 +223,24 @@ function ConvertFrom-{{{apiNamePrefix}}}JsonTo{{{classname}}} { $PSBoundParameters | Out-DebugParameter | Write-Debug $JsonParameters = ConvertFrom-Json -InputObject $Json - {{#vendorExtensions.x-additional-properties}} + {{#isAdditionalPropertiesTrue}} ${{{apiNamePrefix}}}{{{classname}}}AdditionalProperties = @{} - {{/vendorExtensions.x-additional-properties}} + {{/isAdditionalPropertiesTrue}} # check if Json contains properties not defined in {{{apiNamePrefix}}}{{{classname}}} $AllProperties = ({{#allVars}}"{{{baseName}}}"{{^-last}}, {{/-last}}{{/allVars}}) foreach ($name in $JsonParameters.PsObject.Properties.Name) { - {{^vendorExtensions.x-additional-properties}} + {{^isAdditionalPropertiesTrue}} if (!($AllProperties.Contains($name))) { throw "Error! JSON key '$name' not found in the properties: $($AllProperties)" } - {{/vendorExtensions.x-additional-properties}} - {{#vendorExtensions.x-additional-properties}} + {{/isAdditionalPropertiesTrue}} + {{#isAdditionalPropertiesTrue}} # store undefined properties in additionalProperties if (!($AllProperties.Contains($name))) { ${{{apiNamePrefix}}}{{{classname}}}AdditionalProperties[$name] = $JsonParameters.PSobject.Properties[$name].value } - {{/vendorExtensions.x-additional-properties}} + {{/isAdditionalPropertiesTrue}} } {{#requiredVars}} @@ -271,9 +271,9 @@ function ConvertFrom-{{{apiNamePrefix}}}JsonTo{{{classname}}} { "<>" = ${<>} <> <<={{ }}=>> - {{#vendorExtensions.x-additional-properties}} + {{#isAdditionalPropertiesTrue}} "AdditionalProperties" = ${{{apiNamePrefix}}}{{{classname}}}AdditionalProperties - {{/vendorExtensions.x-additional-properties}} + {{/isAdditionalPropertiesTrue}} } return $PSO