Fix: Refactor advisor documentation and type usage for clarity and consistency

Signed-off-by: Wenli Tian <[email protected]>

Author: jamespud

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

@@ -78,6 +78,7 @@
  * @author Dariusz Jedrzejczyk
  * @author Thomas Vitale
  * @author Jonatan Ivanov
+ * @author Wenli Tian
  * @since 1.0.0
  */
 public class DefaultChatClient implements ChatClient {
@@ -813,7 +814,7 @@ public Builder mutate() {
 						this.advisorObservationConvention)
 				.defaultTemplateRenderer(this.templateRenderer)
 				.defaultToolCallbacks(this.toolCallbacks)
-				.defaultToolCallbacks(this.toolCallbackProviders.toArray(new ToolCallback[0]))
+				.defaultToolCallbacks(this.toolCallbackProviders.toArray(new ToolCallbackProvider[0]))
 				.defaultToolContext(this.toolContext)
 				.defaultToolNames(StringUtils.toStringArray(this.toolNames));
 

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

@@ -25,6 +25,7 @@
 import io.micrometer.observation.contextpropagation.ObservationThreadLocalAccessor;
 import reactor.core.publisher.Flux;
 
+import org.springframework.ai.chat.client.ChatClient;
 import org.springframework.ai.chat.client.ChatClientMessageAggregator;
 import org.springframework.ai.chat.client.ChatClientRequest;
 import org.springframework.ai.chat.client.ChatClientResponse;
@@ -43,9 +44,9 @@
 import org.springframework.util.CollectionUtils;
 
 /**
- * Default implementation for the {@link BaseAdvisorChain}. Used by the
- * {@link org.springframework.ai.chat.client.ChatClient} to delegate the call to the next
- * {@link CallAdvisor} or {@link StreamAdvisor} in the chain.
+ * Default implementation for the {@link BaseAdvisorChain}. Used by the {@link ChatClient}
+ * to delegate the call to the next {@link CallAdvisor} or {@link StreamAdvisor} in the
+ * chain.
  *
  * @author Christian Tzolov
  * @author Dariusz Jedrzejczyk

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

@@ -40,6 +40,7 @@
 import org.springframework.ai.chat.prompt.Prompt;
 import org.springframework.ai.util.json.JsonParser;
 import org.springframework.ai.util.json.schema.JsonSchemaGenerator;
+import org.springframework.core.Ordered;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.util.Assert;
 
@@ -63,10 +64,10 @@ public final class StructuredOutputValidationAdvisor implements CallAdvisor, Str
 	};
 
 	/**
-	 * Set the order close to Ordered.LOWEST_PRECEDENCE to ensure an advisor is executed
-	 * toward the last (but before the model call) in the chain (last for request
+	 * Set the order close to {@link Ordered#LOWEST_PRECEDENCE} to ensure an advisor is
+	 * executed toward the last (but before the model call) in the chain (last for request
 	 * processing, first for response processing).
-	 *
+	 * <p>
 	 * https://docs.spring.io/spring-ai/reference/api/advisors.html#_advisor_order
 	 */
 	private final int advisorOrder;
@@ -223,10 +224,10 @@ public static Builder builder() {
 	public final static class Builder {
 
 		/**
-		 * Set the order close to Ordered.LOWEST_PRECEDENCE to ensure an advisor is
-		 * executed toward the last (but before the model call) in the chain (last for
+		 * Set the order close to {@link Ordered#LOWEST_PRECEDENCE} to ensure an advisor
+		 * is executed toward the last (but before the model call) in the chain (last for
 		 * request processing, first for response processing).
-		 *
+		 * <p>
 		 * https://docs.spring.io/spring-ai/reference/api/advisors.html#_advisor_order
 		 */
 		private int advisorOrder = BaseAdvisor.LOWEST_PRECEDENCE - 2000;

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

@@ -30,14 +30,15 @@
 import org.springframework.ai.model.tool.ToolCallingChatOptions;
 import org.springframework.ai.model.tool.ToolCallingManager;
 import org.springframework.ai.model.tool.ToolExecutionResult;
+import org.springframework.core.Ordered;
 import org.springframework.util.Assert;
 
 /**
  * Recursive Advisor that disables the internal tool execution flow and instead implements
  * the tool calling loop as part of the advisor chain.
- *
+ * <p>
  * It uses the CallAdvisorChainUtil to implement looping advisor chain calls.
- *
+ * <p>
  * This enables intercepting the tool calling loop by the rest of the advisors next in the
  * chain.
  *
@@ -48,9 +49,10 @@ public final class ToolCallAdvisor implements CallAdvisor, StreamAdvisor {
 	private final ToolCallingManager toolCallingManager;
 
 	/**
-	 * Set the order close to Ordered.HIGHEST_PRECEDENCE to ensure an advisor is executed
-	 * first in the chain (first for request processing, last for response processing).
-	 *
+	 * Set the order close to {@link Ordered#LOWEST_PRECEDENCE} to ensure an advisor is
+	 * executed first in the chain (first for request processing, last for response
+	 * processing).
+	 * <p>
 	 * https://docs.spring.io/spring-ai/reference/api/advisors.html#_advisor_order
 	 */
 	private final int advisorOrder;