Remove deprecations from 1.0.0-M8

Remove deprecated DocumentCompressor/Ranker/Selector

 - These are replaced by the org.springframework.ai.rag.postretrieval.document.DocumentPostProcessor

Remove deprecated Chatclient/DefaultChatClient methods

In ChatClient:
 - Remove defaultTools and tools as these are replaced by defaultToolCallbacks and defaultToolNames respectively.

In DefaultChatClient:
 - Remove tools method implementation
 - Remove unused DefaultCallPromptResponseSpec and DefaultStreamPromptResponseSpec

Remove deprecated addMessage from Prompt

Remove deprecated isInternalToolExecutionEnabled() from ToolCallingChatOptions

 - This is replaced by getInternalToolExecutionEnabled()

Signed-off-by: Ilayaperumal Gopinathan <[email protected]>

Author: ilayaperumalg

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

@@ -222,12 +222,6 @@ interface ChatClientRequestSpec {
 
 		ChatClientRequestSpec toolNames(String... toolNames);
 
-		/**
-		 * Use toolNames instead
-		 */
-		@Deprecated(forRemoval = true, since = "1.0.0-m8")
-		ChatClientRequestSpec tools(String... toolNames);
-
 		ChatClientRequestSpec tools(Object... toolObjects);
 
 		ChatClientRequestSpec toolCallbacks(ToolCallback... toolCallbacks);
@@ -295,9 +289,6 @@ interface Builder {
 
 		Builder defaultToolNames(String... toolNames);
 
-		@Deprecated
-		Builder defaultTools(String... tools);
-
 		Builder defaultTools(Object... toolObjects);
 
 		Builder defaultToolCallbacks(ToolCallback... toolCallbacks);

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

@@ -51,7 +51,6 @@
 import org.springframework.ai.chat.model.ChatModel;
 import org.springframework.ai.chat.model.ChatResponse;
 import org.springframework.ai.chat.model.Generation;
-import org.springframework.ai.chat.model.StreamingChatModel;
 import org.springframework.ai.chat.prompt.ChatOptions;
 import org.springframework.ai.chat.prompt.Prompt;
 import org.springframework.ai.content.Media;
@@ -835,11 +834,6 @@ public <T extends ChatOptions> ChatClientRequestSpec options(T options) {
 			return this;
 		}
 
-		@Override
-		public ChatClientRequestSpec tools(String... toolNames) {
-			return this.toolNames(toolNames);
-		}
-
 		@Override
 		public ChatClientRequestSpec toolNames(String... toolNames) {
 			Assert.notNull(toolNames, "toolNames cannot be null");
@@ -992,72 +986,4 @@ private BaseAdvisorChain buildAdvisorChain() {
 
 	}
 
-	// Prompt
-
-	@Deprecated // never used, to be removed
-	public static class DefaultCallPromptResponseSpec implements CallPromptResponseSpec {
-
-		private final ChatModel chatModel;
-
-		private final Prompt prompt;
-
-		public DefaultCallPromptResponseSpec(ChatModel chatModel, Prompt prompt) {
-			Assert.notNull(chatModel, "chatModel cannot be null");
-			Assert.notNull(prompt, "prompt cannot be null");
-			this.chatModel = chatModel;
-			this.prompt = prompt;
-		}
-
-		public String content() {
-			return doGetChatResponse(this.prompt).getResult().getOutput().getText();
-		}
-
-		public List<String> contents() {
-			return doGetChatResponse(this.prompt).getResults().stream().map(r -> r.getOutput().getText()).toList();
-		}
-
-		public ChatResponse chatResponse() {
-			return doGetChatResponse(this.prompt);
-		}
-
-		private ChatResponse doGetChatResponse(Prompt prompt) {
-			return this.chatModel.call(prompt);
-		}
-
-	}
-
-	@Deprecated // never used, to be removed
-	public static class DefaultStreamPromptResponseSpec implements StreamPromptResponseSpec {
-
-		private final Prompt prompt;
-
-		private final StreamingChatModel chatModel;
-
-		public DefaultStreamPromptResponseSpec(StreamingChatModel streamingChatModel, Prompt prompt) {
-			Assert.notNull(streamingChatModel, "streamingChatModel cannot be null");
-			Assert.notNull(prompt, "prompt cannot be null");
-			this.chatModel = streamingChatModel;
-			this.prompt = prompt;
-		}
-
-		public Flux<ChatResponse> chatResponse() {
-			return doGetFluxChatResponse(this.prompt);
-		}
-
-		private Flux<ChatResponse> doGetFluxChatResponse(Prompt prompt) {
-			return this.chatModel.stream(prompt);
-		}
-
-		public Flux<String> content() {
-			return doGetFluxChatResponse(this.prompt).map(r -> {
-				if (r.getResult() == null || r.getResult().getOutput() == null
-						|| r.getResult().getOutput().getText() == null) {
-					return "";
-				}
-				return r.getResult().getOutput().getText();
-			}).filter(StringUtils::hasLength);
-		}
-
-	}
-
 }

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

@@ -150,11 +150,6 @@ public Builder defaultSystem(Consumer<PromptSystemSpec> systemSpecConsumer) {
 		return this;
 	}
 
-	@Override
-	public Builder defaultTools(String... toolNames) {
-		return defaultToolNames(toolNames);
-	}
-
 	@Override
 	public Builder defaultToolNames(String... toolNames) {
 		this.defaultRequest.toolNames(toolNames);

spring-ai-model/src/main/java/org/springframework/ai/chat/prompt/Prompt.java

@@ -236,15 +236,6 @@ public Builder messages(List<Message> messages) {
 			return this;
 		}
 
-		@Deprecated
-		public Builder addMessage(Message message) {
-			if (this.messages == null) {
-				this.messages = new ArrayList<>();
-			}
-			this.messages.add(message);
-			return this;
-		}
-
 		public Builder chatOptions(ChatOptions chatOptions) {
 			this.chatOptions = chatOptions;
 			return this;

spring-ai-model/src/main/java/org/springframework/ai/model/tool/ToolCallingChatOptions.java

@@ -70,16 +70,6 @@ public interface ToolCallingChatOptions extends ChatOptions {
 	@Nullable
 	Boolean getInternalToolExecutionEnabled();
 
-	/**
-	 * Whether the {@link ChatModel} is responsible for executing the tools requested by
-	 * the model or if the tools should be executed directly by the caller.
-	 */
-	@Nullable
-	@Deprecated
-	default Boolean isInternalToolExecutionEnabled() {
-		return getInternalToolExecutionEnabled();
-	}
-
 	/**
 	 * Set whether the {@link ChatModel} is responsible for executing the tools requested
 	 * by the model or if the tools should be executed directly by the caller.