fix(kotlin-client): keep annotation imports as com.fasterxml.jackson

yonatankarp · yonatankarp · commit 22338632e8aa · 2026-03-10T09:59:40.000+01:00
Jackson 3 only moves databind/core/module to tools.jackson package.
The annotations artifact stays at com.fasterxml.jackson.annotation.
Also add AbstractKotlinCodegen Jackson 3 infrastructure so this branch
is self-contained for CI testing.
diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/anyof_class.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/anyof_class.mustache
@@ -18,12 +18,12 @@ import com.squareup.moshi.JsonClass
 {{/moshi}}
 {{#jackson}}
 {{#enumUnknownDefaultCase}}
-import {{jacksonPackage}}.annotation.JsonEnumDefaultValue
+import com.fasterxml.jackson.annotation.JsonEnumDefaultValue
 {{/enumUnknownDefaultCase}}
-import {{jacksonPackage}}.annotation.JsonProperty
+import com.fasterxml.jackson.annotation.JsonProperty
 {{#discriminator}}
-import {{jacksonPackage}}.annotation.JsonSubTypes
-import {{jacksonPackage}}.annotation.JsonTypeInfo
+import com.fasterxml.jackson.annotation.JsonSubTypes
+import com.fasterxml.jackson.annotation.JsonTypeInfo
 {{/discriminator}}
 {{/jackson}}
 {{#kotlinx_serialization}}
diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/data_class.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/data_class.mustache
@@ -19,13 +19,13 @@ import com.squareup.moshi.JsonClass
 {{/moshi}}
 {{#jackson}}
 {{#enumUnknownDefaultCase}}
-import {{jacksonPackage}}.annotation.JsonEnumDefaultValue
+import com.fasterxml.jackson.annotation.JsonEnumDefaultValue
 {{/enumUnknownDefaultCase}}
-import {{jacksonPackage}}.annotation.JsonProperty
+import com.fasterxml.jackson.annotation.JsonProperty
 {{#discriminator}}
-import {{jacksonPackage}}.annotation.JsonIgnoreProperties
-import {{jacksonPackage}}.annotation.JsonSubTypes
-import {{jacksonPackage}}.annotation.JsonTypeInfo
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties
+import com.fasterxml.jackson.annotation.JsonSubTypes
+import com.fasterxml.jackson.annotation.JsonTypeInfo
 {{/discriminator}}
 {{/jackson}}
 {{#kotlinx_serialization}}
diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/enum_class.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/enum_class.mustache
@@ -7,12 +7,12 @@ import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 {{/moshi}}
 {{#jackson}}
-import {{jacksonPackage}}.annotation.JsonCreator
+import com.fasterxml.jackson.annotation.JsonCreator
 {{#enumUnknownDefaultCase}}
-import {{jacksonPackage}}.annotation.JsonEnumDefaultValue
+import com.fasterxml.jackson.annotation.JsonEnumDefaultValue
 {{/enumUnknownDefaultCase}}
-import {{jacksonPackage}}.annotation.JsonProperty
-import {{jacksonPackage}}.annotation.JsonValue
+import com.fasterxml.jackson.annotation.JsonProperty
+import com.fasterxml.jackson.annotation.JsonValue
 import kotlin.jvm.JvmStatic
 {{/jackson}}
 {{#kotlinx_serialization}}
diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/jvm-common/infrastructure/Serializer.kt.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/jvm-common/infrastructure/Serializer.kt.mustache
@@ -33,7 +33,7 @@ import java.util.UUID
 import {{jacksonPackage}}.databind.DeserializationFeature
 import {{jacksonPackage}}.databind.ObjectMapper
 import {{jacksonPackage}}.databind.SerializationFeature
-import {{jacksonPackage}}.annotation.JsonInclude
+import com.fasterxml.jackson.annotation.JsonInclude
 import {{jacksonPackage}}.module.kotlin.jacksonObjectMapper
 {{/jackson}}
 {{#kotlinx_serialization}}
diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-okhttp/api.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-okhttp/api.mustache
@@ -16,7 +16,7 @@ import com.google.gson.annotations.SerializedName
 import com.squareup.moshi.Json
 {{/moshi}}
 {{#jackson}}
-import {{jacksonPackage}}.annotation.JsonProperty
+import com.fasterxml.jackson.annotation.JsonProperty
 {{/jackson}}
 {{#kotlinx_serialization}}
 import kotlinx.serialization.SerialName
diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/api.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/api.mustache
@@ -44,7 +44,7 @@ import com.google.gson.annotations.SerializedName
 import com.squareup.moshi.Json
 {{/moshi}}
 {{#jackson}}
-import {{jacksonPackage}}.annotation.JsonProperty
+import com.fasterxml.jackson.annotation.JsonProperty
 {{/jackson}}
 {{#kotlinx_serialization}}
 import kotlinx.serialization.SerialName
diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-spring-restclient/api.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-spring-restclient/api.mustache
@@ -2,7 +2,7 @@
 package {{apiPackage}}
 
 {{#jackson}}
-import {{jacksonPackage}}.annotation.JsonProperty
+import com.fasterxml.jackson.annotation.JsonProperty
 {{/jackson}}
 
 import org.springframework.web.client.RestClient
diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-spring-webclient/api.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-spring-webclient/api.mustache
@@ -2,7 +2,7 @@
 package {{apiPackage}}
 
 {{#jackson}}
-import {{jacksonPackage}}.annotation.JsonProperty
+import com.fasterxml.jackson.annotation.JsonProperty
 {{/jackson}}
 
 import org.springframework.web.reactive.function.client.WebClient
diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-vertx/api.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-vertx/api.mustache
@@ -7,7 +7,7 @@ import java.io.IOException
 {{/imports}}
 
 {{#jackson}}
-import {{jacksonPackage}}.annotation.JsonProperty
+import com.fasterxml.jackson.annotation.JsonProperty
 import {{jacksonPackage}}.core.type.TypeReference
 {{/jackson}}
 {{#gson}}
diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/oneof_class.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/oneof_class.mustache
@@ -18,12 +18,12 @@ import com.squareup.moshi.JsonClass
 {{/moshi}}
 {{#jackson}}
 {{#enumUnknownDefaultCase}}
-import {{jacksonPackage}}.annotation.JsonEnumDefaultValue
+import com.fasterxml.jackson.annotation.JsonEnumDefaultValue
 {{/enumUnknownDefaultCase}}
-import {{jacksonPackage}}.annotation.JsonProperty
+import com.fasterxml.jackson.annotation.JsonProperty
 {{#discriminator}}
-import {{jacksonPackage}}.annotation.JsonSubTypes
-import {{jacksonPackage}}.annotation.JsonTypeInfo
+import com.fasterxml.jackson.annotation.JsonSubTypes
+import com.fasterxml.jackson.annotation.JsonTypeInfo
 {{/discriminator}}
 {{/jackson}}
 {{#kotlinx_serialization}}
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/KotlinClientCodegenModelTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/KotlinClientCodegenModelTest.java
@@ -997,12 +997,12 @@ public void shouldGenerateJackson3Imports() throws IOException {
         generator.opts(input).generate();
 
         Path modelPath = Paths.get(outputPath + "/src/main/kotlin/org/openapitools/client/models/Pet.kt");
-        TestUtils.assertFileContains(modelPath, "import tools.jackson.annotation.JsonProperty");
-        TestUtils.assertFileNotContains(modelPath, "com.fasterxml.jackson");
+        TestUtils.assertFileContains(modelPath, "import com.fasterxml.jackson.annotation.JsonProperty");
 
         Path serializerPath = Paths.get(outputPath + "/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt");
         TestUtils.assertFileContains(serializerPath, "import tools.jackson.databind.ObjectMapper");
-        TestUtils.assertFileNotContains(serializerPath, "com.fasterxml.jackson");
+        TestUtils.assertFileContains(serializerPath, "import tools.jackson.module.kotlin.jacksonObjectMapper");
+        TestUtils.assertFileNotContains(serializerPath, "com.fasterxml.jackson.databind");
     }
 
     @Test
diff --git a/samples/client/petstore/kotlin-jackson3/.openapi-generator/FILES b/samples/client/petstore/kotlin-jackson3/.openapi-generator/FILES
@@ -1,4 +1,3 @@
-.openapi-generator-ignore
 README.md
 build.gradle
 docs/ApiResponse.md
@@ -33,12 +32,3 @@ src/main/kotlin/org/openapitools/client/models/Order.kt
 src/main/kotlin/org/openapitools/client/models/Pet.kt
 src/main/kotlin/org/openapitools/client/models/Tag.kt
 src/main/kotlin/org/openapitools/client/models/User.kt
-src/test/kotlin/org/openapitools/client/apis/PetApiTest.kt
-src/test/kotlin/org/openapitools/client/apis/StoreApiTest.kt
-src/test/kotlin/org/openapitools/client/apis/UserApiTest.kt
-src/test/kotlin/org/openapitools/client/models/ApiResponseTest.kt
-src/test/kotlin/org/openapitools/client/models/CategoryTest.kt
-src/test/kotlin/org/openapitools/client/models/OrderTest.kt
-src/test/kotlin/org/openapitools/client/models/PetTest.kt
-src/test/kotlin/org/openapitools/client/models/TagTest.kt
-src/test/kotlin/org/openapitools/client/models/UserTest.kt
diff --git a/samples/client/petstore/kotlin-jackson3/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-jackson3/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
@@ -22,7 +22,7 @@ import okhttp3.HttpUrl
 import org.openapitools.client.models.ModelApiResponse
 import org.openapitools.client.models.Pet
 
-import tools.jackson.annotation.JsonProperty
+import com.fasterxml.jackson.annotation.JsonProperty
 
 import org.openapitools.client.infrastructure.ApiClient
 import org.openapitools.client.infrastructure.ApiResponse
diff --git a/samples/client/petstore/kotlin-jackson3/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-jackson3/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
@@ -21,7 +21,7 @@ import okhttp3.HttpUrl
 
 import org.openapitools.client.models.Order
 
-import tools.jackson.annotation.JsonProperty
+import com.fasterxml.jackson.annotation.JsonProperty
 
 import org.openapitools.client.infrastructure.ApiClient
 import org.openapitools.client.infrastructure.ApiResponse
diff --git a/samples/client/petstore/kotlin-jackson3/src/main/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-jackson3/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
@@ -21,7 +21,7 @@ import okhttp3.HttpUrl
 
 import org.openapitools.client.models.User
 
-import tools.jackson.annotation.JsonProperty
+import com.fasterxml.jackson.annotation.JsonProperty
 
 import org.openapitools.client.infrastructure.ApiClient
 import org.openapitools.client.infrastructure.ApiResponse
diff --git a/samples/client/petstore/kotlin-jackson3/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt b/samples/client/petstore/kotlin-jackson3/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt
@@ -3,7 +3,7 @@ package org.openapitools.client.infrastructure
 import tools.jackson.databind.DeserializationFeature
 import tools.jackson.databind.ObjectMapper
 import tools.jackson.databind.SerializationFeature
-import tools.jackson.annotation.JsonInclude
+import com.fasterxml.jackson.annotation.JsonInclude
 import tools.jackson.module.kotlin.jacksonObjectMapper
 
 object Serializer {
diff --git a/samples/client/petstore/kotlin-jackson3/src/main/kotlin/org/openapitools/client/models/Category.kt b/samples/client/petstore/kotlin-jackson3/src/main/kotlin/org/openapitools/client/models/Category.kt
@@ -16,8 +16,8 @@
 package org.openapitools.client.models
 
 
-import tools.jackson.annotation.JsonEnumDefaultValue
-import tools.jackson.annotation.JsonProperty
+import com.fasterxml.jackson.annotation.JsonEnumDefaultValue
+import com.fasterxml.jackson.annotation.JsonProperty
 
 /**
  * A category for a pet
diff --git a/samples/client/petstore/kotlin-jackson3/src/main/kotlin/org/openapitools/client/models/ModelApiResponse.kt b/samples/client/petstore/kotlin-jackson3/src/main/kotlin/org/openapitools/client/models/ModelApiResponse.kt
@@ -16,8 +16,8 @@
 package org.openapitools.client.models
 
 
-import tools.jackson.annotation.JsonEnumDefaultValue
-import tools.jackson.annotation.JsonProperty
+import com.fasterxml.jackson.annotation.JsonEnumDefaultValue
+import com.fasterxml.jackson.annotation.JsonProperty
 
 /**
  * Describes the result of uploading an image resource
diff --git a/samples/client/petstore/kotlin-jackson3/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-jackson3/src/main/kotlin/org/openapitools/client/models/Order.kt
@@ -16,8 +16,8 @@
 package org.openapitools.client.models
 
 
-import tools.jackson.annotation.JsonEnumDefaultValue
-import tools.jackson.annotation.JsonProperty
+import com.fasterxml.jackson.annotation.JsonEnumDefaultValue
+import com.fasterxml.jackson.annotation.JsonProperty
 
 /**
  * An order for a pets from the pet store
diff --git a/samples/client/petstore/kotlin-jackson3/src/main/kotlin/org/openapitools/client/models/Pet.kt b/samples/client/petstore/kotlin-jackson3/src/main/kotlin/org/openapitools/client/models/Pet.kt
@@ -18,8 +18,8 @@ package org.openapitools.client.models
 import org.openapitools.client.models.Category
 import org.openapitools.client.models.Tag
 
-import tools.jackson.annotation.JsonEnumDefaultValue
-import tools.jackson.annotation.JsonProperty
+import com.fasterxml.jackson.annotation.JsonEnumDefaultValue
+import com.fasterxml.jackson.annotation.JsonProperty
 
 /**
  * A pet for sale in the pet store
diff --git a/samples/client/petstore/kotlin-jackson3/src/main/kotlin/org/openapitools/client/models/Tag.kt b/samples/client/petstore/kotlin-jackson3/src/main/kotlin/org/openapitools/client/models/Tag.kt
@@ -16,8 +16,8 @@
 package org.openapitools.client.models
 
 
-import tools.jackson.annotation.JsonEnumDefaultValue
-import tools.jackson.annotation.JsonProperty
+import com.fasterxml.jackson.annotation.JsonEnumDefaultValue
+import com.fasterxml.jackson.annotation.JsonProperty
 
 /**
  * A tag for a pet
diff --git a/samples/client/petstore/kotlin-jackson3/src/main/kotlin/org/openapitools/client/models/User.kt b/samples/client/petstore/kotlin-jackson3/src/main/kotlin/org/openapitools/client/models/User.kt
@@ -16,8 +16,8 @@
 package org.openapitools.client.models
 
 
-import tools.jackson.annotation.JsonEnumDefaultValue
-import tools.jackson.annotation.JsonProperty
+import com.fasterxml.jackson.annotation.JsonEnumDefaultValue
+import com.fasterxml.jackson.annotation.JsonProperty
 
 /**
  * A User who is purchasing from the pet store
