samples: replace @tool with @mcptool

Signed-off-by: Daniel Garnier-Moiroux <[email protected]>

Author: Kehrlann

samples/sample-mcp-server-api-key/src/main/java/org/springaicommunity/mcp/security/sample/server/apikey/McpServerConfiguration.java

@@ -22,9 +22,8 @@
 import org.springaicommunity.mcp.security.server.apikey.ApiKeyEntityRepository;
 import org.springaicommunity.mcp.security.server.apikey.memory.ApiKeyEntityImpl;
 import org.springaicommunity.mcp.security.server.apikey.memory.InMemoryApiKeyEntityRepository;
+import org.springaicommunity.mcp.security.server.config.McpApiKeyConfigurer;
 
-import org.springframework.ai.tool.ToolCallbackProvider;
-import org.springframework.ai.tool.method.MethodToolCallbackProvider;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
@@ -33,7 +32,6 @@
 import org.springframework.web.cors.CorsConfiguration;
 import org.springframework.web.cors.CorsConfigurationSource;
 import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
-import static org.springaicommunity.mcp.security.server.config.McpApiKeyConfigurer.mcpServerApiKey;
 
 /**
  * @author Daniel Garnier-Moiroux
@@ -42,15 +40,10 @@
 @EnableWebSecurity
 class McpServerConfiguration {
 
-	@Bean
-	ToolCallbackProvider toolCallbackProvider(WeatherService weatherService) {
-		return MethodToolCallbackProvider.builder().toolObjects(weatherService).build();
-	}
-
 	@Bean
 	SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
 		return http.authorizeHttpRequests(authz -> authz.anyRequest().authenticated())
-			.with(mcpServerApiKey(), (apiKey) -> apiKey.apiKeyRepository(buildApiKeyRepository()))
+			.with(McpApiKeyConfigurer.mcpServerApiKey(), (apiKey) -> apiKey.apiKeyRepository(buildApiKeyRepository()))
 			.cors(cors -> cors.configurationSource(corsConfigurationSource()))
 			.build();
 	}

samples/sample-mcp-server-api-key/src/main/java/org/springaicommunity/mcp/security/sample/server/apikey/WeatherService.java

@@ -18,7 +18,8 @@
 
 import java.time.LocalDateTime;
 
-import org.springframework.ai.tool.annotation.Tool;
+import org.springaicommunity.mcp.annotation.McpTool;
+
 import org.springframework.ai.tool.annotation.ToolParam;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Service;
@@ -45,7 +46,7 @@ public record Current(LocalDateTime time, int interval, double temperature_2m) {
 	}
 
 	@PreAuthorize("isAuthenticated()")
-	@Tool(name = "current-temperature",
+	@McpTool(name = "current-temperature",
 			description = "Get the current temperature (in celsius) for a specific location")
 	public WeatherResponse getTemperature(@ToolParam(description = "The location latitude") double latitude,
 			@ToolParam(description = "The location longitude") double longitude) {

samples/sample-mcp-server-secured-tools/src/main/java/org/springaicommunity/mcp/security/sample/server/securedtools/McpServerConfiguration.java

@@ -18,8 +18,6 @@
 
 import java.util.List;
 
-import org.springframework.ai.tool.ToolCallbackProvider;
-import org.springframework.ai.tool.method.MethodToolCallbackProvider;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -39,11 +37,6 @@
 @EnableMethodSecurity
 class McpServerConfiguration {
 
-	@Bean
-	ToolCallbackProvider toolCallbackProvider(WeatherService weatherService) {
-		return MethodToolCallbackProvider.builder().toolObjects(weatherService).build();
-	}
-
 	@Bean
 	SecurityFilterChain securityFilterChain(HttpSecurity http,
 			@Value("${spring.security.oauth2.resourceserver.jwt.issuer-uri}") String issuerUrl) throws Exception {

samples/sample-mcp-server-secured-tools/src/main/java/org/springaicommunity/mcp/security/sample/server/securedtools/WeatherService.java

@@ -18,8 +18,8 @@
 
 import java.time.LocalDateTime;
 
-import org.springframework.ai.chat.model.ToolContext;
-import org.springframework.ai.tool.annotation.Tool;
+import org.springaicommunity.mcp.annotation.McpTool;
+
 import org.springframework.ai.tool.annotation.ToolParam;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Service;
@@ -46,19 +46,16 @@ public record Current(LocalDateTime time, int interval, double temperature_2m) {
 	}
 
 	@PreAuthorize("isAuthenticated()")
-	@Tool(name = "current-temperature",
+	@McpTool(name = "current-temperature",
 			description = "Get the current temperature (in celsius) for a specific location")
 	public WeatherResponse getTemperature(@ToolParam(description = "The location latitude") double latitude,
-			@ToolParam(description = "The location longitude") double longitude, ToolContext toolContext) {
-
-		WeatherResponse weatherResponse = restClient.get()
+			@ToolParam(description = "The location longitude") double longitude) {
+		return restClient.get()
 			.uri("https://api.open-meteo.com/v1/forecast?latitude={latitude}&longitude={longitude}&current=temperature_2m",
 					latitude, longitude)
 			.retrieve()
 			.body(WeatherResponse.class);
 
-		return weatherResponse;
-
 	}
 
 }

samples/sample-mcp-server/src/main/java/org/springaicommunity/mcp/security/sample/server/streamable/HistoricalWeatherService.java

@@ -22,8 +22,8 @@
 import java.util.Map;
 import java.util.stream.IntStream;
 
-import org.springframework.ai.chat.model.ToolContext;
-import org.springframework.ai.tool.annotation.Tool;
+import org.springaicommunity.mcp.annotation.McpTool;
+
 import org.springframework.ai.tool.annotation.ToolParam;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestClient;
@@ -53,7 +53,7 @@ public record DailyTemperatures(String date, double minTemperature, double maxTe
 		}
 	}
 
-	@Tool(name = "temperature-history",
+	@McpTool(name = "temperature-history",
 			description = "Get 5-year historical temperature data (in Celsius), including daily min and daily max temperatures, for a specific location")
 	public ToolResponse getHistoricalWeatherData(@ToolParam(description = "The location latitude") double latitude,
 			@ToolParam(description = "The location longitude") double longitude) {

samples/sample-mcp-server/src/main/java/org/springaicommunity/mcp/security/sample/server/streamable/McpServerConfiguration.java

@@ -18,8 +18,6 @@
 
 import java.util.List;
 
-import org.springframework.ai.tool.ToolCallbackProvider;
-import org.springframework.ai.tool.method.MethodToolCallbackProvider;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -37,11 +35,6 @@
 @Configuration
 class McpServerConfiguration {
 
-	@Bean
-	ToolCallbackProvider toolCallbackProvider(HistoricalWeatherService weatherService) {
-		return MethodToolCallbackProvider.builder().toolObjects(weatherService).build();
-	}
-
 	@Bean
 	SecurityFilterChain securityFilterChain(HttpSecurity http,
 			@Value("${spring.security.oauth2.resourceserver.jwt.issuer-uri}") String issuerUrl) throws Exception {