Skip to content

Commit ed3d710

Browse files
sobychackochedim
sobychacko
authored and
chedim
committed
Checkstyle fixes
Signed-off-by: Soby Chacko <[email protected]>
1 parent 4fcff8b commit ed3d710

File tree

13 files changed

+41
-45
lines changed

13 files changed

+41
-45
lines changed

‎auto-configurations/mcp/spring-ai-autoconfigure-mcp-client/src/main/java/org/springframework/ai/mcp/client/autoconfigure/McpToolCallbackAutoConfiguration.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import org.springframework.ai.mcp.AsyncMcpToolCallbackProvider;
2525
import org.springframework.ai.mcp.SyncMcpToolCallbackProvider;
2626
import org.springframework.ai.mcp.client.autoconfigure.properties.McpClientCommonProperties;
27-
import org.springframework.ai.tool.ToolCallbackProvider;
2827
import org.springframework.beans.factory.ObjectProvider;
2928
import org.springframework.boot.autoconfigure.AutoConfiguration;
3029
import org.springframework.boot.autoconfigure.condition.AllNestedConditions;

‎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
@@ -129,7 +129,7 @@ public void setReadTimeout(Duration readTimeout) {
129129
}
130130

131131
public String getPathPrefix() {
132-
return pathPrefix;
132+
return this.pathPrefix;
133133
}
134134

135135
public void setPathPrefix(String pathPrefix) {

‎memory/repository/spring-ai-model-chat-memory-repository-jdbc/src/main/java/org/springframework/ai/chat/memory/repository/jdbc/JdbcChatMemoryRepository.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import java.sql.SQLException;
2222
import java.sql.Timestamp;
2323
import java.time.Instant;
24-
import java.util.ArrayList;
2524
import java.util.List;
2625
import java.util.concurrent.atomic.AtomicLong;
2726

@@ -78,7 +77,7 @@ private JdbcChatMemoryRepository(JdbcTemplate jdbcTemplate, JdbcChatMemoryReposi
7877

7978
@Override
8079
public List<String> findConversationIds() {
81-
return this.jdbcTemplate.queryForList(dialect.getSelectConversationIdsSql(), String.class);
80+
return this.jdbcTemplate.queryForList(this.dialect.getSelectConversationIdsSql(), String.class);
8281
}
8382

8483
@Override

‎memory/repository/spring-ai-model-chat-memory-repository-jdbc/src/test/java/org/springframework/ai/chat/memory/repository/jdbc/AbstractJdbcChatMemoryRepositoryIT.java‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,6 @@
4141
import org.springframework.jdbc.core.JdbcTemplate;
4242
import org.springframework.test.context.ContextConfiguration;
4343

44-
import java.sql.Timestamp;
45-
import java.util.List;
46-
import java.util.UUID;
47-
import java.util.stream.Collectors;
48-
49-
import javax.sql.DataSource;
50-
5144
import static org.assertj.core.api.Assertions.assertThat;
5245

5346
/**
@@ -78,7 +71,7 @@ void saveMessagesSingleMessage(String content, MessageType messageType) {
7871

7972
this.chatMemoryRepository.saveAll(conversationId, List.of(message));
8073

81-
assertThat(chatMemoryRepository.findConversationIds()).contains(conversationId);
74+
assertThat(this.chatMemoryRepository.findConversationIds()).contains(conversationId);
8275

8376
// Use dialect to get the appropriate SQL query
8477
JdbcChatMemoryRepositoryDialect dialect = JdbcChatMemoryRepositoryDialect
@@ -103,7 +96,7 @@ void saveMessagesMultipleMessages() {
10396

10497
this.chatMemoryRepository.saveAll(conversationId, messages);
10598

106-
assertThat(chatMemoryRepository.findConversationIds()).contains(conversationId);
99+
assertThat(this.chatMemoryRepository.findConversationIds()).contains(conversationId);
107100

108101
// Use dialect to get the appropriate SQL query
109102
JdbcChatMemoryRepositoryDialect dialect = JdbcChatMemoryRepositoryDialect
@@ -179,10 +172,10 @@ void testMessageOrder() {
179172

180173
// Save messages in the expected order
181174
List<Message> orderedMessages = List.of(firstMessage, secondMessage, thirdMessage, fourthMessage);
182-
chatMemoryRepository.saveAll(conversationId, orderedMessages);
175+
this.chatMemoryRepository.saveAll(conversationId, orderedMessages);
183176

184177
// Retrieve messages using the repository
185-
List<Message> retrievedMessages = chatMemoryRepository.findByConversationId(conversationId);
178+
List<Message> retrievedMessages = this.chatMemoryRepository.findByConversationId(conversationId);
186179
assertThat(retrievedMessages).hasSize(4);
187180

188181
// Get the actual order from the retrieved messages

‎models/spring-ai-bedrock-converse/src/main/java/org/springframework/ai/bedrock/converse/BedrockProxyChatModel.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -791,7 +791,7 @@ public static final class Builder {
791791

792792
private Builder() {
793793
try {
794-
region = DefaultAwsRegionProviderChain.builder().build().getRegion();
794+
this.region = DefaultAwsRegionProviderChain.builder().build().getRegion();
795795
}
796796
catch (SdkClientException e) {
797797
logger.warn("Failed to load region from DefaultAwsRegionProviderChain, using US_EAST_1", e);

‎models/spring-ai-bedrock-converse/src/test/java/org/springframework/ai/bedrock/converse/BedrockProxyChatModelTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ class BedrockProxyChatModelTest {
3737
@Test
3838
void shouldIgnoreExceptionAndUseDefault() {
3939
try (MockedStatic<DefaultAwsRegionProviderChain> mocked = mockStatic(DefaultAwsRegionProviderChain.class)) {
40-
when(awsRegionProviderBuilder.build().getRegion())
40+
when(this.awsRegionProviderBuilder.build().getRegion())
4141
.thenThrow(SdkClientException.builder().message("failed load").build());
42-
mocked.when(DefaultAwsRegionProviderChain::builder).thenReturn(awsRegionProviderBuilder);
42+
mocked.when(DefaultAwsRegionProviderChain::builder).thenReturn(this.awsRegionProviderBuilder);
4343
BedrockProxyChatModel.builder().build();
4444
}
4545
}

‎models/spring-ai-bedrock/src/main/java/org/springframework/ai/bedrock/api/AbstractBedrockApi.java‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import com.fasterxml.jackson.databind.ObjectMapper;
3131
import org.slf4j.Logger;
3232
import org.slf4j.LoggerFactory;
33-
import org.springframework.util.ObjectUtils;
3433
import reactor.core.publisher.Flux;
3534
import reactor.core.publisher.Sinks;
3635
import reactor.core.publisher.Sinks.EmitFailureHandler;
@@ -50,6 +49,7 @@
5049

5150
import org.springframework.ai.model.ModelOptionsUtils;
5251
import org.springframework.util.Assert;
52+
import org.springframework.util.ObjectUtils;
5353

5454
/**
5555
* Abstract class for the Bedrock API. It provides the basic functionality to invoke the chat completion model and
@@ -322,6 +322,20 @@ protected Flux<SO> internalInvocationStream(I request, Class<SO> clazz) {
322322
return eventSink.asFlux();
323323
}
324324

325+
private Region getRegion(Region region) {
326+
if (ObjectUtils.isEmpty(region)) {
327+
try {
328+
return DefaultAwsRegionProviderChain.builder().build().getRegion();
329+
}
330+
catch (SdkClientException e) {
331+
throw new IllegalArgumentException("Region is empty and cannot be loaded from DefaultAwsRegionProviderChain: " + e.getMessage(), e);
332+
}
333+
}
334+
else {
335+
return region;
336+
}
337+
}
338+
325339
/**
326340
* Encapsulates the metrics about the model invocation.
327341
* https://docs.aws.amazon.com/bedrock/latest/userguide/model-parameters-claude.html
@@ -341,16 +355,5 @@ public record AmazonBedrockInvocationMetrics(
341355
@JsonProperty("invocationLatency") Long invocationLatency) {
342356
}
343357

344-
private Region getRegion(Region region) {
345-
if (ObjectUtils.isEmpty(region)) {
346-
try {
347-
return DefaultAwsRegionProviderChain.builder().build().getRegion();
348-
} catch (SdkClientException e) {
349-
throw new IllegalArgumentException("Region is empty and cannot be loaded from DefaultAwsRegionProviderChain: " + e.getMessage(), e);
350-
}
351-
} else {
352-
return region;
353-
}
354-
}
355358
}
356359
// @formatter:on

‎models/spring-ai-bedrock/src/test/java/org/springframework/ai/bedrock/api/AbstractBedrockApiTest.java‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616

1717
package org.springframework.ai.bedrock.api;
1818

19+
import java.time.Duration;
20+
1921
import com.fasterxml.jackson.databind.ObjectMapper;
2022
import org.junit.jupiter.api.Test;
2123
import org.junit.jupiter.api.extension.ExtendWith;
@@ -28,11 +30,11 @@
2830
import software.amazon.awssdk.regions.Region;
2931
import software.amazon.awssdk.regions.providers.DefaultAwsRegionProviderChain;
3032

31-
import java.time.Duration;
32-
3333
import static org.assertj.core.api.Assertions.assertThat;
3434
import static org.assertj.core.api.Assertions.assertThatThrownBy;
35-
import static org.mockito.Mockito.*;
35+
import static org.mockito.Mockito.mock;
36+
import static org.mockito.Mockito.mockStatic;
37+
import static org.mockito.Mockito.when;
3638

3739
@ExtendWith(MockitoExtension.class)
3840
class AbstractBedrockApiTest {
@@ -49,21 +51,21 @@ class AbstractBedrockApiTest {
4951
@Test
5052
void shouldLoadRegionFromAwsDefaults() {
5153
try (MockedStatic<DefaultAwsRegionProviderChain> mocked = mockStatic(DefaultAwsRegionProviderChain.class)) {
52-
when(awsRegionProviderBuilder.build().getRegion()).thenReturn(Region.AF_SOUTH_1);
53-
mocked.when(DefaultAwsRegionProviderChain::builder).thenReturn(awsRegionProviderBuilder);
54+
when(this.awsRegionProviderBuilder.build().getRegion()).thenReturn(Region.AF_SOUTH_1);
55+
mocked.when(DefaultAwsRegionProviderChain::builder).thenReturn(this.awsRegionProviderBuilder);
5456
AbstractBedrockApi<Object, Object, Object> testBedrockApi = new TestBedrockApi("modelId",
55-
awsCredentialsProvider, null, objectMapper, Duration.ofMinutes(5));
57+
this.awsCredentialsProvider, null, this.objectMapper, Duration.ofMinutes(5));
5658
assertThat(testBedrockApi.getRegion()).isEqualTo(Region.AF_SOUTH_1);
5759
}
5860
}
5961

6062
@Test
6163
void shouldThrowIllegalArgumentIfAwsDefaultsFailed() {
6264
try (MockedStatic<DefaultAwsRegionProviderChain> mocked = mockStatic(DefaultAwsRegionProviderChain.class)) {
63-
when(awsRegionProviderBuilder.build().getRegion())
65+
when(this.awsRegionProviderBuilder.build().getRegion())
6466
.thenThrow(SdkClientException.builder().message("failed load").build());
65-
mocked.when(DefaultAwsRegionProviderChain::builder).thenReturn(awsRegionProviderBuilder);
66-
assertThatThrownBy(() -> new TestBedrockApi("modelId", awsCredentialsProvider, null, objectMapper,
67+
mocked.when(DefaultAwsRegionProviderChain::builder).thenReturn(this.awsRegionProviderBuilder);
68+
assertThatThrownBy(() -> new TestBedrockApi("modelId", this.awsCredentialsProvider, null, this.objectMapper,
6769
Duration.ofMinutes(5)))
6870
.isInstanceOf(IllegalArgumentException.class)
6971
.hasMessageContaining("failed load");

‎spring-ai-client-chat/src/main/java/org/springframework/ai/chat/evaluation/RelevancyEvaluator.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616

1717
package org.springframework.ai.chat.evaluation;
1818

19+
import java.util.Collections;
20+
import java.util.Map;
21+
1922
import org.springframework.ai.chat.client.ChatClient;
2023
import org.springframework.ai.chat.prompt.PromptTemplate;
2124
import org.springframework.ai.evaluation.EvaluationRequest;
@@ -24,9 +27,6 @@
2427
import org.springframework.lang.Nullable;
2528
import org.springframework.util.Assert;
2629

27-
import java.util.Collections;
28-
import java.util.Map;
29-
3030
/**
3131
* Evaluates the relevancy of a response to a query based on the context provided.
3232
*/
@@ -91,7 +91,7 @@ public static Builder builder() {
9191
return new Builder();
9292
}
9393

94-
public static class Builder {
94+
public static final class Builder {
9595

9696
private ChatClient.Builder chatClientBuilder;
9797

‎spring-ai-client-chat/src/test/java/org/springframework/ai/chat/evaluation/RelevancyEvaluatorTests.java‎

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

1919
import org.junit.jupiter.api.Test;
20+
2021
import org.springframework.ai.chat.client.ChatClient;
2122
import org.springframework.ai.chat.model.ChatModel;
2223

0 commit comments

Comments
 (0)