From 84049fe5de5b81f98e79af34a1a2b762acef3915 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Deleuze?= <sdeleuze@vmware.com>
Date: Thu, 1 Apr 2021 15:00:23 +0200
Subject: [PATCH] Improve Kotlin support in
 BridgeMethodResolver#findBridgedMethod

This commit adds support for Kotlin non-nullable type which resolves
to primitive Java types in BridgeMethodResolver#findBridgedMethod.

Closes gh-26585
---
 .../core/BridgeMethodResolver.java            |  2 +-
 .../core/KotlinBridgeMethodResolverTests.kt   | 71 +++++++++++++++++++
 2 files changed, 72 insertions(+), 1 deletion(-)
 create mode 100644 spring-core/src/test/kotlin/org/springframework/core/KotlinBridgeMethodResolverTests.kt

diff --git a/spring-core/src/main/java/org/springframework/core/BridgeMethodResolver.java b/spring-core/src/main/java/org/springframework/core/BridgeMethodResolver.java
index 1615469dd154..7ea7e9cb6e93 100644
--- a/spring-core/src/main/java/org/springframework/core/BridgeMethodResolver.java
+++ b/spring-core/src/main/java/org/springframework/core/BridgeMethodResolver.java
@@ -163,7 +163,7 @@ private static boolean isResolvedTypeMatch(Method genericMethod, Method candidat
 				}
 			}
 			// A non-array type: compare the type itself.
-			if (!candidateParameter.equals(genericParameter.toClass())) {
+			if (!ClassUtils.resolvePrimitiveIfNecessary(candidateParameter).equals(ClassUtils.resolvePrimitiveIfNecessary(genericParameter.toClass()))) {
 				return false;
 			}
 		}
diff --git a/spring-core/src/test/kotlin/org/springframework/core/KotlinBridgeMethodResolverTests.kt b/spring-core/src/test/kotlin/org/springframework/core/KotlinBridgeMethodResolverTests.kt
new file mode 100644
index 000000000000..54db15dd45ae
--- /dev/null
+++ b/spring-core/src/test/kotlin/org/springframework/core/KotlinBridgeMethodResolverTests.kt
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2002-2021 the original author or authors.
+ *
+ * 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
+ *
+ *      https://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 org.springframework.core
+
+import org.assertj.core.api.Assertions
+import org.junit.jupiter.api.Test
+
+class KotlinBridgeMethodResolverTests {
+
+	@Test
+	fun findBridgedMethod() {
+		val unbridged = GenericRepository::class.java.getDeclaredMethod("delete", Int::class.java)
+		val bridged = GenericRepository::class.java.getDeclaredMethod("delete", Any::class.java)
+		Assertions.assertThat(unbridged.isBridge).isFalse
+		Assertions.assertThat(bridged.isBridge).isTrue
+
+		Assertions.assertThat(BridgeMethodResolver.findBridgedMethod(unbridged)).`as`("Unbridged method not returned directly").isEqualTo(unbridged)
+		Assertions.assertThat(BridgeMethodResolver.findBridgedMethod(bridged)).`as`("Incorrect bridged method returned").isEqualTo(unbridged)
+	}
+
+	@Test
+	fun findBridgedMethodWithArrays() {
+		val unbridged = GenericRepository::class.java.getDeclaredMethod("delete", Array<Int>::class.java)
+		val bridged = GenericRepository::class.java.getDeclaredMethod("delete", Array<Any>::class.java)
+		Assertions.assertThat(unbridged.isBridge).isFalse
+		Assertions.assertThat(bridged.isBridge).isTrue
+
+		Assertions.assertThat(BridgeMethodResolver.findBridgedMethod(unbridged)).`as`("Unbridged method not returned directly").isEqualTo(unbridged)
+		Assertions.assertThat(BridgeMethodResolver.findBridgedMethod(bridged)).`as`("Incorrect bridged method returned").isEqualTo(unbridged)
+	}
+}
+
+interface GenericInterface<ID> {
+	fun delete(id: ID)
+	fun delete(ids: Array<ID>)
+}
+
+abstract class AbstractGenericClass<ID> : GenericInterface<ID> {
+
+	override fun delete(id: ID) {
+	}
+
+	override fun delete(ids: Array<ID>) {
+	}
+}
+
+class GenericRepository : AbstractGenericClass<Int>() {
+
+	override fun delete(id: Int) {
+		error("gotcha")
+	}
+
+	override fun delete(ids: Array<Int>) {
+		error("gotcha")
+	}
+}
+