Minor code improvements

Author: tzolov

models/spring-ai-openai/src/test/java/org/springframework/ai/openai/chat/api/RestClientBuilderTests.java

@@ -40,7 +40,6 @@ public void test1() {
 	}
 
 	@Test
-	@Disabled("RestClient.builder(restTemplate) bug: https://github.com/spring-projects/spring-framework/issues/32180")
 	public void test2() {
 		RestTemplate restTemplate = new RestTemplate();
 		test(RestClient.builder(restTemplate), BASE_URL);

spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/openai/OpenAiAutoConfiguration.java

@@ -47,10 +47,6 @@
  */
 public class OpenAiAutoConfiguration {
 
-	public static final String OPEN_AI_API_KEY_MUST_BE_SET = "OpenAI API key must be set";
-
-	public static final String OPEN_AI_BASE_URL_MUST_BE_SET = "OpenAI base URL must be set";
-
 	@Bean
 	@ConditionalOnMissingBean
 	@ConditionalOnProperty(prefix = OpenAiChatProperties.CONFIG_PREFIX, name = "enabled", havingValue = "true",
@@ -59,16 +55,8 @@ public OpenAiChatClient openAiChatClient(OpenAiConnectionProperties commonProper
 			OpenAiChatProperties chatProperties, RestClient.Builder restClientBuilder,
 			List<FunctionCallback> toolFunctionCallbacks, FunctionCallbackContext functionCallbackContext) {
 
-		String apiKey = StringUtils.hasText(chatProperties.getApiKey()) ? chatProperties.getApiKey()
-				: commonProperties.getApiKey();
-
-		String baseUrl = StringUtils.hasText(chatProperties.getBaseUrl()) ? chatProperties.getBaseUrl()
-				: commonProperties.getBaseUrl();
-
-		Assert.hasText(apiKey, OPEN_AI_API_KEY_MUST_BE_SET);
-		Assert.hasText(baseUrl, OPEN_AI_BASE_URL_MUST_BE_SET);
-
-		var openAiApi = new OpenAiApi(baseUrl, apiKey, restClientBuilder);
+		var openAiApi = openAiApi(chatProperties.getBaseUrl(), commonProperties.getBaseUrl(),
+				chatProperties.getApiKey(), commonProperties.getApiKey(), restClientBuilder);
 
 		if (!CollectionUtils.isEmpty(toolFunctionCallbacks)) {
 			chatProperties.getOptions().getFunctionCallbacks().addAll(toolFunctionCallbacks);
@@ -84,20 +72,25 @@ public OpenAiChatClient openAiChatClient(OpenAiConnectionProperties commonProper
 	public OpenAiEmbeddingClient openAiEmbeddingClient(OpenAiConnectionProperties commonProperties,
 			OpenAiEmbeddingProperties embeddingProperties, RestClient.Builder restClientBuilder) {
 
-		String apiKey = StringUtils.hasText(embeddingProperties.getApiKey()) ? embeddingProperties.getApiKey()
-				: commonProperties.getApiKey();
-		String baseUrl = StringUtils.hasText(embeddingProperties.getBaseUrl()) ? embeddingProperties.getBaseUrl()
-				: commonProperties.getBaseUrl();
-
-		Assert.hasText(apiKey, OPEN_AI_API_KEY_MUST_BE_SET);
-		Assert.hasText(baseUrl, OPEN_AI_BASE_URL_MUST_BE_SET);
-
-		var openAiApi = new OpenAiApi(baseUrl, apiKey, restClientBuilder);
+		var openAiApi = openAiApi(embeddingProperties.getBaseUrl(), commonProperties.getBaseUrl(),
+				embeddingProperties.getApiKey(), commonProperties.getApiKey(), restClientBuilder);
 
 		return new OpenAiEmbeddingClient(openAiApi, embeddingProperties.getMetadataMode(),
 				embeddingProperties.getOptions());
 	}
 
+	private OpenAiApi openAiApi(String baseUrl, String commonBaseUrl, String apiKey, String commonApiKey,
+			RestClient.Builder restClientBuilder) {
+
+		String resolvedBaseUrl = StringUtils.hasText(baseUrl) ? baseUrl : commonBaseUrl;
+		Assert.hasText(baseUrl, "OpenAI base URL must be set");
+
+		String resolvedApiKey = StringUtils.hasText(apiKey) ? apiKey : commonApiKey;
+		Assert.hasText(apiKey, "OpenAI API key must be set");
+
+		return new OpenAiApi(resolvedBaseUrl, resolvedApiKey, restClientBuilder);
+	}
+
 	@Bean
 	@ConditionalOnMissingBean
 	@ConditionalOnProperty(prefix = OpenAiImageProperties.CONFIG_PREFIX, name = "enabled", havingValue = "true",
@@ -110,8 +103,8 @@ public OpenAiImageClient openAiImageClient(OpenAiConnectionProperties commonProp
 		String baseUrl = StringUtils.hasText(imageProperties.getBaseUrl()) ? imageProperties.getBaseUrl()
 				: commonProperties.getBaseUrl();
 
-		Assert.hasText(apiKey, OPEN_AI_API_KEY_MUST_BE_SET);
-		Assert.hasText(baseUrl, OPEN_AI_BASE_URL_MUST_BE_SET);
+		Assert.hasText(apiKey, "OpenAI API key must be set");
+		Assert.hasText(baseUrl, "OpenAI base URL must be set");
 
 		var openAiImageApi = new OpenAiImageApi(baseUrl, apiKey, restClientBuilder);