Fix VertexAI IT autoconfiguration imports

ilayaperumalg · Willam2004 · commit d438d41efb4a · 2025-10-10T12:00:02.000+08:00
- Create Utility class to expose the static methods for tooling/embedding autoconfigurations
 - Fix VertexAiModelConfigurationTests and other FunctionCall ITs to use the Utils

Signed-off-by: Ilayaperumal Gopinathan &lt;ilayaperumal.gopinathan@broadcom.com&gt;
Signed-off-by: 家娃 &lt;guanjing.pangj@alibaba-inc.com&gt;
diff --git a/auto-configurations/models/spring-ai-autoconfigure-model-vertex-ai/src/test/java/org/springframework/ai/model/vertexai/autoconfigure/VertexAiITUtil.java b/auto-configurations/models/spring-ai-autoconfigure-model-vertex-ai/src/test/java/org/springframework/ai/model/vertexai/autoconfigure/VertexAiITUtil.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2025-2025 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.model.vertexai.autoconfigure;
+
+import org.springframework.ai.model.tool.autoconfigure.ToolCallingAutoConfiguration;
+import org.springframework.ai.model.vertexai.autoconfigure.embedding.VertexAiEmbeddingConnectionAutoConfiguration;
+import org.springframework.ai.retry.autoconfigure.SpringAiRetryAutoConfiguration;
+import org.springframework.boot.autoconfigure.AutoConfigurations;
+
+/**
+ * Utility class for VertexAI integration tests.
+ *
+ * @author Pawel Potaczala
+ */
+public final class VertexAiITUtil {
+
+	private VertexAiITUtil() {
+	}
+
+	public static AutoConfigurations vertexAiToolAutoConfig(Class<?>... additionalAutoConfigurations) {
+		Class<?>[] dependencies = new Class[] { SpringAiRetryAutoConfiguration.class,
+				ToolCallingAutoConfiguration.class };
+		Class<?>[] allAutoConfigurations = new Class[dependencies.length + additionalAutoConfigurations.length];
+		System.arraycopy(dependencies, 0, allAutoConfigurations, 0, dependencies.length);
+		System.arraycopy(additionalAutoConfigurations, 0, allAutoConfigurations, dependencies.length,
+				additionalAutoConfigurations.length);
+
+		return AutoConfigurations.of(allAutoConfigurations);
+	}
+
+	public static AutoConfigurations vertexAiEmbeddingAutoConfig(Class<?>... additionalAutoConfigurations) {
+		Class<?>[] dependencies = new Class[] { SpringAiRetryAutoConfiguration.class,
+				VertexAiEmbeddingConnectionAutoConfiguration.class };
+		Class<?>[] allAutoConfigurations = new Class[dependencies.length + additionalAutoConfigurations.length];
+		System.arraycopy(dependencies, 0, allAutoConfigurations, 0, dependencies.length);
+		System.arraycopy(additionalAutoConfigurations, 0, allAutoConfigurations, dependencies.length,
+				additionalAutoConfigurations.length);
+
+		return AutoConfigurations.of(allAutoConfigurations);
+	}
+
+}
diff --git a/auto-configurations/models/spring-ai-autoconfigure-model-vertex-ai/src/test/java/org/springframework/ai/model/vertexai/autoconfigure/embedding/VertexAiTextEmbeddingModelAutoConfigurationIT.java b/auto-configurations/models/spring-ai-autoconfigure-model-vertex-ai/src/test/java/org/springframework/ai/model/vertexai/autoconfigure/embedding/VertexAiTextEmbeddingModelAutoConfigurationIT.java
@@ -28,10 +28,9 @@
 import org.springframework.ai.embedding.EmbeddingOptionsBuilder;
 import org.springframework.ai.embedding.EmbeddingResponse;
 import org.springframework.ai.embedding.EmbeddingResultMetadata;
-import org.springframework.ai.retry.autoconfigure.SpringAiRetryAutoConfiguration;
+import org.springframework.ai.model.vertexai.autoconfigure.VertexAiITUtil;
 import org.springframework.ai.vertexai.embedding.multimodal.VertexAiMultimodalEmbeddingModel;
 import org.springframework.ai.vertexai.embedding.text.VertexAiTextEmbeddingModel;
-import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -53,7 +52,8 @@ public class VertexAiTextEmbeddingModelAutoConfigurationIT {
 
 	@Test
 	public void textEmbedding() {
-		this.contextRunner.withConfiguration(vertexAiAutoConfig(VertexAiTextEmbeddingAutoConfiguration.class))
+		this.contextRunner
+			.withConfiguration(VertexAiITUtil.vertexAiEmbeddingAutoConfig(VertexAiTextEmbeddingAutoConfiguration.class))
 			.run(context -> {
 				var connectionProperties = context.getBean(VertexAiEmbeddingConnectionProperties.class);
 				var textEmbeddingProperties = context.getBean(VertexAiTextEmbeddingProperties.class);
@@ -73,21 +73,24 @@ public void textEmbedding() {
 
 	@Test
 	void textEmbeddingActivation() {
-		this.contextRunner.withConfiguration(vertexAiAutoConfig(VertexAiTextEmbeddingAutoConfiguration.class))
+		this.contextRunner
+			.withConfiguration(VertexAiITUtil.vertexAiEmbeddingAutoConfig(VertexAiTextEmbeddingAutoConfiguration.class))
 			.withPropertyValues("spring.ai.model.embedding.text=none")
 			.run(context -> {
 				assertThat(context.getBeansOfType(VertexAiTextEmbeddingProperties.class)).isEmpty();
 				assertThat(context.getBeansOfType(VertexAiTextEmbeddingModel.class)).isEmpty();
 			});
 
-		this.contextRunner.withConfiguration(vertexAiAutoConfig(VertexAiTextEmbeddingAutoConfiguration.class))
+		this.contextRunner
+			.withConfiguration(VertexAiITUtil.vertexAiEmbeddingAutoConfig(VertexAiTextEmbeddingAutoConfiguration.class))
 			.withPropertyValues("spring.ai.model.embedding.text=vertexai")
 			.run(context -> {
 				assertThat(context.getBeansOfType(VertexAiTextEmbeddingProperties.class)).isNotEmpty();
 				assertThat(context.getBeansOfType(VertexAiTextEmbeddingModel.class)).isNotEmpty();
 			});
 
-		this.contextRunner.withConfiguration(vertexAiAutoConfig(VertexAiTextEmbeddingAutoConfiguration.class))
+		this.contextRunner
+			.withConfiguration(VertexAiITUtil.vertexAiEmbeddingAutoConfig(VertexAiTextEmbeddingAutoConfiguration.class))
 			.run(context -> {
 				assertThat(context.getBeansOfType(VertexAiTextEmbeddingProperties.class)).isNotEmpty();
 				assertThat(context.getBeansOfType(VertexAiTextEmbeddingModel.class)).isNotEmpty();
@@ -97,7 +100,9 @@ void textEmbeddingActivation() {
 
 	@Test
 	public void multimodalEmbedding() {
-		this.contextRunner.withConfiguration(vertexAiAutoConfig(VertexAiMultiModalEmbeddingAutoConfiguration.class))
+		this.contextRunner
+			.withConfiguration(
+					VertexAiITUtil.vertexAiEmbeddingAutoConfig(VertexAiMultiModalEmbeddingAutoConfiguration.class))
 			.run(context -> {
 				var connectionProperties = context.getBean(VertexAiEmbeddingConnectionProperties.class);
 				var multimodalEmbeddingProperties = context.getBean(VertexAiMultimodalEmbeddingProperties.class);
@@ -132,37 +137,32 @@ public void multimodalEmbedding() {
 
 	@Test
 	void multimodalEmbeddingActivation() {
-		this.contextRunner.withConfiguration(vertexAiAutoConfig(VertexAiMultiModalEmbeddingAutoConfiguration.class))
+		this.contextRunner
+			.withConfiguration(
+					VertexAiITUtil.vertexAiEmbeddingAutoConfig(VertexAiMultiModalEmbeddingAutoConfiguration.class))
 			.withPropertyValues("spring.ai.model.embedding.multimodal=none")
 			.run(context -> {
 				assertThat(context.getBeansOfType(VertexAiMultimodalEmbeddingProperties.class)).isEmpty();
 				assertThat(context.getBeansOfType(VertexAiMultimodalEmbeddingModel.class)).isEmpty();
 			});
 
-		this.contextRunner.withConfiguration(vertexAiAutoConfig(VertexAiMultiModalEmbeddingAutoConfiguration.class))
+		this.contextRunner
+			.withConfiguration(
+					VertexAiITUtil.vertexAiEmbeddingAutoConfig(VertexAiMultiModalEmbeddingAutoConfiguration.class))
 			.withPropertyValues("spring.ai.model.embedding.multimodal=vertexai")
 			.run(context -> {
 				assertThat(context.getBeansOfType(VertexAiMultimodalEmbeddingProperties.class)).isNotEmpty();
 				assertThat(context.getBeansOfType(VertexAiMultimodalEmbeddingModel.class)).isNotEmpty();
 			});
 
-		this.contextRunner.withConfiguration(vertexAiAutoConfig(VertexAiMultiModalEmbeddingAutoConfiguration.class))
+		this.contextRunner
+			.withConfiguration(
+					VertexAiITUtil.vertexAiEmbeddingAutoConfig(VertexAiMultiModalEmbeddingAutoConfiguration.class))
 			.run(context -> {
 				assertThat(context.getBeansOfType(VertexAiMultimodalEmbeddingProperties.class)).isNotEmpty();
 				assertThat(context.getBeansOfType(VertexAiMultimodalEmbeddingModel.class)).isNotEmpty();
 			});
 
 	}
 
-	private static AutoConfigurations vertexAiAutoConfig(Class<?>... additionalAutoConfigurations) {
-		Class<?>[] dependencies = new Class[] { SpringAiRetryAutoConfiguration.class,
-				VertexAiEmbeddingConnectionAutoConfiguration.class };
-		Class<?>[] allAutoConfigurations = new Class[dependencies.length + additionalAutoConfigurations.length];
-		System.arraycopy(dependencies, 0, allAutoConfigurations, 0, dependencies.length);
-		System.arraycopy(additionalAutoConfigurations, 0, allAutoConfigurations, dependencies.length,
-				additionalAutoConfigurations.length);
-
-		return AutoConfigurations.of(allAutoConfigurations);
-	}
-
 }
diff --git a/auto-configurations/models/spring-ai-autoconfigure-model-vertex-ai/src/test/java/org/springframework/ai/model/vertexai/autoconfigure/gemini/VertexAiGeminiChatAutoConfigurationIT.java b/auto-configurations/models/spring-ai-autoconfigure-model-vertex-ai/src/test/java/org/springframework/ai/model/vertexai/autoconfigure/gemini/VertexAiGeminiChatAutoConfigurationIT.java
@@ -16,21 +16,20 @@
 
 package org.springframework.ai.model.vertexai.autoconfigure.gemini;
 
+import java.util.stream.Collectors;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
+import reactor.core.publisher.Flux;
+
 import org.springframework.ai.chat.messages.UserMessage;
 import org.springframework.ai.chat.model.ChatResponse;
 import org.springframework.ai.chat.prompt.Prompt;
-import org.springframework.ai.model.tool.autoconfigure.ToolCallingAutoConfiguration;
-import org.springframework.ai.retry.autoconfigure.SpringAiRetryAutoConfiguration;
+import org.springframework.ai.model.vertexai.autoconfigure.VertexAiITUtil;
 import org.springframework.ai.vertexai.gemini.VertexAiGeminiChatModel;
-import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
-import reactor.core.publisher.Flux;
-
-import java.util.stream.Collectors;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -43,7 +42,7 @@ public class VertexAiGeminiChatAutoConfigurationIT {
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
 		.withPropertyValues("spring.ai.vertex.ai.gemini.project-id=" + System.getenv("VERTEX_AI_GEMINI_PROJECT_ID"),
 				"spring.ai.vertex.ai.gemini.location=" + System.getenv("VERTEX_AI_GEMINI_LOCATION"))
-		.withConfiguration(vertexAiAutoConfig(VertexAiGeminiChatAutoConfiguration.class));
+		.withConfiguration(VertexAiITUtil.vertexAiToolAutoConfig(VertexAiGeminiChatAutoConfiguration.class));
 
 	@Test
 	void generate() {
@@ -71,14 +70,4 @@ void generateStreaming() {
 		});
 	}
 
-	private static AutoConfigurations vertexAiAutoConfig(Class<?>... additionalAutoConfigurations) {
-		Class<?>[] dependencies = new Class[] { SpringAiRetryAutoConfiguration.class, ToolCallingAutoConfiguration.class};
-		Class<?>[] allAutoConfigurations = new Class[dependencies.length + additionalAutoConfigurations.length];
-		System.arraycopy(dependencies, 0, allAutoConfigurations, 0, dependencies.length);
-		System.arraycopy(additionalAutoConfigurations, 0, allAutoConfigurations, dependencies.length,
-				additionalAutoConfigurations.length);
-
-		return AutoConfigurations.of(allAutoConfigurations);
-	}
-
 }
diff --git a/auto-configurations/models/spring-ai-autoconfigure-model-vertex-ai/src/test/java/org/springframework/ai/model/vertexai/autoconfigure/gemini/VertexAiModelConfigurationTests.java b/auto-configurations/models/spring-ai-autoconfigure-model-vertex-ai/src/test/java/org/springframework/ai/model/vertexai/autoconfigure/gemini/VertexAiModelConfigurationTests.java
@@ -19,8 +19,8 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
 
+import org.springframework.ai.model.vertexai.autoconfigure.VertexAiITUtil;
 import org.springframework.ai.vertexai.gemini.VertexAiGeminiChatModel;
-import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -41,14 +41,16 @@ public class VertexAiModelConfigurationTests {
 	@Test
 	void chatModelActivation() {
 
-		this.contextRunner.withConfiguration(AutoConfigurations.of(VertexAiGeminiChatAutoConfiguration.class))
+		this.contextRunner
+			.withConfiguration(VertexAiITUtil.vertexAiToolAutoConfig(VertexAiGeminiChatAutoConfiguration.class))
 			.withPropertyValues("spring.ai.model.chat=none")
 			.run(context -> {
 				assertThat(context.getBeansOfType(VertexAiGeminiChatProperties.class)).isEmpty();
 				assertThat(context.getBeansOfType(VertexAiGeminiChatModel.class)).isEmpty();
 			});
 
-		this.contextRunner.withConfiguration(AutoConfigurations.of(VertexAiGeminiChatAutoConfiguration.class))
+		this.contextRunner
+			.withConfiguration(VertexAiITUtil.vertexAiToolAutoConfig(VertexAiGeminiChatAutoConfiguration.class))
 			.withPropertyValues("spring.ai.model.chat=vertexai")
 			.run(context -> {
 				assertThat(context.getBeansOfType(VertexAiGeminiChatProperties.class)).isNotEmpty();
diff --git a/auto-configurations/models/spring-ai-autoconfigure-model-vertex-ai/src/test/java/org/springframework/ai/model/vertexai/autoconfigure/gemini/tool/FunctionCallWithFunctionBeanIT.java b/auto-configurations/models/spring-ai-autoconfigure-model-vertex-ai/src/test/java/org/springframework/ai/model/vertexai/autoconfigure/gemini/tool/FunctionCallWithFunctionBeanIT.java
@@ -28,10 +28,10 @@
 import org.springframework.ai.chat.model.ChatResponse;
 import org.springframework.ai.chat.prompt.Prompt;
 import org.springframework.ai.model.tool.ToolCallingChatOptions;
+import org.springframework.ai.model.vertexai.autoconfigure.VertexAiITUtil;
 import org.springframework.ai.model.vertexai.autoconfigure.gemini.VertexAiGeminiChatAutoConfiguration;
 import org.springframework.ai.vertexai.gemini.VertexAiGeminiChatModel;
 import org.springframework.ai.vertexai.gemini.VertexAiGeminiChatOptions;
-import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -49,7 +49,7 @@ class FunctionCallWithFunctionBeanIT {
 		.withPropertyValues("spring.ai.vertex.ai.gemini.project-id=" + System.getenv("VERTEX_AI_GEMINI_PROJECT_ID"),
 				"spring.ai.vertex.ai.gemini.location=" + System.getenv("VERTEX_AI_GEMINI_LOCATION"))
 
-		.withConfiguration(AutoConfigurations.of(VertexAiGeminiChatAutoConfiguration.class))
+		.withConfiguration(VertexAiITUtil.vertexAiToolAutoConfig(VertexAiGeminiChatAutoConfiguration.class))
 		.withUserConfiguration(Config.class);
 
 	@Test
diff --git a/auto-configurations/models/spring-ai-autoconfigure-model-vertex-ai/src/test/java/org/springframework/ai/model/vertexai/autoconfigure/gemini/tool/FunctionCallWithFunctionWrapperIT.java b/auto-configurations/models/spring-ai-autoconfigure-model-vertex-ai/src/test/java/org/springframework/ai/model/vertexai/autoconfigure/gemini/tool/FunctionCallWithFunctionWrapperIT.java
@@ -26,12 +26,12 @@
 import org.springframework.ai.chat.messages.UserMessage;
 import org.springframework.ai.chat.model.ChatResponse;
 import org.springframework.ai.chat.prompt.Prompt;
+import org.springframework.ai.model.vertexai.autoconfigure.VertexAiITUtil;
 import org.springframework.ai.model.vertexai.autoconfigure.gemini.VertexAiGeminiChatAutoConfiguration;
 import org.springframework.ai.tool.ToolCallback;
 import org.springframework.ai.tool.function.FunctionToolCallback;
 import org.springframework.ai.vertexai.gemini.VertexAiGeminiChatModel;
 import org.springframework.ai.vertexai.gemini.VertexAiGeminiChatOptions;
-import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -47,7 +47,7 @@ public class FunctionCallWithFunctionWrapperIT {
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
 		.withPropertyValues("spring.ai.vertex.ai.gemini.project-id=" + System.getenv("VERTEX_AI_GEMINI_PROJECT_ID"),
 				"spring.ai.vertex.ai.gemini.location=" + System.getenv("VERTEX_AI_GEMINI_LOCATION"))
-		.withConfiguration(AutoConfigurations.of(VertexAiGeminiChatAutoConfiguration.class))
+		.withConfiguration(VertexAiITUtil.vertexAiToolAutoConfig(VertexAiGeminiChatAutoConfiguration.class))
 		.withUserConfiguration(Config.class);
 
 	@Test
diff --git a/auto-configurations/models/spring-ai-autoconfigure-model-vertex-ai/src/test/java/org/springframework/ai/model/vertexai/autoconfigure/gemini/tool/FunctionCallWithPromptFunctionIT.java b/auto-configurations/models/spring-ai-autoconfigure-model-vertex-ai/src/test/java/org/springframework/ai/model/vertexai/autoconfigure/gemini/tool/FunctionCallWithPromptFunctionIT.java
@@ -26,11 +26,11 @@
 import org.springframework.ai.chat.messages.UserMessage;
 import org.springframework.ai.chat.model.ChatResponse;
 import org.springframework.ai.chat.prompt.Prompt;
+import org.springframework.ai.model.vertexai.autoconfigure.VertexAiITUtil;
 import org.springframework.ai.model.vertexai.autoconfigure.gemini.VertexAiGeminiChatAutoConfiguration;
 import org.springframework.ai.tool.function.FunctionToolCallback;
 import org.springframework.ai.vertexai.gemini.VertexAiGeminiChatModel;
 import org.springframework.ai.vertexai.gemini.VertexAiGeminiChatOptions;
-import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -44,7 +44,7 @@ public class FunctionCallWithPromptFunctionIT {
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
 		.withPropertyValues("spring.ai.vertex.ai.gemini.project-id=" + System.getenv("VERTEX_AI_GEMINI_PROJECT_ID"),
 				"spring.ai.vertex.ai.gemini.location=" + System.getenv("VERTEX_AI_GEMINI_LOCATION"))
-		.withConfiguration(AutoConfigurations.of(VertexAiGeminiChatAutoConfiguration.class));
+		.withConfiguration(VertexAiITUtil.vertexAiToolAutoConfig(VertexAiGeminiChatAutoConfiguration.class));
 
 	@Test
 	void functionCallTest() {
