Introduce NoSuchPropertyException and IllegalAccessException
No new tests added because it's difficult to model a situation where a ::-access is allowed but the code throws these exceptions at runtime
This commit is contained in:
@@ -1,3 +1,4 @@
|
|||||||
|
import kotlin.reflect.IllegalAccessException
|
||||||
import kotlin.reflect.KMemberProperty
|
import kotlin.reflect.KMemberProperty
|
||||||
import kotlin.reflect.jvm.accessible
|
import kotlin.reflect.jvm.accessible
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import kotlin.reflect.IllegalAccessException
|
||||||
import kotlin.reflect.KMutableMemberProperty
|
import kotlin.reflect.KMutableMemberProperty
|
||||||
import kotlin.reflect.jvm.accessible
|
import kotlin.reflect.jvm.accessible
|
||||||
|
|
||||||
|
|||||||
+1
@@ -1,3 +1,4 @@
|
|||||||
|
import kotlin.reflect.IllegalAccessException
|
||||||
import kotlin.reflect.jvm.accessible
|
import kotlin.reflect.jvm.accessible
|
||||||
|
|
||||||
class A(param: String) {
|
class A(param: String) {
|
||||||
|
|||||||
@@ -0,0 +1,31 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2010-2014 JetBrains s.r.o.
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package kotlin.reflect
|
||||||
|
|
||||||
|
suppress("PLATFORM_CLASS_MAPPED_TO_KOTLIN")
|
||||||
|
public class IllegalAccessException(cause: java.lang.IllegalAccessException) : Exception() {
|
||||||
|
{
|
||||||
|
(this as java.lang.Throwable).initCause(cause)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
suppress("PLATFORM_CLASS_MAPPED_TO_KOTLIN")
|
||||||
|
public class NoSuchPropertyException(cause: Exception) : Exception() {
|
||||||
|
{
|
||||||
|
(this as java.lang.Throwable).initCause(cause)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -23,12 +23,22 @@ open class KForeignMemberProperty<T : Any, out R>(
|
|||||||
public override val name: String,
|
public override val name: String,
|
||||||
protected val owner: KClassImpl<T>
|
protected val owner: KClassImpl<T>
|
||||||
) : KMemberProperty<T, R>, KPropertyImpl<R> {
|
) : KMemberProperty<T, R>, KPropertyImpl<R> {
|
||||||
override val field: Field = owner.jClass.getField(name)
|
override val field: Field = try {
|
||||||
|
owner.jClass.getField(name)
|
||||||
|
}
|
||||||
|
catch (e: NoSuchFieldException) {
|
||||||
|
throw NoSuchPropertyException(e)
|
||||||
|
}
|
||||||
|
|
||||||
override val getter: Method? get() = null
|
override val getter: Method? get() = null
|
||||||
|
|
||||||
override fun get(receiver: T): R {
|
override fun get(receiver: T): R {
|
||||||
return field.get(receiver) as R
|
try {
|
||||||
|
return field.get(receiver) as R
|
||||||
|
}
|
||||||
|
catch (e: java.lang.IllegalAccessException) {
|
||||||
|
throw kotlin.reflect.IllegalAccessException(e)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun equals(other: Any?): Boolean =
|
override fun equals(other: Any?): Boolean =
|
||||||
@@ -49,7 +59,12 @@ class KMutableForeignMemberProperty<T : Any, out R>(
|
|||||||
override val setter: Method? get() = null
|
override val setter: Method? get() = null
|
||||||
|
|
||||||
override fun set(receiver: T, value: R) {
|
override fun set(receiver: T, value: R) {
|
||||||
field.set(receiver, value)
|
try {
|
||||||
|
field.set(receiver, value)
|
||||||
|
}
|
||||||
|
catch (e: java.lang.IllegalAccessException) {
|
||||||
|
throw kotlin.reflect.IllegalAccessException(e)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun toString(): String =
|
override fun toString(): String =
|
||||||
|
|||||||
@@ -34,10 +34,20 @@ open class KMemberPropertyImpl<T : Any, out R>(
|
|||||||
}
|
}
|
||||||
|
|
||||||
// TODO: extract, make lazy (weak?), use our descriptors knowledge
|
// TODO: extract, make lazy (weak?), use our descriptors knowledge
|
||||||
override val getter: Method = owner.jClass.getMaybeDeclaredMethod(getterName(name))
|
override val getter: Method = try {
|
||||||
|
owner.jClass.getMaybeDeclaredMethod(getterName(name))
|
||||||
|
}
|
||||||
|
catch (e: NoSuchMethodException) {
|
||||||
|
throw NoSuchPropertyException(e)
|
||||||
|
}
|
||||||
|
|
||||||
override fun get(receiver: T): R {
|
override fun get(receiver: T): R {
|
||||||
return getter(receiver) as R
|
try {
|
||||||
|
return getter(receiver) as R
|
||||||
|
}
|
||||||
|
catch (e: java.lang.IllegalAccessException) {
|
||||||
|
throw kotlin.reflect.IllegalAccessException(e)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun equals(other: Any?): Boolean =
|
override fun equals(other: Any?): Boolean =
|
||||||
@@ -55,10 +65,20 @@ class KMutableMemberPropertyImpl<T : Any, R>(
|
|||||||
name: String,
|
name: String,
|
||||||
owner: KClassImpl<T>
|
owner: KClassImpl<T>
|
||||||
) : KMutableMemberProperty<T, R>, KMutablePropertyImpl<R>, KMemberPropertyImpl<T, R>(name, owner) {
|
) : KMutableMemberProperty<T, R>, KMutablePropertyImpl<R>, KMemberPropertyImpl<T, R>(name, owner) {
|
||||||
override val setter: Method = owner.jClass.getMaybeDeclaredMethod(setterName(name), getter.getReturnType()!!)
|
override val setter: Method = try {
|
||||||
|
owner.jClass.getMaybeDeclaredMethod(setterName(name), getter.getReturnType()!!)
|
||||||
|
}
|
||||||
|
catch (e: NoSuchMethodException) {
|
||||||
|
throw NoSuchPropertyException(e)
|
||||||
|
}
|
||||||
|
|
||||||
override fun set(receiver: T, value: R) {
|
override fun set(receiver: T, value: R) {
|
||||||
setter(receiver, value)
|
try {
|
||||||
|
setter(receiver, value)
|
||||||
|
}
|
||||||
|
catch (e: java.lang.IllegalAccessException) {
|
||||||
|
throw kotlin.reflect.IllegalAccessException(e)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun toString(): String =
|
override fun toString(): String =
|
||||||
|
|||||||
@@ -27,10 +27,20 @@ open class KTopLevelExtensionPropertyImpl<T, out R>(
|
|||||||
override val field: Field? get() = null
|
override val field: Field? get() = null
|
||||||
|
|
||||||
// TODO: extract, make lazy (weak?), use our descriptors knowledge, support Java fields
|
// TODO: extract, make lazy (weak?), use our descriptors knowledge, support Java fields
|
||||||
override val getter: Method = owner.jClass.getMethod(getterName(name), receiverClass)
|
override val getter: Method = try {
|
||||||
|
owner.jClass.getMethod(getterName(name), receiverClass)
|
||||||
|
}
|
||||||
|
catch (e: NoSuchMethodException) {
|
||||||
|
throw NoSuchPropertyException(e)
|
||||||
|
}
|
||||||
|
|
||||||
override fun get(receiver: T): R {
|
override fun get(receiver: T): R {
|
||||||
return getter(null, receiver) as R
|
try {
|
||||||
|
return getter(null, receiver) as R
|
||||||
|
}
|
||||||
|
catch (e: java.lang.IllegalAccessException) {
|
||||||
|
throw kotlin.reflect.IllegalAccessException(e)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun equals(other: Any?): Boolean =
|
override fun equals(other: Any?): Boolean =
|
||||||
@@ -49,10 +59,20 @@ class KMutableTopLevelExtensionPropertyImpl<T, R>(
|
|||||||
owner: KPackageImpl,
|
owner: KPackageImpl,
|
||||||
receiverClass: Class<T>
|
receiverClass: Class<T>
|
||||||
) : KMutableTopLevelExtensionProperty<T, R>, KMutablePropertyImpl<R>, KTopLevelExtensionPropertyImpl<T, R>(name, owner, receiverClass) {
|
) : KMutableTopLevelExtensionProperty<T, R>, KMutablePropertyImpl<R>, KTopLevelExtensionPropertyImpl<T, R>(name, owner, receiverClass) {
|
||||||
override val setter: Method = owner.jClass.getMethod(setterName(name), receiverClass, getter.getReturnType()!!)
|
override val setter: Method = try {
|
||||||
|
owner.jClass.getMethod(setterName(name), receiverClass, getter.getReturnType()!!)
|
||||||
|
}
|
||||||
|
catch (e: NoSuchMethodException) {
|
||||||
|
throw NoSuchPropertyException(e)
|
||||||
|
}
|
||||||
|
|
||||||
override fun set(receiver: T, value: R) {
|
override fun set(receiver: T, value: R) {
|
||||||
setter.invoke(null, receiver, value)
|
try {
|
||||||
|
setter.invoke(null, receiver, value)
|
||||||
|
}
|
||||||
|
catch (e: java.lang.IllegalAccessException) {
|
||||||
|
throw kotlin.reflect.IllegalAccessException(e)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun toString(): String =
|
override fun toString(): String =
|
||||||
|
|||||||
@@ -27,10 +27,20 @@ open class KTopLevelVariableImpl<out R>(
|
|||||||
override val field: Field? get() = null
|
override val field: Field? get() = null
|
||||||
|
|
||||||
// TODO: extract, make lazy (weak?), use our descriptors knowledge, support Java fields
|
// TODO: extract, make lazy (weak?), use our descriptors knowledge, support Java fields
|
||||||
override val getter: Method = owner.jClass.getMethod(getterName(name))
|
override val getter: Method = try {
|
||||||
|
owner.jClass.getMethod(getterName(name))
|
||||||
|
}
|
||||||
|
catch (e: NoSuchMethodException) {
|
||||||
|
throw NoSuchPropertyException(e)
|
||||||
|
}
|
||||||
|
|
||||||
override fun get(): R {
|
override fun get(): R {
|
||||||
return getter(null) as R
|
try {
|
||||||
|
return getter(null) as R
|
||||||
|
}
|
||||||
|
catch (e: java.lang.IllegalAccessException) {
|
||||||
|
throw kotlin.reflect.IllegalAccessException(e)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun equals(other: Any?): Boolean =
|
override fun equals(other: Any?): Boolean =
|
||||||
@@ -48,10 +58,20 @@ class KMutableTopLevelVariableImpl<R>(
|
|||||||
name: String,
|
name: String,
|
||||||
owner: KPackageImpl
|
owner: KPackageImpl
|
||||||
) : KMutableTopLevelVariable<R>, KMutableVariableImpl<R>, KTopLevelVariableImpl<R>(name, owner) {
|
) : KMutableTopLevelVariable<R>, KMutableVariableImpl<R>, KTopLevelVariableImpl<R>(name, owner) {
|
||||||
override val setter: Method = owner.jClass.getMethod(setterName(name), getter.getReturnType()!!)
|
override val setter: Method = try {
|
||||||
|
owner.jClass.getMethod(setterName(name), getter.getReturnType()!!)
|
||||||
|
}
|
||||||
|
catch (e: NoSuchMethodException) {
|
||||||
|
throw NoSuchPropertyException(e)
|
||||||
|
}
|
||||||
|
|
||||||
override fun set(value: R) {
|
override fun set(value: R) {
|
||||||
setter.invoke(null, value)
|
try {
|
||||||
|
setter.invoke(null, value)
|
||||||
|
}
|
||||||
|
catch (e: java.lang.IllegalAccessException) {
|
||||||
|
throw kotlin.reflect.IllegalAccessException(e)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun toString(): String =
|
override fun toString(): String =
|
||||||
|
|||||||
Reference in New Issue
Block a user