Merge remote-tracking branch 'FasterXML/2.17'

FasterXML · Mar 24, 2024 · aa57bfe · aa57bfe
2 parents 20d998a + ce3e046
commit aa57bfe
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/release-notes/CREDITS-2.x b/release-notes/CREDITS-2.x
@@ -19,6 +19,7 @@ Contributors:
 
 WrongWrong (@k163377)
 * #776: Delete Duration conversion that was no longer needed
+* #779: Fixed to not process constructors of Java classes
 
 # 2.17.0
 

diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
@@ -19,6 +19,7 @@ Co-maintainers:
 2.17.1 (not yet released)
 
 #776: Delete Duration conversion that was no longer needed.
+#779: Errors no longer occur when processing Record types defined in Java.
 
 2.17.0 (12-Mar-2024)
 

diff --git a/src/main/kotlin/tools/jackson/module/kotlin/ReflectionCache.kt b/src/main/kotlin/tools/jackson/module/kotlin/ReflectionCache.kt
@@ -59,8 +59,15 @@ internal class ReflectionCache(reflectionCacheSize: Int) : Serializable {
     private val valueClassBoxConverterCache: SimpleLookupCache<KClass<*>, ValueClassBoxConverter<*, *>> =
         SimpleLookupCache(0, reflectionCacheSize)
 
-    fun kotlinFromJava(key: Constructor<*>): KFunction<*>? = javaExecutableToKotlin.get(key)
-        ?: key.valueClassAwareKotlinFunction()?.let { javaExecutableToKotlin.putIfAbsent(key, it) ?: it }
+    // If the Record type defined in Java is processed,
+    // an error will occur, so if it is not defined in Kotlin, skip the process.
+    // see https://github.com/FasterXML/jackson-module-kotlin/issues/778
+    fun kotlinFromJava(key: Constructor<*>): KFunction<*>? = if (key.declaringClass.isKotlinClass()) {
+        javaExecutableToKotlin.get(key)
+            ?: key.valueClassAwareKotlinFunction()?.let { javaExecutableToKotlin.putIfAbsent(key, it) ?: it }
+    } else {
+        null
+    }
 
     fun kotlinFromJava(key: Method): KFunction<*>? = javaExecutableToKotlin.get(key)
         ?: key.kotlinFunction?.let { javaExecutableToKotlin.putIfAbsent(key, it) ?: it }