Skip to content

Commit fc0c834

Browse files
committed
fix: correct visibility scope issues in Spring AI components
- Change return types from implementation to interface in AutoConfiguration beans - OllamaConnectionDetails in OllamaApiAutoConfiguration - WeaviateConnectionDetails in WeaviateVectorStoreAutoConfiguration - Fix visibility modifiers for: - Make Aws class public in OpenSearchVectorStoreProperties - Set OpenAIAutoConfigurationUtil.resolveConnectionProperties to package-private - Change static NumericBoundary constants to private in RedisFilterExpressionConverter - Explicitly mark metadataFields as final in RedisFilterExpressionConverter These changes ensure components are properly encapsulated and follow API design best practices by exposing only what's necessary through interfaces rather than implementations. Signed-off-by: Soby Chacko <[email protected]>
1 parent 3919204 commit fc0c834

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

auto-configurations/models/spring-ai-autoconfigure-model-ollama/src/main/java/org/springframework/ai/model/ollama/autoconfigure/OllamaApiAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public class OllamaApiAutoConfiguration {
4242

4343
@Bean
4444
@ConditionalOnMissingBean(OllamaConnectionDetails.class)
45-
public PropertiesOllamaConnectionDetails ollamaConnectionDetails(OllamaConnectionProperties properties) {
45+
public OllamaConnectionDetails ollamaConnectionDetails(OllamaConnectionProperties properties) {
4646
return new PropertiesOllamaConnectionDetails(properties);
4747
}
4848

auto-configurations/models/spring-ai-autoconfigure-model-openai/src/main/java/org/springframework/ai/model/openai/autoconfigure/OpenAIAutoConfigurationUtil.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ private OpenAIAutoConfigurationUtil() {
3333
// Avoids instantiation
3434
}
3535

36-
public static @NotNull ResolvedConnectionProperties resolveConnectionProperties(
37-
OpenAiParentProperties commonProperties, OpenAiParentProperties modelProperties, String modelType) {
36+
static @NotNull ResolvedConnectionProperties resolveConnectionProperties(OpenAiParentProperties commonProperties,
37+
OpenAiParentProperties modelProperties, String modelType) {
3838

3939
String baseUrl = StringUtils.hasText(modelProperties.getBaseUrl()) ? modelProperties.getBaseUrl()
4040
: commonProperties.getBaseUrl();

auto-configurations/vector-stores/spring-ai-autoconfigure-vector-store-opensearch/src/main/java/org/springframework/ai/vectorstore/opensearch/autoconfigure/OpenSearchVectorStoreProperties.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ public void setAws(Aws aws) {
144144
this.aws = aws;
145145
}
146146

147-
static class Aws {
147+
public static class Aws {
148148

149149
private String domainName;
150150

auto-configurations/vector-stores/spring-ai-autoconfigure-vector-store-weaviate/src/main/java/org/springframework/ai/vectorstore/weaviate/autoconfigure/WeaviateVectorStoreAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public class WeaviateVectorStoreAutoConfiguration {
5252

5353
@Bean
5454
@ConditionalOnMissingBean(WeaviateConnectionDetails.class)
55-
public PropertiesWeaviateConnectionDetails weaviateConnectionDetails(WeaviateVectorStoreProperties properties) {
55+
public WeaviateConnectionDetails weaviateConnectionDetails(WeaviateVectorStoreProperties properties) {
5656
return new PropertiesWeaviateConnectionDetails(properties);
5757
}
5858

vector-stores/spring-ai-redis-store/src/main/java/org/springframework/ai/vectorstore/redis/RedisFilterExpressionConverter.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@
3838
*/
3939
public class RedisFilterExpressionConverter extends AbstractFilterExpressionConverter {
4040

41-
public static final NumericBoundary POSITIVE_INFINITY = new NumericBoundary(Double.POSITIVE_INFINITY, true);
41+
static final NumericBoundary POSITIVE_INFINITY = new NumericBoundary(Double.POSITIVE_INFINITY, true);
4242

43-
public static final NumericBoundary NEGATIVE_INFINITY = new NumericBoundary(Double.NEGATIVE_INFINITY, true);
43+
static final NumericBoundary NEGATIVE_INFINITY = new NumericBoundary(Double.NEGATIVE_INFINITY, true);
4444

45-
private Map<String, MetadataField> metadataFields;
45+
private final Map<String, MetadataField> metadataFields;
4646

4747
public RedisFilterExpressionConverter(List<MetadataField> metadataFields) {
4848
this.metadataFields = metadataFields.stream()
@@ -168,11 +168,11 @@ private NumericBoundary exclusive(Value value) {
168168
return new NumericBoundary(value.value(), true);
169169
}
170170

171-
static record Numeric(NumericBoundary lower, NumericBoundary upper) {
171+
record Numeric(NumericBoundary lower, NumericBoundary upper) {
172172

173173
}
174174

175-
static record NumericBoundary(Object value, boolean exclusive) {
175+
record NumericBoundary(Object value, boolean exclusive) {
176176

177177
private static final String INFINITY = "inf";
178178

0 commit comments

Comments
 (0)