kimhyungsik/ax_hub_mcp_tool
0
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: Remove fallback HTTP logic from McpRouterController

Browse Source
This commit is contained in:
jade
2026-07-21 21:49:32 +09:00
parent 11b8b08890
commit a46943ca23
1 changed files with 3 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
dap-gateway/src/main/java/io/shinhanlife/dap/mcg/presentation/McpRouterController.java
View File

@@ -19,7 +19,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import io.shinhanlife.dap.common.adapter.dto.JsonRpcRequest; import io.shinhanlife.dap.common.adapter.dto.JsonRpcRequest;
import io.shinhanlife.dap.common.adapter.dto.JsonRpcResponse; import io.shinhanlife.dap.common.adapter.dto.JsonRpcResponse;
import io.shinhanlife.dap.common.adapter.dto.Params; import io.shinhanlife.dap.common.adapter.dto.Params;
import io.shinhanlife.dap.mcg.config.GatewayFallbackProperties;
import io.shinhanlife.dap.mcg.dto.ToolMetadata; import io.shinhanlife.dap.mcg.dto.ToolMetadata;
import io.shinhanlife.dap.mcg.registry.RedisRegistryService; import io.shinhanlife.dap.mcg.registry.RedisRegistryService;
import io.shinhanlife.dap.mcg.service.ExecuteService; import io.shinhanlife.dap.mcg.service.ExecuteService;
@@ -53,19 +53,17 @@ public class McpRouterController {
private final ExecuteService executeService; private final ExecuteService executeService;
private final SecurityProperties securityProperties; private final SecurityProperties securityProperties;
private final ObjectMapper objectMapper; private final ObjectMapper objectMapper;
private final GatewayFallbackProperties gatewayFallbackProperties;
private final RestClient restClient; private final RestClient restClient;
public McpRouterController(RedisRegistryService redisRegistryService, public McpRouterController(RedisRegistryService redisRegistryService,
ExecuteService executeService, ExecuteService executeService,
SecurityProperties securityProperties, SecurityProperties securityProperties,
ObjectMapper objectMapper, ObjectMapper objectMapper) {
GatewayFallbackProperties gatewayFallbackProperties) {
this.redisRegistryService = redisRegistryService; this.redisRegistryService = redisRegistryService;
this.executeService = executeService; this.executeService = executeService;
this.securityProperties = securityProperties; this.securityProperties = securityProperties;
this.objectMapper = objectMapper; this.objectMapper = objectMapper;
this.gatewayFallbackProperties = gatewayFallbackProperties;
// [수정됨] 1초 타임아웃을 강제하여 죽은 서버 대기로 인한 지연 방지 // [수정됨] 1초 타임아웃을 강제하여 죽은 서버 대기로 인한 지연 방지
SimpleClientHttpRequestFactory factory = new SimpleClientHttpRequestFactory(); SimpleClientHttpRequestFactory factory = new SimpleClientHttpRequestFactory();
@@ -124,31 +122,7 @@ public class McpRouterController {
.map(ToolMetadata::getUid) .map(ToolMetadata::getUid)
.collect(Collectors.toSet()); .collect(Collectors.toSet());
Set<String> fallbackUrls = new HashSet<>(gatewayFallbackProperties.getRoutes().values());
if (gatewayFallbackProperties.getDefaultUrl() != null) {
fallbackUrls.add(gatewayFallbackProperties.getDefaultUrl());
}
for (String url : fallbackUrls) {
try {
List<ToolMetadata> localTools = restClient.get()
.uri(url + "/mcp/api/v1/tools/local")
.retrieve()
.body(new ParameterizedTypeReference<List<ToolMetadata>>() {});
if (localTools != null) {
for (ToolMetadata t : localTools) {
if (!Boolean.TRUE.equals(t.getIsRegistered()) && Boolean.TRUE.equals(t.getVisible()) && !knownTools.contains(t.getUid())) {
activeTools.add(t);
knownTools.add(t.getUid());
}
}
}
} catch (Exception e) {
log.warn("Failed to fetch local tools from fallback URL: {}", url);
}
}
if (categoryKey != null && !categoryKey.trim().isEmpty()) { if (categoryKey != null && !categoryKey.trim().isEmpty()) {
activeTools = activeTools.stream() activeTools = activeTools.stream()
.filter(t -> categoryKey.equals(t.getCategoryKey())) .filter(t -> categoryKey.equals(t.getCategoryKey()))