diff --git a/spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/vectorstore/oracle/OracleVectorStoreAutoConfiguration.java b/spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/vectorstore/oracle/OracleVectorStoreAutoConfiguration.java index 9726182ba..85c41f21a 100644 --- a/spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/vectorstore/oracle/OracleVectorStoreAutoConfiguration.java +++ b/spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/vectorstore/oracle/OracleVectorStoreAutoConfiguration.java @@ -20,7 +20,6 @@ import javax.sql.DataSource; import org.springframework.ai.embedding.EmbeddingModel; import org.springframework.ai.vectorstore.OracleVectorStore; import org.springframework.boot.autoconfigure.AutoConfiguration; -import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.jdbc.JdbcTemplateAutoConfiguration; @@ -30,11 +29,11 @@ import org.springframework.jdbc.core.JdbcTemplate; /** * @author Loïc Lefèvre + * @author Eddú Meléndez */ @AutoConfiguration(after = JdbcTemplateAutoConfiguration.class) @ConditionalOnClass({ OracleVectorStore.class, DataSource.class, JdbcTemplate.class }) @EnableConfigurationProperties(OracleVectorStoreProperties.class) -@ImportAutoConfiguration(classes = JdbcTemplateAutoConfiguration.class) public class OracleVectorStoreAutoConfiguration { @Bean diff --git a/spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/vectorstore/oracle/OracleVectorStoreAutoConfigurationIT.java b/spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/vectorstore/oracle/OracleVectorStoreAutoConfigurationIT.java index 26a6ea355..d08be5194 100644 --- a/spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/vectorstore/oracle/OracleVectorStoreAutoConfigurationIT.java +++ b/spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/vectorstore/oracle/OracleVectorStoreAutoConfigurationIT.java @@ -21,6 +21,7 @@ import java.util.List; import java.util.Map; import org.junit.jupiter.api.Test; +import org.springframework.boot.autoconfigure.jdbc.JdbcTemplateAutoConfiguration; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; import org.testcontainers.oracle.OracleContainer; @@ -42,6 +43,7 @@ import static org.assertj.core.api.Assertions.assertThat; /** * @author Christian Tzolov + * @author Eddú Meléndez */ @Testcontainers public class OracleVectorStoreAutoConfigurationIT { @@ -57,8 +59,8 @@ public class OracleVectorStoreAutoConfigurationIT { new Document(getText("classpath:/test/data/great.depression.txt"), Map.of("depression", "bad"))); private final ApplicationContextRunner contextRunner = new ApplicationContextRunner() - .withConfiguration( - AutoConfigurations.of(OracleVectorStoreAutoConfiguration.class, DataSourceAutoConfiguration.class)) + .withConfiguration(AutoConfigurations.of(OracleVectorStoreAutoConfiguration.class, + JdbcTemplateAutoConfiguration.class, DataSourceAutoConfiguration.class)) .withUserConfiguration(Config.class) .withPropertyValues("test.spring.ai.vectorstore.oracle.distanceType=COSINE", "test.spring.ai.vectorstore.oracle.dimensions=384",