loafle/openapi-generator-original
3
0
Fork 1
mirror of https://github.com/OpenAPITools/openapi-generator.git synced 2025-07-04 22:50:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

add nullable body support to powershell (#6930)

Browse Source
This commit is contained in:
William Cheng 2020-07-15 00:19:13 +08:00 committed by GitHub
parent b86a51ae17
commit 9d76ca291e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 61 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/openapi-generator/src/main/resources/powershell/api.mustache vendored
View File

@ -221,7 +221,8 @@ function {{{vendorExtensions.x-powershell-method-name}}} {
-QueryParameters $LocalVarQueryParameters ` -QueryParameters $LocalVarQueryParameters `
-FormParameters $LocalVarFormParameters ` -FormParameters $LocalVarFormParameters `
-CookieParameters $LocalVarCookieParameters ` -CookieParameters $LocalVarCookieParameters `
-ReturnType "{{#returnType}}{{{.}}}{{/returnType}}" -ReturnType "{{#returnType}}{{{.}}}{{/returnType}}" `
-IsBodyNullable {{#bodyParam}}{{#isNullable}}$true{{/isNullable}}{{^isNullable}}$false{{/isNullable}}{{/bodyParam}}{{^bodyParam}}$false{{/bodyParam}}
{{#vendorExtensions.x-ps-return-type-one-of}} {{#vendorExtensions.x-ps-return-type-one-of}}
# process oneOf response # process oneOf response

9
modules/openapi-generator/src/main/resources/powershell/api_client.mustache vendored
View File

@ -26,7 +26,9 @@ function Invoke-{{{apiNamePrefix}}}ApiClient {
[string]$Method, [string]$Method,
[Parameter(Mandatory)] [Parameter(Mandatory)]
[AllowEmptyString()] [AllowEmptyString()]
[string]$ReturnType [string]$ReturnType,
[Parameter(Mandatory)]
[bool]$IsBodyNullable
) )
'Calling method: Invoke-{{{apiNamePrefix}}}ApiClient' | Write-Debug 'Calling method: Invoke-{{{apiNamePrefix}}}ApiClient' | Write-Debug
@ -85,8 +87,11 @@ function Invoke-{{{apiNamePrefix}}}ApiClient {
$RequestBody = $FormParameters $RequestBody = $FormParameters
} }
if ($Body) { if ($Body -or $IsBodyNullable) {
$RequestBody = $Body $RequestBody = $Body
if ([string]::IsNullOrEmpty($RequestBody) -and $IsBodyNullable -eq $true) {
$RequestBody = "null"
}
} }
{{#hasHttpSignatureMethods}} {{#hasHttpSignatureMethods}}

9
samples/client/petstore/powershell/Test1.ps1
View File

@ -27,13 +27,14 @@ $Id = 38369
) -Status Available ) -Status Available
#Write-Host $pet #Write-Host $pet
$Result = Add-PSPet -Pet $pet #$Result = Add-PSPet -Pet $pet
$Result = Add-PSPet -Pet $null
Set-PSConfigurationApiKey -Id "api_key" -ApiKey "zzZZZZZZZZZZZZZ" Set-PSConfigurationApiKey -Id "api_key" -ApiKey "zzZZZZZZZZZZZZZ"
$Result2 = Get-PSPetById -petId ($Id) -Verbose -WithHttpInfo #-testHeader "testing only" -testQuery "testing something here" $Result2 = Get-PSPetById -petId ($Id) -Verbose -WithHttpInfo #-testHeader "testing only" -testQuery "testing something here"
Write-Host $Result2["Headers"]["Content-Type"] Write-Host $Result2["Headers"]["Content-Type"]
$Result3 = Get-PSPetById -petId ($Id) -Verbose -WithHttpInfo -ReturnType "application/xml" #-testHeader "testing only" -testQuery "testing something here" #$Result3 = Get-PSPetById -petId ($Id) -Verbose -WithHttpInfo -ReturnType "application/xml" #-testHeader "testing only" -testQuery "testing something here"
Write-Host $Result3["Headers"]["Content-Type"] #Write-Host $Result3["Headers"]["Content-Type"]
Write-Host $Result3["Response"] #Write-Host $Result3["Response"]
#} catch { #} catch {
# Write-Host ("Exception occured when calling '': {0}" -f ($_.ErrorDetails | ConvertFrom-Json)) # Write-Host ("Exception occured when calling '': {0}" -f ($_.ErrorDetails | ConvertFrom-Json))
# Write-Host ("Response headers: {0}" -f ($_.Exception.Response.Headers | ConvertTo-Json)) # Write-Host ("Response headers: {0}" -f ($_.Exception.Response.Headers | ConvertTo-Json))

24
samples/client/petstore/powershell/src/PSPetstore/Api/PSPetApi.ps1
View File

@ -85,7 +85,8 @@ function Add-PSPet {
-QueryParameters $LocalVarQueryParameters ` -QueryParameters $LocalVarQueryParameters `
-FormParameters $LocalVarFormParameters ` -FormParameters $LocalVarFormParameters `
-CookieParameters $LocalVarCookieParameters ` -CookieParameters $LocalVarCookieParameters `
-ReturnType "Pet" -ReturnType "Pet" `
-IsBodyNullable $false
if ($WithHttpInfo.IsPresent) { if ($WithHttpInfo.IsPresent) {
return $LocalVarResult return $LocalVarResult
@ -165,7 +166,8 @@ function Remove-Pet {
-QueryParameters $LocalVarQueryParameters ` -QueryParameters $LocalVarQueryParameters `
-FormParameters $LocalVarFormParameters ` -FormParameters $LocalVarFormParameters `
-CookieParameters $LocalVarCookieParameters ` -CookieParameters $LocalVarCookieParameters `
-ReturnType "" -ReturnType "" `
-IsBodyNullable $false
if ($WithHttpInfo.IsPresent) { if ($WithHttpInfo.IsPresent) {
return $LocalVarResult return $LocalVarResult
@ -252,7 +254,8 @@ function Find-PSPetsByStatus {
-QueryParameters $LocalVarQueryParameters ` -QueryParameters $LocalVarQueryParameters `
-FormParameters $LocalVarFormParameters ` -FormParameters $LocalVarFormParameters `
-CookieParameters $LocalVarCookieParameters ` -CookieParameters $LocalVarCookieParameters `
-ReturnType "Pet[]" -ReturnType "Pet[]" `
-IsBodyNullable $false
if ($WithHttpInfo.IsPresent) { if ($WithHttpInfo.IsPresent) {
return $LocalVarResult return $LocalVarResult
@ -338,7 +341,8 @@ function Find-PSPetsByTags {
-QueryParameters $LocalVarQueryParameters ` -QueryParameters $LocalVarQueryParameters `
-FormParameters $LocalVarFormParameters ` -FormParameters $LocalVarFormParameters `
-CookieParameters $LocalVarCookieParameters ` -CookieParameters $LocalVarCookieParameters `
-ReturnType "Pet[]" -ReturnType "Pet[]" `
-IsBodyNullable $false
if ($WithHttpInfo.IsPresent) { if ($WithHttpInfo.IsPresent) {
return $LocalVarResult return $LocalVarResult
@ -427,7 +431,8 @@ function Get-PSPetById {
-QueryParameters $LocalVarQueryParameters ` -QueryParameters $LocalVarQueryParameters `
-FormParameters $LocalVarFormParameters ` -FormParameters $LocalVarFormParameters `
-CookieParameters $LocalVarCookieParameters ` -CookieParameters $LocalVarCookieParameters `
-ReturnType "Pet" -ReturnType "Pet" `
-IsBodyNullable $false
if ($WithHttpInfo.IsPresent) { if ($WithHttpInfo.IsPresent) {
return $LocalVarResult return $LocalVarResult
@ -517,7 +522,8 @@ function Update-PSPet {
-QueryParameters $LocalVarQueryParameters ` -QueryParameters $LocalVarQueryParameters `
-FormParameters $LocalVarFormParameters ` -FormParameters $LocalVarFormParameters `
-CookieParameters $LocalVarCookieParameters ` -CookieParameters $LocalVarCookieParameters `
-ReturnType "Pet" -ReturnType "Pet" `
-IsBodyNullable $false
if ($WithHttpInfo.IsPresent) { if ($WithHttpInfo.IsPresent) {
return $LocalVarResult return $LocalVarResult
@ -610,7 +616,8 @@ function Update-PSPetWithForm {
-QueryParameters $LocalVarQueryParameters ` -QueryParameters $LocalVarQueryParameters `
-FormParameters $LocalVarFormParameters ` -FormParameters $LocalVarFormParameters `
-CookieParameters $LocalVarCookieParameters ` -CookieParameters $LocalVarCookieParameters `
-ReturnType "" -ReturnType "" `
-IsBodyNullable $false
if ($WithHttpInfo.IsPresent) { if ($WithHttpInfo.IsPresent) {
return $LocalVarResult return $LocalVarResult
@ -706,7 +713,8 @@ function Invoke-PSUploadFile {
-QueryParameters $LocalVarQueryParameters ` -QueryParameters $LocalVarQueryParameters `
-FormParameters $LocalVarFormParameters ` -FormParameters $LocalVarFormParameters `
-CookieParameters $LocalVarCookieParameters ` -CookieParameters $LocalVarCookieParameters `
-ReturnType "ApiResponse" -ReturnType "ApiResponse" `
-IsBodyNullable $false
if ($WithHttpInfo.IsPresent) { if ($WithHttpInfo.IsPresent) {
return $LocalVarResult return $LocalVarResult

12
samples/client/petstore/powershell/src/PSPetstore/Api/PSStoreApi.ps1
View File

@ -64,7 +64,8 @@ function Remove-PSOrder {
-QueryParameters $LocalVarQueryParameters ` -QueryParameters $LocalVarQueryParameters `
-FormParameters $LocalVarFormParameters ` -FormParameters $LocalVarFormParameters `
-CookieParameters $LocalVarCookieParameters ` -CookieParameters $LocalVarCookieParameters `
-ReturnType "" -ReturnType "" `
-IsBodyNullable $false
if ($WithHttpInfo.IsPresent) { if ($WithHttpInfo.IsPresent) {
return $LocalVarResult return $LocalVarResult
@ -131,7 +132,8 @@ function Get-PSInventory {
-QueryParameters $LocalVarQueryParameters ` -QueryParameters $LocalVarQueryParameters `
-FormParameters $LocalVarFormParameters ` -FormParameters $LocalVarFormParameters `
-CookieParameters $LocalVarCookieParameters ` -CookieParameters $LocalVarCookieParameters `
-ReturnType "System.Collections.Hashtable" -ReturnType "System.Collections.Hashtable" `
-IsBodyNullable $false
if ($WithHttpInfo.IsPresent) { if ($WithHttpInfo.IsPresent) {
return $LocalVarResult return $LocalVarResult
@ -215,7 +217,8 @@ function Get-PSOrderById {
-QueryParameters $LocalVarQueryParameters ` -QueryParameters $LocalVarQueryParameters `
-FormParameters $LocalVarFormParameters ` -FormParameters $LocalVarFormParameters `
-CookieParameters $LocalVarCookieParameters ` -CookieParameters $LocalVarCookieParameters `
-ReturnType "Order" -ReturnType "Order" `
-IsBodyNullable $false
if ($WithHttpInfo.IsPresent) { if ($WithHttpInfo.IsPresent) {
return $LocalVarResult return $LocalVarResult
@ -304,7 +307,8 @@ function Invoke-PSPlaceOrder {
-QueryParameters $LocalVarQueryParameters ` -QueryParameters $LocalVarQueryParameters `
-FormParameters $LocalVarFormParameters ` -FormParameters $LocalVarFormParameters `
-CookieParameters $LocalVarCookieParameters ` -CookieParameters $LocalVarCookieParameters `
-ReturnType "Order" -ReturnType "Order" `
-IsBodyNullable $false
if ($WithHttpInfo.IsPresent) { if ($WithHttpInfo.IsPresent) {
return $LocalVarResult return $LocalVarResult

24
samples/client/petstore/powershell/src/PSPetstore/Api/PSUserApi.ps1
View File

@ -74,7 +74,8 @@ function New-PSUser {
-QueryParameters $LocalVarQueryParameters ` -QueryParameters $LocalVarQueryParameters `
-FormParameters $LocalVarFormParameters ` -FormParameters $LocalVarFormParameters `
-CookieParameters $LocalVarCookieParameters ` -CookieParameters $LocalVarCookieParameters `
-ReturnType "" -ReturnType "" `
-IsBodyNullable $false
if ($WithHttpInfo.IsPresent) { if ($WithHttpInfo.IsPresent) {
return $LocalVarResult return $LocalVarResult
@ -153,7 +154,8 @@ function New-PSUsersWithArrayInput {
-QueryParameters $LocalVarQueryParameters ` -QueryParameters $LocalVarQueryParameters `
-FormParameters $LocalVarFormParameters ` -FormParameters $LocalVarFormParameters `
-CookieParameters $LocalVarCookieParameters ` -CookieParameters $LocalVarCookieParameters `
-ReturnType "" -ReturnType "" `
-IsBodyNullable $false
if ($WithHttpInfo.IsPresent) { if ($WithHttpInfo.IsPresent) {
return $LocalVarResult return $LocalVarResult
@ -232,7 +234,8 @@ function New-PSUsersWithListInput {
-QueryParameters $LocalVarQueryParameters ` -QueryParameters $LocalVarQueryParameters `
-FormParameters $LocalVarFormParameters ` -FormParameters $LocalVarFormParameters `
-CookieParameters $LocalVarCookieParameters ` -CookieParameters $LocalVarCookieParameters `
-ReturnType "" -ReturnType "" `
-IsBodyNullable $false
if ($WithHttpInfo.IsPresent) { if ($WithHttpInfo.IsPresent) {
return $LocalVarResult return $LocalVarResult
@ -306,7 +309,8 @@ function Remove-PSUser {
-QueryParameters $LocalVarQueryParameters ` -QueryParameters $LocalVarQueryParameters `
-FormParameters $LocalVarFormParameters ` -FormParameters $LocalVarFormParameters `
-CookieParameters $LocalVarCookieParameters ` -CookieParameters $LocalVarCookieParameters `
-ReturnType "" -ReturnType "" `
-IsBodyNullable $false
if ($WithHttpInfo.IsPresent) { if ($WithHttpInfo.IsPresent) {
return $LocalVarResult return $LocalVarResult
@ -390,7 +394,8 @@ function Get-PSUserByName {
-QueryParameters $LocalVarQueryParameters ` -QueryParameters $LocalVarQueryParameters `
-FormParameters $LocalVarFormParameters ` -FormParameters $LocalVarFormParameters `
-CookieParameters $LocalVarCookieParameters ` -CookieParameters $LocalVarCookieParameters `
-ReturnType "User" -ReturnType "User" `
-IsBodyNullable $false
if ($WithHttpInfo.IsPresent) { if ($WithHttpInfo.IsPresent) {
return $LocalVarResult return $LocalVarResult
@ -486,7 +491,8 @@ function Invoke-PSLoginUser {
-QueryParameters $LocalVarQueryParameters ` -QueryParameters $LocalVarQueryParameters `
-FormParameters $LocalVarFormParameters ` -FormParameters $LocalVarFormParameters `
-CookieParameters $LocalVarCookieParameters ` -CookieParameters $LocalVarCookieParameters `
-ReturnType "String" -ReturnType "String" `
-IsBodyNullable $false
if ($WithHttpInfo.IsPresent) { if ($WithHttpInfo.IsPresent) {
return $LocalVarResult return $LocalVarResult
@ -550,7 +556,8 @@ function Invoke-PSLogoutUser {
-QueryParameters $LocalVarQueryParameters ` -QueryParameters $LocalVarQueryParameters `
-FormParameters $LocalVarFormParameters ` -FormParameters $LocalVarFormParameters `
-CookieParameters $LocalVarCookieParameters ` -CookieParameters $LocalVarCookieParameters `
-ReturnType "" -ReturnType "" `
-IsBodyNullable $false
if ($WithHttpInfo.IsPresent) { if ($WithHttpInfo.IsPresent) {
return $LocalVarResult return $LocalVarResult
@ -639,7 +646,8 @@ function Update-PSUser {
-QueryParameters $LocalVarQueryParameters ` -QueryParameters $LocalVarQueryParameters `
-FormParameters $LocalVarFormParameters ` -FormParameters $LocalVarFormParameters `
-CookieParameters $LocalVarCookieParameters ` -CookieParameters $LocalVarCookieParameters `
-ReturnType "" -ReturnType "" `
-IsBodyNullable $false
if ($WithHttpInfo.IsPresent) { if ($WithHttpInfo.IsPresent) {
return $LocalVarResult return $LocalVarResult

9
samples/client/petstore/powershell/src/PSPetstore/Private/PSApiClient.ps1
View File

@ -32,7 +32,9 @@ function Invoke-PSApiClient {
[string]$Method, [string]$Method,
[Parameter(Mandatory)] [Parameter(Mandatory)]
[AllowEmptyString()] [AllowEmptyString()]
[string]$ReturnType [string]$ReturnType,
[Parameter(Mandatory)]
[bool]$IsBodyNullable
) )
'Calling method: Invoke-PSApiClient' | Write-Debug 'Calling method: Invoke-PSApiClient' | Write-Debug
@ -91,8 +93,11 @@ function Invoke-PSApiClient {
$RequestBody = $FormParameters $RequestBody = $FormParameters
} }
if ($Body) { if ($Body -or $IsBodyNullable) {
$RequestBody = $Body $RequestBody = $Body
if ([string]::IsNullOrEmpty($RequestBody) -and $IsBodyNullable -eq $true) {
$RequestBody = "null"
}
} }
if ($SkipCertificateCheck -eq $true) { if ($SkipCertificateCheck -eq $true) {