Skip to content

Commit 6d26ac1

Browse files
committed
fix: replace deprecated Nullable annotation with jspecify's Nullable
Signed-off-by: Wenli Tian <jamespud9@gmail.com>
1 parent 28891ab commit 6d26ac1

File tree

106 files changed

+148
-114
lines changed

Some content is hidden

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

106 files changed

+148
-114
lines changed

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

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

24+
import org.jspecify.annotations.Nullable;
2425
import reactor.core.scheduler.Scheduler;
2526
import reactor.core.scheduler.Schedulers;
2627

@@ -36,7 +37,6 @@
3637
import org.springframework.ai.vectorstore.VectorStore;
3738
import org.springframework.ai.vectorstore.filter.Filter;
3839
import org.springframework.ai.vectorstore.filter.FilterExpressionTextParser;
39-
import org.springframework.lang.Nullable;
4040
import org.springframework.util.Assert;
4141
import org.springframework.util.StringUtils;
4242

@@ -150,8 +150,7 @@ public ChatClientResponse after(ChatClientResponse chatClientResponse, AdvisorCh
150150
.build();
151151
}
152152

153-
@Nullable
154-
protected Filter.Expression doGetFilterExpression(Map<String, Object> context) {
153+
protected Filter.@Nullable Expression doGetFilterExpression(Map<String, Object> context) {
155154
if (!context.containsKey(FILTER_EXPRESSION)
156155
|| !StringUtils.hasText(context.get(FILTER_EXPRESSION).toString())) {
157156
return this.searchRequest.getFilterExpression();

auto-configurations/models/chat/memory/repository/spring-ai-autoconfigure-model-chat-memory-repository-cassandra/src/main/java/org/springframework/ai/model/chat/memory/repository/cassandra/autoconfigure/CassandraChatMemoryRepositoryProperties.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818

1919
import java.time.Duration;
2020

21+
import org.jspecify.annotations.Nullable;
2122
import org.slf4j.Logger;
2223
import org.slf4j.LoggerFactory;
2324

2425
import org.springframework.ai.chat.memory.repository.cassandra.CassandraChatMemoryRepositoryConfig;
2526
import org.springframework.boot.context.properties.ConfigurationProperties;
26-
import org.springframework.lang.Nullable;
2727

2828
/**
2929
* Configuration properties for Cassandra chat memory.

mcp/common/src/main/java/org/springframework/ai/mcp/AsyncMcpToolCallback.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import io.modelcontextprotocol.spec.McpSchema.CallToolResult;
2424
import io.modelcontextprotocol.spec.McpSchema.Tool;
2525
import io.modelcontextprotocol.util.Assert;
26+
import org.jspecify.annotations.Nullable;
2627
import org.slf4j.Logger;
2728
import org.slf4j.LoggerFactory;
2829

@@ -32,7 +33,6 @@
3233
import org.springframework.ai.tool.ToolCallback;
3334
import org.springframework.ai.tool.definition.ToolDefinition;
3435
import org.springframework.ai.tool.execution.ToolExecutionException;
35-
import org.springframework.lang.Nullable;
3636
import org.springframework.util.StringUtils;
3737

3838
/**

mcp/common/src/main/java/org/springframework/ai/mcp/McpToolUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import io.modelcontextprotocol.spec.McpSchema;
3434
import io.modelcontextprotocol.spec.McpSchema.CallToolRequest;
3535
import io.modelcontextprotocol.spec.McpSchema.Role;
36+
import org.jspecify.annotations.Nullable;
3637
import reactor.core.publisher.Mono;
3738
import reactor.core.scheduler.Schedulers;
3839

@@ -42,7 +43,6 @@
4243
import org.springframework.ai.tool.definition.DefaultToolDefinition;
4344
import org.springframework.ai.tool.definition.ToolDefinition;
4445
import org.springframework.ai.util.json.schema.JsonSchemaUtils;
45-
import org.springframework.lang.Nullable;
4646
import org.springframework.util.CollectionUtils;
4747
import org.springframework.util.MimeType;
4848

mcp/common/src/main/java/org/springframework/ai/mcp/SyncMcpToolCallback.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import io.modelcontextprotocol.spec.McpSchema.CallToolResult;
2424
import io.modelcontextprotocol.spec.McpSchema.Tool;
2525
import io.modelcontextprotocol.util.Assert;
26+
import org.jspecify.annotations.Nullable;
2627
import org.slf4j.Logger;
2728
import org.slf4j.LoggerFactory;
2829

@@ -31,7 +32,6 @@
3132
import org.springframework.ai.tool.ToolCallback;
3233
import org.springframework.ai.tool.definition.ToolDefinition;
3334
import org.springframework.ai.tool.execution.ToolExecutionException;
34-
import org.springframework.lang.Nullable;
3535
import org.springframework.util.StringUtils;
3636

3737
/**

mcp/common/src/main/java/org/springframework/ai/mcp/aot/McpHints.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@
1919
import java.util.Set;
2020

2121
import io.modelcontextprotocol.spec.McpSchema;
22+
import org.jspecify.annotations.Nullable;
2223

2324
import org.springframework.ai.aot.AiRuntimeHints;
2425
import org.springframework.aot.hint.MemberCategory;
2526
import org.springframework.aot.hint.RuntimeHints;
2627
import org.springframework.aot.hint.RuntimeHintsRegistrar;
2728
import org.springframework.aot.hint.TypeReference;
28-
import org.springframework.lang.Nullable;
2929

3030
/**
3131
* Runtime hints registrar for Model Context Protocol (MCP) schema classes.

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 & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626

2727
import javax.sql.DataSource;
2828

29+
import org.jspecify.annotations.Nullable;
2930
import org.slf4j.Logger;
3031
import org.slf4j.LoggerFactory;
3132

@@ -40,7 +41,6 @@
4041
import org.springframework.jdbc.core.JdbcTemplate;
4142
import org.springframework.jdbc.core.RowMapper;
4243
import org.springframework.jdbc.datasource.DataSourceTransactionManager;
43-
import org.springframework.lang.Nullable;
4444
import org.springframework.transaction.PlatformTransactionManager;
4545
import org.springframework.transaction.support.TransactionTemplate;
4646
import org.springframework.util.Assert;

models/spring-ai-anthropic/src/main/java/org/springframework/ai/anthropic/AnthropicChatOptions.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import com.fasterxml.jackson.annotation.JsonInclude;
3030
import com.fasterxml.jackson.annotation.JsonInclude.Include;
3131
import com.fasterxml.jackson.annotation.JsonProperty;
32+
import org.jspecify.annotations.Nullable;
3233

3334
import org.springframework.ai.anthropic.api.AnthropicApi;
3435
import org.springframework.ai.anthropic.api.AnthropicApi.ChatCompletionRequest;
@@ -39,7 +40,6 @@
3940
import org.springframework.ai.model.tool.StructuredOutputChatOptions;
4041
import org.springframework.ai.model.tool.ToolCallingChatOptions;
4142
import org.springframework.ai.tool.ToolCallback;
42-
import org.springframework.lang.Nullable;
4343
import org.springframework.util.Assert;
4444

4545
/**
@@ -652,4 +652,4 @@ public AnthropicChatOptions build() {
652652

653653
}
654654

655-
}
655+
}

models/spring-ai-anthropic/src/main/java/org/springframework/ai/anthropic/aot/AnthropicRuntimeHints.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,12 @@
1616

1717
package org.springframework.ai.anthropic.aot;
1818

19+
import org.jspecify.annotations.Nullable;
20+
1921
import org.springframework.aot.hint.MemberCategory;
2022
import org.springframework.aot.hint.RuntimeHints;
2123
import org.springframework.aot.hint.RuntimeHintsRegistrar;
2224
import org.springframework.lang.NonNull;
23-
import org.springframework.lang.Nullable;
2425

2526
import static org.springframework.ai.aot.AiRuntimeHints.findJsonAnnotatedClassesInPackage;
2627

models/spring-ai-azure-openai/src/main/java/org/springframework/ai/azure/openai/AzureOpenAiChatOptions.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@
3131
import com.fasterxml.jackson.annotation.JsonInclude;
3232
import com.fasterxml.jackson.annotation.JsonInclude.Include;
3333
import com.fasterxml.jackson.annotation.JsonProperty;
34+
import org.jspecify.annotations.Nullable;
3435
import org.slf4j.Logger;
3536
import org.slf4j.LoggerFactory;
3637

3738
import org.springframework.ai.model.tool.ToolCallingChatOptions;
3839
import org.springframework.ai.tool.ToolCallback;
39-
import org.springframework.lang.Nullable;
4040
import org.springframework.util.Assert;
4141

4242
/**

0 commit comments

Comments
 (0)