Make callable references Serializable on JVM

#KT-11254 Fixed
2017-02-13 14:03:22 +03:00
parent 4d451356eb
commit 1ee2053a16
17 changed files with 351 additions and 5 deletions
@@ -0,0 +1,19 @@
+// IGNORE_BACKEND: JS
+// WITH_REFLECT
+// FULL_JDK
+
+import java.io.*
+import kotlin.test.*
+
+class Foo(val value: String)
+
+fun box(): String {
+    val oos = ObjectOutputStream(ByteArrayOutputStream())
+    try {
+        oos.writeObject(Foo("abacaba")::value)
+        return "Fail: Foo is not Serializable and thus writeObject should have thrown an exception"
+    }
+    catch (e: NotSerializableException) {
+        return "OK"
+    }
+}
@@ -0,0 +1,21 @@
+// IGNORE_BACKEND: JS
+// WITH_REFLECT
+
+import java.io.*
+import kotlin.test.*
+
+data class Foo(val value: String) : Serializable
+
+fun box(): String {
+    val baos = ByteArrayOutputStream()
+    val oos = ObjectOutputStream(baos)
+    oos.writeObject(Foo("abacaba")::value)
+    oos.close()
+
+    val bais = ByteArrayInputStream(baos.toByteArray())
+    val ois = ObjectInputStream(bais)
+    assertEquals(Foo("abacaba")::value, ois.readObject())
+    ois.close()
+
+    return "OK"
+}
@@ -0,0 +1,27 @@
+// IGNORE_BACKEND: JS
+// WITH_RUNTIME
+
+import java.io.*
+import kotlin.test.*
+
+class Foo(val prop: String) {
+    fun method() {}
+}
+
+fun box(): String {
+    val baos = ByteArrayOutputStream()
+    val oos = ObjectOutputStream(baos)
+    oos.writeObject(Foo::prop)
+    oos.writeObject(Foo::method)
+    oos.writeObject(::Foo)
+    oos.close()
+
+    val bais = ByteArrayInputStream(baos.toByteArray())
+    val ois = ObjectInputStream(bais)
+    assertEquals(Foo::prop, ois.readObject())
+    assertEquals(Foo::method, ois.readObject())
+    assertEquals(::Foo, ois.readObject())
+    ois.close()
+
+    return "OK"
+}
@@ -0,0 +1,25 @@
+// IGNORE_BACKEND: JS
+// WITH_REFLECT
+
+import java.io.*
+import kotlin.test.*
+
+fun bar() {}
+
+fun box(): String {
+    val baos = ByteArrayOutputStream()
+    val oos = ObjectOutputStream(baos)
+    oos.writeObject(::bar)
+    oos.close()
+
+    val bais = ByteArrayInputStream(baos.toByteArray())
+    val ois = ObjectInputStream(bais)
+    val o = ois.readObject()
+    ois.close()
+
+    // Test that we don't serialize the reflected view of the reference: it's not needed because it can be restored at runtime
+    val field = kotlin.jvm.internal.CallableReference::class.java.getDeclaredField("reflected").apply { isAccessible = true }
+    assertNull(field.get(o))
+
+    return "OK"
+}
@@ -0,0 +1,27 @@
+// IGNORE_BACKEND: JS
+// WITH_REFLECT
+
+import java.io.*
+import kotlin.test.*
+
+class Foo(val prop: String) {
+    fun method() {}
+}
+
+fun box(): String {
+    val baos = ByteArrayOutputStream()
+    val oos = ObjectOutputStream(baos)
+    oos.writeObject(Foo::prop)
+    oos.writeObject(Foo::method)
+    oos.writeObject(::Foo)
+    oos.close()
+
+    val bais = ByteArrayInputStream(baos.toByteArray())
+    val ois = ObjectInputStream(bais)
+    assertEquals(Foo::prop, ois.readObject())
+    assertEquals(Foo::method, ois.readObject())
+    assertEquals(::Foo, ois.readObject())
+    ois.close()
+
+    return "OK"
+}
@@ -0,0 +1,12 @@
+@kotlin.Metadata
+public final class CallableReferencesAreSerializableKt {
+    public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
+}
+
+@kotlin.Metadata
+public final class Foo {
+    private final @org.jetbrains.annotations.NotNull field prop: java.lang.String
+    public method <init>(@org.jetbrains.annotations.NotNull p0: java.lang.String): void
+    public final @org.jetbrains.annotations.NotNull method getProp(): java.lang.String
+    public final method method(): void
+}
@@ -0,0 +1,11 @@
+@kotlin.Metadata
+public final class BoundWithNotSerializableReceiverKt {
+    public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
+}
+
+@kotlin.Metadata
+public final class Foo {
+    private final @org.jetbrains.annotations.NotNull field value: java.lang.String
+    public method <init>(@org.jetbrains.annotations.NotNull p0: java.lang.String): void
+    public final @org.jetbrains.annotations.NotNull method getValue(): java.lang.String
+}
@@ -0,0 +1,17 @@
+@kotlin.Metadata
+public final class BoundWithSerializableReceiverKt {
+    public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
+}
+
+@kotlin.Metadata
+public final class Foo {
+    private final @org.jetbrains.annotations.NotNull field value: java.lang.String
+    public method <init>(@org.jetbrains.annotations.NotNull p0: java.lang.String): void
+    public final @org.jetbrains.annotations.NotNull method component1(): java.lang.String
+    public synthetic static method copy$default(p0: Foo, p1: java.lang.String, p2: int, p3: java.lang.Object): Foo
+    public final @org.jetbrains.annotations.NotNull method copy(@org.jetbrains.annotations.NotNull p0: java.lang.String): Foo
+    public method equals(p0: java.lang.Object): boolean
+    public final @org.jetbrains.annotations.NotNull method getValue(): java.lang.String
+    public method hashCode(): int
+    public method toString(): java.lang.String
+}
@@ -0,0 +1,12 @@
+@kotlin.Metadata
+public final class Foo {
+    private final @org.jetbrains.annotations.NotNull field prop: java.lang.String
+    public method <init>(@org.jetbrains.annotations.NotNull p0: java.lang.String): void
+    public final @org.jetbrains.annotations.NotNull method getProp(): java.lang.String
+    public final method method(): void
+}
+
+@kotlin.Metadata
+public final class NoReflectKt {
+    public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
+}
@@ -0,0 +1,5 @@
+@kotlin.Metadata
+public final class ReflectedIsNotSerializedKt {
+    public final static method bar(): void
+    public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
+}
@@ -0,0 +1,12 @@
+@kotlin.Metadata
+public final class Foo {
+    private final @org.jetbrains.annotations.NotNull field prop: java.lang.String
+    public method <init>(@org.jetbrains.annotations.NotNull p0: java.lang.String): void
+    public final @org.jetbrains.annotations.NotNull method getProp(): java.lang.String
+    public final method method(): void
+}
+
+@kotlin.Metadata
+public final class WithReflectKt {
+    public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
+}