Improve ChatClient impl. parameter cohesion

Author: tzolov

models/spring-ai-openai/src/test/java/org/springframework/ai/openai/chat/client/OpenAiChatClientIT.java

@@ -123,7 +123,7 @@ void customOutputConverter() {
 
 		logger.info("ice cream flavors" + flavors);
 		assertThat(flavors).hasSize(5);
-		assertThat(flavors).contains("Vanilla");
+		assertThat(flavors).containsAnyOf("Vanilla", "vanilla");
 	}
 
 	@Test

spring-ai-core/src/main/java/org/springframework/ai/chat/client/ChatClient.java

@@ -26,15 +26,15 @@
 import java.util.Map;
 import java.util.function.Consumer;
 
-import org.springframework.ai.chat.model.ChatModel;
-import org.springframework.ai.chat.model.ChatResponse;
-import org.springframework.ai.chat.model.StreamingChatModel;
 import reactor.core.publisher.Flux;
 
 import org.springframework.ai.chat.messages.Media;
 import org.springframework.ai.chat.messages.Message;
 import org.springframework.ai.chat.messages.SystemMessage;
 import org.springframework.ai.chat.messages.UserMessage;
+import org.springframework.ai.chat.model.ChatModel;
+import org.springframework.ai.chat.model.ChatResponse;
+import org.springframework.ai.chat.model.StreamingChatModel;
 import org.springframework.ai.chat.prompt.ChatOptions;
 import org.springframework.ai.chat.prompt.Prompt;
 import org.springframework.ai.chat.prompt.PromptTemplate;
@@ -443,9 +443,7 @@ public <T> T entity(StructuredOutputConverter<T> structuredOutputConverter) {
 			}
 
 			private <T> T doSingleWithBeanOutputConverter(StructuredOutputConverter<T> boc) {
-				var processedUserText = this.request.userText + System.lineSeparator() + System.lineSeparator()
-						+ "{format}";
-				var chatResponse = doGetChatResponse(processedUserText, boc.getFormat());
+				var chatResponse = doGetChatResponse(boc.getFormat());
 				var stringResponse = chatResponse.getResult().getOutput().getContent();
 				return boc.convert(stringResponse);
 			}
@@ -456,11 +454,15 @@ public <T> T entity(Class<T> type) {
 				return doSingleWithBeanOutputConverter(boc);
 			}
 
-			private ChatResponse doGetChatResponse(String processedUserText) {
-				return this.doGetChatResponse(processedUserText, "");
+			private ChatResponse doGetChatResponse() {
+				return this.doGetChatResponse("");
 			}
 
-			private ChatResponse doGetChatResponse(String processedUserText, String formatParam) {
+			private ChatResponse doGetChatResponse(String formatParam) {
+
+				var processedUserText = StringUtils.hasText(formatParam)
+						? this.request.userText + System.lineSeparator() + "{format}" : this.request.userText;
+
 				Map<String, Object> userParams = new HashMap<>(this.request.userParams);
 				if (StringUtils.hasText(formatParam)) {
 					userParams.put("format", formatParam);
@@ -486,9 +488,6 @@ private ChatResponse doGetChatResponse(String processedUserText, String formatPa
 					messages.add(userMessage);
 				}
 				if (this.request.chatOptions instanceof FunctionCallingOptions functionCallingOptions) {
-					// if (this.request.chatOptions instanceof
-					// FunctionCallingOptionsBuilder.PortableFunctionCallingOptions
-					// functionCallingOptions) {
 					if (!this.request.functionNames.isEmpty()) {
 						functionCallingOptions.setFunctions(new HashSet<>(this.request.functionNames));
 					}
@@ -501,11 +500,11 @@ private ChatResponse doGetChatResponse(String processedUserText, String formatPa
 			}
 
 			public ChatResponse chatResponse() {
-				return doGetChatResponse(this.request.userText);
+				return doGetChatResponse();
 			}
 
 			public String content() {
-				return doGetChatResponse(this.request.userText).getResult().getOutput().getContent();
+				return doGetChatResponse().getResult().getOutput().getContent();
 			}
 
 		}