From f50b43e2562b9ddbceab4410413d232c46c486a5 Mon Sep 17 00:00:00 2001 From: Josh Long Date: Tue, 12 Nov 2024 12:02:50 -0800 Subject: [PATCH 1/2] extension function for Chatclient.CalLResponseSpec.entity(Class) and Kotlin --- .../ai/chat/client/ChatClientExtensions.kt | 25 ++++++++++++ .../chat/client/ChatClientExtensionsTests.kt | 40 +++++++++++++++++++ 2 files changed, 65 insertions(+) create mode 100644 spring-ai-core/src/main/kotlin/org/springframework/ai/chat/client/ChatClientExtensions.kt create mode 100644 spring-ai-core/src/test/kotlin/org/springframework/ai/chat/client/ChatClientExtensionsTests.kt diff --git a/spring-ai-core/src/main/kotlin/org/springframework/ai/chat/client/ChatClientExtensions.kt b/spring-ai-core/src/main/kotlin/org/springframework/ai/chat/client/ChatClientExtensions.kt new file mode 100644 index 00000000000..ef05104a74e --- /dev/null +++ b/spring-ai-core/src/main/kotlin/org/springframework/ai/chat/client/ChatClientExtensions.kt @@ -0,0 +1,25 @@ +/* + * Copyright 2023-2024 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.ai.chat.client + +/** + * Extension for [ChatClient] providing a `entity()` variant. + * + * @author Josh Long + */ + +inline fun ChatClient.CallResponseSpec.entity(): T = entity(T::class.java) as T diff --git a/spring-ai-core/src/test/kotlin/org/springframework/ai/chat/client/ChatClientExtensionsTests.kt b/spring-ai-core/src/test/kotlin/org/springframework/ai/chat/client/ChatClientExtensionsTests.kt new file mode 100644 index 00000000000..75fbacb2f21 --- /dev/null +++ b/spring-ai-core/src/test/kotlin/org/springframework/ai/chat/client/ChatClientExtensionsTests.kt @@ -0,0 +1,40 @@ +/* + * Copyright 2023-2024 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.ai.chat.client + +import io.mockk.every +import io.mockk.mockk +import io.mockk.verify +import org.junit.jupiter.api.Test + +class ChatClientExtensionsTests { + + private val crs = mockk() + + 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>()) } returns joke + crs.entity() + verify { crs.entity(Joke::class.java) } + } +} From d16a16358cb6b74e69425480a4790f3e1c760c6c Mon Sep 17 00:00:00 2001 From: Josh Long Date: Fri, 15 Nov 2024 10:27:02 -0800 Subject: [PATCH 2/2] kotlin ftw --- .../ai/chat/client/ChatClientExtensions.kt | 11 ++++++-- .../chat/client/ChatClientExtensionsTests.kt | 25 ++++++++++++------- 2 files changed, 25 insertions(+), 11 deletions(-) diff --git a/spring-ai-core/src/main/kotlin/org/springframework/ai/chat/client/ChatClientExtensions.kt b/spring-ai-core/src/main/kotlin/org/springframework/ai/chat/client/ChatClientExtensions.kt index ef05104a74e..40a4c6ffd84 100644 --- a/spring-ai-core/src/main/kotlin/org/springframework/ai/chat/client/ChatClientExtensions.kt +++ b/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()` variant. + * Extensions for [ChatClient] providing a reified generic adapters for `entity` and `responseEntity` * * @author Josh Long */ -inline fun ChatClient.CallResponseSpec.entity(): T = entity(T::class.java) as T +inline fun ChatClient.CallResponseSpec.entity(): T = + entity(object : ParameterizedTypeReference() {}) as T + +inline fun ChatClient.CallResponseSpec.responseEntity(): ResponseEntity = + responseEntity(object : ParameterizedTypeReference() {}) diff --git a/spring-ai-core/src/test/kotlin/org/springframework/ai/chat/client/ChatClientExtensionsTests.kt b/spring-ai-core/src/test/kotlin/org/springframework/ai/chat/client/ChatClientExtensionsTests.kt index 75fbacb2f21..63b58b90dd1 100644 --- a/spring-ai-core/src/test/kotlin/org/springframework/ai/chat/client/ChatClientExtensionsTests.kt +++ b/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() - 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>()) } returns joke + fun responseEntity() { + val crs = mockk() + val re = mockk>() + every { crs.responseEntity() } returns re + crs.responseEntity() + verify { crs.responseEntity(object : ParameterizedTypeReference() {}) } + } + + @Test + fun entity() { + val crs = mockk() + val joke = mockk() + every { crs.entity(any>()) } returns joke crs.entity() - verify { crs.entity(Joke::class.java) } + verify { crs.entity(object : ParameterizedTypeReference(){}) } } }