Merge pull request #349 from ProjectMapK/develop

Release 2025-05-25 02:17:56 +0000

Author: k163377

.editorconfig

@@ -3,5 +3,3 @@ root = true
 
 [*.{kt,kts}]
 ktlint_code_style = intellij_idea
-ij_kotlin_allow_trailing_comma = false
-ij_kotlin_allow_trailing_comma_on_call_site = false

.github/workflows/test-main.yml

@@ -42,7 +42,7 @@ jobs:
         # LTS versions, latest version (if exists)
         java-version: [ '17', '21', '24' ]
         # Minimum version, latest release version, latest pre-release version (if exists)
-        kotlin: ['2.0.21', '2.1.20', '2.2.0-Beta2']
+        kotlin: ['2.0.21', '2.1.20', '2.2.0-RC']
     env:
       KOTLIN_VERSION: ${{ matrix.kotlin }}
     name: "Kotlin ${{ matrix.kotlin }} - Java ${{ matrix.java-version }}"

build.gradle.kts

@@ -18,7 +18,7 @@ val jacksonVersion = libs.versions.jackson.get()
 val generatedSrcPath = "${layout.buildDirectory.get()}/generated/kotlin"
 
 group = groupStr
-version = "${jacksonVersion}-beta23"
+version = "${jacksonVersion}-beta24"
 
 repositories {
     mavenCentral()

src/main/kotlin/io/github/projectmapk/jackson/module/kogera/ClosedRangeSupport.kt

@@ -9,7 +9,7 @@ import com.fasterxml.jackson.databind.module.SimpleAbstractTypeResolver
 
 internal abstract class ClosedRangeMixin<T> @JsonCreator constructor(
     public val start: T,
-    @get:JsonProperty("end") public val endInclusive: T
+    @get:JsonProperty("end") public val endInclusive: T,
 ) {
     @JsonIgnore
     public abstract fun getEnd(): T

src/main/kotlin/io/github/projectmapk/jackson/module/kogera/Converters.kt

@@ -14,7 +14,7 @@ import com.fasterxml.jackson.databind.util.StdConverter
  */
 internal class ValueClassBoxConverter<S : Any?, D : Any>(
     unboxedClass: Class<S>,
-    val boxedClass: Class<D>
+    val boxedClass: Class<D>,
 ) : StdConverter<S, D>() {
     private val boxMethod = boxedClass.getDeclaredMethod("box-impl", unboxedClass).apply {
         ClassUtil.checkAndFixAccess(this, false)
@@ -35,7 +35,7 @@ internal class ValueClassUnboxConverter<T : Any>(val valueClass: Class<T>) : Std
 
     override fun getInputType(typeFactory: TypeFactory): JavaType = typeFactory.constructType(valueClass)
     override fun getOutputType(
-        typeFactory: TypeFactory
+        typeFactory: TypeFactory,
     ): JavaType = typeFactory.constructType(unboxMethod.genericReturnType)
 
     val delegatingSerializer: StdDelegatingSerializer by lazy { StdDelegatingSerializer(this) }

src/main/kotlin/io/github/projectmapk/jackson/module/kogera/Extensions.kt

@@ -49,7 +49,7 @@ public fun jacksonMapperBuilder(initializer: KotlinModule.Builder.() -> Unit = {
 
 @JvmOverloads
 public fun ObjectMapper.registerKotlinModule(
-    initializer: KotlinModule.Builder.() -> Unit = {}
+    initializer: KotlinModule.Builder.() -> Unit = {},
 ): ObjectMapper = this.registerModule(kotlinModule(initializer))
 // endregion
 
@@ -67,7 +67,7 @@ internal inline fun <reified T> Any?.checkTypeMismatch(): T {
         // JsonMappingException was not used to unify the behavior.
         throw RuntimeJsonMappingException(
             "Deserialized value did not match the specified type; " +
-                "specified ${T::class.qualifiedName}$nullability but was ${this?.let { it::class.qualifiedName }}"
+                "specified ${T::class.qualifiedName}$nullability but was ${this?.let { it::class.qualifiedName }}",
         )
     }
     return this
@@ -157,7 +157,7 @@ public inline fun <reified T> ObjectMapper.readValue(src: ByteArray): T = readVa
  *   due to an incorrect customization to [ObjectMapper].
  */
 public inline fun <reified T> ObjectMapper.treeToValue(
-    n: TreeNode
+    n: TreeNode,
 ): T = readValue(this.treeAsTokens(n), jacksonTypeRef<T>()).checkTypeMismatch()
 
 /**
@@ -192,13 +192,13 @@ public inline fun <reified T> ObjectReader.readValuesTyped(jp: JsonParser): Iter
     }
 }
 public inline fun <reified T> ObjectReader.treeToValue(
-    n: TreeNode
+    n: TreeNode,
 ): T? = readValue(this.treeAsTokens(n), jacksonTypeRef<T>())
 
 public inline fun <reified T, reified U> ObjectMapper.addMixIn(): ObjectMapper = addMixIn(T::class.java, U::class.java)
 public inline fun <reified T, reified U> JsonMapper.Builder.addMixIn(): JsonMapper.Builder = addMixIn(
     T::class.java,
-    U::class.java
+    U::class.java,
 )
 
 public operator fun ArrayNode.plus(element: Boolean) {
@@ -298,15 +298,15 @@ public operator fun JsonNode.contains(index: Int): Boolean = has(index)
 
 public fun <T : Any> SimpleModule.addSerializer(
     kClass: KClass<T>,
-    serializer: JsonSerializer<T>
+    serializer: JsonSerializer<T>,
 ): SimpleModule = this.apply {
     kClass.javaPrimitiveType?.let { addSerializer(it, serializer) }
     addSerializer(kClass.javaObjectType, serializer)
 }
 
 public fun <T : Any> SimpleModule.addDeserializer(
     kClass: KClass<T>,
-    deserializer: JsonDeserializer<T>
+    deserializer: JsonDeserializer<T>,
 ): SimpleModule = this.apply {
     kClass.javaPrimitiveType?.let { addDeserializer(it, deserializer) }
     addDeserializer(kClass.javaObjectType, deserializer)

src/main/kotlin/io/github/projectmapk/jackson/module/kogera/InternalCommons.kt

@@ -30,7 +30,7 @@ private val primitiveClassToDesc = mapOf(
     Long::class.java to 'J',
     Short::class.java to 'S',
     Boolean::class.java to 'Z',
-    Void.TYPE to 'V'
+    Void.TYPE to 'V',
 )
 
 // -> this.name.replace(".", "/")
@@ -56,12 +56,12 @@ internal fun Array<Class<*>>.toDescBuilder(): StringBuilder = this
 
 internal fun Constructor<*>.toSignature(): JvmMethodSignature = JvmMethodSignature(
     "<init>",
-    parameterTypes.toDescBuilder().append('V').toString()
+    parameterTypes.toDescBuilder().append('V').toString(),
 )
 
 internal fun Method.toSignature(): JvmMethodSignature = JvmMethodSignature(
     this.name,
-    parameterTypes.toDescBuilder().appendDescriptor(this.returnType).toString()
+    parameterTypes.toDescBuilder().appendDescriptor(this.returnType).toString(),
 )
 
 internal val defaultConstructorMarker: Class<*> by lazy {

src/main/kotlin/io/github/projectmapk/jackson/module/kogera/KotlinClassIntrospector.kt

@@ -40,7 +40,7 @@ internal object KotlinClassIntrospector : BasicClassIntrospector() {
     override fun forSerialization(
         config: SerializationConfig,
         type: JavaType,
-        r: MixInResolver
+        r: MixInResolver,
     ): BasicBeanDescription {
         // minor optimization: for some JDK types do minimal introspection
         return _findStdTypeDesc(config, type)
@@ -61,7 +61,7 @@ internal object KotlinClassIntrospector : BasicClassIntrospector() {
     override fun forDeserialization(
         config: DeserializationConfig,
         type: JavaType,
-        r: MixInResolver
+        r: MixInResolver,
     ): BasicBeanDescription {
         // minor optimization: for some JDK types do minimal introspection
         return _findStdTypeDesc(config, type)

src/main/kotlin/io/github/projectmapk/jackson/module/kogera/KotlinFeature.kt

@@ -84,7 +84,8 @@ public enum class KotlinFeature(internal val enabledByDefault: Boolean) {
      * `@JsonFormat` annotations need to be declared either on getter using `@get:JsonFormat` or field using `@field:JsonFormat`.
      * See [jackson-module-kotlin#651] for details.
      */
-    UseJavaDurationConversion(enabledByDefault = false);
+    UseJavaDurationConversion(enabledByDefault = false),
+    ;
 
     internal val bitSet: BitSet = (1 shl ordinal).toBitSet()
 

src/main/kotlin/io/github/projectmapk/jackson/module/kogera/KotlinModule.kt

@@ -49,7 +49,7 @@ public class KotlinModule private constructor(
     public val strictNullChecks: Boolean = StrictNullChecks.enabledByDefault,
     public val copySyntheticConstructorParameterAnnotations: Boolean =
         CopySyntheticConstructorParameterAnnotations.enabledByDefault,
-    public val useJavaDurationConversion: Boolean = UseJavaDurationConversion.enabledByDefault
+    public val useJavaDurationConversion: Boolean = UseJavaDurationConversion.enabledByDefault,
 ) : SimpleModule(KotlinModule::class.java.name, kogeraVersion) { // kogeraVersion is generated by building.
     private constructor(builder: Builder) : this(
         builder.cacheSize,
@@ -59,12 +59,12 @@ public class KotlinModule private constructor(
         builder.isEnabled(SingletonSupport),
         builder.isEnabled(StrictNullChecks),
         builder.isEnabled(CopySyntheticConstructorParameterAnnotations),
-        builder.isEnabled(UseJavaDurationConversion)
+        builder.isEnabled(UseJavaDurationConversion),
     )
 
     @Deprecated(
         message = "This is an API for compatibility; use Builder.",
-        level = DeprecationLevel.HIDDEN
+        level = DeprecationLevel.HIDDEN,
     )
     public constructor() : this(Builder())
 
@@ -101,7 +101,7 @@ public class KotlinModule private constructor(
 
         if (!context.isEnabled(MapperFeature.USE_ANNOTATIONS)) {
             throw IllegalStateException(
-                "The Jackson Kotlin module requires USE_ANNOTATIONS to be true or it cannot function"
+                "The Jackson Kotlin module requires USE_ANNOTATIONS to be true or it cannot function",
             )
         }
 
@@ -123,7 +123,7 @@ public class KotlinModule private constructor(
      */
     public data class CacheSize(
         val initialCacheSize: Int = Builder.DEFAULT_CACHE_SIZE,
-        val maxCacheSize: Int = Builder.DEFAULT_CACHE_SIZE
+        val maxCacheSize: Int = Builder.DEFAULT_CACHE_SIZE,
     ) : Serializable {
         /**
          * Set the same size for [initialCacheSize] and [maxCacheSize].
@@ -133,12 +133,12 @@ public class KotlinModule private constructor(
         init {
             if (maxCacheSize < 16) {
                 throw IllegalArgumentException(
-                    "The maxCacheSize must be at least 16. The recommended value is 100 or more."
+                    "The maxCacheSize must be at least 16. The recommended value is 100 or more.",
                 )
             }
             if (maxCacheSize < initialCacheSize) {
                 throw IllegalArgumentException(
-                    "maxCacheSize($maxCacheSize) was less than initialCacheSize($initialCacheSize)."
+                    "maxCacheSize($maxCacheSize) was less than initialCacheSize($initialCacheSize).",
                 )
             }
         }