Skip to content

Fix issues when processing nested json object more than 2 level #6787

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wing328 merged 1 commit into from
Jun 27, 2020
Merged

Fix issues when processing nested json object more than 2 level #6787

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions modules/openapi-generator/src/main/resources/powershell/api.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ function {{{vendorExtensions.x-powershell-method-name}}} {

{{/isNullable}}
{{/required}}
$LocalVarBodyParameter = ${{{paramName}}} | ConvertTo-Json
$LocalVarBodyParameter = ${{{paramName}}} | ConvertTo-Json -Depth 100

{{/bodyParam}}
{{#authMethods}}
Expand Down Expand Up @@ -225,12 +225,12 @@ function {{{vendorExtensions.x-powershell-method-name}}} {

{{#vendorExtensions.x-ps-return-type-one-of}}
# process oneOf response
$LocalVarResult["Response"] = ConvertFrom-{{apiNamePrefix}}JsonTo{{returnType}} (ConvertTo-Json $LocalVarResult["Response"])
$LocalVarResult["Response"] = ConvertFrom-{{apiNamePrefix}}JsonTo{{returnType}} (ConvertTo-Json $LocalVarResult["Response"] -Depth 100)

{{/vendorExtensions.x-ps-return-type-one-of}}
{{#vendorExtensions.x-ps-return-type-any-of}}
# process anyOf response
$LocalVarResult["Response"] = ConvertFrom-{{apiNamePrefix}}JsonTo{{returnType}} (ConvertTo-Json $LocalVarResult["Response"])
$LocalVarResult["Response"] = ConvertFrom-{{apiNamePrefix}}JsonTo{{returnType}} (ConvertTo-Json $LocalVarResult["Response"] -Depth 100)

{{/vendorExtensions.x-ps-return-type-any-of}}
if ($WithHttpInfo.IsPresent) {
Expand Down
4 changes: 2 additions & 2 deletions samples/client/petstore/powershell/src/PSPetstore/Api/PSPetApi.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ function Add-PSPet {
throw "Error! The required parameter `Pet` missing when calling addPet."
}

$LocalVarBodyParameter = $Pet | ConvertTo-Json
$LocalVarBodyParameter = $Pet | ConvertTo-Json -Depth 100


$LocalVarResult = Invoke-PSApiClient -Method 'POST' `
Expand Down Expand Up @@ -505,7 +505,7 @@ function Update-PSPet {
throw "Error! The required parameter `Pet` missing when calling updatePet."
}

$LocalVarBodyParameter = $Pet | ConvertTo-Json
$LocalVarBodyParameter = $Pet | ConvertTo-Json -Depth 100


$LocalVarResult = Invoke-PSApiClient -Method 'PUT' `
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/powershell/src/PSPetstore/Api/PSStoreApi.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ function Invoke-PSPlaceOrder {
throw "Error! The required parameter `Order` missing when calling placeOrder."
}

$LocalVarBodyParameter = $Order | ConvertTo-Json
$LocalVarBodyParameter = $Order | ConvertTo-Json -Depth 100

$LocalVarResult = Invoke-PSApiClient -Method 'POST' `
-Uri $LocalVarUri `
Expand Down
8 changes: 4 additions & 4 deletions samples/client/petstore/powershell/src/PSPetstore/Api/PSUserApi.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ function New-PSUser {
throw "Error! The required parameter `User` missing when calling createUser."
}

$LocalVarBodyParameter = $User | ConvertTo-Json
$LocalVarBodyParameter = $User | ConvertTo-Json -Depth 100

if ($Configuration["Cookie"]) {
$LocalVarCookieParameters['auth_cookie'] = $Configuration["Cookie"]
Expand Down Expand Up @@ -137,7 +137,7 @@ function New-PSUsersWithArrayInput {
throw "Error! The required parameter `User` missing when calling createUsersWithArrayInput."
}

$LocalVarBodyParameter = $User | ConvertTo-Json
$LocalVarBodyParameter = $User | ConvertTo-Json -Depth 100

if ($Configuration["Cookie"]) {
$LocalVarCookieParameters['auth_cookie'] = $Configuration["Cookie"]
Expand Down Expand Up @@ -216,7 +216,7 @@ function New-PSUsersWithListInput {
throw "Error! The required parameter `User` missing when calling createUsersWithListInput."
}

$LocalVarBodyParameter = $User | ConvertTo-Json
$LocalVarBodyParameter = $User | ConvertTo-Json -Depth 100

if ($Configuration["Cookie"]) {
$LocalVarCookieParameters['auth_cookie'] = $Configuration["Cookie"]
Expand Down Expand Up @@ -623,7 +623,7 @@ function Update-PSUser {
throw "Error! The required parameter `User` missing when calling updateUser."
}

$LocalVarBodyParameter = $User | ConvertTo-Json
$LocalVarBodyParameter = $User | ConvertTo-Json -Depth 100

if ($Configuration["Cookie"]) {
$LocalVarCookieParameters['auth_cookie'] = $Configuration["Cookie"]
Expand Down