fixing jakarta

andrewwilsonnew · andrewwilsonnew · commit c8fbb247cad6 · 2025-03-21T11:58:02.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
@@ -4,15 +4,15 @@ package {{package}}
 {{/imports}}
 
 {{#useBeanValidation}}
-import {{javaxPackage}}.validation.Valid
-import {{javaxPackage}}.validation.constraints.DecimalMax
-import {{javaxPackage}}.validation.constraints.DecimalMin
-import {{javaxPackage}}.validation.constraints.Email
-import {{javaxPackage}}.validation.constraints.Max
-import {{javaxPackage}}.validation.constraints.Min
-import {{javaxPackage}}.validation.constraints.NotNull
-import {{javaxPackage}}.validation.constraints.Pattern
-import {{javaxPackage}}.validation.constraints.Size
+import {{jakartaPackage}}.validation.Valid
+import {{jakartaPackage}}.validation.constraints.DecimalMax
+import {{jakartaPackage}}.validation.constraints.DecimalMin
+import {{jakartaPackage}}.validation.constraints.Email
+import {{jakartaPackage}}.validation.constraints.Max
+import {{jakartaPackage}}.validation.constraints.Min
+import {{jakartaPackage}}.validation.constraints.NotNull
+import {{jakartaPackage}}.validation.constraints.Pattern
+import {{jakartaPackage}}.validation.constraints.Size
 {{/useBeanValidation}}
 
 import jakarta.inject.Inject
diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/build.gradle.kts.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/build.gradle.kts.mustache
@@ -8,7 +8,7 @@ group = "{{groupId}}"
 version = "{{artifactVersion}}"
 
 dependencies {
-    implementation("javax.validation:validation-api:2.0.1.Final")
+    implementation("jakarta.validation:validation-api:2.0.1.Final")
     implementation("com.squareup.misk:misk:2025.02.11.123913-8a41324")
     //implementation("com.squareup.wire:wire-runtime:5.2.1")
 
diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/miskModule.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/miskModule.mustache
@@ -2,7 +2,7 @@ package {{apiPackage}}
 
 import misk.inject.KAbstractModule
 import misk.web.WebActionModule
-import javax.inject.Singleton
+import jakarta.inject.Singleton
 {{#apiInfo}}
 {{#apis}}
 {{#operations}}
diff --git a/samples/server/petstore/kotlin-misk/.openapi-generator/FILES b/samples/server/petstore/kotlin-misk/.openapi-generator/FILES
@@ -20,3 +20,6 @@ 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/build.gradle.kts b/samples/server/petstore/kotlin-misk/build.gradle.kts
@@ -8,7 +8,7 @@ group = "org.openapitools"
 version = "1.0.0-SNAPSHOT"
 
 dependencies {
-    implementation("javax.validation:validation-api:2.0.1.Final")
+    implementation("jakarta.validation:validation-api:2.0.1.Final")
     implementation("com.squareup.misk:misk:2025.02.11.123913-8a41324")
     //implementation("com.squareup.wire:wire-runtime:5.2.1")
 
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
@@ -3,15 +3,15 @@ package org.openapitools.server.api.api
 import org.openapitools.server.api.model.ModelApiResponse
 import org.openapitools.server.api.model.Pet
 
-import javax.validation.Valid
-import javax.validation.constraints.DecimalMax
-import javax.validation.constraints.DecimalMin
-import javax.validation.constraints.Email
-import javax.validation.constraints.Max
-import javax.validation.constraints.Min
-import javax.validation.constraints.NotNull
-import javax.validation.constraints.Pattern
-import javax.validation.constraints.Size
+import .validation.Valid
+import .validation.constraints.DecimalMax
+import .validation.constraints.DecimalMin
+import .validation.constraints.Email
+import .validation.constraints.Max
+import .validation.constraints.Min
+import .validation.constraints.NotNull
+import .validation.constraints.Pattern
+import .validation.constraints.Size
 
 import jakarta.inject.Inject
 import jakarta.inject.Singleton
diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetStoreModule.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetStoreModule.kt
@@ -2,7 +2,7 @@ package org.openapitools.server.api.api
 
 import misk.inject.KAbstractModule
 import misk.web.WebActionModule
-import javax.inject.Singleton
+import jakarta.inject.Singleton
 import org.openapitools.server.api.api.PetApiController
 import org.openapitools.server.api.api.StoreApiController
 import org.openapitools.server.api.api.UserApiController
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
@@ -2,15 +2,15 @@ package org.openapitools.server.api.api
 
 import org.openapitools.server.api.model.Order
 
-import javax.validation.Valid
-import javax.validation.constraints.DecimalMax
-import javax.validation.constraints.DecimalMin
-import javax.validation.constraints.Email
-import javax.validation.constraints.Max
-import javax.validation.constraints.Min
-import javax.validation.constraints.NotNull
-import javax.validation.constraints.Pattern
-import javax.validation.constraints.Size
+import .validation.Valid
+import .validation.constraints.DecimalMax
+import .validation.constraints.DecimalMin
+import .validation.constraints.Email
+import .validation.constraints.Max
+import .validation.constraints.Min
+import .validation.constraints.NotNull
+import .validation.constraints.Pattern
+import .validation.constraints.Size
 
 import jakarta.inject.Inject
 import jakarta.inject.Singleton
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
@@ -2,15 +2,15 @@ package org.openapitools.server.api.api
 
 import org.openapitools.server.api.model.User
 
-import javax.validation.Valid
-import javax.validation.constraints.DecimalMax
-import javax.validation.constraints.DecimalMin
-import javax.validation.constraints.Email
-import javax.validation.constraints.Max
-import javax.validation.constraints.Min
-import javax.validation.constraints.NotNull
-import javax.validation.constraints.Pattern
-import javax.validation.constraints.Size
+import .validation.Valid
+import .validation.constraints.DecimalMax
+import .validation.constraints.DecimalMin
+import .validation.constraints.Email
+import .validation.constraints.Max
+import .validation.constraints.Min
+import .validation.constraints.NotNull
+import .validation.constraints.Pattern
+import .validation.constraints.Size
 
 import jakarta.inject.Inject
 import jakarta.inject.Singleton
diff --git a/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/PetApiTest.kt b/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/PetApiTest.kt
@@ -0,0 +1,93 @@
+package org.openapitools.server.api.api
+
+import org.openapitools.server.api.model.ModelApiResponse
+import org.openapitools.server.api.model.Pet
+import jakarta.inject.Inject
+import misk.testing.MiskTest
+import okhttp3.Headers
+
+import org.junit.jupiter.api.Test
+
+@MiskTest(startService = true)
+internal class PetApiTest {
+
+    @Inject private lateinit var petApi: PetApiController
+
+    /**
+     * To test PetApiController.addPet
+     */
+    @Test
+    fun `should handle addPet`() {
+        val pet = TODO()
+        val response: Pet = petApi.addPet(pet)
+    }
+
+    /**
+     * To test PetApiController.deletePet
+     */
+    @Test
+    fun `should handle deletePet`() {
+        val petId = TODO()
+        val apiKey = TODO()
+        val response = petApi.deletePet(petId, apiKey)
+    }
+
+    /**
+     * To test PetApiController.findPetsByStatus
+     */
+    @Test
+    fun `should handle findPetsByStatus`() {
+        val status = TODO()
+        val response: kotlin.Array<Pet> = petApi.findPetsByStatus(status)
+    }
+
+    /**
+     * To test PetApiController.findPetsByTags
+     */
+    @Test
+    fun `should handle findPetsByTags`() {
+        val tags = TODO()
+        val response: kotlin.Array<Pet> = petApi.findPetsByTags(tags)
+    }
+
+    /**
+     * To test PetApiController.getPetById
+     */
+    @Test
+    fun `should handle getPetById`() {
+        val petId = TODO()
+        val response: Pet = petApi.getPetById(petId)
+    }
+
+    /**
+     * To test PetApiController.updatePet
+     */
+    @Test
+    fun `should handle updatePet`() {
+        val pet = TODO()
+        val response: Pet = petApi.updatePet(pet)
+    }
+
+    /**
+     * To test PetApiController.updatePetWithForm
+     */
+    @Test
+    fun `should handle updatePetWithForm`() {
+        val petId = TODO()
+        val name = TODO()
+        val status = TODO()
+        val response = petApi.updatePetWithForm(petId, name, status)
+    }
+
+    /**
+     * To test PetApiController.uploadFile
+     */
+    @Test
+    fun `should handle uploadFile`() {
+        val petId = TODO()
+        val additionalMetadata = TODO()
+        val file = TODO()
+        val response: ModelApiResponse = petApi.uploadFile(petId, additionalMetadata, file)
+    }
+
+}
diff --git a/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/StoreApiTest.kt b/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/StoreApiTest.kt
@@ -0,0 +1,50 @@
+package org.openapitools.server.api.api
+
+import org.openapitools.server.api.model.Order
+import jakarta.inject.Inject
+import misk.testing.MiskTest
+import okhttp3.Headers
+
+import org.junit.jupiter.api.Test
+
+@MiskTest(startService = true)
+internal class StoreApiTest {
+
+    @Inject private lateinit var storeApi: StoreApiController
+
+    /**
+     * To test StoreApiController.deleteOrder
+     */
+    @Test
+    fun `should handle deleteOrder`() {
+        val orderId = TODO()
+        val response = storeApi.deleteOrder(orderId)
+    }
+
+    /**
+     * To test StoreApiController.getInventory
+     */
+    @Test
+    fun `should handle getInventory`() {
+        val response: kotlin.collections.Map<kotlin.String, kotlin.Int> = storeApi.getInventory()
+    }
+
+    /**
+     * To test StoreApiController.getOrderById
+     */
+    @Test
+    fun `should handle getOrderById`() {
+        val orderId = TODO()
+        val response: Order = storeApi.getOrderById(orderId)
+    }
+
+    /**
+     * To test StoreApiController.placeOrder
+     */
+    @Test
+    fun `should handle placeOrder`() {
+        val order = TODO()
+        val response: Order = storeApi.placeOrder(order)
+    }
+
+}
diff --git a/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/UserApiTest.kt b/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/UserApiTest.kt
@@ -17,7 +17,7 @@ internal class UserApiTest {
      */
     @Test
     fun `should handle createUser`() {
-        val user: User = TODO()
+        val user = TODO()
         val response = userApi.createUser(user)
     }
 
@@ -26,7 +26,7 @@ internal class UserApiTest {
      */
     @Test
     fun `should handle createUsersWithArrayInput`() {
-        val user: kotlin.Array<User> = TODO()
+        val user = TODO()
         val response = userApi.createUsersWithArrayInput(user)
     }
 
@@ -35,7 +35,7 @@ internal class UserApiTest {
      */
     @Test
     fun `should handle createUsersWithListInput`() {
-        val user: kotlin.Array<User> = TODO()
+        val user = TODO()
         val response = userApi.createUsersWithListInput(user)
     }
 
@@ -44,7 +44,7 @@ internal class UserApiTest {
      */
     @Test
     fun `should handle deleteUser`() {
-        val username: kotlin.String = TODO()
+        val username = TODO()
         val response = userApi.deleteUser(username)
     }
 
@@ -53,7 +53,7 @@ internal class UserApiTest {
      */
     @Test
     fun `should handle getUserByName`() {
-        val username: kotlin.String = TODO()
+        val username = TODO()
         val response: User = userApi.getUserByName(username)
     }
 
@@ -62,8 +62,8 @@ internal class UserApiTest {
      */
     @Test
     fun `should handle loginUser`() {
-        val username: kotlin.String = TODO()
-        val password: kotlin.String = TODO()
+        val username = TODO()
+        val password = TODO()
         val response: kotlin.String = userApi.loginUser(username, password)
     }
 
@@ -80,8 +80,8 @@ internal class UserApiTest {
      */
     @Test
     fun `should handle updateUser`() {
-        val username: kotlin.String = TODO()
-        val user: User = TODO()
+        val username = TODO()
+        val user = TODO()
         val response = userApi.updateUser(username, user)
     }
 
