Fix Google GenAI ITs

 - Re-use import autoconfigs in the ITs

Signed-off-by: Ilayaperumal Gopinathan <[email protected]>

Author: ilayaperumalg

auto-configurations/models/spring-ai-autoconfigure-model-google-genai/src/test/java/org/springframework/ai/model/google/genai/autoconfigure/chat/tool/FunctionCallWithFunctionWrapperIT.java

@@ -29,11 +29,9 @@
 import org.springframework.ai.chat.prompt.Prompt;
 import org.springframework.ai.google.genai.GoogleGenAiChatModel;
 import org.springframework.ai.google.genai.GoogleGenAiChatOptions;
-import org.springframework.ai.model.google.genai.autoconfigure.chat.GoogleGenAiChatAutoConfiguration;
+import org.springframework.ai.model.google.genai.autoconfigure.BaseGoogleGenAiIT;
 import org.springframework.ai.tool.ToolCallback;
 import org.springframework.ai.tool.function.FunctionToolCallback;
-import org.springframework.boot.autoconfigure.AutoConfigurations;
-import org.springframework.boot.autoconfigure.web.client.RestClientAutoConfiguration;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -51,8 +49,7 @@ public class FunctionCallWithFunctionWrapperIT {
 	void functionCallWithApiKey() {
 		ApplicationContextRunner contextRunner = new ApplicationContextRunner()
 			.withPropertyValues("spring.ai.google.genai.api-key=" + System.getenv("GOOGLE_API_KEY"))
-			.withConfiguration(
-					AutoConfigurations.of(RestClientAutoConfiguration.class, GoogleGenAiChatAutoConfiguration.class));
+			.withConfiguration(BaseGoogleGenAiIT.googleGenAiChatAutoConfig());
 
 		contextRunner.run(context -> {
 
@@ -89,8 +86,7 @@ void functionCallWithVertexAi() {
 		ApplicationContextRunner contextRunner = new ApplicationContextRunner()
 			.withPropertyValues("spring.ai.google.genai.project-id=" + System.getenv("GOOGLE_CLOUD_PROJECT"),
 					"spring.ai.google.genai.location=" + System.getenv("GOOGLE_CLOUD_LOCATION"))
-			.withConfiguration(
-					AutoConfigurations.of(RestClientAutoConfiguration.class, GoogleGenAiChatAutoConfiguration.class));
+			.withConfiguration(BaseGoogleGenAiIT.googleGenAiChatAutoConfig());
 
 		contextRunner.run(context -> {
 

auto-configurations/models/spring-ai-autoconfigure-model-google-genai/src/test/java/org/springframework/ai/model/google/genai/autoconfigure/chat/tool/FunctionCallWithPromptFunctionIT.java

@@ -28,9 +28,8 @@
 import org.springframework.ai.chat.prompt.Prompt;
 import org.springframework.ai.google.genai.GoogleGenAiChatModel;
 import org.springframework.ai.google.genai.GoogleGenAiChatOptions;
-import org.springframework.ai.model.google.genai.autoconfigure.chat.GoogleGenAiChatAutoConfiguration;
+import org.springframework.ai.model.google.genai.autoconfigure.BaseGoogleGenAiIT;
 import org.springframework.ai.tool.function.FunctionToolCallback;
-import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -48,7 +47,7 @@ public class FunctionCallWithPromptFunctionIT {
 	void functionCallTestWithApiKey() {
 		ApplicationContextRunner contextRunner = new ApplicationContextRunner()
 			.withPropertyValues("spring.ai.google.genai.api-key=" + System.getenv("GOOGLE_API_KEY"))
-			.withConfiguration(AutoConfigurations.of(GoogleGenAiChatAutoConfiguration.class));
+			.withConfiguration(BaseGoogleGenAiIT.googleGenAiChatAutoConfig());
 
 		contextRunner
 			.withPropertyValues("spring.ai.google.genai.chat.options.model="
@@ -93,7 +92,7 @@ void functionCallTestWithVertexAi() {
 		ApplicationContextRunner contextRunner = new ApplicationContextRunner()
 			.withPropertyValues("spring.ai.google.genai.project-id=" + System.getenv("GOOGLE_CLOUD_PROJECT"),
 					"spring.ai.google.genai.location=" + System.getenv("GOOGLE_CLOUD_LOCATION"))
-			.withConfiguration(AutoConfigurations.of(GoogleGenAiChatAutoConfiguration.class));
+			.withConfiguration(BaseGoogleGenAiIT.googleGenAiChatAutoConfig());
 
 		contextRunner
 			.withPropertyValues("spring.ai.google.genai.chat.options.model="

auto-configurations/models/spring-ai-autoconfigure-model-google-genai/src/test/java/org/springframework/ai/model/google/genai/autoconfigure/embedding/GoogleGenAiTextEmbeddingAutoConfigurationIT.java

@@ -64,8 +64,7 @@ void embeddingWithVertexAi() {
 		ApplicationContextRunner contextRunner = new ApplicationContextRunner()
 			.withPropertyValues("spring.ai.google.genai.embedding.project-id=" + System.getenv("GOOGLE_CLOUD_PROJECT"),
 					"spring.ai.google.genai.embedding.location=" + System.getenv("GOOGLE_CLOUD_LOCATION"))
-			.withConfiguration(AutoConfigurations.of(GoogleGenAiTextEmbeddingAutoConfiguration.class,
-					GoogleGenAiEmbeddingConnectionAutoConfiguration.class));
+			.withConfiguration(BaseGoogleGenAiIT.googleGenAiEmbeddingAutoConfig());
 
 		contextRunner.run(context -> {
 			GoogleGenAiTextEmbeddingModel embeddingModel = context.getBean(GoogleGenAiTextEmbeddingModel.class);
@@ -96,9 +95,7 @@ void embeddingModelActivation() {
 			});
 
 		// Test that embedding model is activated when enabled
-		contextRunner
-			.withConfiguration(AutoConfigurations.of(GoogleGenAiTextEmbeddingAutoConfiguration.class,
-					GoogleGenAiEmbeddingConnectionAutoConfiguration.class))
+		contextRunner.withConfiguration(BaseGoogleGenAiIT.googleGenAiEmbeddingAutoConfig())
 			.withPropertyValues("spring.ai.model.embedding.text=google-genai")
 			.run(context -> {
 				assertThat(context.getBeansOfType(GoogleGenAiTextEmbeddingProperties.class)).isNotEmpty();