Skip to content

[PS][Experimental] use allVars to cover all properties #5835

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
Apr 6, 2020
Merged

[PS][Experimental] use allVars to cover all properties #5835

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
use allVars to cover all properties
  • Loading branch information
@wing328
wing328 committed Apr 5, 2020
commit 4e953d74d4525b09dc4fbaac85949cf9965e2a62
4 changes: 2 additions & 2 deletions ...src/main/java/org/openapitools/codegen/languages/PowerShellExperimentalClientCodegen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -818,7 +818,7 @@ public Map<String, Object> postProcessModels(Map<String, Object> objs) {
Map<String, Object> mo = (Map<String, Object>) _mo;
CodegenModel cm = (CodegenModel) mo.get("model");

for (CodegenProperty cp : cm.vars) {
for (CodegenProperty cp : cm.allVars) {
cp.vendorExtensions.put("x-powershell-data-type", getPSDataType(cp));
}
}
Expand Down Expand Up @@ -952,7 +952,7 @@ private String constructExampleCode(CodegenModel codegenModel, HashMap<String, C

example = "(Initialize-" + codegenModel.name;
List<String> propertyExamples = new ArrayList<>();
for (CodegenProperty codegenProperty : codegenModel.vars) {
for (CodegenProperty codegenProperty : codegenModel.allVars) {
propertyExamples.add("-" + codegenProperty.name + " " + constructExampleCode(codegenProperty, modelMaps, processedModelMap));
}
example += StringUtils.join(propertyExamples, " ");
Expand Down
12 changes: 6 additions & 6 deletions modules/openapi-generator/src/main/resources/powershell-experimental/model.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@

{{#description}}{{{description}}}{{/description}}{{^description}}No description available.{{/description}}

{{#vars}}
{{#allVars}}
.PARAMETER {{{name}}}
{{#description}}{{{description}}}{{/description}}{{^description}}No description available.{{/description}}

{{/vars}}
{{/allVars}}
.OUTPUTS

{{{classname}}}<PSCustomObject>
Expand All @@ -23,13 +23,13 @@
function Initialize-{{{apiNamePrefix}}}{{{classname}}} {
[CmdletBinding()]
Param (
{{#vars}}
{{#allVars}}
[Parameter(Position = {{vendorExtensions.x-index}}, ValueFromPipelineByPropertyName = $true{{#required}}, Mandatory = $true{{/required}})]
[{{vendorExtensions.x-powershell-data-type}}]
{{=<% %>=}}
${<%name%>}<%^-last%>,<%/-last%>
<%={{ }}=%>
{{/vars}}
{{/allVars}}
)

Process {
Expand All @@ -38,9 +38,9 @@ function Initialize-{{{apiNamePrefix}}}{{{classname}}} {

$PSO = [PSCustomObject]@{
{{=<< >>=}}
<<#vars>>
<<#allVars>>
"<<baseName>>" = ${<<name>>}
<</vars>>
<</allVars>>
<<={{ }}=>>
}

Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/powershell-experimental/src/PSPetstore/Client/PSConfiguration.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ Get the host setting in the form of array of hashtables.
System.Collections.Hashtable[]
#>
function Get-PSHostSetting {
return @(
return ,@(
@{
"Url" = "http://{server}.swagger.io:{port}/v2";
"Description" = "petstore server";
Expand Down