Skip to content

Commit d9e7ace

Browse files
sobychackoilayaperumalg
sobychacko
authored and
ilayaperumalg
committed
Miscellaneous checkstyle fixes
Signed-off-by: Soby Chacko <[email protected]>
1 parent 318bdfc commit d9e7ace

File tree

212 files changed

+1203
-942
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

212 files changed

+1203
-942
lines changed

‎advisors/spring-ai-advisors-vector-store/src/main/java/org/springframework/ai/chat/client/advisor/vectorstore/QuestionAnswerAdvisor.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,17 @@
2121
import java.util.Map;
2222
import java.util.stream.Collectors;
2323

24+
import reactor.core.publisher.Flux;
25+
import reactor.core.publisher.Mono;
26+
import reactor.core.scheduler.Schedulers;
27+
2428
import org.springframework.ai.chat.client.advisor.api.AdvisedRequest;
2529
import org.springframework.ai.chat.client.advisor.api.AdvisedResponse;
2630
import org.springframework.ai.chat.client.advisor.api.AdvisedResponseStreamUtils;
2731
import org.springframework.ai.chat.client.advisor.api.CallAroundAdvisor;
2832
import org.springframework.ai.chat.client.advisor.api.CallAroundAdvisorChain;
2933
import org.springframework.ai.chat.client.advisor.api.StreamAroundAdvisor;
3034
import org.springframework.ai.chat.client.advisor.api.StreamAroundAdvisorChain;
31-
import reactor.core.publisher.Flux;
32-
import reactor.core.publisher.Mono;
33-
import reactor.core.scheduler.Schedulers;
34-
3535
import org.springframework.ai.chat.model.ChatResponse;
3636
import org.springframework.ai.chat.prompt.PromptTemplate;
3737
import org.springframework.ai.document.Document;

‎auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-jdbc/src/main/java/org/springframework/ai/model/chat/memory/jdbc/autoconfigure/JdbcChatMemoryDataSourceScriptDatabaseInitializer.java

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
/*
2+
* Copyright 2024-2025 the original author or authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* https://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
117
package org.springframework.ai.model.chat.memory.jdbc.autoconfigure;
218

319
import java.util.List;
@@ -13,7 +29,7 @@ class JdbcChatMemoryDataSourceScriptDatabaseInitializer extends DataSourceScript
1329

1430
private static final String SCHEMA_LOCATION = "classpath:org/springframework/ai/chat/memory/jdbc/schema-@@platform@@.sql";
1531

16-
public JdbcChatMemoryDataSourceScriptDatabaseInitializer(DataSource dataSource) {
32+
JdbcChatMemoryDataSourceScriptDatabaseInitializer(DataSource dataSource) {
1733
super(dataSource, getSettings(dataSource));
1834
}
1935

‎auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-jdbc/src/test/java/org/springframework/ai/model/chat/memory/jdbc/autoconfigure/JdbcChatMemoryAutoConfigurationIT.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,16 +60,14 @@ class JdbcChatMemoryAutoConfigurationIT {
6060

6161
@Test
6262
void jdbcChatMemoryScriptDatabaseInitializer_shouldBeLoaded() {
63-
this.contextRunner.withPropertyValues("spring.ai.chat.memory.jdbc.initialize-schema=true").run(context -> {
64-
assertThat(context.containsBean("jdbcChatMemoryScriptDatabaseInitializer")).isTrue();
65-
});
63+
this.contextRunner.withPropertyValues("spring.ai.chat.memory.jdbc.initialize-schema=true")
64+
.run(context -> assertThat(context.containsBean("jdbcChatMemoryScriptDatabaseInitializer")).isTrue());
6665
}
6766

6867
@Test
6968
void jdbcChatMemoryScriptDatabaseInitializer_shouldNotBeLoaded() {
70-
this.contextRunner.withPropertyValues("spring.ai.chat.memory.jdbc.initialize-schema=false").run(context -> {
71-
assertThat(context.containsBean("jdbcChatMemoryScriptDatabaseInitializer")).isFalse();
72-
});
69+
this.contextRunner.withPropertyValues("spring.ai.chat.memory.jdbc.initialize-schema=false")
70+
.run(context -> assertThat(context.containsBean("jdbcChatMemoryScriptDatabaseInitializer")).isFalse());
7371
}
7472

7573
@Test

‎auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-jdbc/src/test/java/org/springframework/ai/model/chat/memory/jdbc/autoconfigure/JdbcChatMemoryDataSourceScriptDatabaseInitializerTests.java

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
/*
2+
* Copyright 2024-2025 the original author or authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* https://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
117
package org.springframework.ai.model.chat.memory.jdbc.autoconfigure;
218

319
import javax.sql.DataSource;

‎auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-neo4j/src/main/java/org/springframework/ai/model/chat/memory/neo4j/autoconfigure/Neo4jChatMemoryAutoConfiguration.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package org.springframework.ai.model.chat.memory.neo4j.autoconfigure;
1818

1919
import org.neo4j.driver.Driver;
20+
2021
import org.springframework.ai.chat.memory.neo4j.Neo4jChatMemory;
2122
import org.springframework.ai.chat.memory.neo4j.Neo4jChatMemoryConfig;
2223
import org.springframework.boot.autoconfigure.AutoConfiguration;

‎auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-neo4j/src/main/java/org/springframework/ai/model/chat/memory/neo4j/autoconfigure/Neo4jChatMemoryProperties.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,31 +42,31 @@ public class Neo4jChatMemoryProperties {
4242
private String mediaLabel = Neo4jChatMemoryConfig.DEFAULT_MEDIA_LABEL;
4343

4444
public String getSessionLabel() {
45-
return sessionLabel;
45+
return this.sessionLabel;
4646
}
4747

4848
public void setSessionLabel(String sessionLabel) {
4949
this.sessionLabel = sessionLabel;
5050
}
5151

5252
public String getToolCallLabel() {
53-
return toolCallLabel;
53+
return this.toolCallLabel;
5454
}
5555

5656
public String getMetadataLabel() {
57-
return metadataLabel;
57+
return this.metadataLabel;
5858
}
5959

6060
public String getMessageLabel() {
61-
return messageLabel;
61+
return this.messageLabel;
6262
}
6363

6464
public String getToolResponseLabel() {
65-
return toolResponseLabel;
65+
return this.toolResponseLabel;
6666
}
6767

6868
public String getMediaLabel() {
69-
return mediaLabel;
69+
return this.mediaLabel;
7070
}
7171

7272
public void setToolCallLabel(String toolCallLabel) {

‎auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-neo4j/src/test/java/org/springframework/ai/model/chat/memory/neo4j/autoconfigure/Neo4jChatMemoryPropertiesTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package org.springframework.ai.model.chat.memory.neo4j.autoconfigure;
1818

1919
import org.junit.jupiter.api.Test;
20+
2021
import org.springframework.ai.chat.memory.neo4j.Neo4jChatMemoryConfig;
2122

2223
import static org.assertj.core.api.Assertions.assertThat;

‎auto-configurations/models/spring-ai-autoconfigure-model-anthropic/src/main/java/org/springframework/ai/model/anthropic/autoconfigure/AnthropicChatAutoConfiguration.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,16 @@
2020

2121
import org.springframework.ai.anthropic.AnthropicChatModel;
2222
import org.springframework.ai.anthropic.api.AnthropicApi;
23+
import org.springframework.ai.chat.observation.ChatModelObservationConvention;
2324
import org.springframework.ai.model.SpringAIModelProperties;
2425
import org.springframework.ai.model.SpringAIModels;
25-
import org.springframework.ai.model.tool.autoconfigure.ToolCallingAutoConfiguration;
26-
import org.springframework.ai.retry.autoconfigure.SpringAiRetryAutoConfiguration;
27-
import org.springframework.ai.chat.observation.ChatModelObservationConvention;
2826
import org.springframework.ai.model.function.DefaultFunctionCallbackResolver;
2927
import org.springframework.ai.model.function.FunctionCallbackResolver;
3028
import org.springframework.ai.model.tool.DefaultToolExecutionEligibilityPredicate;
3129
import org.springframework.ai.model.tool.ToolCallingManager;
3230
import org.springframework.ai.model.tool.ToolExecutionEligibilityPredicate;
31+
import org.springframework.ai.model.tool.autoconfigure.ToolCallingAutoConfiguration;
32+
import org.springframework.ai.retry.autoconfigure.SpringAiRetryAutoConfiguration;
3333
import org.springframework.beans.factory.ObjectProvider;
3434
import org.springframework.boot.autoconfigure.AutoConfiguration;
3535
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;

‎auto-configurations/models/spring-ai-autoconfigure-model-anthropic/src/test/java/org/springframework/ai/model/anthropic/autoconfigure/AnthropicModelConfigurationTests.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,7 @@ public class AnthropicModelConfigurationTests {
3737

3838
@Test
3939
void chatModelActivation() {
40-
this.contextRunner.run(context -> {
41-
assertThat(context.getBeansOfType(AnthropicChatModel.class)).isNotEmpty();
42-
});
40+
this.contextRunner.run(context -> assertThat(context.getBeansOfType(AnthropicChatModel.class)).isNotEmpty());
4341

4442
this.contextRunner.withPropertyValues("spring.ai.model.chat=none").run(context -> {
4543
assertThat(context.getBeansOfType(AnthropicChatProperties.class)).isEmpty();

‎auto-configurations/models/spring-ai-autoconfigure-model-anthropic/src/test/java/org/springframework/ai/model/anthropic/autoconfigure/AnthropicPropertiesTests.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,7 @@ public void chatCompletionDisabled() {
121121
new ApplicationContextRunner().withPropertyValues("spring.ai.model.chat=none")
122122
.withConfiguration(AutoConfigurations.of(SpringAiRetryAutoConfiguration.class,
123123
RestClientAutoConfiguration.class, AnthropicChatAutoConfiguration.class))
124-
.run(context -> {
125-
assertThat(context.getBeansOfType(AnthropicChatModel.class)).isEmpty();
126-
});
124+
.run(context -> assertThat(context.getBeansOfType(AnthropicChatModel.class)).isEmpty());
127125
}
128126

129127
}

‎auto-configurations/models/spring-ai-autoconfigure-model-anthropic/src/test/java/org/springframework/ai/model/anthropic/autoconfigure/tool/FunctionCallWithFunctionBeanIT.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@
2727
import org.springframework.ai.anthropic.AnthropicChatModel;
2828
import org.springframework.ai.anthropic.AnthropicChatOptions;
2929
import org.springframework.ai.anthropic.api.AnthropicApi;
30-
import org.springframework.ai.model.anthropic.autoconfigure.AnthropicChatAutoConfiguration;
31-
import org.springframework.ai.model.anthropic.autoconfigure.tool.MockWeatherService.Request;
32-
import org.springframework.ai.model.anthropic.autoconfigure.tool.MockWeatherService.Response;
3330
import org.springframework.ai.chat.messages.UserMessage;
3431
import org.springframework.ai.chat.model.ChatResponse;
3532
import org.springframework.ai.chat.prompt.Prompt;
33+
import org.springframework.ai.model.anthropic.autoconfigure.AnthropicChatAutoConfiguration;
34+
import org.springframework.ai.model.anthropic.autoconfigure.tool.MockWeatherService.Request;
35+
import org.springframework.ai.model.anthropic.autoconfigure.tool.MockWeatherService.Response;
3636
import org.springframework.ai.model.tool.ToolCallingChatOptions;
3737
import org.springframework.boot.autoconfigure.AutoConfigurations;
3838
import org.springframework.boot.test.context.runner.ApplicationContextRunner;

‎auto-configurations/models/spring-ai-autoconfigure-model-anthropic/src/test/java/org/springframework/ai/model/anthropic/autoconfigure/tool/FunctionCallWithPromptFunctionIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@
2626
import org.springframework.ai.anthropic.AnthropicChatModel;
2727
import org.springframework.ai.anthropic.AnthropicChatOptions;
2828
import org.springframework.ai.anthropic.api.AnthropicApi;
29-
import org.springframework.ai.model.anthropic.autoconfigure.AnthropicChatAutoConfiguration;
3029
import org.springframework.ai.chat.messages.UserMessage;
3130
import org.springframework.ai.chat.model.ChatResponse;
3231
import org.springframework.ai.chat.prompt.Prompt;
32+
import org.springframework.ai.model.anthropic.autoconfigure.AnthropicChatAutoConfiguration;
3333
import org.springframework.ai.tool.function.FunctionToolCallback;
3434
import org.springframework.boot.autoconfigure.AutoConfigurations;
3535
import org.springframework.boot.test.context.runner.ApplicationContextRunner;

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
/*
2+
* Copyright 2025-2025 the original author or authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* https://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
117
package org.springframework.ai.model.azure.openai.autoconfigure;
218

319
import com.azure.ai.openai.OpenAIClientBuilder;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import org.springframework.ai.model.SpringAIModelProperties;
2323
import org.springframework.ai.model.SpringAIModels;
2424
import org.springframework.boot.autoconfigure.AutoConfiguration;
25-
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
2625
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
2726
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
2827
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import com.azure.core.util.Header;
2929

3030
import org.springframework.beans.factory.ObjectProvider;
31-
import org.springframework.boot.autoconfigure.AutoConfiguration;
3231
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
3332
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
3433
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import org.springframework.ai.model.SpringAIModels;
2626
import org.springframework.beans.factory.ObjectProvider;
2727
import org.springframework.boot.autoconfigure.AutoConfiguration;
28-
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
2928
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
3029
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
3130
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import org.springframework.ai.model.SpringAIModelProperties;
2323
import org.springframework.ai.model.SpringAIModels;
2424
import org.springframework.boot.autoconfigure.AutoConfiguration;
25-
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
2625
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
2726
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
2827
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;

‎auto-configurations/models/spring-ai-autoconfigure-model-azure-openai/src/test/java/org/springframework/ai/model/azure/openai/autoconfigure/AzureOpenAiAutoConfigurationIT.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
import com.azure.core.http.HttpResponse;
3535
import org.junit.jupiter.api.Test;
3636
import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
37-
3837
import reactor.core.publisher.Flux;
3938

4039
import org.springframework.ai.azure.openai.AzureOpenAiAudioTranscriptionModel;

‎auto-configurations/models/spring-ai-autoconfigure-model-bedrock-ai/src/main/java/org/springframework/ai/model/bedrock/cohere/autoconfigure/BedrockCohereEmbeddingAutoConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020
import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
2121
import software.amazon.awssdk.regions.providers.AwsRegionProvider;
2222

23+
import org.springframework.ai.bedrock.cohere.BedrockCohereEmbeddingModel;
24+
import org.springframework.ai.bedrock.cohere.api.CohereEmbeddingBedrockApi;
2325
import org.springframework.ai.model.SpringAIModelProperties;
2426
import org.springframework.ai.model.SpringAIModels;
2527
import org.springframework.ai.model.bedrock.autoconfigure.BedrockAwsConnectionConfiguration;
2628
import org.springframework.ai.model.bedrock.autoconfigure.BedrockAwsConnectionProperties;
27-
import org.springframework.ai.bedrock.cohere.BedrockCohereEmbeddingModel;
28-
import org.springframework.ai.bedrock.cohere.api.CohereEmbeddingBedrockApi;
2929
import org.springframework.boot.autoconfigure.AutoConfiguration;
3030
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
3131
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;

‎auto-configurations/models/spring-ai-autoconfigure-model-bedrock-ai/src/main/java/org/springframework/ai/model/bedrock/converse/autoconfigure/BedrockConverseProxyChatAutoConfiguration.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,18 @@
2222
import software.amazon.awssdk.services.bedrockruntime.BedrockRuntimeAsyncClient;
2323
import software.amazon.awssdk.services.bedrockruntime.BedrockRuntimeClient;
2424

25+
import org.springframework.ai.bedrock.converse.BedrockProxyChatModel;
26+
import org.springframework.ai.chat.observation.ChatModelObservationConvention;
2527
import org.springframework.ai.model.SpringAIModelProperties;
2628
import org.springframework.ai.model.SpringAIModels;
2729
import org.springframework.ai.model.bedrock.autoconfigure.BedrockAwsConnectionConfiguration;
2830
import org.springframework.ai.model.bedrock.autoconfigure.BedrockAwsConnectionProperties;
29-
import org.springframework.ai.model.tool.autoconfigure.ToolCallingAutoConfiguration;
30-
import org.springframework.ai.bedrock.converse.BedrockProxyChatModel;
31-
import org.springframework.ai.chat.observation.ChatModelObservationConvention;
3231
import org.springframework.ai.model.function.DefaultFunctionCallbackResolver;
3332
import org.springframework.ai.model.function.FunctionCallbackResolver;
3433
import org.springframework.ai.model.tool.DefaultToolExecutionEligibilityPredicate;
3534
import org.springframework.ai.model.tool.ToolCallingManager;
3635
import org.springframework.ai.model.tool.ToolExecutionEligibilityPredicate;
36+
import org.springframework.ai.model.tool.autoconfigure.ToolCallingAutoConfiguration;
3737
import org.springframework.beans.factory.ObjectProvider;
3838
import org.springframework.boot.autoconfigure.AutoConfiguration;
3939
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;

‎auto-configurations/models/spring-ai-autoconfigure-model-bedrock-ai/src/main/java/org/springframework/ai/model/bedrock/titan/autoconfigure/BedrockTitanEmbeddingAutoConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020
import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
2121
import software.amazon.awssdk.regions.providers.AwsRegionProvider;
2222

23+
import org.springframework.ai.bedrock.titan.BedrockTitanEmbeddingModel;
24+
import org.springframework.ai.bedrock.titan.api.TitanEmbeddingBedrockApi;
2325
import org.springframework.ai.model.SpringAIModelProperties;
2426
import org.springframework.ai.model.SpringAIModels;
2527
import org.springframework.ai.model.bedrock.autoconfigure.BedrockAwsConnectionConfiguration;
2628
import org.springframework.ai.model.bedrock.autoconfigure.BedrockAwsConnectionProperties;
27-
import org.springframework.ai.bedrock.titan.BedrockTitanEmbeddingModel;
28-
import org.springframework.ai.bedrock.titan.api.TitanEmbeddingBedrockApi;
2929
import org.springframework.boot.autoconfigure.AutoConfiguration;
3030
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
3131
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;

‎auto-configurations/models/spring-ai-autoconfigure-model-bedrock-ai/src/test/java/org/springframework/ai/model/bedrock/cohere/autoconfigure/BedrockCohereEmbeddingAutoConfigurationIT.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@
2121
import org.junit.jupiter.api.Test;
2222
import software.amazon.awssdk.regions.Region;
2323

24-
import org.springframework.ai.model.bedrock.autoconfigure.BedrockAwsConnectionProperties;
25-
import org.springframework.ai.model.bedrock.autoconfigure.BedrockTestUtils;
26-
import org.springframework.ai.model.bedrock.autoconfigure.RequiresAwsCredentials;
2724
import org.springframework.ai.bedrock.cohere.BedrockCohereEmbeddingModel;
2825
import org.springframework.ai.bedrock.cohere.api.CohereEmbeddingBedrockApi.CohereEmbeddingModel;
2926
import org.springframework.ai.bedrock.cohere.api.CohereEmbeddingBedrockApi.CohereEmbeddingRequest;
3027
import org.springframework.ai.bedrock.cohere.api.CohereEmbeddingBedrockApi.CohereEmbeddingRequest.InputType;
3128
import org.springframework.ai.embedding.EmbeddingResponse;
29+
import org.springframework.ai.model.bedrock.autoconfigure.BedrockAwsConnectionProperties;
30+
import org.springframework.ai.model.bedrock.autoconfigure.BedrockTestUtils;
31+
import org.springframework.ai.model.bedrock.autoconfigure.RequiresAwsCredentials;
3232
import org.springframework.boot.autoconfigure.AutoConfigurations;
3333
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
3434

‎auto-configurations/models/spring-ai-autoconfigure-model-bedrock-ai/src/test/java/org/springframework/ai/model/bedrock/cohere/autoconfigure/BedrockCohereModelConfigurationTests.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,8 @@ public class BedrockCohereModelConfigurationTests {
3939

4040
@Test
4141
void embeddingModelActivation() {
42-
this.contextRunner.run(context -> {
43-
assertThat(context.getBeansOfType(BedrockCohereEmbeddingModel.class)).isNotEmpty();
44-
});
42+
this.contextRunner
43+
.run(context -> assertThat(context.getBeansOfType(BedrockCohereEmbeddingModel.class)).isNotEmpty());
4544

4645
this.contextRunner.withPropertyValues("spring.ai.model.embedding=none").run(context -> {
4746
assertThat(context.getBeansOfType(BedrockCohereEmbeddingProperties.class)).isEmpty();

‎auto-configurations/models/spring-ai-autoconfigure-model-bedrock-ai/src/test/java/org/springframework/ai/model/bedrock/converse/autoconfigure/BedrockConverseModelConfigurationTests.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,7 @@ public class BedrockConverseModelConfigurationTests {
3737

3838
@Test
3939
void chatModelActivation() {
40-
this.contextRunner.run(context -> {
41-
assertThat(context.getBeansOfType(BedrockProxyChatModel.class)).isNotEmpty();
42-
});
40+
this.contextRunner.run(context -> assertThat(context.getBeansOfType(BedrockProxyChatModel.class)).isNotEmpty());
4341

4442
this.contextRunner.withPropertyValues("spring.ai.model.chat=none").run(context -> {
4543
assertThat(context.getBeansOfType(BedrockConverseProxyChatProperties.class)).isEmpty();

‎auto-configurations/models/spring-ai-autoconfigure-model-bedrock-ai/src/test/java/org/springframework/ai/model/bedrock/converse/autoconfigure/BedrockConverseProxyChatAutoConfigurationIT.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@
2424
import org.junit.jupiter.api.Test;
2525
import reactor.core.publisher.Flux;
2626

27-
import org.springframework.ai.model.bedrock.autoconfigure.BedrockTestUtils;
28-
import org.springframework.ai.model.bedrock.autoconfigure.RequiresAwsCredentials;
2927
import org.springframework.ai.bedrock.converse.BedrockProxyChatModel;
3028
import org.springframework.ai.chat.messages.AssistantMessage;
3129
import org.springframework.ai.chat.messages.UserMessage;
3230
import org.springframework.ai.chat.model.ChatResponse;
3331
import org.springframework.ai.chat.model.Generation;
3432
import org.springframework.ai.chat.prompt.Prompt;
33+
import org.springframework.ai.model.bedrock.autoconfigure.BedrockTestUtils;
34+
import org.springframework.ai.model.bedrock.autoconfigure.RequiresAwsCredentials;
3535
import org.springframework.boot.autoconfigure.AutoConfigurations;
3636
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
3737

0 commit comments

Comments
 (0)