From 1461388b25d737286ae5159432ed4140b22c4d9f Mon Sep 17 00:00:00 2001 From: YuJie Wan <31400063+eeaters@users.noreply.github.com> Date: Tue, 25 Nov 2025 15:40:19 +0800 Subject: [PATCH 1/2] chore: clean up compiler warnings Signed-off-by: YuJie Wan <31400063+eeaters@users.noreply.github.com> --- .../ai/deepseek/DeepSeekChatOptions.java | 16 +++++----------- .../ai/deepseek/api/DeepSeekApi.java | 4 ++-- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/models/spring-ai-deepseek/src/main/java/org/springframework/ai/deepseek/DeepSeekChatOptions.java b/models/spring-ai-deepseek/src/main/java/org/springframework/ai/deepseek/DeepSeekChatOptions.java index b7d42380c82..e37b33223b1 100644 --- a/models/spring-ai-deepseek/src/main/java/org/springframework/ai/deepseek/DeepSeekChatOptions.java +++ b/models/spring-ai-deepseek/src/main/java/org/springframework/ai/deepseek/DeepSeekChatOptions.java @@ -374,17 +374,16 @@ public static DeepSeekChatOptions fromOptions(DeepSeekChatOptions fromOptions) { .topP(fromOptions.getTopP()) .tools(fromOptions.getTools()) .toolChoice(fromOptions.getToolChoice()) - .toolCallbacks( - fromOptions.getToolCallbacks() != null ? new ArrayList<>(fromOptions.getToolCallbacks()) : null) - .toolNames(fromOptions.getToolNames() != null ? new HashSet<>(fromOptions.getToolNames()) : null) + .toolCallbacks(new ArrayList<>(fromOptions.getToolCallbacks())) + .toolNames(new HashSet<>(fromOptions.getToolNames())) .internalToolExecutionEnabled(fromOptions.getInternalToolExecutionEnabled()) - .toolContext(fromOptions.getToolContext() != null ? new HashMap<>(fromOptions.getToolContext()) : null) + .toolContext(new HashMap<>(fromOptions.getToolContext())) .build(); } public static final class Builder { - protected DeepSeekChatOptions options; + private final DeepSeekChatOptions options; public Builder() { this.options = new DeepSeekChatOptions(); @@ -488,12 +487,7 @@ public Builder internalToolExecutionEnabled(@Nullable Boolean internalToolExecut } public Builder toolContext(Map toolContext) { - if (this.options.toolContext == null) { - this.options.toolContext = toolContext; - } - else { - this.options.toolContext.putAll(toolContext); - } + this.options.toolContext.putAll(toolContext); return this; } diff --git a/models/spring-ai-deepseek/src/main/java/org/springframework/ai/deepseek/api/DeepSeekApi.java b/models/spring-ai-deepseek/src/main/java/org/springframework/ai/deepseek/api/DeepSeekApi.java index 13667f0e3d5..9f1a8321665 100644 --- a/models/spring-ai-deepseek/src/main/java/org/springframework/ai/deepseek/api/DeepSeekApi.java +++ b/models/spring-ai-deepseek/src/main/java/org/springframework/ai/deepseek/api/DeepSeekApi.java @@ -47,7 +47,7 @@ /** * Single class implementation of the DeepSeek Chat Completion API: - * https://platform.deepseek.com/api-docs/api/create-chat-completion + * ... * * @author Geng Rong */ @@ -201,7 +201,7 @@ public Flux chatCompletionStream(ChatCompletionRequest chat .concatMapIterable(window -> { Mono monoChunk = window.reduce( new ChatCompletionChunk(null, null, null, null, null, null, null, null), - (previous, current) -> this.chunkMerger.merge(previous, current)); + this.chunkMerger::merge); return List.of(monoChunk); }) // Flux> -> Flux From ed28c3df2b97c83761918a18420c5d641380fbec Mon Sep 17 00:00:00 2001 From: YuJie Wan <31400063+eeaters@users.noreply.github.com> Date: Tue, 25 Nov 2025 15:48:43 +0800 Subject: [PATCH 2/2] chore: clean up compiler warnings Signed-off-by: YuJie Wan <31400063+eeaters@users.noreply.github.com> --- .../org/springframework/ai/deepseek/DeepSeekChatOptions.java | 1 + 1 file changed, 1 insertion(+) diff --git a/models/spring-ai-deepseek/src/main/java/org/springframework/ai/deepseek/DeepSeekChatOptions.java b/models/spring-ai-deepseek/src/main/java/org/springframework/ai/deepseek/DeepSeekChatOptions.java index e37b33223b1..595c5bb6701 100644 --- a/models/spring-ai-deepseek/src/main/java/org/springframework/ai/deepseek/DeepSeekChatOptions.java +++ b/models/spring-ai-deepseek/src/main/java/org/springframework/ai/deepseek/DeepSeekChatOptions.java @@ -487,6 +487,7 @@ public Builder internalToolExecutionEnabled(@Nullable Boolean internalToolExecut } public Builder toolContext(Map toolContext) { + Assert.notNull(toolContext, "toolContext cannot be null"); this.options.toolContext.putAll(toolContext); return this; }