fixing RequestHeader

andrewwilsonnew · andrewwilsonnew · commit 30fab8aa8ad2 · 2025-03-24T09:52:20.000Z
diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache
@@ -24,12 +24,11 @@ import misk.web.Put
 import misk.web.QueryParam
 import misk.web.RequestBody
 import misk.web.RequestContentType
-import misk.web.RequestHeaders
+import misk.web.RequestHeader
 import misk.web.ResponseContentType
 import misk.web.actions.WebAction
 import misk.web.interceptors.LogRequestResponse
 import misk.web.mediatype.MediaTypes
-import okhttp3.Headers
 {{#imports}}import {{import}}
 {{/imports}}
 
diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache
@@ -17,8 +17,7 @@ import misk.web.HttpCall
 import misk.web.PathParam
 import misk.web.QueryParam
 import misk.web.RequestBody
-import misk.web.RequestHeaders
-import okhttp3.Headers
+import misk.web.RequestHeader
 {{#imports}}import {{import}}
 {{/imports}}
 
diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache
@@ -15,8 +15,7 @@ import misk.web.HttpCall
 import misk.web.PathParam
 import misk.web.QueryParam
 import misk.web.RequestBody
-import misk.web.RequestHeaders
-import okhttp3.Headers
+import misk.web.RequestHeader
 {{#imports}}import {{import}}
 {{/imports}}
 
diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/api_test.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/api_test.mustache
@@ -8,11 +8,10 @@ import misk.web.HttpCall
 import misk.web.PathParam
 import misk.web.QueryParam
 import misk.web.RequestBody
-import misk.web.RequestHeaders
+import misk.web.RequestHeader
 
 {{#imports}}import {{import}}
 {{/imports}}
-import okhttp3.Headers
 
 @MiskTest(startService = true)
 internal class {{classname}}Test {
diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/headerParams.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/headerParams.mustache
@@ -1 +1 @@
-{{#isHeaderParam}}{{#useBeanValidation}}{{>beanValidationCore}}{{/useBeanValidation}}{{{paramName}}}: Headers{{/isHeaderParam}}
+{{#isHeaderParam}}{{#useBeanValidation}}{{>beanValidationCore}}{{/useBeanValidation}}@RequestHeader(value = "{{baseName}}") {{{paramName}}}: {{>optionalDataType}}{{/isHeaderParam}}
diff --git a/samples/server/petstore/kotlin-misk/.openapi-generator/FILES b/samples/server/petstore/kotlin-misk/.openapi-generator/FILES
@@ -26,6 +26,3 @@ src/main/kotlin/org/openapitools/server/api/model/Order.kt
 src/main/kotlin/org/openapitools/server/api/model/Pet.kt
 src/main/kotlin/org/openapitools/server/api/model/Tag.kt
 src/main/kotlin/org/openapitools/server/api/model/User.kt
-src/test/kotlin/org/openapitools/server/api/api/PetApiTest.kt
-src/test/kotlin/org/openapitools/server/api/api/StoreApiTest.kt
-src/test/kotlin/org/openapitools/server/api/api/UserApiTest.kt
diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApi.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApi.kt
@@ -13,16 +13,15 @@ import misk.web.HttpCall
 import misk.web.PathParam
 import misk.web.QueryParam
 import misk.web.RequestBody
-import misk.web.RequestHeaders
-import okhttp3.Headers
+import misk.web.RequestHeader
 import org.openapitools.server.api.model.ModelApiResponse
 import org.openapitools.server.api.model.Pet
 
 interface PetApi {
 
     fun addPet(@Valid @RequestBody pet: Pet): Pet
 
-    fun deletePet(@PathParam("petId") petId: kotlin.Long, apiKey: Headers)
+    fun deletePet(@PathParam("petId") petId: kotlin.Long, @RequestHeader(value = "api_key") apiKey: kotlin.String?)
 
     fun findPetsByStatus( @QueryParam(value = "status") status: kotlin.Array<kotlin.String>): kotlin.Array<Pet>
 
diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiController.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiController.kt
@@ -22,12 +22,11 @@ import misk.web.Put
 import misk.web.QueryParam
 import misk.web.RequestBody
 import misk.web.RequestContentType
-import misk.web.RequestHeaders
+import misk.web.RequestHeader
 import misk.web.ResponseContentType
 import misk.web.actions.WebAction
 import misk.web.interceptors.LogRequestResponse
 import misk.web.mediatype.MediaTypes
-import okhttp3.Headers
 import org.openapitools.server.api.model.ModelApiResponse
 import org.openapitools.server.api.model.Pet
 
@@ -51,7 +50,7 @@ class PetApiController @Inject constructor(
     @Delete("/pet/{petId}")
     @Description("Deletes a pet")
     @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0)
-    override fun deletePet(@PathParam("petId") petId: kotlin.Long, apiKey: Headers) {
+    override fun deletePet(@PathParam("petId") petId: kotlin.Long, @RequestHeader(value = "api_key") apiKey: kotlin.String?) {
         TODO()
     }
 
diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiImpl.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiImpl.kt
@@ -15,8 +15,7 @@ import misk.web.HttpCall
 import misk.web.PathParam
 import misk.web.QueryParam
 import misk.web.RequestBody
-import misk.web.RequestHeaders
-import okhttp3.Headers
+import misk.web.RequestHeader
 import org.openapitools.server.api.model.ModelApiResponse
 import org.openapitools.server.api.model.Pet
 
@@ -31,7 +30,7 @@ class PetApiImpl @Inject constructor(
         TODO()
     }
 
-    override fun deletePet(@PathParam("petId") petId: kotlin.Long, apiKey: Headers) {
+    override fun deletePet(@PathParam("petId") petId: kotlin.Long, @RequestHeader(value = "api_key") apiKey: kotlin.String?) {
         TODO()
     }
 
diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApi.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApi.kt
@@ -13,8 +13,7 @@ import misk.web.HttpCall
 import misk.web.PathParam
 import misk.web.QueryParam
 import misk.web.RequestBody
-import misk.web.RequestHeaders
-import okhttp3.Headers
+import misk.web.RequestHeader
 import org.openapitools.server.api.model.Order
 
 interface StoreApi {
diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiController.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiController.kt
@@ -22,12 +22,11 @@ import misk.web.Put
 import misk.web.QueryParam
 import misk.web.RequestBody
 import misk.web.RequestContentType
-import misk.web.RequestHeaders
+import misk.web.RequestHeader
 import misk.web.ResponseContentType
 import misk.web.actions.WebAction
 import misk.web.interceptors.LogRequestResponse
 import misk.web.mediatype.MediaTypes
-import okhttp3.Headers
 import org.openapitools.server.api.model.Order
 
 /**
diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiImpl.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiImpl.kt
@@ -15,8 +15,7 @@ import misk.web.HttpCall
 import misk.web.PathParam
 import misk.web.QueryParam
 import misk.web.RequestBody
-import misk.web.RequestHeaders
-import okhttp3.Headers
+import misk.web.RequestHeader
 import org.openapitools.server.api.model.Order
 
 /**
diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApi.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApi.kt
@@ -13,8 +13,7 @@ import misk.web.HttpCall
 import misk.web.PathParam
 import misk.web.QueryParam
 import misk.web.RequestBody
-import misk.web.RequestHeaders
-import okhttp3.Headers
+import misk.web.RequestHeader
 import org.openapitools.server.api.model.User
 
 interface UserApi {
diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiController.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiController.kt
@@ -22,12 +22,11 @@ import misk.web.Put
 import misk.web.QueryParam
 import misk.web.RequestBody
 import misk.web.RequestContentType
-import misk.web.RequestHeaders
+import misk.web.RequestHeader
 import misk.web.ResponseContentType
 import misk.web.actions.WebAction
 import misk.web.interceptors.LogRequestResponse
 import misk.web.mediatype.MediaTypes
-import okhttp3.Headers
 import org.openapitools.server.api.model.User
 
 /**
diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiImpl.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiImpl.kt
@@ -15,8 +15,7 @@ import misk.web.HttpCall
 import misk.web.PathParam
 import misk.web.QueryParam
 import misk.web.RequestBody
-import misk.web.RequestHeaders
-import okhttp3.Headers
+import misk.web.RequestHeader
 import org.openapitools.server.api.model.User
 
 /**
diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/Category.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/Category.kt
@@ -2,6 +2,6 @@ package org.openapitools.server.api.model
 
 
 data class Category(
-    val id: kotlin.Long?,
-    val name: kotlin.String?
+    val id: kotlin.Long? = null,
+    val name: kotlin.String? = null
 )
diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/ModelApiResponse.kt
@@ -2,7 +2,7 @@ package org.openapitools.server.api.model
 
 
 data class ModelApiResponse(
-    val code: kotlin.Int?,
-    val type: kotlin.String?,
-    val message: kotlin.String?
+    val code: kotlin.Int? = null,
+    val type: kotlin.String? = null,
+    val message: kotlin.String? = null
 )
diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/Order.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/Order.kt
@@ -2,11 +2,11 @@ package org.openapitools.server.api.model
 
 
 data class Order(
-    val id: kotlin.Long?,
-    val petId: kotlin.Long?,
-    val quantity: kotlin.Int?,
-    val shipDate: java.time.OffsetDateTime?,
+    val id: kotlin.Long? = null,
+    val petId: kotlin.Long? = null,
+    val quantity: kotlin.Int? = null,
+    val shipDate: java.time.OffsetDateTime? = null,
     /** Order Status */
-    val status: kotlin.String?,
+    val status: kotlin.String? = null,
     val complete: kotlin.Boolean? = false
 )
diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/Pet.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/Pet.kt
@@ -6,9 +6,9 @@ import org.openapitools.server.api.model.Tag
 data class Pet(
     val name: kotlin.String,
     val photoUrls: kotlin.Array<kotlin.String>,
-    val id: kotlin.Long?,
-    val category: Category?,
-    val tags: kotlin.Array<Tag>?,
+    val id: kotlin.Long? = null,
+    val category: Category? = null,
+    val tags: kotlin.Array<Tag>? = null,
     /** pet status in the store */
-    val status: kotlin.String?
+    val status: kotlin.String? = null
 )
diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/Tag.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/Tag.kt
@@ -2,6 +2,6 @@ package org.openapitools.server.api.model
 
 
 data class Tag(
-    val id: kotlin.Long?,
-    val name: kotlin.String?
+    val id: kotlin.Long? = null,
+    val name: kotlin.String? = null
 )
diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/User.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/User.kt
@@ -2,13 +2,13 @@ package org.openapitools.server.api.model
 
 
 data class User(
-    val id: kotlin.Long?,
-    val username: kotlin.String?,
-    val firstName: kotlin.String?,
-    val lastName: kotlin.String?,
-    val email: kotlin.String?,
-    val password: kotlin.String?,
-    val phone: kotlin.String?,
+    val id: kotlin.Long? = null,
+    val username: kotlin.String? = null,
+    val firstName: kotlin.String? = null,
+    val lastName: kotlin.String? = null,
+    val email: kotlin.String? = null,
+    val password: kotlin.String? = null,
+    val phone: kotlin.String? = null,
     /** User Status */
-    val userStatus: kotlin.Int?
+    val userStatus: kotlin.Int? = null
 )

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-{{#isHeaderParam}}{{#useBeanValidation}}{{>beanValidationCore}}{{/useBeanValidation}}{{{paramName}}}: Headers{{/isHeaderParam}}`
	`1`	`+{{#isHeaderParam}}{{#useBeanValidation}}{{>beanValidationCore}}{{/useBeanValidation}}@RequestHeader(value = "{{baseName}}") {{{paramName}}}: {{>optionalDataType}}{{/isHeaderParam}}`