fixing file etc.

Author: andrewwilsonnew

modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache

@@ -48,7 +48,7 @@ import okhttp3.Headers
         @RequestContentType({{#consumes}}{{{mediaType}}}{{^-last}}, {{/-last}}{{/consumes}}){{/hasConsumes}}{{#hasProduces}}
         @ResponseContentType({{#produces}}{{{mediaType}}}{{^-last}}, {{/-last}}{{/produces}}){{/hasProduces}}
         @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0)
-        fun {{operationId}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>cookieParams}}{{>bodyParams}}{{>formParams}}{{^-last}},{{/-last}}{{/allParams}}){{#returnType}}: {{{returnType}}}{{/returnType}} {
+        fun {{operationId}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>cookieParams}}{{>bodyParams}}{{>formParams}}{{^-last}}, {{/-last}}{{/allParams}}){{#returnType}}: {{{returnType}}}{{/returnType}} {
             TODO()
         }
     {{/operation}}

modules/openapi-generator/src/main/resources/kotlin-misk/formParams.mustache

@@ -1 +1 @@
-{{#isFormParam}}{{^isFile}}{{#useBeanValidation}}@Valid{{/useBeanValidation}}@QueryParam("{{baseName}}") {{{paramName}}}: {{>optionalDataType}}{{/isFile}}{{/isFormParam}}
+{{#isFormParam}}{{^isFile}}{{#isModel}}@RequestPart{{/isModel}}{{^isModel}}@QueryParam{{/isModel}}(value = "{{baseName}}") {{{paramName}}}: {{>optionalDataType}} {{/isFile}}{{#isFile}}{{#useBeanValidation}}@Valid{{/useBeanValidation}} {{{paramName}}}: {{>optionalDataType}}HttpCall{{/isFile}}{{/isFormParam}}

modules/openapi-generator/src/main/resources/kotlin-misk/optionalDataType.mustache

@@ -1 +1 @@
-{{^isFile}}{{{dataType}}}{{^required}}{{^defaultValue}}?{{/defaultValue}}{{/required}}{{/isFile}}{{#isFile}}{{#isArray}}Array<{{/isArray}}Headers{{#isArray}}>{{/isArray}}{{^isArray}}{{^required}}{{/required}}{{/isArray}}{{/isFile}}
+{{^isFile}}{{{dataType}}}{{^required}}{{^defaultValue}}?{{/defaultValue}}{{/required}}{{/isFile}}{{#isFile}}{{#isArray}}Array<{{/isArray}}{{#isArray}}>{{/isArray}}{{^isArray}}{{^required}}{{/required}}{{/isArray}}{{/isFile}}

samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiController.kt

@@ -51,7 +51,7 @@ import okhttp3.Headers
         @Delete("/pet/{petId}")
         @Description("Deletes a pet")
         @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0)
-        fun deletePet(@PathParam("petId") petId: kotlin.Long,apiKey: Headers) {
+        fun deletePet(@PathParam("petId") petId: kotlin.Long, apiKey: Headers) {
             TODO()
         }
 
@@ -92,7 +92,7 @@ import okhttp3.Headers
         @Description("Updates a pet in the store with form data")
         @RequestContentType(MediaTypes.APPLICATION_FORM_URLENCODED)
         @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0)
-        fun updatePetWithForm(@PathParam("petId") petId: kotlin.Long,@Valid@QueryParam("name") name: kotlin.String?,@Valid@QueryParam("status") status: kotlin.String?) {
+        fun updatePetWithForm(@PathParam("petId") petId: kotlin.Long, @QueryParam(value = "name") name: kotlin.String? , @QueryParam(value = "status") status: kotlin.String? ) {
             TODO()
         }
 
@@ -101,7 +101,7 @@ import okhttp3.Headers
         @RequestContentType(MediaTypes.APPLICATION_OCTETSTREAM /* unknown -> multipart/form-data */ )
         @ResponseContentType(MediaTypes.APPLICATION_JSON)
         @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0)
-        fun uploadFile(@PathParam("petId") petId: kotlin.Long,@Valid@QueryParam("additionalMetadata") additionalMetadata: kotlin.String?,): ModelApiResponse {
+        fun uploadFile(@PathParam("petId") petId: kotlin.Long, @QueryParam(value = "additionalMetadata") additionalMetadata: kotlin.String? , @Valid file: HttpCall): ModelApiResponse {
             TODO()
         }
     }

samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiController.kt

@@ -81,7 +81,7 @@ import okhttp3.Headers
         @Description("Logs user into the system")
         @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON)
         @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0)
-        fun loginUser( @QueryParam(value = "username") username: kotlin.String, @QueryParam(value = "password") password: kotlin.String): kotlin.String {
+        fun loginUser( @QueryParam(value = "username") username: kotlin.String,  @QueryParam(value = "password") password: kotlin.String): kotlin.String {
             TODO()
         }
 
@@ -96,7 +96,7 @@ import okhttp3.Headers
         @Description("Updated user")
         @RequestContentType(MediaTypes.APPLICATION_JSON)
         @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0)
-        fun updateUser(@PathParam("username") username: kotlin.String,@Valid @RequestBody user: User) {
+        fun updateUser(@PathParam("username") username: kotlin.String, @Valid @RequestBody user: User) {
             TODO()
         }
     }