fix: handle tool not found error and update requestConfig type to JsonElement (#6284)

Author: Aias00

shenyu-plugin/shenyu-plugin-mcp-server/src/main/java/org/apache/shenyu/plugin/mcp/server/manager/ShenyuMcpServerManager.java

@@ -432,13 +432,30 @@ public void removeTool(final String serverPath, final String name) {
                 LOG.info("Removed tool '{}' from shared server for path: {} (removed from protocols: {})",
                         name, normalizedPath, protocols);
             } catch (Exception e) {
+                if (isToolNotFoundError(e)) {
+                    LOG.debug("Tool '{}' not found on shared server for path: {} (skip removal)",
+                            name, normalizedPath);
+                    return;
+                }
                 LOG.error("Failed to remove tool '{}' from shared server for path: {}", name, normalizedPath, e);
             }
         } else {
             LOG.warn("No shared server found for path: {}", normalizedPath);
         }
     }
 
+    private boolean isToolNotFoundError(final Throwable error) {
+        Throwable current = error;
+        while (Objects.nonNull(current)) {
+            String message = current.getMessage();
+            if (Objects.nonNull(message) && message.contains("Tool with name") && message.contains("not found")) {
+                return true;
+            }
+            current = current.getCause();
+        }
+        return false;
+    }
+
     /**
      * Get supported protocols for a server path.
      *

shenyu-plugin/shenyu-plugin-mcp-server/src/main/java/org/apache/shenyu/plugin/mcp/server/model/ShenyuMcpServerTool.java

@@ -18,6 +18,8 @@
 package org.apache.shenyu.plugin.mcp.server.model;
 
 import com.google.common.collect.Lists;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonPrimitive;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -43,7 +45,7 @@ public class ShenyuMcpServerTool {
     /**
      * requestTemplate of the tool .
      */
-    private String requestConfig;
+    private JsonElement requestConfig;
 
     /**
      * Parameters of the tool .
@@ -93,7 +95,13 @@ public void setDescription(final String description) {
      * @return requestConfig
      */
     public String getRequestConfig() {
-        return requestConfig;
+        if (Objects.isNull(requestConfig) || requestConfig.isJsonNull()) {
+            return null;
+        }
+        if (requestConfig.isJsonPrimitive() && requestConfig.getAsJsonPrimitive().isString()) {
+            return requestConfig.getAsString();
+        }
+        return requestConfig.toString();
     }
 
     /**
@@ -102,6 +110,19 @@ public String getRequestConfig() {
      * @param requestConfig requestConfig
      */
     public void setRequestConfig(final String requestConfig) {
+        if (Objects.isNull(requestConfig)) {
+            this.requestConfig = null;
+            return;
+        }
+        this.requestConfig = new JsonPrimitive(requestConfig);
+    }
+
+    /**
+     * Setter for requestConfig.
+     *
+     * @param requestConfig requestConfig
+     */
+    public void setRequestConfig(final JsonElement requestConfig) {
         this.requestConfig = requestConfig;
     }
 
@@ -157,7 +178,7 @@ public String toString() {
         return String.format("McpServerPluginRuleHandle: name: %s, description: %s, requestConfig: %s, parameters: %s",
                 name,
                 description,
-                requestConfig,
+                getRequestConfig(),
                 parameters);
     }
 }