[Kotlin SpringBoot Server] alternative: fix optional parameter not correctly declared in service (#2539)

* fix kotlin optional parameters

* ensure kotlin samples up to date

bin/utils/ensure-up-to-date

@@ -24,6 +24,7 @@ declare -a scripts=(
 "./bin/kotlin-client-string.sh"
 "./bin/kotlin-client-threetenbp.sh"
 "./bin/kotlin-server-petstore.sh"
+"./bin/kotlin-springboot-petstore-server.sh"
 "./bin/mysql-schema-petstore.sh"
 "./bin/python-petstore-all.sh"
 "./bin/openapi3/python-petstore.sh"

bin/windows/kotlin-springboot-petstore-server.bat

@@ -1,10 +1,10 @@
-set executable=.\modules\openapi-generator-cli\target\openapi-generator-cli.jar
+set executable=.\modules\openapi-generator-cli\target\openapi-generator-cli.jar
-
+
-If Not Exist %executable% (
+If Not Exist %executable% (
-  mvn clean package
+  mvn clean package
-)
+)
-
+
-REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
+REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
-set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -g kotlin-spring -o samples\server\petstore\kotlin-springboot --additional-properties=library=spring-boot
+set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -g kotlin-spring -o samples\server\petstore\kotlin-springboot --additional-properties=library=spring-boot,beanValidations=true,swaggerAnnotations=true,serviceImplementation=true
-
+
-java %JAVA_OPTS% -jar %executable% %ags%
+java %JAVA_OPTS% -jar %executable% %ags%

modules/openapi-generator/src/main/resources/kotlin-spring/service.mustache

@@ -7,7 +7,7 @@ package {{package}}
 interface {{classname}}Service {
 {{#operation}}
 
-    fun {{operationId}}({{#allParams}}{{paramName}}: {{{dataType}}}{{#hasMore}},{{/hasMore}}{{/allParams}}): {{>returnTypes}}
+    fun {{operationId}}({{#allParams}}{{paramName}}: {{>optionalDataType}}{{#hasMore}}, {{/hasMore}}{{/allParams}}): {{>returnTypes}}
 {{/operation}}
 }
 {{/operations}}

modules/openapi-generator/src/main/resources/kotlin-spring/serviceImpl.mustache

@@ -8,7 +8,7 @@ import org.springframework.stereotype.Service
 class {{classname}}ServiceImpl : {{classname}}Service {
 {{#operation}}
 
-    override fun {{operationId}}({{#allParams}}{{paramName}}: {{{dataType}}}{{#hasMore}},{{/hasMore}}{{/allParams}}): {{>returnTypes}} {
+    override fun {{operationId}}({{#allParams}}{{paramName}}: {{>optionalDataType}}{{#hasMore}}, {{/hasMore}}{{/allParams}}): {{>returnTypes}} {
         TODO("Implement me")
     }
 {{/operation}}

samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/PetApiService.kt

@@ -7,7 +7,7 @@ interface PetApiService {
 
     fun addPet(body: Pet): Unit
 
-    fun deletePet(petId: Long,apiKey: String): Unit
+    fun deletePet(petId: Long, apiKey: String?): Unit
 
     fun findPetsByStatus(status: List<String>): List<Pet>
 
@@ -17,7 +17,7 @@ interface PetApiService {
 
     fun updatePet(body: Pet): Unit
 
-    fun updatePetWithForm(petId: Long,name: String,status: String): Unit
+    fun updatePetWithForm(petId: Long, name: String?, status: String?): Unit
 
-    fun uploadFile(petId: Long,additionalMetadata: String,file: org.springframework.core.io.Resource): ModelApiResponse
+    fun uploadFile(petId: Long, additionalMetadata: String?, file: org.springframework.core.io.Resource?): ModelApiResponse
 }

samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/PetApiServiceImpl.kt

@@ -10,7 +10,7 @@ class PetApiServiceImpl : PetApiService {
         TODO("Implement me")
     }
 
-    override fun deletePet(petId: Long,apiKey: String): Unit {
+    override fun deletePet(petId: Long, apiKey: String?): Unit {
         TODO("Implement me")
     }
 
@@ -30,11 +30,11 @@ class PetApiServiceImpl : PetApiService {
         TODO("Implement me")
     }
 
-    override fun updatePetWithForm(petId: Long,name: String,status: String): Unit {
+    override fun updatePetWithForm(petId: Long, name: String?, status: String?): Unit {
         TODO("Implement me")
     }
 
-    override fun uploadFile(petId: Long,additionalMetadata: String,file: org.springframework.core.io.Resource): ModelApiResponse {
+    override fun uploadFile(petId: Long, additionalMetadata: String?, file: org.springframework.core.io.Resource?): ModelApiResponse {
         TODO("Implement me")
     }
 }

samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/UserApiService.kt

@@ -14,9 +14,9 @@ interface UserApiService {
 
     fun getUserByName(username: String): User
 
-    fun loginUser(username: String,password: String): String
+    fun loginUser(username: String, password: String): String
 
     fun logoutUser(): Unit
 
-    fun updateUser(username: String,body: User): Unit
+    fun updateUser(username: String, body: User): Unit
 }

samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/UserApiServiceImpl.kt

@@ -25,7 +25,7 @@ class UserApiServiceImpl : UserApiService {
         TODO("Implement me")
     }
 
-    override fun loginUser(username: String,password: String): String {
+    override fun loginUser(username: String, password: String): String {
         TODO("Implement me")
     }
 
@@ -33,7 +33,7 @@ class UserApiServiceImpl : UserApiService {
         TODO("Implement me")
     }
 
-    override fun updateUser(username: String,body: User): Unit {
+    override fun updateUser(username: String, body: User): Unit {
         TODO("Implement me")
     }
 }