upgrade spring-ai to version 2.0.0

Author: bnasslahsen

pom.xml

@@ -67,8 +67,8 @@
 		<spring-security-oauth2-authorization-server.version>2.0.0-M2
 		</spring-security-oauth2-authorization-server.version>
 		<scalar.version>0.5.55</scalar.version>
-		<spring-ai.version>1.1.2</spring-ai.version>
-		<mcp-sdk.version>0.17.0</mcp-sdk.version>
+		<spring-ai.version>2.0.0</spring-ai.version>
+		<mcp-sdk.version>2.0.0</mcp-sdk.version>
 		<skipPublishing>false</skipPublishing>
 		<skip.npm>true</skip.npm>
 		<frontend-maven-plugin.version>1.15.1</frontend-maven-plugin.version>

springdoc-openapi-starter-common-mcp/src/main/java/org/springdoc/ai/configuration/SpringDocAiAutoConfiguration.java

@@ -79,14 +79,14 @@ McpNativeToolAuditAspect mcpNativeToolAuditAspect() {
 	}
 
 	/**
-	 * Registers the audit aspect for Spring AI Community {@code @McpTool}-annotated
-	 * methods. Only active when the {@code org.springaicommunity.mcp.annotation.McpTool}
-	 * class is on the classpath.
+	 * Registers the audit aspect for Spring AI {@code @McpTool}-annotated methods. Only
+	 * active when the {@code org.springframework.ai.mcp.annotation.McpTool} class is on the
+	 * classpath.
 	 * @return the audit aspect
 	 */
 	@Bean
 	@ConditionalOnMissingBean
-	@ConditionalOnClass(name = "org.springaicommunity.mcp.annotation.McpTool")
+	@ConditionalOnClass(name = "org.springframework.ai.mcp.annotation.McpTool")
 	McpCommunityToolAuditAspect mcpCommunityToolAuditAspect() {
 		return new McpCommunityToolAuditAspect();
 	}

springdoc-openapi-starter-common-mcp/src/main/java/org/springdoc/ai/dashboard/McpSyncServerDashboardToolSource.java

@@ -120,13 +120,7 @@ public McpToolExecutionResponse executeTool(String toolName, String arguments, M
 		long start = System.currentTimeMillis();
 		try {
 			Map<String, Object> argsMap = parseArguments(arguments);
-			CallToolResult result;
-			if (spec.callHandler() != null) {
-				result = spec.callHandler().apply(null, new CallToolRequest(toolName, argsMap));
-			}
-			else {
-				result = spec.call().apply(null, argsMap);
-			}
+			CallToolResult result = spec.callHandler().apply(null, new CallToolRequest(toolName, argsMap));
 			long duration = System.currentTimeMillis() - start;
 			String resultText = extractResultText(result);
 			boolean isError = Boolean.TRUE.equals(result.isError());
@@ -139,27 +133,16 @@ public McpToolExecutionResponse executeTool(String toolName, String arguments, M
 	}
 
 	/**
-	 * Converts McpSchema.JsonSchema to a JSON string.
+	 * Converts the tool input schema map to a JSON string.
 	 * @param inputSchema the input schema
 	 * @return JSON string representation
 	 */
-	private String convertInputSchema(McpSchema.JsonSchema inputSchema) {
-		if (inputSchema == null) {
+	private String convertInputSchema(Map<String, Object> inputSchema) {
+		if (inputSchema == null || inputSchema.isEmpty()) {
 			return "{}";
 		}
 		try {
-			Map<String, Object> schemaMap = new HashMap<>();
-			schemaMap.put("type", inputSchema.type());
-			if (inputSchema.properties() != null) {
-				schemaMap.put("properties", inputSchema.properties());
-			}
-			if (inputSchema.required() != null) {
-				schemaMap.put("required", inputSchema.required());
-			}
-			if (inputSchema.additionalProperties() != null) {
-				schemaMap.put("additionalProperties", inputSchema.additionalProperties());
-			}
-			return OBJECT_MAPPER.writeValueAsString(schemaMap);
+			return OBJECT_MAPPER.writeValueAsString(inputSchema);
 		}
 		catch (JsonProcessingException ex) {
 			return "{}";
@@ -207,7 +190,7 @@ private Map<String, Type> scanToolReturnTypes(ApplicationContext applicationCont
 		Map<String, Type> returnTypes = new HashMap<>();
 		try {
 			Class<? extends Annotation> mcpToolAnnotation = (Class<? extends Annotation>) Class
-				.forName("org.springaicommunity.mcp.annotation.McpTool");
+				.forName("org.springframework.ai.mcp.annotation.McpTool");
 			Method nameMethod = mcpToolAnnotation.getMethod("name");
 			for (String beanName : applicationContext.getBeanDefinitionNames()) {
 				try {

springdoc-openapi-starter-common-mcp/src/main/java/org/springdoc/ai/mcp/McpCommunityToolAuditAspect.java

@@ -35,26 +35,25 @@
 
 /**
  * AOP aspect that writes a structured JSON audit event (via {@link McpAuditLogger}) each
- * time an {@code @McpTool}-annotated method from the Spring AI Community library
- * ({@code org.springaicommunity.mcp.annotation.McpTool}) is invoked.
+ * time an {@code @McpTool}-annotated method from Spring AI
+ * ({@code org.springframework.ai.mcp.annotation.McpTool}) is invoked.
  *
  * <p>
- * This aspect is only registered when {@code org.springaicommunity.mcp.annotation.McpTool}
+ * This aspect is only registered when {@code org.springframework.ai.mcp.annotation.McpTool}
  * is on the classpath (see
  * {@link org.springdoc.ai.configuration.SpringDocAiAutoConfiguration}). The annotation
  * class is referenced by fully-qualified name in the pointcut expression to avoid a
- * compile-time dependency on the springaicommunity library.
+ * compile-time dependency on the Spring AI MCP annotations library.
  *
  * @author bnasslahsen
  */
 @Aspect
 public class McpCommunityToolAuditAspect {
 
 	/**
-	 * Fully-qualified name of the {@code @McpTool} annotation from the Spring AI
-	 * Community library.
+	 * Fully-qualified name of the {@code @McpTool} annotation from Spring AI.
 	 */
-	private static final String MCP_TOOL_ANNOTATION = "org.springaicommunity.mcp.annotation.McpTool";
+	private static final String MCP_TOOL_ANNOTATION = "org.springframework.ai.mcp.annotation.McpTool";
 
 	/**
 	 * Intercepts any bean method annotated with {@code @McpTool} and emits a JSON audit
@@ -63,7 +62,7 @@ public class McpCommunityToolAuditAspect {
 	 * @return the method's return value
 	 * @throws Throwable if the intercepted method throws
 	 */
-	@Around("@annotation(org.springaicommunity.mcp.annotation.McpTool)")
+	@Around("@annotation(org.springframework.ai.mcp.annotation.McpTool)")
 	public Object audit(ProceedingJoinPoint pjp) throws Throwable {
 		String toolName = extractToolName(pjp);
 		long startNanos = System.nanoTime();