From 724807556564bc174c81be5bc053f7a0429a8b32 Mon Sep 17 00:00:00 2001 From: Thomas Vitale Date: Thu, 13 Jun 2024 19:28:46 +0200 Subject: [PATCH] Fix Spring AOT for ConnectionDetails beans Fixes gh-861 Signed-off-by: Thomas Vitale --- .../ai/autoconfigure/ollama/OllamaAutoConfiguration.java | 2 +- .../vectorstore/chroma/ChromaVectorStoreAutoConfiguration.java | 2 +- .../vectorstore/milvus/MilvusVectorStoreAutoConfiguration.java | 3 +-- .../vectorstore/redis/RedisVectorStoreAutoConfiguration.java | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/ollama/OllamaAutoConfiguration.java b/spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/ollama/OllamaAutoConfiguration.java index 20ff7fb63..f74aa2578 100644 --- a/spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/ollama/OllamaAutoConfiguration.java +++ b/spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/ollama/OllamaAutoConfiguration.java @@ -72,7 +72,7 @@ public class OllamaAutoConfiguration { return new OllamaEmbeddingModel(ollamaApi, properties.getOptions()); } - private static class PropertiesOllamaConnectionDetails implements OllamaConnectionDetails { + static class PropertiesOllamaConnectionDetails implements OllamaConnectionDetails { private final OllamaConnectionProperties properties; diff --git a/spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/vectorstore/chroma/ChromaVectorStoreAutoConfiguration.java b/spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/vectorstore/chroma/ChromaVectorStoreAutoConfiguration.java index 8da48c0bb..88d0bcf5b 100644 --- a/spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/vectorstore/chroma/ChromaVectorStoreAutoConfiguration.java +++ b/spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/vectorstore/chroma/ChromaVectorStoreAutoConfiguration.java @@ -76,7 +76,7 @@ public class ChromaVectorStoreAutoConfiguration { storeProperties.isInitializeSchema()); } - private static class PropertiesChromaConnectionDetails implements ChromaConnectionDetails { + static class PropertiesChromaConnectionDetails implements ChromaConnectionDetails { private final ChromaApiProperties properties; diff --git a/spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/vectorstore/milvus/MilvusVectorStoreAutoConfiguration.java b/spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/vectorstore/milvus/MilvusVectorStoreAutoConfiguration.java index 557d1f358..f0cef2f09 100644 --- a/spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/vectorstore/milvus/MilvusVectorStoreAutoConfiguration.java +++ b/spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/vectorstore/milvus/MilvusVectorStoreAutoConfiguration.java @@ -113,8 +113,7 @@ public class MilvusVectorStoreAutoConfiguration { return new MilvusServiceClient(builder.build()); } - private static class PropertiesMilvusServiceClientConnectionDetails - implements MilvusServiceClientConnectionDetails { + static class PropertiesMilvusServiceClientConnectionDetails implements MilvusServiceClientConnectionDetails { private final MilvusServiceClientProperties properties; diff --git a/spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/vectorstore/redis/RedisVectorStoreAutoConfiguration.java b/spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/vectorstore/redis/RedisVectorStoreAutoConfiguration.java index bb093f4aa..4f203ed19 100644 --- a/spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/vectorstore/redis/RedisVectorStoreAutoConfiguration.java +++ b/spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/vectorstore/redis/RedisVectorStoreAutoConfiguration.java @@ -53,7 +53,7 @@ public class RedisVectorStoreAutoConfiguration { return new RedisVectorStore(config, embeddingModel, properties.isInitializeSchema()); } - private static class PropertiesRedisConnectionDetails implements RedisConnectionDetails { + static class PropertiesRedisConnectionDetails implements RedisConnectionDetails { private final RedisVectorStoreProperties properties;