Address review comments.

- Renamed CommonInvokingSpec to CommonCallbackInvokingSpec and
  DefaultCommonInvokingSpec to DefaultCommonCallbackInvokingSpec
- Simplified callback specification by removing parent spec reference
- Removed cascading getter logic for description, schema type, and other properties
- Minor adjustments to function callback builder and invoking specs

Author: tzolov

models/spring-ai-anthropic/src/test/java/org/springframework/ai/anthropic/client/AnthropicChatClientMethodInvokingFunctionCallbackIT.java

@@ -174,8 +174,8 @@ void methodGetWeatherToolContextButNonContextMethod() {
 		assertThatThrownBy(() -> ChatClient.create(this.chatModel).prompt()
 				.user("What's the weather like in San Francisco, Tokyo, and Paris?  Use Celsius.")
 				.functions(FunctionCallback.builder()
-					.description("Get the weather in location")
 					.method("getWeatherNonStatic", String.class, Unit.class)
+					.description("Get the weather in location")
 					.targetObject(targetObject)
 					.build())
 				.toolContext(Map.of("tool", "value"))

models/spring-ai-zhipuai/src/test/java/org/springframework/ai/zhipuai/chat/ZhiPuAiChatModelIT.java

@@ -231,8 +231,8 @@ void functionCallTest() {
 		var promptOptions = ZhiPuAiChatOptions.builder()
 			.withModel(ZhiPuAiApi.ChatModel.GLM_4.getValue())
 			.withFunctionCallbacks(List.of(FunctionCallback.builder()
-				.description("Get the weather in location")
 				.function("getCurrentWeather", new MockWeatherService())
+				.description("Get the weather in location")
 				.inputType(MockWeatherService.Request.class)
 				.build()))
 			.build();
@@ -257,8 +257,8 @@ void streamFunctionCallTest() {
 		var promptOptions = ZhiPuAiChatOptions.builder()
 			.withModel(ZhiPuAiApi.ChatModel.GLM_4.getValue())
 			.withFunctionCallbacks(List.of(FunctionCallback.builder()
-				.description("Get the weather in location")
 				.function("getCurrentWeather", new MockWeatherService())
+				.description("Get the weather in location")
 				.inputType(MockWeatherService.Request.class)
 				.build()))
 			.build();

spring-ai-core/src/main/java/org/springframework/ai/model/function/DefaultCommonInvokingSpec.java renamed to spring-ai-core/src/main/java/org/springframework/ai/model/function/DefaultCommonCallbackInvokingSpec.java

@@ -8,14 +8,13 @@
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.databind.json.JsonMapper;
 
-import org.springframework.ai.model.function.FunctionCallback.CommonInvokingSpec;
+import org.springframework.ai.model.function.FunctionCallback.CommonCallbackInvokingSpec;
 import org.springframework.ai.model.function.FunctionCallback.SchemaType;
 import org.springframework.ai.util.JacksonUtils;
 import org.springframework.util.Assert;
 
-public class DefaultCommonInvokingSpec<B extends CommonInvokingSpec<B>> implements CommonInvokingSpec<B> {
-
-	protected DefaultCommonInvokingSpec<?> parentCommonInvokingSpec;
+public class DefaultCommonCallbackInvokingSpec<B extends CommonCallbackInvokingSpec<B>>
+		implements CommonCallbackInvokingSpec<B> {
 
 	/**
 	 * The description of the function callback. Used to hint the LLM model about the
@@ -94,28 +93,23 @@ public B objectMapper(ObjectMapper objectMapper) {
 	}
 
 	public String getDescription() {
-		return (this.description != null) ? this.description
-				: (this.parentCommonInvokingSpec != null) ? this.parentCommonInvokingSpec.getDescription() : null;
+		return this.description;
 	}
 
 	public SchemaType getSchemaType() {
-		return (this.schemaType != null) ? this.schemaType
-				: (this.parentCommonInvokingSpec != null) ? this.parentCommonInvokingSpec.getSchemaType() : null;
+		return this.schemaType;
 	}
 
 	public Function<Object, String> getResponseConverter() {
-		return (this.responseConverter != null) ? this.responseConverter
-				: (this.parentCommonInvokingSpec != null) ? this.parentCommonInvokingSpec.getResponseConverter() : null;
+		return this.responseConverter;
 	}
 
 	public String getInputTypeSchema() {
-		return (this.inputTypeSchema != null) ? this.inputTypeSchema
-				: (this.parentCommonInvokingSpec != null) ? this.parentCommonInvokingSpec.getInputTypeSchema() : null;
+		return this.inputTypeSchema;
 	}
 
 	public ObjectMapper getObjectMapper() {
-		return (this.objectMapper != null) ? this.objectMapper
-				: (this.parentCommonInvokingSpec != null) ? this.parentCommonInvokingSpec.getObjectMapper() : null;
+		return this.objectMapper;
 	}
 
 }

spring-ai-core/src/main/java/org/springframework/ai/model/function/DefaultFunctionCallbackBuilder.java

@@ -31,7 +31,6 @@
 import org.springframework.ai.model.function.FunctionCallback.FunctionInvokingSpec;
 import org.springframework.ai.model.function.FunctionCallback.MethodInvokingSpec;
 import org.springframework.ai.model.function.FunctionCallback.SchemaType;
-import org.springframework.ai.util.JacksonUtils;
 import org.springframework.ai.util.ParsingUtils;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.util.Assert;
@@ -44,8 +43,7 @@
  * @author Christian Tzolov
  * @since 1.0.0
  */
-public class DefaultFunctionCallbackBuilder extends DefaultCommonInvokingSpec<FunctionCallback.Builder>
-		implements FunctionCallback.Builder {
+public class DefaultFunctionCallbackBuilder implements FunctionCallback.Builder {
 
 	private final static Logger logger = LoggerFactory.getLogger(DefaultFunctionCallbackBuilder.class);
 
@@ -89,7 +87,7 @@ private String generateDescription(String fromName) {
 		return generatedDescription;
 	}
 
-	final class DefaultFunctionInvokingSpec<I, O> extends DefaultCommonInvokingSpec<FunctionInvokingSpec<I, O>>
+	final class DefaultFunctionInvokingSpec<I, O> extends DefaultCommonCallbackInvokingSpec<FunctionInvokingSpec<I, O>>
 			implements FunctionInvokingSpec<I, O> {
 
 		private final String name;
@@ -160,7 +158,7 @@ private String getDescriptionExt() {
 
 	}
 
-	final class DefaultMethodInvokingSpec extends DefaultCommonInvokingSpec<MethodInvokingSpec>
+	final class DefaultMethodInvokingSpec extends DefaultCommonCallbackInvokingSpec<MethodInvokingSpec>
 			implements FunctionCallback.MethodInvokingSpec {
 
 		private String name;

spring-ai-core/src/main/java/org/springframework/ai/model/function/FunctionCallback.java

@@ -116,7 +116,7 @@ enum SchemaType {
 	 * <li>{@link MethodInvokingSpec} - The method invoking builder interface.
 	 * </ul>
 	 */
-	interface Builder extends CommonInvokingSpec<Builder> {
+	interface Builder {
 
 		/**
 		 * Builds a {@link Function} invoking {@link FunctionCallback} instance.
@@ -145,7 +145,7 @@ interface Builder extends CommonInvokingSpec<Builder> {
 
 	}
 
-	interface CommonInvokingSpec<B extends CommonInvokingSpec<B>> {
+	interface CommonCallbackInvokingSpec<B extends CommonCallbackInvokingSpec<B>> {
 
 		/**
 		 * Function description. This description is used by the model do decide if the
@@ -186,7 +186,7 @@ interface CommonInvokingSpec<B extends CommonInvokingSpec<B>> {
 	 * @param <I> Function input type.
 	 * @param <O> Function output type.
 	 */
-	interface FunctionInvokingSpec<I, O> extends CommonInvokingSpec<FunctionInvokingSpec<I, O>> {
+	interface FunctionInvokingSpec<I, O> extends CommonCallbackInvokingSpec<FunctionInvokingSpec<I, O>> {
 
 		/**
 		 * Function input type. The input type is used to validate the function input
@@ -211,7 +211,7 @@ interface FunctionInvokingSpec<I, O> extends CommonInvokingSpec<FunctionInvoking
 	/**
 	 * Method invoking builder interface.
 	 */
-	interface MethodInvokingSpec extends CommonInvokingSpec<MethodInvokingSpec> {
+	interface MethodInvokingSpec extends CommonCallbackInvokingSpec<MethodInvokingSpec> {
 
 		/**
 		 * Optional function name. If not provided the method name is used as the