From e24030be52148882cf76fb70d50080fe1e319ff8 Mon Sep 17 00:00:00 2001
From: Martin Weber <7472943+martinweu@users.noreply.github.com>
Date: Wed, 9 Oct 2019 18:23:19 +0200
Subject: [PATCH] fix nullable for arrays and complex types (#4106)

change csharp folder parameter from "SwaggerClient" to "OpenAPIClient"
---
 bin/windows/powershell-petsstore.bat                          | 2 +-
 .../src/main/resources/powershell/model.mustache              | 2 +-
 samples/client/petstore/powershell/.openapi-generator/VERSION | 2 +-
 .../powershell/src/Org.OpenAPITools/Model/New-Pet.ps1         | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bin/windows/powershell-petsstore.bat b/bin/windows/powershell-petsstore.bat
index b7b6f8f8930..ca7e08dcaa8 100644
--- a/bin/windows/powershell-petsstore.bat
+++ b/bin/windows/powershell-petsstore.bat
@@ -5,6 +5,6 @@ If Not Exist %executable% (
 )
 
 REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties
-set ags=generate  -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -g powershell -o samples\client\petstore\powershell --additional-properties packageGuid=a27b908d-2a20-467f-bc32-af6f3a654ac5,csharpClientPath=$ScriptDir\..\..\petstore\csharp\SwaggerClient
+set ags=generate  -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -g powershell -o samples\client\petstore\powershell --additional-properties packageGuid=a27b908d-2a20-467f-bc32-af6f3a654ac5,csharpClientPath=$ScriptDir\..\..\petstore\csharp\OpenAPIClient
 
 java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/modules/openapi-generator/src/main/resources/powershell/model.mustache b/modules/openapi-generator/src/main/resources/powershell/model.mustache
index 8c2452cd027..c03f5daca65 100644
--- a/modules/openapi-generator/src/main/resources/powershell/model.mustache
+++ b/modules/openapi-generator/src/main/resources/powershell/model.mustache
@@ -5,7 +5,7 @@ function New-{{{classname}}} {
     Param (
 {{#vars}}
         [Parameter(Position = {{vendorExtensions.x-index}}, ValueFromPipelineByPropertyName = $true{{#required}}, Mandatory = $true{{/required}})]
-        [{{#isString}}{{{dataType}}}{{/isString}}{{^isString}}{{^required}}System.Nullable[{{/required}}{{dataType}}{{^required}}]{{/required}}{{/isString}}]
+        [{{#isString}}{{{dataType}}}{{/isString}}{{^isString}}{{#isListContainer}}{{{dataType}}}{{/isListContainer}}{{^isListContainer}}{{#isPrimitiveType}}{{^required}}System.Nullable[{{/required}}{{dataType}}{{^required}}]{{/required}}{{/isPrimitiveType}}{{^isPrimitiveType}}{{dataType}}{{/isPrimitiveType}}{{/isListContainer}}{{/isString}}]
         {{=<% %>=}}
         ${<%name%>}<%^-last%>,<%/-last%>
         <%={{ }}=%>
diff --git a/samples/client/petstore/powershell/.openapi-generator/VERSION b/samples/client/petstore/powershell/.openapi-generator/VERSION
index afa63656064..c3a2c7076fa 100644
--- a/samples/client/petstore/powershell/.openapi-generator/VERSION
+++ b/samples/client/petstore/powershell/.openapi-generator/VERSION
@@ -1 +1 @@
-4.0.0-SNAPSHOT
\ No newline at end of file
+4.2.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/powershell/src/Org.OpenAPITools/Model/New-Pet.ps1 b/samples/client/petstore/powershell/src/Org.OpenAPITools/Model/New-Pet.ps1
index 733267b0ac6..27f0f8a42d9 100644
--- a/samples/client/petstore/powershell/src/Org.OpenAPITools/Model/New-Pet.ps1
+++ b/samples/client/petstore/powershell/src/Org.OpenAPITools/Model/New-Pet.ps1
@@ -5,7 +5,7 @@ function New-Pet {
         [System.Nullable[Int64]]
         ${id},
         [Parameter(Position = 1, ValueFromPipelineByPropertyName = $true)]
-        [System.Nullable[Org.OpenAPITools.Model.Category]]
+        [Org.OpenAPITools.Model.Category]
         ${category},
         [Parameter(Position = 2, ValueFromPipelineByPropertyName = $true, Mandatory = $true)]
         [String]
@@ -14,7 +14,7 @@ function New-Pet {
         [String[]]
         ${photoUrls},
         [Parameter(Position = 4, ValueFromPipelineByPropertyName = $true)]
-        [System.Nullable[Org.OpenAPITools.Model.Tag[]]]
+        [Org.OpenAPITools.Model.Tag[]]
         ${tags},
         [Parameter(Position = 5, ValueFromPipelineByPropertyName = $true)]
         [String]