final fix2

Author: andrewwilsonnew

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java

@@ -186,10 +186,17 @@ public KotlinMiskServerCodegen() {
     public void processOpts() {
         super.processOpts();
 
-        convertPropertyToTypeAndWriteBack(ACTION_ANNOTATIONS,
-                it -> Arrays.asList(it.split(";")), this::setActionAnnotations);
-        convertPropertyToTypeAndWriteBack(ACTION_IMPORTS,
-                it -> Arrays.asList(it.split(";")), this::setActionImports);
+        if (additionalProperties.containsKey(ACTION_ANNOTATIONS)) {
+            convertPropertyToTypeAndWriteBack(ACTION_ANNOTATIONS,
+                    it -> Arrays.asList(it.split(";")), this::setActionAnnotations);
+        }
+        writePropertyBack(ACTION_ANNOTATIONS, actionAnnotations);
+
+        if (additionalProperties.containsKey(ACTION_IMPORTS)) {
+            convertPropertyToTypeAndWriteBack(ACTION_IMPORTS,
+                    it -> Arrays.asList(it.split(";")), this::setActionImports);
+        }
+        writePropertyBack(ACTION_IMPORTS, actionImports);
 
         if (additionalProperties.containsKey(ACTION_PARENT_CLASS)) {
             setActionParentClass((String) additionalProperties.get(ACTION_PARENT_CLASS));

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

@@ -11,6 +11,8 @@ import jakarta.validation.constraints.Min
 import jakarta.validation.constraints.NotNull
 import jakarta.validation.constraints.Pattern
 import jakarta.validation.constraints.Size
+import misk.web.actions.WebAction
+import misk.web.interceptors.LogRequestResponse
 import misk.web.Delete
 import misk.web.Description
 import misk.web.Get
@@ -39,13 +41,15 @@ class PetApiAction @Inject constructor(
     @Description("Add a new pet to the store")
     @RequestContentType(MediaTypes.APPLICATION_JSON, MediaTypes.APPLICATION_XML)
     @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON)
+    @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0)
     fun addPet(
         @Valid @RequestBody pet: Pet): Pet {
         TODO()
     }
 
     @Delete("/pet/{petId}")
     @Description("Deletes a pet")
+    @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0)
     fun deletePet(
         @PathParam("petId") petId: kotlin.Long, 
         @RequestHeader(value = "api_key") apiKey: kotlin.String?) {
@@ -55,6 +59,7 @@ class PetApiAction @Inject constructor(
     @Get("/pet/findByStatus")
     @Description("Finds Pets by status")
     @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON)
+    @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0)
     fun findPetsByStatus(
          @QueryParam(value = "status") status: kotlin.Array<kotlin.String>): kotlin.Array<Pet> {
         TODO()
@@ -63,6 +68,7 @@ class PetApiAction @Inject constructor(
     @Get("/pet/findByTags")
     @Description("Finds Pets by tags")
     @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON)
+    @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0)
     fun findPetsByTags(
          @QueryParam(value = "tags") tags: kotlin.Array<kotlin.String>): kotlin.Array<Pet> {
         TODO()
@@ -71,6 +77,7 @@ class PetApiAction @Inject constructor(
     @Get("/pet/{petId}")
     @Description("Find pet by ID")
     @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON)
+    @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0)
     fun getPetById(
         @PathParam("petId") petId: kotlin.Long): Pet {
         TODO()
@@ -80,6 +87,7 @@ class PetApiAction @Inject constructor(
     @Description("Update an existing pet")
     @RequestContentType(MediaTypes.APPLICATION_JSON, MediaTypes.APPLICATION_XML)
     @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON)
+    @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0)
     fun updatePet(
         @Valid @RequestBody pet: Pet): Pet {
         TODO()
@@ -88,6 +96,7 @@ class PetApiAction @Inject constructor(
     @Post("/pet/{petId}")
     @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, 
         @QueryParam(value = "name") name: kotlin.String? , 
@@ -99,6 +108,7 @@ class PetApiAction @Inject constructor(
     @Description("uploads an image")
     @RequestContentType(MediaTypes.FORM_DATA)
     @ResponseContentType(MediaTypes.APPLICATION_JSON)
+    @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0)
     fun uploadFile(
         @PathParam("petId") petId: kotlin.Long, 
         @QueryParam(value = "additionalMetadata") additionalMetadata: kotlin.String? , 

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

@@ -11,6 +11,8 @@ import jakarta.validation.constraints.Min
 import jakarta.validation.constraints.NotNull
 import jakarta.validation.constraints.Pattern
 import jakarta.validation.constraints.Size
+import misk.web.actions.WebAction
+import misk.web.interceptors.LogRequestResponse
 import misk.web.Delete
 import misk.web.Description
 import misk.web.Get
@@ -36,6 +38,7 @@ class StoreApiAction @Inject constructor(
 
     @Delete("/store/order/{orderId}")
     @Description("Delete purchase order by ID")
+    @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0)
     fun deleteOrder(
         @PathParam("orderId") orderId: kotlin.String) {
         TODO()
@@ -44,13 +47,15 @@ class StoreApiAction @Inject constructor(
     @Get("/store/inventory")
     @Description("Returns pet inventories by status")
     @ResponseContentType(MediaTypes.APPLICATION_JSON)
+    @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0)
     fun getInventory(): kotlin.collections.Map<kotlin.String, kotlin.Int> {
         TODO()
     }
 
     @Get("/store/order/{orderId}")
     @Description("Find purchase order by ID")
     @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON)
+    @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0)
     fun getOrderById(
         @Min(1L) @Max(5L) @PathParam("orderId") orderId: kotlin.Long): Order {
         TODO()
@@ -60,6 +65,7 @@ class StoreApiAction @Inject constructor(
     @Description("Place an order for a pet")
     @RequestContentType(MediaTypes.APPLICATION_JSON)
     @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON)
+    @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0)
     fun placeOrder(
         @Valid @RequestBody order: Order): Order {
         TODO()

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

@@ -11,6 +11,8 @@ import jakarta.validation.constraints.Min
 import jakarta.validation.constraints.NotNull
 import jakarta.validation.constraints.Pattern
 import jakarta.validation.constraints.Size
+import misk.web.actions.WebAction
+import misk.web.interceptors.LogRequestResponse
 import misk.web.Delete
 import misk.web.Description
 import misk.web.Get
@@ -37,6 +39,7 @@ class UserApiAction @Inject constructor(
     @Post("/user")
     @Description("Create user")
     @RequestContentType(MediaTypes.APPLICATION_JSON)
+    @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0)
     fun createUser(
         @Valid @RequestBody user: User) {
         TODO()
@@ -45,6 +48,7 @@ class UserApiAction @Inject constructor(
     @Post("/user/createWithArray")
     @Description("Creates list of users with given input array")
     @RequestContentType(MediaTypes.APPLICATION_JSON)
+    @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0)
     fun createUsersWithArrayInput(
         @Valid @RequestBody user: kotlin.Array<User>) {
         TODO()
@@ -53,13 +57,15 @@ class UserApiAction @Inject constructor(
     @Post("/user/createWithList")
     @Description("Creates list of users with given input array")
     @RequestContentType(MediaTypes.APPLICATION_JSON)
+    @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0)
     fun createUsersWithListInput(
         @Valid @RequestBody user: kotlin.Array<User>) {
         TODO()
     }
 
     @Delete("/user/{username}")
     @Description("Delete user")
+    @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0)
     fun deleteUser(
         @PathParam("username") username: kotlin.String) {
         TODO()
@@ -68,6 +74,7 @@ class UserApiAction @Inject constructor(
     @Get("/user/{username}")
     @Description("Get user by user name")
     @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON)
+    @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0)
     fun getUserByName(
         @PathParam("username") username: kotlin.String): User {
         TODO()
@@ -76,6 +83,7 @@ class UserApiAction @Inject constructor(
     @Get("/user/login")
     @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 {
@@ -84,13 +92,15 @@ class UserApiAction @Inject constructor(
 
     @Get("/user/logout")
     @Description("Logs out current logged in user session")
+    @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0)
     fun logoutUser() {
         TODO()
     }
 
     @Put("/user/{username}")
     @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) {