Merge pull request #49063 from dj258255

* pr/49063:
  Polish "Add Kotlin DSL extension functions for TestEntityManager"
  Add Kotlin DSL extension functions for TestEntityManager

Closes gh-49063

Author: snicoll

module/spring-boot-jpa-test/build.gradle

@@ -15,6 +15,7 @@
  */
 
 plugins {
+	id "org.jetbrains.kotlin.jvm"
 	id "java-library"
 	id "org.springframework.boot.deployed"
 	id "org.springframework.boot.optional-dependencies"
@@ -29,6 +30,7 @@ dependencies {
 	api(project(":module:spring-boot-jpa"))
 
 	optional(project(":core:spring-boot-autoconfigure"))
+	optional("org.jetbrains.kotlin:kotlin-stdlib")
 
 	testImplementation(project(":test-support:spring-boot-test-support"))
 

module/spring-boot-jpa-test/src/main/kotlin/org/springframework/boot/jpa/test/autoconfigure/TestEntityManagerExtensions.kt

@@ -0,0 +1,50 @@
+/*
+ * Copyright 2012-present 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.boot.jpa.test.autoconfigure
+
+/**
+ * Extension for [TestEntityManager.find] providing a `find<MyEntity>(...)`
+ * variant leveraging Kotlin reified type parameters.
+ *
+ * @param primaryKey the primary key of the entity
+ * @author Beom Su
+ * @since 4.1.0
+ */
+inline fun <reified E : Any> TestEntityManager.find(primaryKey: Any): E? =
+		find(E::class.java, primaryKey)
+
+/**
+ * Extension for [TestEntityManager.persistAndGetId] providing a
+ * `persistAndGetId<Long>(...)` variant leveraging Kotlin reified type parameters.
+ *
+ * @param entity the source entity
+ * @author Beom Su
+ * @since 4.1.0
+ */
+inline fun <reified T : Any> TestEntityManager.persistAndGetId(entity: Any): T? =
+		persistAndGetId(entity, T::class.java)
+
+/**
+ * Extension for [TestEntityManager.getId] providing a `getId<MyEntity>(...)`
+ * variant leveraging Kotlin reified type parameters.
+ *
+ * @param entity the source entity
+ * @author Beom Su
+ * @since 4.1.0
+ */
+inline fun <reified T : Any> TestEntityManager.getId(entity: Any): T? =
+		getId(entity, T::class.java)

module/spring-boot-jpa-test/src/test/kotlin/org/springframework/boot/jpa/test/autoconfigure/TestEntityManagerExtensionsTests.kt

@@ -0,0 +1,94 @@
+/*
+ * Copyright 2012-present 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.boot.jpa.test.autoconfigure
+
+import jakarta.persistence.EntityManager
+import jakarta.persistence.EntityManagerFactory
+import jakarta.persistence.PersistenceUnitUtil
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.extension.ExtendWith
+import org.mockito.BDDMockito.given
+import org.mockito.BDDMockito.then
+import org.mockito.Mock
+import org.mockito.junit.jupiter.MockitoExtension
+import org.springframework.orm.jpa.EntityManagerHolder
+import org.springframework.transaction.support.TransactionSynchronizationManager
+
+/**
+ * Tests for [TestEntityManager] Kotlin extensions.
+ *
+ * @author Beom Su
+ * @since 4.1.0
+ */
+@ExtendWith(MockitoExtension::class)
+class TestEntityManagerExtensionsTests {
+
+	@Mock
+	private lateinit var entityManagerFactory: EntityManagerFactory
+
+	@Mock
+	private lateinit var entityManager: EntityManager
+
+	@Mock
+	private lateinit var persistenceUnitUtil: PersistenceUnitUtil
+
+	private lateinit var testEntityManager: TestEntityManager
+
+	@BeforeEach
+	fun setup() {
+		this.testEntityManager = TestEntityManager(this.entityManagerFactory)
+	}
+
+	@Test
+	fun `find with reified type parameter`() {
+		bindEntityManager()
+		val entity = TestEntity()
+		given(this.entityManager.find(TestEntity::class.java, 123)).willReturn(entity)
+		val result = this.testEntityManager.find<TestEntity>(123)
+		assertThat(result).isSameAs(entity)
+	}
+
+	@Test
+	fun `persistAndGetId with reified type parameter`() {
+		bindEntityManager()
+		val entity = TestEntity()
+		given(this.entityManagerFactory.persistenceUnitUtil).willReturn(this.persistenceUnitUtil)
+		given(this.persistenceUnitUtil.getIdentifier(entity)).willReturn(123)
+		val result = this.testEntityManager.persistAndGetId<Int>(entity)
+		then(this.entityManager).should().persist(entity)
+		assertThat(result).isEqualTo(123)
+	}
+
+	@Test
+	fun `getId with reified type parameter`() {
+		val entity = TestEntity()
+		given(this.entityManagerFactory.persistenceUnitUtil).willReturn(this.persistenceUnitUtil)
+		given(this.persistenceUnitUtil.getIdentifier(entity)).willReturn(123)
+		val result = this.testEntityManager.getId<Int>(entity)
+		assertThat(result).isEqualTo(123)
+	}
+
+	private fun bindEntityManager() {
+		val holder = EntityManagerHolder(this.entityManager)
+		TransactionSynchronizationManager.bindResource(this.entityManagerFactory, holder)
+	}
+
+	class TestEntity
+
+}