diff --git a/core/jvmMain/src/kotlinx/serialization/internal/Platform.kt b/core/jvmMain/src/kotlinx/serialization/internal/Platform.kt index 399dbb2378..72ec9ea968 100644 --- a/core/jvmMain/src/kotlinx/serialization/internal/Platform.kt +++ b/core/jvmMain/src/kotlinx/serialization/internal/Platform.kt @@ -153,6 +153,9 @@ private fun Class.createEnumSerializer(): KSerializer { } private fun Class.findObjectSerializer(): KSerializer? { + // Special case to avoid IllegalAccessException on Java11+ (#2449) + // There are no serializable objects in the stdlib anyway. + if (this.canonicalName?.let { it.startsWith("java.") || it.startsWith("kotlin.") } != false) return null // Check it is an object without using kotlin-reflect val field = declaredFields.singleOrNull { it.name == "INSTANCE" && it.type == this && Modifier.isStatic(it.modifiers) } diff --git a/formats/json-tests/jvmTest/src/kotlinx/serialization/JavaCollectionsTest.kt b/formats/json-tests/jvmTest/src/kotlinx/serialization/JavaCollectionsTest.kt index a0ff55a25c..1f4958a6bc 100644 --- a/formats/json-tests/jvmTest/src/kotlinx/serialization/JavaCollectionsTest.kt +++ b/formats/json-tests/jvmTest/src/kotlinx/serialization/JavaCollectionsTest.kt @@ -17,6 +17,7 @@ package kotlinx.serialization import kotlinx.serialization.json.Json +import kotlinx.serialization.test.typeTokenOf import org.junit.Test import java.util.HashMap import java.util.HashSet @@ -24,7 +25,8 @@ import kotlin.collections.LinkedHashMap import kotlin.collections.Map import kotlin.collections.hashMapOf import kotlin.collections.hashSetOf -import kotlin.test.assertEquals +import kotlin.reflect.* +import kotlin.test.* class JavaCollectionsTest { @@ -38,7 +40,7 @@ class JavaCollectionsTest { ) @Test - fun test() { + fun testJavaCollectionsInsideClass() { val original = HasHashMap("42", hashMapOf(1 to "1", 2 to "2"), hashSetOf(11), LinkedHashMap(), null) val serializer = HasHashMap.serializer() val string = Json.encodeToString(serializer = serializer, value = original) @@ -49,4 +51,62 @@ class JavaCollectionsTest { val restored = Json.decodeFromString(deserializer = serializer, string = string) assertEquals(expected = original, actual = restored) } + + @Test + fun testTopLevelMaps() { + // Returning null here is a deliberate choice: map constructor functions may return different specialized + // implementations (e.g., kotlin.collections.EmptyMap or java.util.Collections.SingletonMap) + // that may or may not be generic. Since we generally cannot return a generic serializer using Java class only, + // all attempts to get map serializer using only .javaClass should return null. + assertNull(serializerOrNull(emptyMap().javaClass)) + assertNull(serializerOrNull(mapOf("a" to "b").javaClass)) + assertNull(serializerOrNull(mapOf("a" to "b", "b" to "c").javaClass)) + // Correct ways of retrieving map serializer: + assertContains( + serializer(typeTokenOf>()).descriptor.serialName, + "kotlin.collections.LinkedHashMap" + ) + assertContains( + serializer(typeTokenOf>()).descriptor.serialName, + "kotlin.collections.LinkedHashMap" + ) + assertContains( + serializer(typeOf>()).descriptor.serialName, + "kotlin.collections.LinkedHashMap" + ) + } + + @Test + fun testTopLevelSetsAndLists() { + // Same reasoning as for maps + assertNull(serializerOrNull(emptyList().javaClass)) + assertNull(serializerOrNull(listOf("a").javaClass)) + assertNull(serializerOrNull(listOf("a", "b").javaClass)) + assertNull(serializerOrNull(emptySet().javaClass)) + assertNull(serializerOrNull(setOf("a").javaClass)) + assertNull(serializerOrNull(setOf("a", "b").javaClass)) + assertContains( + serializer(typeTokenOf>()).descriptor.serialName, + "kotlin.collections.LinkedHashSet" + ) + assertContains( + serializer(typeTokenOf>()).descriptor.serialName, + "kotlin.collections.ArrayList" + ) + assertContains( + serializer(typeTokenOf>()).descriptor.serialName, + "kotlin.collections.LinkedHashSet" + ) + assertContains( + serializer(typeTokenOf>()).descriptor.serialName, + "kotlin.collections.ArrayList" + ) + } + + @Test + fun testAnonymousObject() { + val obj: Any = object {} + assertNull(serializerOrNull(obj.javaClass)) + } } + diff --git a/formats/json-tests/jvmTest/src/kotlinx/serialization/features/SerializerByTypeTest.kt b/formats/json-tests/jvmTest/src/kotlinx/serialization/features/SerializerByTypeTest.kt index 3bc4528595..a600b9d719 100644 --- a/formats/json-tests/jvmTest/src/kotlinx/serialization/features/SerializerByTypeTest.kt +++ b/formats/json-tests/jvmTest/src/kotlinx/serialization/features/SerializerByTypeTest.kt @@ -209,15 +209,6 @@ class SerializerByTypeTest { assertEquals(expected, json.encodeToString(serial2 as KSerializer, value)) } - @PublishedApi - internal open class TypeBase - - public inline fun typeTokenOf(): Type { - val base = object : TypeBase() {} - val superType = base::class.java.genericSuperclass!! - return (superType as ParameterizedType).actualTypeArguments.first()!! - } - class IntBox(val i: Int) object CustomIntSerializer : KSerializer { diff --git a/formats/json-tests/jvmTest/src/kotlinx/serialization/test/TypeToken.kt b/formats/json-tests/jvmTest/src/kotlinx/serialization/test/TypeToken.kt new file mode 100644 index 0000000000..2b04274c94 --- /dev/null +++ b/formats/json-tests/jvmTest/src/kotlinx/serialization/test/TypeToken.kt @@ -0,0 +1,17 @@ +/* + * Copyright 2017-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. + */ + +package kotlinx.serialization.test + +import java.lang.reflect.* + + +@PublishedApi +internal open class TypeBase + +public inline fun typeTokenOf(): Type { + val base = object : TypeBase() {} + val superType = base::class.java.genericSuperclass!! + return (superType as ParameterizedType).actualTypeArguments.first()!! +}