Merge remote-tracking branch 'FasterXML/2.17'

FasterXML · Dec 10, 2023 · d2c721f · d2c721f
2 parents 7112c02 + c53e606
commit d2c721f
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 26 deletions.
diff --git a/README.md b/README.md
@@ -55,28 +55,8 @@ val mapper = jsonMapper {
 }
 ```
 
-<details>
-  <summary>Jackson versions prior to 2.10–2.11</summary>
-
-```kotlin
-import tools.jackson.databind.json.JsonMapper
-import tools.jackson.module.kotlin.KotlinModule
-...
-val mapper = JsonMapper.builder().addModule(KotlinModule()).build()
-```
-</details>
-
-
-<details>
-  <summary>Jackson versions prior to 2.10</summary>
-
-```kotlin
-import tools.jackson.databind.ObjectMapper
-import tools.jackson.module.kotlin.KotlinModule
-...
-val mapper = ObjectMapper().registerModule(KotlinModule())
-```
-</details>
+In 2.17 and later, the `jacksonObjectMapper {}` and `registerKotlinModule {}` lambdas allow configuration for `KotlinModule`.  
+See [#Configuration](#Configuration) for details on the available configuration items.
 
 A simple data class example:
 ```kotlin

diff --git a/release-notes/CREDITS-2.x b/release-notes/CREDITS-2.x
@@ -18,6 +18,7 @@ Contributors:
 # 2.17.0 (not yet released)
 
 WrongWrong (@k163377)
+* #741: Changed to allow KotlinFeature to be set in the function that registers a KotlinModule.
 * #740: Reduce conversion cache from Executable to KFunction.
 * #738: Fix JacksonInject priority.
 * #732: SequenceSerializer removed.

diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
@@ -18,6 +18,8 @@ Co-maintainers:
 
 2.17.0 (not yet released)
 
+#741: Changed to allow KotlinFeature to be set in the function that registers a KotlinModule.
+ The `jacksonObjectMapper {}` and `registerKotlinModule {}` lambdas allow configuration for KotlinModule.
 #740: Reduce conversion cache from Executable to KFunction.
  This will reduce memory usage efficiency and total memory consumption, but may result in a minor performance degradation in use cases where a large number of factory functions are used as JsonCreator.
 #738: JacksonInject is now preferred over the default argument(fixes #722).

diff --git a/src/main/kotlin/tools/jackson/module/kotlin/Extensions.kt b/src/main/kotlin/tools/jackson/module/kotlin/Extensions.kt
@@ -35,12 +35,19 @@ fun jsonMapper(initializer: JsonMapper.Builder.() -> Unit = {}): JsonMapper {
     return builder.build()
 }
 
-//TODO: causing java.lang.IndexOutOfBoundsException: Index: 1, Size: 1
-fun jacksonObjectMapper(): ObjectMapper = jsonMapper { addModule(kotlinModule()) }
-fun jacksonMapperBuilder(): JsonMapper.Builder = JsonMapper.builder().addModule(kotlinModule())
+// region: JvmOverloads is set for bytecode compatibility for versions below 2.17.
+@JvmOverloads
+fun jacksonObjectMapper(initializer: KotlinModule.Builder.() -> Unit = {}): ObjectMapper =
+    jsonMapper { addModule(kotlinModule(initializer)) }
+@JvmOverloads
+fun jacksonMapperBuilder(initializer: KotlinModule.Builder.() -> Unit = {}): JsonMapper.Builder =
+    JsonMapper.builder().addModule(kotlinModule(initializer))
 
 // 22-Jul-2019, tatu: Can not be implemented same way as in 2.x, addition via mapper.builder():
-//fun ObjectMapper.registerKotlinModule(): ObjectMapper = this.registerModule(KotlinModule())
+// @JvmOverloads
+// fun ObjectMapper.registerKotlinModule(initializer: KotlinModule.Builder.() -> Unit = {}): ObjectMapper =
+//     this.registerModule(kotlinModule(initializer))
+// endregion
 
 inline fun <reified T> jacksonTypeRef(): TypeReference<T> = object : TypeReference<T>() {}