fixing jakarta

Author: andrewwilsonnew

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

@@ -139,6 +139,8 @@ public void processOpts() {
         }
         writePropertyBack(USE_BEANVALIDATION, useBeanValidation);
 
+        applyJakartaPackage();
+
         String apiModuleFolder = (sourceFolder + File.separator + apiPackage).replace(".", File.separator);
         String moduleFileName = moduleClassName + ".kt";
         supportingFiles.add(new SupportingFile("miskModule.mustache", apiModuleFolder, moduleFileName));

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

@@ -4,19 +4,19 @@ package {{package}}
 {{/imports}}
 
 {{#useBeanValidation}}
-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
+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
 {{/useBeanValidation}}
 
-import jakarta.inject.Inject
-import jakarta.inject.Singleton
+import {{javaxPackage}}.inject.Inject
+import {{javaxPackage}}.inject.Singleton
 
 import misk.web.Delete
 import misk.web.Description
@@ -40,7 +40,7 @@ import okhttp3.Headers
     @Singleton
     class {{classname}}Controller @Inject constructor(
         private val {{#lambda.camelcase}}{{classname}}{{/lambda.camelcase}}: {{classname}}
-    ) : WebAction, {{classname}} {
+    ) : WebAction implements {{classname}} {
     {{#operation}}
 
         @{{httpMethod}}("{{path}}")

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

@@ -3,8 +3,20 @@ package {{package}}
 {{#imports}}import {{import}}
 {{/imports}}
 
-import jakarta.inject.Inject
-import jakarta.inject.Singleton
+{{#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
+{{/useBeanValidation}}
+
+import {{javaxPackage}}.inject.Inject
+import {{javaxPackage}}.inject.Singleton
 import okhttp3.Headers
 
 /**

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

@@ -1,5 +1,17 @@
 package {{package}}
 
+{{#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
+{{/useBeanValidation}}
+
 {{#imports}}import {{import}}
 {{/imports}}
 import okhttp3.Headers

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

@@ -1,6 +1,6 @@
 package {{package}}
 
-import jakarta.inject.Inject
+import {{javaxPackage}}.inject.Inject
 import misk.testing.MiskTest
 import org.junit.jupiter.api.Test
 {{#imports}}import {{import}}

modules/openapi-generator/src/main/resources/kotlin-misk/build.gradle.kts.mustache

@@ -8,7 +8,7 @@ group = "{{groupId}}"
 version = "{{artifactVersion}}"
 
 dependencies {
-    implementation("jakarta.validation:validation-api:3.1.1")
+    implementation("jakarta.validation:jakarta.validation-api:3.1.1")
     implementation("com.squareup.misk:misk:2025.02.11.123913-8a41324")
     //implementation("com.squareup.wire:wire-runtime:5.2.1")
 

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 jakarta.inject.Singleton
+import {{javaxPackage}}.inject.Singleton
 {{#apiInfo}}
 {{#apis}}
 {{#operations}}

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

samples/server/petstore/kotlin-misk/build.gradle.kts

@@ -8,7 +8,7 @@ group = "org.openapitools"
 version = "1.0.0-SNAPSHOT"
 
 dependencies {
-    implementation("jakarta.validation:validation-api:3.1.1")
+    implementation("jakarta.validation:jakarta.validation-api:3.1.1")
     implementation("com.squareup.misk:misk:2025.02.11.123913-8a41324")
     //implementation("com.squareup.wire:wire-runtime:5.2.1")
 

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

@@ -1,5 +1,15 @@
 package org.openapitools.server.api.api
 
+    import jakarta.validation.Valid
+    import jakarta.validation.constraints.DecimalMax
+    import jakarta.validation.constraints.DecimalMin
+    import jakarta.validation.constraints.Email
+    import jakarta.validation.constraints.Max
+    import jakarta.validation.constraints.Min
+    import jakarta.validation.constraints.NotNull
+    import jakarta.validation.constraints.Pattern
+    import jakarta.validation.constraints.Size
+
 import org.openapitools.server.api.model.ModelApiResponse
 import org.openapitools.server.api.model.Pet
 import okhttp3.Headers