Skip to content

Fix NPE caused by uninitialized static variables in interfaces in native images #3256

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix NPE caused by uninitialized static variables in interfaces in native images #3256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions ...in/java/org/springframework/ai/chat/client/advisor/vectorstore/QuestionAnswerAdvisor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import org.springframework.ai.chat.client.ChatClientResponse;
import org.springframework.ai.chat.client.advisor.api.AdvisorChain;
import org.springframework.ai.chat.client.advisor.api.BaseAdvisor;
import org.springframework.ai.chat.client.advisor.api.SchedulerHolder;
import org.springframework.ai.chat.messages.UserMessage;
import org.springframework.ai.chat.model.ChatResponse;
import org.springframework.ai.chat.prompt.PromptTemplate;
Expand Down Expand Up @@ -83,7 +84,7 @@ public class QuestionAnswerAdvisor implements BaseAdvisor {
private final int order;

public QuestionAnswerAdvisor(VectorStore vectorStore) {
this(vectorStore, SearchRequest.builder().build(), DEFAULT_PROMPT_TEMPLATE, BaseAdvisor.DEFAULT_SCHEDULER,
this(vectorStore, SearchRequest.builder().build(), DEFAULT_PROMPT_TEMPLATE, SchedulerHolder.DEFAULT_SCHEDULER,
DEFAULT_ORDER);
}

Expand All @@ -95,7 +96,7 @@ public QuestionAnswerAdvisor(VectorStore vectorStore) {
this.vectorStore = vectorStore;
this.searchRequest = searchRequest;
this.promptTemplate = promptTemplate != null ? promptTemplate : DEFAULT_PROMPT_TEMPLATE;
this.scheduler = scheduler != null ? scheduler : BaseAdvisor.DEFAULT_SCHEDULER;
this.scheduler = scheduler != null ? scheduler : SchedulerHolder.DEFAULT_SCHEDULER;
this.order = order;
}

Expand Down Expand Up @@ -197,7 +198,7 @@ public Builder searchRequest(SearchRequest searchRequest) {
}

public Builder protectFromBlocking(boolean protectFromBlocking) {
this.scheduler = protectFromBlocking ? BaseAdvisor.DEFAULT_SCHEDULER : Schedulers.immediate();
this.scheduler = protectFromBlocking ? SchedulerHolder.DEFAULT_SCHEDULER : Schedulers.immediate();
return this;
}

Expand Down
4 changes: 2 additions & 2 deletions .../org/springframework/ai/chat/client/advisor/vectorstore/VectorStoreChatMemoryAdvisor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
import org.springframework.ai.chat.client.ChatClientResponse;
import org.springframework.ai.chat.client.advisor.api.Advisor;
import org.springframework.ai.chat.client.advisor.api.AdvisorChain;
import org.springframework.ai.chat.client.advisor.api.BaseAdvisor;
import org.springframework.ai.chat.client.advisor.api.BaseChatMemoryAdvisor;
import org.springframework.ai.chat.client.advisor.api.SchedulerHolder;
import org.springframework.ai.chat.client.advisor.api.StreamAdvisorChain;
import org.springframework.ai.chat.memory.ChatMemory;
import org.springframework.ai.chat.messages.AssistantMessage;
Expand Down Expand Up @@ -223,7 +223,7 @@ public static class Builder {

private String conversationId = ChatMemory.DEFAULT_CONVERSATION_ID;

private Scheduler scheduler = BaseAdvisor.DEFAULT_SCHEDULER;
private Scheduler scheduler = SchedulerHolder.DEFAULT_SCHEDULER;

private int order = Advisor.DEFAULT_CHAT_MEMORY_PRECEDENCE_ORDER;

Expand Down
4 changes: 2 additions & 2 deletions ...at/src/main/java/org/springframework/ai/chat/client/advisor/MessageChatMemoryAdvisor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
import org.springframework.ai.chat.client.ChatClientResponse;
import org.springframework.ai.chat.client.advisor.api.Advisor;
import org.springframework.ai.chat.client.advisor.api.AdvisorChain;
import org.springframework.ai.chat.client.advisor.api.BaseAdvisor;
import org.springframework.ai.chat.client.advisor.api.BaseChatMemoryAdvisor;
import org.springframework.ai.chat.client.advisor.api.SchedulerHolder;
import org.springframework.ai.chat.client.advisor.api.StreamAdvisorChain;
import org.springframework.ai.chat.memory.ChatMemory;
import org.springframework.ai.chat.messages.Message;
Expand Down Expand Up @@ -138,7 +138,7 @@ public static final class Builder {

private int order = Advisor.DEFAULT_CHAT_MEMORY_PRECEDENCE_ORDER;

private Scheduler scheduler = BaseAdvisor.DEFAULT_SCHEDULER;
private Scheduler scheduler = SchedulerHolder.DEFAULT_SCHEDULER;

private ChatMemory chatMemory;

Expand Down
4 changes: 2 additions & 2 deletions ...hat/src/main/java/org/springframework/ai/chat/client/advisor/PromptChatMemoryAdvisor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
import org.springframework.ai.chat.client.ChatClientResponse;
import org.springframework.ai.chat.client.advisor.api.Advisor;
import org.springframework.ai.chat.client.advisor.api.AdvisorChain;
import org.springframework.ai.chat.client.advisor.api.BaseAdvisor;
import org.springframework.ai.chat.client.advisor.api.BaseChatMemoryAdvisor;
import org.springframework.ai.chat.client.advisor.api.SchedulerHolder;
import org.springframework.ai.chat.client.advisor.api.StreamAdvisorChain;
import org.springframework.ai.chat.memory.ChatMemory;
import org.springframework.ai.chat.messages.Message;
Expand Down Expand Up @@ -194,7 +194,7 @@ public static final class Builder {

private int order = Advisor.DEFAULT_CHAT_MEMORY_PRECEDENCE_ORDER;

private Scheduler scheduler = BaseAdvisor.DEFAULT_SCHEDULER;
private Scheduler scheduler = SchedulerHolder.DEFAULT_SCHEDULER;

private ChatMemory chatMemory;

Expand Down
5 changes: 1 addition & 4 deletions ...client-chat/src/main/java/org/springframework/ai/chat/client/advisor/api/BaseAdvisor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import reactor.core.scheduler.Scheduler;
import reactor.core.scheduler.Schedulers;

import org.springframework.ai.chat.client.ChatClientRequest;
import org.springframework.ai.chat.client.ChatClientResponse;
Expand All @@ -41,8 +40,6 @@
*/
public interface BaseAdvisor extends CallAdvisor, StreamAdvisor {

Scheduler DEFAULT_SCHEDULER = Schedulers.boundedElastic();

@Override
default ChatClientResponse adviseCall(ChatClientRequest chatClientRequest, CallAdvisorChain callAdvisorChain) {
Assert.notNull(chatClientRequest, "chatClientRequest cannot be null");
Expand Down Expand Up @@ -92,7 +89,7 @@ default String getName() {
* Scheduler used for processing the advisor logic when streaming.
*/
default Scheduler getScheduler() {
return DEFAULT_SCHEDULER;
return SchedulerHolder.DEFAULT_SCHEDULER;
}

}
30 changes: 30 additions & 0 deletions ...nt-chat/src/main/java/org/springframework/ai/chat/client/advisor/api/SchedulerHolder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
/*
* Copyright 2023-2025 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package org.springframework.ai.chat.client.advisor.api;

import reactor.core.scheduler.Scheduler;
import reactor.core.scheduler.Schedulers;

/**
* @author Jonghoon Park
* @since 1.0.0
*/
public class SchedulerHolder {

public static final Scheduler DEFAULT_SCHEDULER = Schedulers.boundedElastic();

}
3 changes: 2 additions & 1 deletion ...ai-rag/src/main/java/org/springframework/ai/rag/advisor/RetrievalAugmentationAdvisor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import org.springframework.ai.chat.client.ChatClientResponse;
import org.springframework.ai.chat.client.advisor.api.AdvisorChain;
import org.springframework.ai.chat.client.advisor.api.BaseAdvisor;
import org.springframework.ai.chat.client.advisor.api.SchedulerHolder;
import org.springframework.ai.chat.model.ChatResponse;
import org.springframework.ai.document.Document;
import org.springframework.ai.rag.Query;
Expand Down Expand Up @@ -95,7 +96,7 @@ private RetrievalAugmentationAdvisor(@Nullable List<QueryTransformer> queryTrans
this.documentPostProcessors = documentPostProcessors != null ? documentPostProcessors : List.of();
this.queryAugmenter = queryAugmenter != null ? queryAugmenter : ContextualQueryAugmenter.builder().build();
this.taskExecutor = taskExecutor != null ? taskExecutor : buildDefaultTaskExecutor();
this.scheduler = scheduler != null ? scheduler : BaseAdvisor.DEFAULT_SCHEDULER;
this.scheduler = scheduler != null ? scheduler : SchedulerHolder.DEFAULT_SCHEDULER;
this.order = order != null ? order : 0;
}

Expand Down