kotlin ftw

Author: joshlong

spring-ai-core/src/main/kotlin/org/springframework/ai/chat/client/ChatClientExtensions.kt

@@ -16,10 +16,17 @@
 
 package org.springframework.ai.chat.client
 
+import org.springframework.ai.chat.model.ChatResponse
+import org.springframework.core.ParameterizedTypeReference
+
 /**
- * Extension for [ChatClient] providing a `entity<Foo>()` variant.
+ * Extensions for [ChatClient] providing a reified generic adapters for `entity` and `responseEntity`
  *
  * @author Josh Long
  */
 
-inline fun <reified T> ChatClient.CallResponseSpec.entity(): T = entity(T::class.java) as T
+inline fun <reified T> ChatClient.CallResponseSpec.entity(): T =
+	entity(object : ParameterizedTypeReference<T>() {}) as T
+
+inline fun <reified T> ChatClient.CallResponseSpec.responseEntity(): ResponseEntity<ChatResponse, T> =
+	responseEntity(object : ParameterizedTypeReference<T>() {}) 

spring-ai-core/src/test/kotlin/org/springframework/ai/chat/client/ChatClientExtensionsTests.kt

@@ -20,21 +20,28 @@ import io.mockk.every
 import io.mockk.mockk
 import io.mockk.verify
 import org.junit.jupiter.api.Test
+import org.springframework.ai.chat.model.ChatResponse
+import org.springframework.core.ParameterizedTypeReference
 
 class ChatClientExtensionsTests {
 
-	private val crs = mockk<ChatClient.CallResponseSpec>()
-
 	data class Joke(val setup: String, val punchline: String)
 
 	@Test
-	fun withEntityType() {
-		val joke = Joke(
-			setup = "Why did the scarecrow win an award?",
-			punchline = "Because he was outstanding in his field!"
-		)
-		every { crs.entity(any<Class<*>>()) } returns joke 
+	fun responseEntity() {
+		val crs = mockk<ChatClient.CallResponseSpec>()
+		val re = mockk<ResponseEntity<ChatResponse, Joke>>()
+		every { crs.responseEntity<Joke>() } returns re
+		crs.responseEntity<Joke>()
+		verify { crs.responseEntity(object : ParameterizedTypeReference<Joke>() {}) }
+	}
+	
+	@Test
+	fun entity() {
+		val crs = mockk<ChatClient.CallResponseSpec>()
+		val joke =  mockk<Joke>()
+		every { crs.entity(any<ParameterizedTypeReference<Joke>>()) } returns joke 
 		crs.entity<Joke>()
-		verify { crs.entity(Joke::class.java) }
+		verify { crs.entity(object : ParameterizedTypeReference<Joke>(){}) }
 	}
 }