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

Signed-off-by: jonghoon park <[email protected]>

Author: dev-jonghoonpark

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

@@ -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;
@@ -83,8 +84,8 @@ public class QuestionAnswerAdvisor implements BaseAdvisor {
 	private final int order;
 
 	public QuestionAnswerAdvisor(VectorStore vectorStore) {
-		this(vectorStore, SearchRequest.builder().build(), DEFAULT_PROMPT_TEMPLATE, BaseAdvisor.DEFAULT_SCHEDULER,
-				DEFAULT_ORDER);
+		this(vectorStore, SearchRequest.builder().build(), DEFAULT_PROMPT_TEMPLATE,
+				SchedulerHolder.getDefaultScheduler(), DEFAULT_ORDER);
 	}
 
 	QuestionAnswerAdvisor(VectorStore vectorStore, SearchRequest searchRequest, @Nullable PromptTemplate promptTemplate,
@@ -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.getDefaultScheduler();
 		this.order = order;
 	}
 
@@ -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.getDefaultScheduler() : Schedulers.immediate();
 			return this;
 		}
 

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

@@ -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;
@@ -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.getDefaultScheduler();
 
 		private int order = Advisor.DEFAULT_CHAT_MEMORY_PRECEDENCE_ORDER;
 

spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/advisor/MessageChatMemoryAdvisor.java

@@ -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;
@@ -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.getDefaultScheduler();
 
 		private ChatMemory chatMemory;
 

spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/advisor/PromptChatMemoryAdvisor.java

@@ -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;
@@ -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.getDefaultScheduler();
 
 		private ChatMemory chatMemory;
 

spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/advisor/api/BaseAdvisor.java

@@ -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;
@@ -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");
@@ -92,7 +89,7 @@ default String getName() {
 	 * Scheduler used for processing the advisor logic when streaming.
 	 */
 	default Scheduler getScheduler() {
-		return DEFAULT_SCHEDULER;
+		return SchedulerHolder.getDefaultScheduler();
 	}
 
 }

spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/advisor/api/SchedulerHolder.java

@@ -0,0 +1,34 @@
+/*
+ * 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 {
+
+	private static final Scheduler DEFAULT_SCHEDULER = Schedulers.boundedElastic();
+
+	public static Scheduler getDefaultScheduler() {
+		return DEFAULT_SCHEDULER;
+	}
+
+}

spring-ai-rag/src/main/java/org/springframework/ai/rag/advisor/RetrievalAugmentationAdvisor.java

@@ -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;
@@ -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.getDefaultScheduler();
 		this.order = order != null ? order : 0;
 	}