From 518ba27b28a2f4446bc1f10b0304f342a3d64573 Mon Sep 17 00:00:00 2001
From: Guan Huo <9uanhuo@gmail.com>
Date: Wed, 11 Jun 2025 04:38:47 +0800
Subject: [PATCH] fix: missing 'embeddingFieldName' when configuring ES
 VectorStore (#3501)

Fixes: #3500

Signed-off-by: Jionghui Zheng <9uanhuo@gmail.com>
(cherry picked from commit 1f5dc3f73974c31c5d3e27c9c304e29f98b78516)
---
 .../ElasticsearchVectorStoreAutoConfiguration.java            | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/auto-configurations/vector-stores/spring-ai-autoconfigure-vector-store-elasticsearch/src/main/java/org/springframework/ai/vectorstore/elasticsearch/autoconfigure/ElasticsearchVectorStoreAutoConfiguration.java b/auto-configurations/vector-stores/spring-ai-autoconfigure-vector-store-elasticsearch/src/main/java/org/springframework/ai/vectorstore/elasticsearch/autoconfigure/ElasticsearchVectorStoreAutoConfiguration.java
index 19f8d36b8..7046adad3 100644
--- a/auto-configurations/vector-stores/spring-ai-autoconfigure-vector-store-elasticsearch/src/main/java/org/springframework/ai/vectorstore/elasticsearch/autoconfigure/ElasticsearchVectorStoreAutoConfiguration.java
+++ b/auto-configurations/vector-stores/spring-ai-autoconfigure-vector-store-elasticsearch/src/main/java/org/springframework/ai/vectorstore/elasticsearch/autoconfigure/ElasticsearchVectorStoreAutoConfiguration.java
@@ -45,6 +45,7 @@ import org.springframework.context.annotation.Bean;
  * @author Christian Tzolov
  * @author Soby Chacko
  * @author Jonghoon Park
+ * @author Jionghui Zheng
  * @since 1.0.0
  */
 @AutoConfiguration(after = ElasticsearchRestClientAutoConfiguration.class)
@@ -72,6 +73,9 @@ public class ElasticsearchVectorStoreAutoConfiguration {
 		mapper.from(properties::getIndexName).whenHasText().to(elasticsearchVectorStoreOptions::setIndexName);
 		mapper.from(properties::getDimensions).whenNonNull().to(elasticsearchVectorStoreOptions::setDimensions);
 		mapper.from(properties::getSimilarity).whenNonNull().to(elasticsearchVectorStoreOptions::setSimilarity);
+		mapper.from(properties::getEmbeddingFieldName)
+			.whenHasText()
+			.to(elasticsearchVectorStoreOptions::setEmbeddingFieldName);
 
 		return ElasticsearchVectorStore.builder(restClient, embeddingModel)
 			.options(elasticsearchVectorStoreOptions)