Expose Java reflection objects out of Kotlin ones

core/runtime.jvm/src/kotlin/reflect/jvm/internal/KExtensionPropertyImpl.kt

@@ -16,15 +16,17 @@
 
 package kotlin.reflect.jvm.internal
 
-import java.lang.reflect.Method
+import java.lang.reflect.*
 
 open class KExtensionPropertyImpl<T, out R>(
         public override val name: String,
         protected val owner: KPackageImpl,
         protected val receiverClass: Class<T>
 ) : KExtensionProperty<T, R>, KPropertyImpl<R> {
+    override val field: Field? get() = null
+
     // TODO: extract, make lazy (weak?), use our descriptors knowledge, support Java fields
-    val getter: Method = owner.jClass.getMethod(getterName(name), receiverClass)
+    override val getter: Method = owner.jClass.getMethod(getterName(name), receiverClass)
 
     override fun get(receiver: T): R {
         return getter(null, receiver) as R
@@ -36,7 +38,7 @@ class KMutableExtensionPropertyImpl<T, R>(
         owner: KPackageImpl,
         receiverClass: Class<T>
 ) : KMutableExtensionProperty<T, R>, KMutablePropertyImpl<R>, KExtensionPropertyImpl<T, R>(name, owner, receiverClass) {
-    val setter = owner.jClass.getMethod(setterName(name), receiverClass, getter.getReturnType()!!)
+    override val setter: Method = owner.jClass.getMethod(setterName(name), receiverClass, getter.getReturnType()!!)
 
     override fun set(receiver: T, value: R) {
         setter.invoke(null, receiver, value)

core/runtime.jvm/src/kotlin/reflect/jvm/internal/KMemberPropertyImpl.kt

@@ -16,21 +16,20 @@
 
 package kotlin.reflect.jvm.internal
 
-import java.lang.reflect.Field
+import java.lang.reflect.*
-import java.lang.reflect.Method
 
 open class KMemberPropertyImpl<T : Any, out R>(
         public override val name: String,
         protected val owner: KClassImpl<T>
 ) : KMemberProperty<T, R>, KPropertyImpl<R> {
-    val field: Field? =
+    override val field: Field? =
             if (owner.origin == KClassOrigin.FOREIGN) {
                 owner.jClass.getField(name)
             }
             else null
 
     // TODO: extract, make lazy (weak?), use our descriptors knowledge
-    val getter: Method? =
+    override val getter: Method? =
             if (owner.origin == KClassOrigin.KOTLIN) {
                 owner.jClass.getMaybeDeclaredMethod(getterName(name))
             }
@@ -49,7 +48,7 @@ class KMutableMemberPropertyImpl<T : Any, R>(
         name: String,
         owner: KClassImpl<T>
 ) : KMutableMemberProperty<T, R>, KMutablePropertyImpl<R>, KMemberPropertyImpl<T, R>(name, owner) {
-    val setter: Method? =
+    override val setter: Method? =
             if (owner.origin == KClassOrigin.KOTLIN) {
                 owner.jClass.getMaybeDeclaredMethod(setterName(name), getter!!.getReturnType()!!)
             }

core/runtime.jvm/src/kotlin/reflect/jvm/internal/KPropertyImpl.kt

@@ -19,9 +19,12 @@ package kotlin.reflect.jvm.internal
 import java.lang.reflect.*
 
 trait KPropertyImpl<out R> : KProperty<R>, KCallableImpl<R> {
+    val field: Field?
 
+    val getter: Method?
 }
 
 
 trait KMutablePropertyImpl<R> : KMutableProperty<R>, KPropertyImpl<R> {
+    val setter: Method?
 }

core/runtime.jvm/src/kotlin/reflect/jvm/internal/KTopLevelPropertyImpl.kt

@@ -16,14 +16,17 @@
 
 package kotlin.reflect.jvm.internal
 
-import java.lang.reflect.Method
+import java.lang.reflect.*
 
 open class KTopLevelPropertyImpl<out R>(
         public override val name: String,
         protected val owner: KPackageImpl
 ) : KTopLevelProperty<R>, KVariableImpl<R> {
+    // TODO: load the field from the corresponding package part
+    override val field: Field? get() = null
+
     // TODO: extract, make lazy (weak?), use our descriptors knowledge, support Java fields
-    val getter: Method = owner.jClass.getMethod(getterName(name))
+    override val getter: Method = owner.jClass.getMethod(getterName(name))
 
     override fun get(): R {
         return getter(null) as R
@@ -34,7 +37,7 @@ class KMutableTopLevelPropertyImpl<R>(
         name: String,
         owner: KPackageImpl
 ) : KMutableTopLevelProperty<R>, KMutableVariableImpl<R>, KTopLevelPropertyImpl<R>(name, owner) {
-    val setter = owner.jClass.getMethod(setterName(name), getter.getReturnType()!!)
+    override val setter: Method = owner.jClass.getMethod(setterName(name), getter.getReturnType()!!)
 
     override fun set(value: R) {
         setter.invoke(null, value)