From 36930fe5ccf5bbfe0fa7a97c720d387921469b12 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Thu, 25 Jun 2020 18:09:44 +0800 Subject: [PATCH] [PS] better code format, vendor extension naming (#6778) * better code format, extension * show php version * set php version to 7.2.15 --- .travis.yml | 3 ++- .../codegen/languages/PowerShellClientCodegen.java | 2 +- .../src/main/resources/powershell/model_simple.mustache | 8 ++++---- .../powershell/src/PSPetstore/Model/ApiResponse.ps1 | 6 +++--- .../petstore/powershell/src/PSPetstore/Model/Category.ps1 | 6 +++--- .../powershell/src/PSPetstore/Model/InlineObject.ps1 | 6 +++--- .../powershell/src/PSPetstore/Model/InlineObject1.ps1 | 6 +++--- .../petstore/powershell/src/PSPetstore/Model/Order.ps1 | 6 +++--- .../petstore/powershell/src/PSPetstore/Model/Pet.ps1 | 6 +++--- .../petstore/powershell/src/PSPetstore/Model/Tag.ps1 | 6 +++--- .../petstore/powershell/src/PSPetstore/Model/User.ps1 | 6 +++--- 11 files changed, 31 insertions(+), 30 deletions(-) diff --git a/.travis.yml b/.travis.yml index a1afdc1e33f..cf3357aa1fc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -89,7 +89,8 @@ before_install: #- sudo apt-get update #- sudo apt-get install dart # switch to php7 - - phpenv global 7.3 + - phpenv versions + - phpenv global 7.2.15 - php -v # install perl module #- cpanm --local-lib=~/perl5 local::lib && eval $(perl -I ~/perl5/lib/perl5/ -Mlocal::lib) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PowerShellClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PowerShellClientCodegen.java index 7adc76f36ed..2b3e4922838 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PowerShellClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PowerShellClientCodegen.java @@ -932,7 +932,7 @@ public class PowerShellClientCodegen extends DefaultCodegen implements CodegenCo // Mark the last readonly false property if(this.discardReadOnly && lastWritableProperty != null) { - lastWritableProperty.vendorExtensions.put("x-lastWritable", true); + lastWritableProperty.vendorExtensions.put("x-powershell-last-writable", true); model.allVars.set(model.allVars.indexOf(lastWritableProperty), lastWritableProperty); } diff --git a/modules/openapi-generator/src/main/resources/powershell/model_simple.mustache b/modules/openapi-generator/src/main/resources/powershell/model_simple.mustache index d3c3467c766..95310597e61 100644 --- a/modules/openapi-generator/src/main/resources/powershell/model_simple.mustache +++ b/modules/openapi-generator/src/main/resources/powershell/model_simple.mustache @@ -41,7 +41,7 @@ function Initialize-{{{apiNamePrefix}}}{{{classname}}} { {{/isEnum}} [{{vendorExtensions.x-powershell-data-type}}] {{=<% %>=}} - ${<%name%>}<%^vendorExtensions.x-lastWritable%>,<%/vendorExtensions.x-lastWritable%> + ${<%name%>}<%^vendorExtensions.x-powershell-last-writable%>,<%/vendorExtensions.x-powershell-last-writable%> <%={{ }}=%> {{/isReadOnly}} {{/allVars}} @@ -118,15 +118,15 @@ function Initialize-{{{apiNamePrefix}}}{{{classname}}} { {{/minItems}} {{/hasValidation}} {{/vars}} - - $PSO = [PSCustomObject]@{ + + $PSO = [PSCustomObject]@{ {{=<< >>=}} <<#allVars>> "<>" = ${<>} <> <<={{ }}=>> } - + {{/discardReadOnly}} {{#discardReadOnly}} {{#vars}} diff --git a/samples/client/petstore/powershell/src/PSPetstore/Model/ApiResponse.ps1 b/samples/client/petstore/powershell/src/PSPetstore/Model/ApiResponse.ps1 index 92fe8175d23..44be11154a3 100644 --- a/samples/client/petstore/powershell/src/PSPetstore/Model/ApiResponse.ps1 +++ b/samples/client/petstore/powershell/src/PSPetstore/Model/ApiResponse.ps1 @@ -43,13 +43,13 @@ function Initialize-PSApiResponse { 'Creating PSCustomObject: PSPetstore => PSApiResponse' | Write-Debug $PSBoundParameters | Out-DebugParameter | Write-Debug - - $PSO = [PSCustomObject]@{ + + $PSO = [PSCustomObject]@{ "code" = ${Code} "type" = ${Type} "message" = ${Message} } - + return $PSO } diff --git a/samples/client/petstore/powershell/src/PSPetstore/Model/Category.ps1 b/samples/client/petstore/powershell/src/PSPetstore/Model/Category.ps1 index 7c67f87d13d..cb05b8778cc 100644 --- a/samples/client/petstore/powershell/src/PSPetstore/Model/Category.ps1 +++ b/samples/client/petstore/powershell/src/PSPetstore/Model/Category.ps1 @@ -39,12 +39,12 @@ function Initialize-PSCategory { 'Creating PSCustomObject: PSPetstore => PSCategory' | Write-Debug $PSBoundParameters | Out-DebugParameter | Write-Debug - - $PSO = [PSCustomObject]@{ + + $PSO = [PSCustomObject]@{ "id" = ${Id} "name" = ${Name} } - + return $PSO } diff --git a/samples/client/petstore/powershell/src/PSPetstore/Model/InlineObject.ps1 b/samples/client/petstore/powershell/src/PSPetstore/Model/InlineObject.ps1 index 24d12c8d34f..fab7cf7e6a3 100644 --- a/samples/client/petstore/powershell/src/PSPetstore/Model/InlineObject.ps1 +++ b/samples/client/petstore/powershell/src/PSPetstore/Model/InlineObject.ps1 @@ -38,12 +38,12 @@ function Initialize-PSInlineObject { 'Creating PSCustomObject: PSPetstore => PSInlineObject' | Write-Debug $PSBoundParameters | Out-DebugParameter | Write-Debug - - $PSO = [PSCustomObject]@{ + + $PSO = [PSCustomObject]@{ "name" = ${Name} "status" = ${Status} } - + return $PSO } diff --git a/samples/client/petstore/powershell/src/PSPetstore/Model/InlineObject1.ps1 b/samples/client/petstore/powershell/src/PSPetstore/Model/InlineObject1.ps1 index 189cbbd4618..0b49ac3942c 100644 --- a/samples/client/petstore/powershell/src/PSPetstore/Model/InlineObject1.ps1 +++ b/samples/client/petstore/powershell/src/PSPetstore/Model/InlineObject1.ps1 @@ -38,12 +38,12 @@ function Initialize-PSInlineObject1 { 'Creating PSCustomObject: PSPetstore => PSInlineObject1' | Write-Debug $PSBoundParameters | Out-DebugParameter | Write-Debug - - $PSO = [PSCustomObject]@{ + + $PSO = [PSCustomObject]@{ "additionalMetadata" = ${AdditionalMetadata} "file" = ${File} } - + return $PSO } diff --git a/samples/client/petstore/powershell/src/PSPetstore/Model/Order.ps1 b/samples/client/petstore/powershell/src/PSPetstore/Model/Order.ps1 index 5739f48e461..253b4759321 100644 --- a/samples/client/petstore/powershell/src/PSPetstore/Model/Order.ps1 +++ b/samples/client/petstore/powershell/src/PSPetstore/Model/Order.ps1 @@ -59,8 +59,8 @@ function Initialize-PSOrder { 'Creating PSCustomObject: PSPetstore => PSOrder' | Write-Debug $PSBoundParameters | Out-DebugParameter | Write-Debug - - $PSO = [PSCustomObject]@{ + + $PSO = [PSCustomObject]@{ "id" = ${Id} "petId" = ${PetId} "quantity" = ${Quantity} @@ -68,7 +68,7 @@ function Initialize-PSOrder { "status" = ${Status} "complete" = ${Complete} } - + return $PSO } diff --git a/samples/client/petstore/powershell/src/PSPetstore/Model/Pet.ps1 b/samples/client/petstore/powershell/src/PSPetstore/Model/Pet.ps1 index e8eca455f6d..7e93b07545d 100644 --- a/samples/client/petstore/powershell/src/PSPetstore/Model/Pet.ps1 +++ b/samples/client/petstore/powershell/src/PSPetstore/Model/Pet.ps1 @@ -67,8 +67,8 @@ function Initialize-PSPet { throw "invalid value for 'PhotoUrls', 'PhotoUrls' cannot be null." } - - $PSO = [PSCustomObject]@{ + + $PSO = [PSCustomObject]@{ "id" = ${Id} "category" = ${Category} "name" = ${Name} @@ -76,7 +76,7 @@ function Initialize-PSPet { "tags" = ${Tags} "status" = ${Status} } - + return $PSO } diff --git a/samples/client/petstore/powershell/src/PSPetstore/Model/Tag.ps1 b/samples/client/petstore/powershell/src/PSPetstore/Model/Tag.ps1 index e906877f406..5a2d92bdb7c 100644 --- a/samples/client/petstore/powershell/src/PSPetstore/Model/Tag.ps1 +++ b/samples/client/petstore/powershell/src/PSPetstore/Model/Tag.ps1 @@ -38,12 +38,12 @@ function Initialize-PSTag { 'Creating PSCustomObject: PSPetstore => PSTag' | Write-Debug $PSBoundParameters | Out-DebugParameter | Write-Debug - - $PSO = [PSCustomObject]@{ + + $PSO = [PSCustomObject]@{ "id" = ${Id} "name" = ${Name} } - + return $PSO } diff --git a/samples/client/petstore/powershell/src/PSPetstore/Model/User.ps1 b/samples/client/petstore/powershell/src/PSPetstore/Model/User.ps1 index 591f212b20e..a021b75ec4c 100644 --- a/samples/client/petstore/powershell/src/PSPetstore/Model/User.ps1 +++ b/samples/client/petstore/powershell/src/PSPetstore/Model/User.ps1 @@ -69,8 +69,8 @@ function Initialize-PSUser { 'Creating PSCustomObject: PSPetstore => PSUser' | Write-Debug $PSBoundParameters | Out-DebugParameter | Write-Debug - - $PSO = [PSCustomObject]@{ + + $PSO = [PSCustomObject]@{ "id" = ${Id} "username" = ${Username} "firstName" = ${FirstName} @@ -80,7 +80,7 @@ function Initialize-PSUser { "phone" = ${Phone} "userStatus" = ${UserStatus} } - + return $PSO }