Remove deprecated methods/classes from spring-ai-core

Author: markpollack

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

@@ -261,13 +261,8 @@ public enum ChatModel implements ChatModelDescription {
 		/**
 		 * The CLAUDE_2_0
 		 */
-		CLAUDE_2("claude-2.0"),
+		CLAUDE_2("claude-2.0");
 
-		/**
-		 * The CLAUDE_INSTANT_1_2
-		 */
-		@Deprecated
-		CLAUDE_INSTANT_1_2("claude-instant-1.2");
 		// @formatter:on
 
 		private final String value;

models/spring-ai-bedrock-converse/src/main/java/org/springframework/ai/bedrock/converse/api/ConverseApiUtils.java

@@ -68,8 +68,8 @@
 public final class ConverseApiUtils {
 
 	public static final ChatResponse EMPTY_CHAT_RESPONSE = ChatResponse.builder()
-		.withGenerations(List.of())
-		.withMetadata("empty", true)
+		.generations(List.of())
+		.metadata("empty", true)
 		.build();
 
 	private ConverseApiUtils() {

models/spring-ai-openai/src/test/java/org/springframework/ai/openai/chat/client/OpenAiChatClientMultipleFunctionCallsIT.java

@@ -255,7 +255,11 @@ void functionCallWithExplicitInputType() throws NoSuchMethodException {
 
 		String content = chatClient.prompt()
 			.user("What's the weather like in Shanghai?")
-			.function("currentTemp", "get current temp", MyFunction.Req.class, function)
+			.functions(FunctionCallback.builder()
+				.function("currentTemp", function)
+				.description("get current temp")
+				.inputType(MyFunction.Req.class)
+				.build())
 			.call()
 			.content();
 

spring-ai-core/src/main/java/org/springframework/ai/aot/SpringAiCoreRuntimeHints.java

@@ -28,7 +28,6 @@
 import org.springframework.ai.chat.messages.UserMessage;
 import org.springframework.ai.model.function.DefaultFunctionCallbackResolver;
 import org.springframework.ai.model.function.FunctionCallback;
-import org.springframework.ai.model.function.FunctionCallbackWrapper;
 import org.springframework.aot.hint.ExecutableMode;
 import org.springframework.aot.hint.RuntimeHints;
 import org.springframework.aot.hint.RuntimeHintsRegistrar;
@@ -44,7 +43,7 @@ public void registerHints(@NonNull RuntimeHints hints, @Nullable ClassLoader cla
 
 		var chatTypes = Set.of(AbstractMessage.class, AssistantMessage.class, ToolResponseMessage.class, Message.class,
 				MessageType.class, UserMessage.class, SystemMessage.class, DefaultFunctionCallbackResolver.class,
-				FunctionCallback.class, FunctionCallbackWrapper.class);
+				FunctionCallback.class);
 		for (var c : chatTypes) {
 			hints.reflection().registerType(c);
 		}

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

@@ -30,7 +30,6 @@
 import org.springframework.ai.chat.messages.Message;
 import org.springframework.ai.chat.model.ChatModel;
 import org.springframework.ai.chat.model.ChatResponse;
-import org.springframework.ai.chat.model.ToolContext;
 import org.springframework.ai.chat.prompt.ChatOptions;
 import org.springframework.ai.chat.prompt.Prompt;
 import org.springframework.ai.converter.StructuredOutputConverter;
@@ -221,29 +220,8 @@ interface ChatClientRequestSpec {
 
 		ChatClientRequestSpec toolCallbacks(FunctionCallback... toolCallbacks);
 
-		/**
-		 * @deprecated use {@link #functions(FunctionCallback...)} instead.
-		 */
-		@Deprecated
-		<I, O> ChatClientRequestSpec function(String name, String description,
-				java.util.function.Function<I, O> function);
-
-		/**
-		 * @deprecated use {@link #functions(FunctionCallback...)} instead.
-		 */
-		@Deprecated
-		<I, O> ChatClientRequestSpec function(String name, String description,
-				java.util.function.BiFunction<I, ToolContext, O> function);
-
 		<I, O> ChatClientRequestSpec functions(FunctionCallback... functionCallbacks);
 
-		/**
-		 * @deprecated use {@link #functions(FunctionCallback...)} instead.
-		 */
-		@Deprecated
-		<I, O> ChatClientRequestSpec function(String name, String description, Class<I> inputType,
-				java.util.function.Function<I, O> function);
-
 		ChatClientRequestSpec functions(String... functionBeanNames);
 
 		ChatClientRequestSpec toolContext(Map<String, Object> toolContext);
@@ -305,19 +283,6 @@ interface Builder {
 
 		Builder defaultToolCallbacks(FunctionCallback... toolCallbacks);
 
-		/**
-		 * @deprecated use {@link #defaultFunctions(FunctionCallback...)} instead.
-		 */
-		@Deprecated
-		<I, O> Builder defaultFunction(String name, String description, java.util.function.Function<I, O> function);
-
-		/**
-		 * @deprecated use {@link #defaultFunctions(FunctionCallback...)} instead.
-		 */
-		@Deprecated
-		<I, O> Builder defaultFunction(String name, String description,
-				java.util.function.BiFunction<I, ToolContext, O> function);
-
 		Builder defaultFunctions(String... functionNames);
 
 		Builder defaultFunctions(FunctionCallback... functionCallbacks);

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

@@ -57,14 +57,12 @@
 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.model.ToolContext;
 import org.springframework.ai.chat.prompt.ChatOptions;
 import org.springframework.ai.chat.prompt.Prompt;
 import org.springframework.ai.converter.BeanOutputConverter;
 import org.springframework.ai.converter.StructuredOutputConverter;
 import org.springframework.ai.model.Media;
 import org.springframework.ai.model.function.FunctionCallback;
-import org.springframework.ai.model.function.FunctionCallbackWrapper;
 import org.springframework.core.Ordered;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.core.io.Resource;
@@ -549,11 +547,11 @@ private Flux<ChatResponse> doGetObservableFluxChatResponse(DefaultChatClientRequ
 				Flux<AdvisedResponse> stream = inputRequest.aroundAdvisorChainBuilder.build().nextAroundStream(initialAdvisedRequest);
 
 				return stream
-					.map(AdvisedResponse::response)
-					.doOnError(observation::error)
-					.doFinally(s -> observation.stop())
-					.contextWrite(ctx -> ctx.put(ObservationThreadLocalAccessor.KEY, observation));
-				 // @formatter:on
+						.map(AdvisedResponse::response)
+						.doOnError(observation::error)
+						.doFinally(s -> observation.stop())
+						.contextWrite(ctx -> ctx.put(ObservationThreadLocalAccessor.KEY, observation));
+				// @formatter:on
 			});
 		}
 
@@ -695,8 +693,8 @@ public int getOrder() {
 				@Override
 				public Flux<AdvisedResponse> aroundStream(AdvisedRequest advisedRequest, StreamAroundAdvisorChain chain) {
 					return chatModel.stream(advisedRequest.toPrompt())
-					.map(chatResponse -> new AdvisedResponse(chatResponse, Collections.unmodifiableMap(advisedRequest.adviseContext())))
-					.publishOn(Schedulers.boundedElastic()); // TODO add option to disable.
+							.map(chatResponse -> new AdvisedResponse(chatResponse, Collections.unmodifiableMap(advisedRequest.adviseContext())))
+							.publishOn(Schedulers.boundedElastic()); // TODO add option to disable.
 				}
 			});
 			// @formatter:on
@@ -863,57 +861,6 @@ public ChatClientRequestSpec toolCallbacks(FunctionCallback... toolCallbacks) {
 			return this;
 		}
 
-		@Override
-		public <I, O> ChatClientRequestSpec function(String name, String description,
-				java.util.function.Function<I, O> function) {
-			Assert.hasText(name, "name cannot be null or empty");
-			Assert.hasText(description, "description cannot be null or empty");
-			Assert.notNull(function, "function cannot be null");
-
-			var fcw = FunctionCallbackWrapper.builder(function)
-				.withDescription(description)
-				.withName(name)
-				.withResponseConverter(Object::toString)
-				.build();
-			this.functionCallbacks.add(fcw);
-			return this;
-		}
-
-		@Override
-		public <I, O> ChatClientRequestSpec function(String name, String description,
-				java.util.function.BiFunction<I, ToolContext, O> biFunction) {
-
-			Assert.hasText(name, "name cannot be null or empty");
-			Assert.hasText(description, "description cannot be null or empty");
-			Assert.notNull(biFunction, "biFunction cannot be null");
-
-			var fcw = FunctionCallbackWrapper.builder(biFunction)
-				.withDescription(description)
-				.withName(name)
-				.withResponseConverter(Object::toString)
-				.build();
-			this.functionCallbacks.add(fcw);
-			return this;
-		}
-
-		@Override
-		public <I, O> ChatClientRequestSpec function(String name, String description, @Nullable Class<I> inputType,
-				java.util.function.Function<I, O> function) {
-
-			Assert.hasText(name, "name cannot be null or empty");
-			Assert.hasText(description, "description cannot be null or empty");
-			Assert.notNull(function, "function cannot be null");
-
-			var fcw = FunctionCallback.builder()
-				.function(name, function)
-				.description(description)
-				.responseConverter(Object::toString)
-				.inputType(inputType)
-				.build();
-			this.functionCallbacks.add(fcw);
-			return this;
-		}
-
 		public ChatClientRequestSpec functions(String... functionBeanNames) {
 			return tools(functionBeanNames);
 		}

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

@@ -168,13 +168,15 @@ public Builder defaultToolCallbacks(FunctionCallback... toolCallbacks) {
 	}
 
 	public <I, O> Builder defaultFunction(String name, String description, java.util.function.Function<I, O> function) {
-		this.defaultRequest.function(name, description, function);
+		this.defaultRequest
+			.functions(FunctionCallback.builder().function(name, function).description(description).build());
 		return this;
 	}
 
 	public <I, O> Builder defaultFunction(String name, String description,
 			java.util.function.BiFunction<I, ToolContext, O> biFunction) {
-		this.defaultRequest.function(name, description, biFunction);
+		this.defaultRequest
+			.functions(FunctionCallback.builder().function(name, biFunction).description(description).build());
 		return this;
 	}
 

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

@@ -246,7 +246,7 @@ private AdvisedRequest before(AdvisedRequest request) {
 
 	private AdvisedResponse after(AdvisedResponse advisedResponse) {
 		ChatResponse.Builder chatResponseBuilder = ChatResponse.builder().from(advisedResponse.response());
-		chatResponseBuilder.withMetadata(RETRIEVED_DOCUMENTS, advisedResponse.adviseContext().get(RETRIEVED_DOCUMENTS));
+		chatResponseBuilder.metadata(RETRIEVED_DOCUMENTS, advisedResponse.adviseContext().get(RETRIEVED_DOCUMENTS));
 		return new AdvisedResponse(chatResponseBuilder.build(), advisedResponse.adviseContext());
 	}
 

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

@@ -97,7 +97,7 @@ public Flux<AdvisedResponse> aroundStream(AdvisedRequest advisedRequest, StreamA
 
 	private AdvisedResponse createFailureResponse(AdvisedRequest advisedRequest) {
 		return new AdvisedResponse(ChatResponse.builder()
-			.withGenerations(List.of(new Generation(new AssistantMessage(this.failureResponse))))
+			.generations(List.of(new Generation(new AssistantMessage(this.failureResponse))))
 			.build(), advisedRequest.adviseContext());
 	}