Remove unnecessary method.isAccessible() invocation

Closes gh-32548
This commit is contained in:
Sébastien Deleuze 2024-03-28 11:50:29 +01:00
parent dc982d0d51
commit cf87441a26
6 changed files with 42 additions and 6 deletions

View File

@ -115,7 +115,7 @@ public abstract class CoroutinesUtils {
Assert.isTrue(KotlinDetector.isSuspendingFunction(method), "Method must be a suspending function"); Assert.isTrue(KotlinDetector.isSuspendingFunction(method), "Method must be a suspending function");
KFunction<?> function = ReflectJvmMapping.getKotlinFunction(method); KFunction<?> function = ReflectJvmMapping.getKotlinFunction(method);
Assert.notNull(function, () -> "Failed to get Kotlin function for method: " + method); Assert.notNull(function, () -> "Failed to get Kotlin function for method: " + method);
if (method.isAccessible() && !KCallablesJvm.isAccessible(function)) { if (!KCallablesJvm.isAccessible(function)) {
KCallablesJvm.setAccessible(function, true); KCallablesJvm.setAccessible(function, true);
} }
Mono<Object> mono = MonoKt.mono(context, (scope, continuation) -> { Mono<Object> mono = MonoKt.mono(context, (scope, continuation) -> {

View File

@ -93,6 +93,17 @@ class CoroutinesUtilsTests {
} }
} }
@Test
fun invokePrivateSuspendingFunction() {
val method = CoroutinesUtilsTests::class.java.getDeclaredMethod("privateSuspendingFunction", String::class.java, Continuation::class.java)
val publisher = CoroutinesUtils.invokeSuspendingFunction(method, this, "foo")
Assertions.assertThat(publisher).isInstanceOf(Mono::class.java)
StepVerifier.create(publisher)
.expectNext("foo")
.expectComplete()
.verify()
}
@Test @Test
fun invokeNonSuspendingFunction() { fun invokeNonSuspendingFunction() {
val method = CoroutinesUtilsTests::class.java.getDeclaredMethod("nonSuspendingFunction", String::class.java) val method = CoroutinesUtilsTests::class.java.getDeclaredMethod("nonSuspendingFunction", String::class.java)
@ -252,6 +263,11 @@ class CoroutinesUtilsTests {
return value return value
} }
private suspend fun privateSuspendingFunction(value: String): String {
delay(1)
return value
}
suspend fun suspendingFunctionWithNullable(value: String?): String? { suspend fun suspendingFunctionWithNullable(value: String?): String? {
delay(1) delay(1)
return value return value

View File

@ -305,7 +305,7 @@ public class InvocableHandlerMethod extends HandlerMethod {
if (function == null) { if (function == null) {
return method.invoke(target, args); return method.invoke(target, args);
} }
if (method.isAccessible() && !KCallablesJvm.isAccessible(function)) { if (!KCallablesJvm.isAccessible(function)) {
KCallablesJvm.setAccessible(function, true); KCallablesJvm.setAccessible(function, true);
} }
Map<KParameter, Object> argMap = CollectionUtils.newHashMap(args.length + 1); Map<KParameter, Object> argMap = CollectionUtils.newHashMap(args.length + 1);

View File

@ -84,6 +84,15 @@ class InvocableHandlerMethodKotlinTests {
Assertions.assertThat(value).isNull() Assertions.assertThat(value).isNull()
} }
@Test
fun private() {
composite.addResolver(StubArgumentResolver(Float::class.java, 1.2f))
val value = getInvocable(Handler::class.java, Float::class.java).invokeForRequest(request, null)
Assertions.assertThat(getStubResolver(0).resolvedParameters).hasSize(1)
Assertions.assertThat(value).isEqualTo("1.2")
}
@Test @Test
fun valueClass() { fun valueClass() {
composite.addResolver(StubArgumentResolver(Long::class.java, 1L)) composite.addResolver(StubArgumentResolver(Long::class.java, 1L))
@ -182,6 +191,8 @@ class InvocableHandlerMethodKotlinTests {
return null return null
} }
private fun private(value: Float) = value.toString()
} }
private class ValueClassHandler { private class ValueClassHandler {

View File

@ -318,7 +318,7 @@ public class InvocableHandlerMethod extends HandlerMethod {
if (function == null) { if (function == null) {
return method.invoke(target, args); return method.invoke(target, args);
} }
if (method.isAccessible() && !KCallablesJvm.isAccessible(function)) { if (!KCallablesJvm.isAccessible(function)) {
KCallablesJvm.setAccessible(function, true); KCallablesJvm.setAccessible(function, true);
} }
Map<KParameter, Object> argMap = CollectionUtils.newHashMap(args.length + 1); Map<KParameter, Object> argMap = CollectionUtils.newHashMap(args.length + 1);

View File

@ -112,11 +112,18 @@ class InvocableHandlerMethodKotlinTests {
@Test @Test
fun privateController() { fun privateController() {
this.resolvers.add(stubResolver("foo")) this.resolvers.add(stubResolver("foo"))
val method = PrivateCoroutinesController::singleArg.javaMethod!! val method = PrivateController::singleArg.javaMethod!!
val result = invoke(PrivateCoroutinesController(), method,"foo") val result = invoke(PrivateController(), method,"foo")
assertHandlerResultValue(result, "success:foo") assertHandlerResultValue(result, "success:foo")
} }
@Test
fun privateFunction() {
val method = PrivateController::class.java.getDeclaredMethod("private")
val result = invoke(PrivateController(), method)
assertHandlerResultValue(result, "private")
}
@Test @Test
fun defaultValue() { fun defaultValue() {
this.resolvers.add(stubResolver(null, String::class.java)) this.resolvers.add(stubResolver(null, String::class.java))
@ -330,12 +337,14 @@ class InvocableHandlerMethodKotlinTests {
} }
} }
private class PrivateCoroutinesController { private class PrivateController {
suspend fun singleArg(q: String?): String { suspend fun singleArg(q: String?): String {
delay(1) delay(1)
return "success:$q" return "success:$q"
} }
private fun private() = "private"
} }
class DefaultValueController { class DefaultValueController {