Skip to content

Add process utils class to add index to properties #1796

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 2 commits into from
Jan 3, 2019
Merged

Add process utils class to add index to properties #1796

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
df21702
add process utils to add index to properties
wing328 Jan 2, 2019
4379929
fix javadoc warning
wing328 Jan 2, 2019
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
11 changes: 11 additions & 0 deletions ...i-generator/src/main/java/org/openapitools/codegen/languages/PowerShellClientCodegen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import org.openapitools.codegen.DefaultCodegen;
import org.openapitools.codegen.SupportingFile;
import org.openapitools.codegen.utils.ModelUtils;
import org.openapitools.codegen.utils.ProcessUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down Expand Up @@ -425,6 +426,16 @@ public Map<String, Object> postProcessOperationsWithModels(Map<String, Object> o
index++;
}
}

return objs;
}

@Override
public Map<String, Object> postProcessModels(Map<String, Object> objs) {
List<Object> models = (List<Object>) objs.get("models");
// add x-index to properties
ProcessUtils.addIndexToProperties(models);
return objs;
}

}
37 changes: 37 additions & 0 deletions modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ProcessUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
package org.openapitools.codegen.utils;

import org.openapitools.codegen.CodegenModel;
import org.openapitools.codegen.CodegenProperty;

import java.util.List;
import java.util.Map;

public class ProcessUtils {

/**
* Add x-index extension to the model's properties
*
* @param models List of models
*/
public static void addIndexToProperties(List<Object> models) {
for (Object _mo : models) {
Map<String, Object> mo = (Map<String, Object>) _mo;
CodegenModel cm = (CodegenModel) mo.get("model");

int i = 0;
for (CodegenProperty var : cm.vars) {
var.vendorExtensions.put("x-index", i);
i++;
}

int j = 0;
for (CodegenProperty var : cm.allVars) {
var.vendorExtensions.put("x-index", j);
j++;
}

}

}

}
2 changes: 1 addition & 1 deletion modules/openapi-generator/src/main/resources/powershell/model.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ function New-{{{classname}}} {
[CmdletBinding()]
Param (
{{#vars}}
[Parameter(Position = 0, ValueFromPipelineByPropertyName = $true{{#required}}, Mandatory = $true{{/required}})]
[Parameter(Position = {{vendorExtensions.x-index}}, ValueFromPipelineByPropertyName = $true{{#required}}, Mandatory = $true{{/required}})]
[{{#isString}}{{{dataType}}}{{/isString}}{{^isString}}{{^required}}System.Nullable[{{/required}}{{dataType}}{{^required}}]{{/required}}{{/isString}}]
{{=<% %>=}}
${<%name%>}<%^-last%>,<%/-last%>
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/powershell/.openapi-generator/VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.0.0-SNAPSHOT
4.0.0-SNAPSHOT
8 changes: 4 additions & 4 deletions samples/client/petstore/powershell/src/Org.OpenAPITools/API/PetApi.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ function Invoke-PetApiAddPet {
Param (
[Parameter(Position = 0, ValueFromPipeline = $true, ValueFromPipelineByPropertyName = $true, Mandatory = $true)]
[Org.OpenAPITools.Model.Pet]
${pet}
${body}
)

Process {
'Calling method: PetApi-AddPet' | Write-Verbose
$PSBoundParameters | Out-DebugParameter | Write-Debug

$Script:PetApi.AddPet(
${pet}
${body}
)
}
}
Expand Down Expand Up @@ -97,15 +97,15 @@ function Invoke-PetApiUpdatePet {
Param (
[Parameter(Position = 0, ValueFromPipeline = $true, ValueFromPipelineByPropertyName = $true, Mandatory = $true)]
[Org.OpenAPITools.Model.Pet]
${pet}
${body}
)

Process {
'Calling method: PetApi-UpdatePet' | Write-Verbose
$PSBoundParameters | Out-DebugParameter | Write-Debug

$Script:PetApi.UpdatePet(
${pet}
${body}
)
}
}
Expand Down
4 changes: 2 additions & 2 deletions samples/client/petstore/powershell/src/Org.OpenAPITools/API/StoreApi.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,15 @@ function Invoke-StoreApiPlaceOrder {
Param (
[Parameter(Position = 0, ValueFromPipeline = $true, ValueFromPipelineByPropertyName = $true, Mandatory = $true)]
[Org.OpenAPITools.Model.Order]
${order}
${body}
)

Process {
'Calling method: StoreApi-PlaceOrder' | Write-Verbose
$PSBoundParameters | Out-DebugParameter | Write-Debug

$Script:StoreApi.PlaceOrder(
${order}
${body}
)
}
}
Expand Down
16 changes: 8 additions & 8 deletions samples/client/petstore/powershell/src/Org.OpenAPITools/API/UserApi.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ function Invoke-UserApiCreateUser {
Param (
[Parameter(Position = 0, ValueFromPipeline = $true, ValueFromPipelineByPropertyName = $true, Mandatory = $true)]
[Org.OpenAPITools.Model.User]
${user}
${body}
)

Process {
'Calling method: UserApi-CreateUser' | Write-Verbose
$PSBoundParameters | Out-DebugParameter | Write-Debug

$Script:UserApi.CreateUser(
${user}
${body}
)
}
}
Expand All @@ -21,15 +21,15 @@ function Invoke-UserApiCreateUsersWithArrayInput {
Param (
[Parameter(Position = 0, ValueFromPipeline = $true, ValueFromPipelineByPropertyName = $true, Mandatory = $true)]
[Org.OpenAPITools.Model.User[]]
${user}
${body}
)

Process {
'Calling method: UserApi-CreateUsersWithArrayInput' | Write-Verbose
$PSBoundParameters | Out-DebugParameter | Write-Debug

$Script:UserApi.CreateUsersWithArrayInput(
${user}
${body}
)
}
}
Expand All @@ -39,15 +39,15 @@ function Invoke-UserApiCreateUsersWithListInput {
Param (
[Parameter(Position = 0, ValueFromPipeline = $true, ValueFromPipelineByPropertyName = $true, Mandatory = $true)]
[Org.OpenAPITools.Model.User[]]
${user}
${body}
)

Process {
'Calling method: UserApi-CreateUsersWithListInput' | Write-Verbose
$PSBoundParameters | Out-DebugParameter | Write-Debug

$Script:UserApi.CreateUsersWithListInput(
${user}
${body}
)
}
}
Expand Down Expand Up @@ -132,7 +132,7 @@ function Invoke-UserApiUpdateUser {
${username},
[Parameter(Position = 1, ValueFromPipeline = $true, ValueFromPipelineByPropertyName = $true, Mandatory = $true)]
[Org.OpenAPITools.Model.User]
${user}
${body}
)

Process {
Expand All @@ -141,7 +141,7 @@ function Invoke-UserApiUpdateUser {

$Script:UserApi.UpdateUser(
${username},
${user}
${body}
)
}
}
Expand Down
4 changes: 2 additions & 2 deletions samples/client/petstore/powershell/src/Org.OpenAPITools/Model/New-ApiResponse.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ function New-ApiResponse {
[Parameter(Position = 0, ValueFromPipelineByPropertyName = $true)]
[System.Nullable[Int32]]
${code},
[Parameter(Position = 0, ValueFromPipelineByPropertyName = $true)]
[Parameter(Position = 1, ValueFromPipelineByPropertyName = $true)]
[String]
${type},
[Parameter(Position = 0, ValueFromPipelineByPropertyName = $true)]
[Parameter(Position = 2, ValueFromPipelineByPropertyName = $true)]
[String]
${message}
)
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/powershell/src/Org.OpenAPITools/Model/New-Category.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ function New-Category {
[Parameter(Position = 0, ValueFromPipelineByPropertyName = $true)]
[System.Nullable[Int64]]
${id},
[Parameter(Position = 0, ValueFromPipelineByPropertyName = $true)]
[Parameter(Position = 1, ValueFromPipelineByPropertyName = $true)]
[String]
${name}
)
Expand Down
10 changes: 5 additions & 5 deletions samples/client/petstore/powershell/src/Org.OpenAPITools/Model/New-Order.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@ function New-Order {
[Parameter(Position = 0, ValueFromPipelineByPropertyName = $true)]
[System.Nullable[Int64]]
${id},
[Parameter(Position = 0, ValueFromPipelineByPropertyName = $true)]
[Parameter(Position = 1, ValueFromPipelineByPropertyName = $true)]
[System.Nullable[Int64]]
${petId},
[Parameter(Position = 0, ValueFromPipelineByPropertyName = $true)]
[Parameter(Position = 2, ValueFromPipelineByPropertyName = $true)]
[System.Nullable[Int32]]
${quantity},
[Parameter(Position = 0, ValueFromPipelineByPropertyName = $true)]
[Parameter(Position = 3, ValueFromPipelineByPropertyName = $true)]
[System.Nullable[System.DateTime]]
${shipDate},
[Parameter(Position = 0, ValueFromPipelineByPropertyName = $true)]
[Parameter(Position = 4, ValueFromPipelineByPropertyName = $true)]
[String]
${status},
[Parameter(Position = 0, ValueFromPipelineByPropertyName = $true)]
[Parameter(Position = 5, ValueFromPipelineByPropertyName = $true)]
[System.Nullable[Boolean]]
${complete}
)
Expand Down
10 changes: 5 additions & 5 deletions samples/client/petstore/powershell/src/Org.OpenAPITools/Model/New-Pet.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@ function New-Pet {
[Parameter(Position = 0, ValueFromPipelineByPropertyName = $true)]
[System.Nullable[Int64]]
${id},
[Parameter(Position = 0, ValueFromPipelineByPropertyName = $true)]
[Parameter(Position = 1, ValueFromPipelineByPropertyName = $true)]
[System.Nullable[Org.OpenAPITools.Model.Category]]
${category},
[Parameter(Position = 0, ValueFromPipelineByPropertyName = $true, Mandatory = $true)]
[Parameter(Position = 2, ValueFromPipelineByPropertyName = $true, Mandatory = $true)]
[String]
${name},
[Parameter(Position = 0, ValueFromPipelineByPropertyName = $true, Mandatory = $true)]
[Parameter(Position = 3, ValueFromPipelineByPropertyName = $true, Mandatory = $true)]
[String[]]
${photoUrls},
[Parameter(Position = 0, ValueFromPipelineByPropertyName = $true)]
[Parameter(Position = 4, ValueFromPipelineByPropertyName = $true)]
[System.Nullable[Org.OpenAPITools.Model.Tag[]]]
${tags},
[Parameter(Position = 0, ValueFromPipelineByPropertyName = $true)]
[Parameter(Position = 5, ValueFromPipelineByPropertyName = $true)]
[String]
${status}
)
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/powershell/src/Org.OpenAPITools/Model/New-Tag.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ function New-Tag {
[Parameter(Position = 0, ValueFromPipelineByPropertyName = $true)]
[System.Nullable[Int64]]
${id},
[Parameter(Position = 0, ValueFromPipelineByPropertyName = $true)]
[Parameter(Position = 1, ValueFromPipelineByPropertyName = $true)]
[String]
${name}
)
Expand Down
14 changes: 7 additions & 7 deletions samples/client/petstore/powershell/src/Org.OpenAPITools/Model/New-User.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,25 @@ function New-User {
[Parameter(Position = 0, ValueFromPipelineByPropertyName = $true)]
[System.Nullable[Int64]]
${id},
[Parameter(Position = 0, ValueFromPipelineByPropertyName = $true)]
[Parameter(Position = 1, ValueFromPipelineByPropertyName = $true)]
[String]
${username},
[Parameter(Position = 0, ValueFromPipelineByPropertyName = $true)]
[Parameter(Position = 2, ValueFromPipelineByPropertyName = $true)]
[String]
${firstName},
[Parameter(Position = 0, ValueFromPipelineByPropertyName = $true)]
[Parameter(Position = 3, ValueFromPipelineByPropertyName = $true)]
[String]
${lastName},
[Parameter(Position = 0, ValueFromPipelineByPropertyName = $true)]
[Parameter(Position = 4, ValueFromPipelineByPropertyName = $true)]
[String]
${email},
[Parameter(Position = 0, ValueFromPipelineByPropertyName = $true)]
[Parameter(Position = 5, ValueFromPipelineByPropertyName = $true)]
[String]
${password},
[Parameter(Position = 0, ValueFromPipelineByPropertyName = $true)]
[Parameter(Position = 6, ValueFromPipelineByPropertyName = $true)]
[String]
${phone},
[Parameter(Position = 0, ValueFromPipelineByPropertyName = $true)]
[Parameter(Position = 7, ValueFromPipelineByPropertyName = $true)]
[System.Nullable[Int32]]
${userStatus}
)
Expand Down