fix alibaba#978, variable rename (alibaba#986)

Author: skippy-404

spring-ai-alibaba-mcp/spring-ai-alibaba-mcp-nacos/src/main/java/com/alibaba/cloud/ai/mcp/nacos/dynamic/server/config/NacosMcpDynamicProperties.java

@@ -27,14 +27,22 @@ public class NacosMcpDynamicProperties {
 
 	public static final String CONFIG_PREFIX = "spring.ai.alibaba.mcp.nacos.dynamic";
 
-	List<String> serverNames;
+	List<String> serviceNames;
 
 	public List<String> getServerNames() {
-		return serverNames;
+		return serviceNames;
 	}
 
-	public void setServerNames(List<String> serverNames) {
-		this.serverNames = serverNames;
+	public void setServerNames(List<String> serviceNames) {
+		this.serviceNames = serviceNames;
+	}
+
+	public List<String> getServiceNames() {
+		return serviceNames;
+	}
+
+	public void setServiceNames(List<String> serviceNames) {
+		this.serviceNames = serviceNames;
 	}
 
 }

spring-ai-alibaba-mcp/spring-ai-alibaba-mcp-nacos/src/main/java/com/alibaba/cloud/ai/mcp/nacos/dynamic/server/tools/DynamicToolsInitializer.java

@@ -50,24 +50,24 @@ public DynamicToolsInitializer(NacosMcpOperationService nacosMcpOperationService
 	}
 
 	public List<ToolCallback> initializeTools() {
-		List<String> serverNames = nacosMcpDynamicProperties.getServerNames();
-		if (CollectionUtils.isEmpty(serverNames)) {
+		List<String> serviceNames = nacosMcpDynamicProperties.getServerNames();
+		if (CollectionUtils.isEmpty(serviceNames)) {
 			logger.warn("No service names configured, no tools will be initialized");
 			return new ArrayList<>();
 		}
 		List<ToolCallback> allTools = new ArrayList<>();
-		for (String serverName : serverNames) {
+		for (String serviceName : serviceNames) {
 			try {
-				McpServerDetailInfo mcpServerDetailInfo = nacosMcpOperationService.getServerDetail(serverName);
+				McpServerDetailInfo mcpServerDetailInfo = nacosMcpOperationService.getServerDetail(serviceName);
 				if (mcpServerDetailInfo == null) {
-					logger.warn("No server detail info found for server: {}", serverName);
+					logger.warn("No service detail info found for service: {}", serviceName);
 					continue;
 				}
 				boolean isProtocolSupported = StringUtils.equals(mcpServerDetailInfo.getProtocol(), "http")
 						|| StringUtils.equals(mcpServerDetailInfo.getProtocol(), "https");
 				if (!isProtocolSupported) {
-					logger.warn("Protocol {} is not supported, no tools will be initialized for server: {}",
-							mcpServerDetailInfo.getProtocol(), serverName);
+					logger.warn("Protocol {} is not supported, no tools will be initialized for service: {}",
+							mcpServerDetailInfo.getProtocol(), serviceName);
 					continue;
 				}
 				List<ToolCallback> tools = parseToolsFromMcpServerDetailInfo(mcpServerDetailInfo);
@@ -77,7 +77,7 @@ public List<ToolCallback> initializeTools() {
 
 			}
 			catch (Exception e) {
-				logger.error("Failed to initialize tools for server: {}", serverName, e);
+				logger.error("Failed to initialize tools for service: {}", serviceName, e);
 			}
 		}
 		logger.info("Initial dynamic tools loading completed from nacos - Found {} tools", allTools.size());
@@ -120,7 +120,7 @@ private List<ToolCallback> parseToolsFromMcpServerDetailInfo(McpServerDetailInfo
 			return toolCallbacks;
 		}
 		catch (Exception e) {
-			logger.warn("Failed to get or parse nacos mcp server tools info (mcpName {})",
+			logger.warn("Failed to get or parse nacos mcp service tools info (mcpName {})",
 					mcpServerDetailInfo.getName() + mcpServerDetailInfo.getVersionDetail().getVersion(), e);
 		}
 		return null;

spring-ai-alibaba-mcp/spring-ai-alibaba-mcp-nacos/src/main/java/com/alibaba/cloud/ai/mcp/nacos/dynamic/server/watcher/DynamicNacosToolsWatcher.java

@@ -56,7 +56,7 @@ public class DynamicNacosToolsWatcher {
 
 	private final DynamicMcpToolsProvider dynamicMcpToolsProvider;
 
-	private final Map<String, McpServerDetailInfo> serverDetailInfoCache = new ConcurrentHashMap<>();
+	private final Map<String, McpServerDetailInfo> serviceDetailInfoCache = new ConcurrentHashMap<>();
 
 	public DynamicNacosToolsWatcher(final NacosMcpDynamicProperties nacosMcpDynamicProperties,
 			final NacosMcpOperationService nacosMcpOperationService,
@@ -93,12 +93,12 @@ private void watch() {
 
 	private void cleanupStaleServices(Set<String> currentServices) {
 		// 获取所有已缓存但不在当前服务列表中的服务
-		Set<String> staleServices = new HashSet<>(serverDetailInfoCache.keySet());
+		Set<String> staleServices = new HashSet<>(serviceDetailInfoCache.keySet());
 		staleServices.removeAll(currentServices);
 
 		// 移除过期服务的所有工具
 		for (String staleService : staleServices) {
-			McpServerDetailInfo staleServerDetail = serverDetailInfoCache.get(staleService);
+			McpServerDetailInfo staleServerDetail = serviceDetailInfoCache.get(staleService);
 			McpToolSpecification mcpToolSpec = staleServerDetail.getToolSpec();
 			if (mcpToolSpec != null) {
 				List<McpTool> toolsToRemove = mcpToolSpec.getTools();
@@ -117,12 +117,12 @@ private void cleanupStaleServices(Set<String> currentServices) {
 					dynamicMcpToolsProvider.removeTool(staleServerDetail.getName() + "_tools_" + tool.getName());
 				}
 			}
-			serverDetailInfoCache.remove(staleService);
+			serviceDetailInfoCache.remove(staleService);
 		}
 	}
 
 	private void handleChange() {
-		List<String> serviceNames = nacosMcpDynamicProperties.getServerNames();
+		List<String> serviceNames = nacosMcpDynamicProperties.getServiceNames();
 		if (CollectionUtils.isEmpty(serviceNames)) {
 			logger.warn("No service names configured, no tools will be watched");
 			return;
@@ -251,16 +251,16 @@ private void updateHighVersionServiceTools(String mcpName) {
 		try {
 			McpServerDetailInfo mcpServerDetail = nacosMcpOperationService.getServerDetail(mcpName);
 			if (mcpServerDetail == null) {
-				logger.warn("No server detail info found for server: {},do not update", mcpName);
+				logger.warn("No service detail info found for service: {},do not update", mcpName);
 				return;
 			}
-			McpServerDetailInfo oldMcpServerDetail = serverDetailInfoCache.get(mcpName);
-			serverDetailInfoCache.put(mcpName, mcpServerDetail);
+			McpServerDetailInfo oldMcpServerDetail = serviceDetailInfoCache.get(mcpName);
+			serviceDetailInfoCache.put(mcpName, mcpServerDetail);
 			Set<String> needToDeleteTools = new HashSet<>();
 			Set<String> needToUpdateTools = new HashSet<>();
 			compareToolsChange(oldMcpServerDetail, mcpServerDetail, needToDeleteTools, needToUpdateTools);
 
-			logger.info("Nacos mcp server info (name {}): {}", mcpName, mcpServerDetail);
+			logger.info("Nacos mcp service info (name {}): {}", mcpName, mcpServerDetail);
 			McpToolSpecification toolSpec = mcpServerDetail.getToolSpec();
 			McpServerRemoteServiceConfig remoteServerConfig = mcpServerDetail.getRemoteServerConfig();
 			String protocol = mcpServerDetail.getProtocol();