Skip to content
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

Jump to bottom

[PS] consolidate header selection functions #5889

Merged
merged 2 commits into from
Apr 10, 2020
Merged

[PS] consolidate header selection functions #5889

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f668253
consolidate header selection functions
wing328 Apr 10, 2020
bead81b
Merge remote-tracking branch 'origin/master' into ps_select_header
wing328 Apr 10, 2020
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
43 changes: 12 additions & 31 deletions modules/openapi-generator/src/main/resources/powershell-experimental/api_client.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,12 @@ function Invoke-{{{apiNamePrefix}}}ApiClient {
}

# accept, content-type headers
$Accept = SelectAcceptHeaders -Accepts $Accepts
$Accept = SelectHeaders -Headers $Accepts
if ($Accept) {
$HeaderParameters['Accept'] = $Accept
}

$ContentType= SelectContentTypeHeaders -ContentTypes $ContentTypes
$ContentType= SelectHeaders -Headers $ContentTypes
if ($ContentType) {
$HeaderParameters['Content-Type'] = $ContentType
}
Expand Down Expand Up @@ -114,43 +114,24 @@ function Invoke-{{{apiNamePrefix}}}ApiClient {
}
}

function SelectAcceptHeaders {
# Select JSON MIME if present, otherwise choose the first one if available
function SelectHeaders {
Param(
[Parameter(Mandatory)]
[AllowEmptyCollection()]
[String[]]$Accepts
[String[]]$Headers
)

foreach ($Accept in $Accepts) {
if (IsJsonMIME -MIME $Accept) {
return $Accept
foreach ($Header in $Headers) {
if (IsJsonMIME -MIME $Header) {
return $Header
}
}

if (!($Accepts) -or $Accepts.Count -eq 0) {
if (!($Headers) -or $Headers.Count -eq 0) {
return $null
} else {
return $Accepts[0] # return the first one
}
}

function SelectContentTypeHeaders {
Param(
[Parameter(Mandatory)]
[AllowEmptyCollection()]
[String[]]$ContentTypes
)

foreach ($ContentType in $ContentTypes) {
if (IsJsonMIME -MIME $ContentType) {
return $ContentType
}
}

if (!($ContentTypes) -or $ContentTypes.Count -eq 0) {
return $null
} else {
return $ContentTypes[0] # return the first one
return $Headers[0] # return the first one
}
}

Expand Down Expand Up @@ -190,12 +171,12 @@ function DeserializeResponse {
if ($ContentTypes) {
$ContentType = $null
if ($ContentTypes.Count -gt 1) {
$ContentType = SelectContentTypeHeaders -ContentTypes $ContentTypes
$ContentType = SelectHeaders -Headers $ContentTypes
} else {
$ContentType = $ContentTypes[0]
}

if (IsJsonMIME -MIME $ContentType) { # JSON
if (IsJsonMIME -MIME $ContentType) { # JSON
return ConvertFrom-Json $Response
} else { # XML, file, etc
return $Response
Expand Down
43 changes: 12 additions & 31 deletions samples/client/petstore/powershell-experimental/src/PSPetstore/Private/PSApiClient.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,12 @@ function Invoke-PSApiClient {
}

# accept, content-type headers
$Accept = SelectAcceptHeaders -Accepts $Accepts
$Accept = SelectHeaders -Headers $Accepts
if ($Accept) {
$HeaderParameters['Accept'] = $Accept
}

$ContentType= SelectContentTypeHeaders -ContentTypes $ContentTypes
$ContentType= SelectHeaders -Headers $ContentTypes
if ($ContentType) {
$HeaderParameters['Content-Type'] = $ContentType
}
Expand Down Expand Up @@ -120,43 +120,24 @@ function Invoke-PSApiClient {
}
}

function SelectAcceptHeaders {
# Select JSON MIME if present, otherwise choose the first one if available
function SelectHeaders {
Param(
[Parameter(Mandatory)]
[AllowEmptyCollection()]
[String[]]$Accepts
[String[]]$Headers
)

foreach ($Accept in $Accepts) {
if (IsJsonMIME -MIME $Accept) {
return $Accept
foreach ($Header in $Headers) {
if (IsJsonMIME -MIME $Header) {
return $Header
}
}

if (!($Accepts) -or $Accepts.Count -eq 0) {
if (!($Headers) -or $Headers.Count -eq 0) {
return $null
} else {
return $Accepts[0] # return the first one
}
}

function SelectContentTypeHeaders {
Param(
[Parameter(Mandatory)]
[AllowEmptyCollection()]
[String[]]$ContentTypes
)

foreach ($ContentType in $ContentTypes) {
if (IsJsonMIME -MIME $ContentType) {
return $ContentType
}
}

if (!($ContentTypes) -or $ContentTypes.Count -eq 0) {
return $null
} else {
return $ContentTypes[0] # return the first one
return $Headers[0] # return the first one
}
}

Expand Down Expand Up @@ -196,12 +177,12 @@ function DeserializeResponse {
if ($ContentTypes) {
$ContentType = $null
if ($ContentTypes.Count -gt 1) {
$ContentType = SelectContentTypeHeaders -ContentTypes $ContentTypes
$ContentType = SelectHeaders -Headers $ContentTypes
} else {
$ContentType = $ContentTypes[0]
}

if (IsJsonMIME -MIME $ContentType) { # JSON
if (IsJsonMIME -MIME $ContentType) { # JSON
return ConvertFrom-Json $Response
} else { # XML, file, etc
return $Response
Expand Down