Update tool calling examples

Author: ThomasVitale

README.md

@@ -98,13 +98,13 @@ Including various media in prompts with LLMs:
 * **[Ollama](https://github.com/ThomasVitale/llm-apps-java-spring-ai/tree/main/patterns/multimodality/multimodality-ollama)**
 * **[OpenAI](https://github.com/ThomasVitale/llm-apps-java-spring-ai/tree/main/patterns/multimodality/multimodality-openai)**
 
-### ⚙️ Function Calling/Tools
+### ⚙️ Tool Calling
 
-Function calling with LLMs via different model providers:
+Tool calling with LLMs via different model providers:
 
-* **[Mistral AI](https://github.com/ThomasVitale/llm-apps-java-spring-ai/tree/main/patterns/function-calling/function-calling-mistral-ai)**
-* **[Ollama](https://github.com/ThomasVitale/llm-apps-java-spring-ai/tree/main/patterns/function-calling/function-calling-ollama)**
-* **[OpenAI](https://github.com/ThomasVitale/llm-apps-java-spring-ai/tree/main/patterns/function-calling/function-calling-openai)**
+* **[Mistral AI](https://github.com/ThomasVitale/llm-apps-java-spring-ai/tree/main/patterns/tool-calling/tool-calling-mistral-ai)**
+* **[Ollama](https://github.com/ThomasVitale/llm-apps-java-spring-ai/tree/main/patterns/tool-calling/tool-calling-ollama)**
+* **[OpenAI](https://github.com/ThomasVitale/llm-apps-java-spring-ai/tree/main/patterns/tool-calling/tool-calling-openai)**
 
 ### 🧠 Memory
 

patterns/tool-calling/tool-calling-mistral-ai/README.md

@@ -1,6 +1,6 @@
-# Tools / Function Calling: Mistral AI
+# Tool Calling: Mistral AI
 
-Tools / Function calling via Mistral AI.
+Tool calling via Mistral AI.
 
 ## Mistral AI
 

patterns/tool-calling/tool-calling-ollama/README.md

@@ -1,6 +1,6 @@
-# Tools / Function Calling: Ollama
+# Tool Calling: Ollama
 
-Tools / Function calling via Ollama.
+Tool calling via Ollama.
 
 ## Ollama
 

patterns/tool-calling/tool-calling-openai/README.md

@@ -1,6 +1,6 @@
-# Tools / Function Calling: OpenAI
+# Tool Calling: OpenAI
 
-Tools / Function calling via OpenAI.
+Tool calling via OpenAI.
 
 ## OpenAI
 

tools/mcp-brave/src/main/java/com/thomasvitale/ai/spring/ChatController.java

@@ -2,7 +2,6 @@
 
 import org.springframework.ai.chat.client.ChatClient;
 import org.springframework.ai.mcp.client.McpSyncClient;
-import org.springframework.ai.mcp.spring.McpFunctionCallback;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 

tools/mcp-brave/src/main/java/com/thomasvitale/ai/spring/McpBraveApplication.java

@@ -26,7 +26,7 @@ public McpSyncClient mcpClient() {
                 .addEnvVar("BRAVE_API_KEY", System.getenv("BRAVE_API_KEY"))
                 .build();
 
-        var mcpClient = McpClient.using(new StdioClientTransport(serverParameters)).sync();
+        var mcpClient = McpClient.sync(new StdioClientTransport(serverParameters)).build();
 
         var initializeResult = mcpClient.initialize();
         logger.info("MCP Initialized: {}", initializeResult);

tools/mcp-brave/src/main/java/com/thomasvitale/ai/spring/McpFunctionCallbackResolver.java

@@ -3,6 +3,8 @@
 import org.springframework.ai.mcp.client.McpSyncClient;
 import org.springframework.ai.mcp.spring.McpFunctionCallback;
 import org.springframework.ai.model.function.FunctionCallback;
+import org.springframework.ai.tool.ToolCallback;
+import org.springframework.ai.tool.ToolCallbacks;
 import org.springframework.util.Assert;
 
 import java.util.Arrays;

tools/mcp-brave/src/main/java/com/thomasvitale/ai/spring/model/ChatModelController.java

@@ -4,7 +4,7 @@
 import org.springframework.ai.chat.model.ChatModel;
 import org.springframework.ai.chat.prompt.Prompt;
 import org.springframework.ai.mcp.client.McpSyncClient;
-import org.springframework.ai.model.function.FunctionCallingOptions;
+import org.springframework.ai.model.tool.ToolCallingChatOptions;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -26,7 +26,7 @@ class ChatModelController {
 
     @GetMapping("/chat/mcp")
     String chat(String question) {
-        var prompt = new Prompt(question, FunctionCallingOptions.builder()
+        var prompt = new Prompt(question, ToolCallingChatOptions.builder()
                 .functionCallbacks(McpFunctionCallbackResolver.resolve(mcpClient))
                 .build());