Merge remote-tracking branch 'FasterXML/2.19' into 3.x

Author: k163377

release-notes/CREDITS-2.x

@@ -18,6 +18,7 @@ Contributors:
 # 2.19.0 (not yet released)
 
 WrongWrong (@k163377)
+* #944: Fixed to use common util for Member accessibility override
 * #937: Added type match check to read functions
 
 Tatu Saloranta (@cowtowncoder)

release-notes/VERSION-2.x

@@ -18,6 +18,7 @@ Co-maintainers:
 
 2.19.0 (not yet released)
 
+#944: Common util is now used for member accessibility overrides.
 #937: For `readValue` and other shorthands for `ObjectMapper` deserialization methods,
   type consistency checks have been added.
   A `RuntimeJsonMappingException` will be thrown in case of inconsistency.

src/main/kotlin/tools/jackson/module/kotlin/Converters.kt

@@ -4,6 +4,7 @@ import tools.jackson.databind.JavaType
 import tools.jackson.databind.deser.std.StdConvertingDeserializer
 import tools.jackson.databind.ser.std.StdDelegatingSerializer
 import tools.jackson.databind.type.TypeFactory
+import tools.jackson.databind.util.ClassUtil
 import tools.jackson.databind.util.StdConverter
 import kotlin.reflect.KClass
 import kotlin.time.toJavaDuration
@@ -51,7 +52,7 @@ internal class ValueClassBoxConverter<S : Any?, D : Any>(
     val boxedClass: KClass<D>
 ) : StdConverter<S, D>() {
     private val boxMethod = boxedClass.java.getDeclaredMethod("box-impl", unboxedClass).apply {
-        if (!this.isAccessible) this.isAccessible = true
+        ClassUtil.checkAndFixAccess(this, false)
     }
 
     @Suppress("UNCHECKED_CAST")

src/main/kotlin/tools/jackson/module/kotlin/KotlinDeserializers.kt

@@ -11,6 +11,7 @@ import tools.jackson.databind.ValueDeserializer
 import tools.jackson.databind.deser.Deserializers
 import tools.jackson.databind.deser.std.StdDeserializer
 import tools.jackson.databind.exc.InvalidDefinitionException
+import tools.jackson.databind.util.ClassUtil
 import java.lang.reflect.Method
 import java.lang.reflect.Modifier
 import kotlin.reflect.full.primaryConstructor
@@ -94,7 +95,7 @@ internal class WrapsNullableValueClassBoxDeserializer<S, D : Any>(
     private val inputType: Class<*> = creator.parameterTypes[0]
 
     init {
-        creator.apply { if (!this.isAccessible) this.isAccessible = true }
+        ClassUtil.checkAndFixAccess(creator, false)
     }
 
     // Cache the result of wrapping null, since the result is always expected to be the same.

src/main/kotlin/tools/jackson/module/kotlin/KotlinKeyDeserializers.kt

@@ -6,6 +6,7 @@ import tools.jackson.databind.*
 import tools.jackson.databind.deser.jdk.JDKKeyDeserializer
 import tools.jackson.databind.deser.jdk.JDKKeyDeserializers
 import tools.jackson.databind.exc.InvalidDefinitionException
+import tools.jackson.databind.util.ClassUtil
 import java.lang.reflect.Method
 import kotlin.reflect.KClass
 import kotlin.reflect.full.primaryConstructor
@@ -70,7 +71,7 @@ internal class ValueClassKeyDeserializer<S, D : Any>(
     private val unboxedClass: Class<*> = creator.parameterTypes[0]
 
     init {
-        creator.apply { if (!this.isAccessible) this.isAccessible = true }
+        ClassUtil.checkAndFixAccess(creator, false)
     }
 
     // Based on databind error

src/main/kotlin/tools/jackson/module/kotlin/MethodValueCreator.kt

@@ -1,5 +1,6 @@
 package tools.jackson.module.kotlin
 
+import tools.jackson.databind.util.ClassUtil
 import kotlin.reflect.KFunction
 import kotlin.reflect.full.extensionReceiverParameter
 import kotlin.reflect.full.instanceParameter
@@ -39,7 +40,7 @@ internal class MethodValueCreator<T> private constructor(
                 possibleCompanion.java.enclosingClass.declaredFields
                     .firstOrNull { it.type.kotlin.isCompanion }
                     ?.let {
-                        it.isAccessible = true
+                        ClassUtil.checkAndFixAccess(it, false)
 
                         // If the instance of the companion object cannot be obtained, accessibility will always be false
                         it.get(null) to false