From e1591761d2d5e4acef34f35c6c0eb6daea26ce89 Mon Sep 17 00:00:00 2001 From: jade Date: Thu, 16 Jul 2026 21:36:51 +0900 Subject: [PATCH] refactor: Replace inline fully qualified package names with proper imports --- .../biz/mcp/gateway/service/ExecuteService.java | 6 ++++-- .../CustomWebMvcSseServerTransportProvider.java | 4 +++- .../mcp/gateway/sync/DynamicMcpController.java | 4 +++- .../gateway/sync/DynamicMcpServerManager.java | 3 ++- .../tool/large/AgentResponseBudgetService.java | 17 ++++++++++------- .../tool/large/LargeToolResponseService.java | 6 ++++-- 6 files changed, 26 insertions(+), 14 deletions(-) diff --git a/dap-gateway/src/main/java/io/shinhanlife/dap/biz/mcp/gateway/service/ExecuteService.java b/dap-gateway/src/main/java/io/shinhanlife/dap/biz/mcp/gateway/service/ExecuteService.java index 1875e12..7c95e4c 100644 --- a/dap-gateway/src/main/java/io/shinhanlife/dap/biz/mcp/gateway/service/ExecuteService.java +++ b/dap-gateway/src/main/java/io/shinhanlife/dap/biz/mcp/gateway/service/ExecuteService.java @@ -1,5 +1,7 @@ package io.shinhanlife.dap.biz.mcp.gateway.service; +import java.util.HashMap; + import io.shinhanlife.dap.biz.mcp.gateway.dto.ToolMetadata; import io.shinhanlife.dap.biz.mcp.gateway.resilience.FailureType; import io.shinhanlife.dap.biz.mcp.gateway.resilience.RetryPolicy; @@ -219,9 +221,9 @@ public class ExecuteService { LargeToolResponseService.Collector collector = largeResponses.newCollector(metadata.getName(), context.requestId()); while (true) { - Map pagePayload = new java.util.HashMap<>(payload); + Map pagePayload = new HashMap<>(payload); if (pagePayload.containsKey("params")) { - Map params = new java.util.HashMap<>((Map) pagePayload.get("params")); + Map params = new HashMap<>((Map) pagePayload.get("params")); params.put("arguments", objectMapper.convertValue(pageArguments, Map.class)); pagePayload.put("params", params); } else { diff --git a/dap-gateway/src/main/java/io/shinhanlife/dap/biz/mcp/gateway/sync/CustomWebMvcSseServerTransportProvider.java b/dap-gateway/src/main/java/io/shinhanlife/dap/biz/mcp/gateway/sync/CustomWebMvcSseServerTransportProvider.java index 22405d6..fc661d3 100644 --- a/dap-gateway/src/main/java/io/shinhanlife/dap/biz/mcp/gateway/sync/CustomWebMvcSseServerTransportProvider.java +++ b/dap-gateway/src/main/java/io/shinhanlife/dap/biz/mcp/gateway/sync/CustomWebMvcSseServerTransportProvider.java @@ -1,5 +1,7 @@ package io.shinhanlife.dap.biz.mcp.gateway.sync; +import com.fasterxml.jackson.core.type.TypeReference; + import com.fasterxml.jackson.databind.ObjectMapper; import io.modelcontextprotocol.json.TypeRef; import io.modelcontextprotocol.spec.McpSchema; @@ -127,7 +129,7 @@ public class CustomWebMvcSseServerTransportProvider implements McpServerTranspor McpServerSession session = sessions.get(sessionId); try { - java.util.Map map = objectMapper.readValue(body, new com.fasterxml.jackson.core.type.TypeReference>() {}); + Map map = objectMapper.readValue(body, new TypeReference>() {}); io.modelcontextprotocol.spec.McpSchema.JSONRPCMessage message; if (map.containsKey("id")) { diff --git a/dap-gateway/src/main/java/io/shinhanlife/dap/biz/mcp/gateway/sync/DynamicMcpController.java b/dap-gateway/src/main/java/io/shinhanlife/dap/biz/mcp/gateway/sync/DynamicMcpController.java index 94ec729..5640694 100644 --- a/dap-gateway/src/main/java/io/shinhanlife/dap/biz/mcp/gateway/sync/DynamicMcpController.java +++ b/dap-gateway/src/main/java/io/shinhanlife/dap/biz/mcp/gateway/sync/DynamicMcpController.java @@ -1,5 +1,7 @@ package io.shinhanlife.dap.biz.mcp.gateway.sync; +import java.util.UUID; + import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -72,7 +74,7 @@ public class DynamicMcpController { if (sessionId == null || sessionId.isEmpty()) { // 새 세션 생성 (initialize 요청) - String newSessionId = java.util.UUID.randomUUID().toString(); + String newSessionId = UUID.randomUUID().toString(); SseEmitter emitter = transport.handleCustomSse(newSessionId, body); return ResponseEntity.ok() diff --git a/dap-gateway/src/main/java/io/shinhanlife/dap/biz/mcp/gateway/sync/DynamicMcpServerManager.java b/dap-gateway/src/main/java/io/shinhanlife/dap/biz/mcp/gateway/sync/DynamicMcpServerManager.java index 6d95f53..2d7964e 100644 --- a/dap-gateway/src/main/java/io/shinhanlife/dap/biz/mcp/gateway/sync/DynamicMcpServerManager.java +++ b/dap-gateway/src/main/java/io/shinhanlife/dap/biz/mcp/gateway/sync/DynamicMcpServerManager.java @@ -1,5 +1,6 @@ package io.shinhanlife.dap.biz.mcp.gateway.sync; +import io.modelcontextprotocol.spec.McpSchema.ServerCapabilities; import io.modelcontextprotocol.server.McpServer; import io.modelcontextprotocol.server.McpSyncServer; import io.shinhanlife.dap.biz.mcp.gateway.dto.ToolMetadata; @@ -51,7 +52,7 @@ public class DynamicMcpServerManager { McpSyncServer newServer = McpServer.sync(transport) .serverInfo("DAP-Gateway-" + key, "1.0.0") - .capabilities(io.modelcontextprotocol.spec.McpSchema.ServerCapabilities.builder().tools(true).build()) + .capabilities(ServerCapabilities.builder().tools(true).build()) .build(); categoryTransports.put(key, transport); diff --git a/dap-gateway/src/main/java/io/shinhanlife/dap/biz/mcp/gateway/tool/large/AgentResponseBudgetService.java b/dap-gateway/src/main/java/io/shinhanlife/dap/biz/mcp/gateway/tool/large/AgentResponseBudgetService.java index e3c43e5..0f7859e 100644 --- a/dap-gateway/src/main/java/io/shinhanlife/dap/biz/mcp/gateway/tool/large/AgentResponseBudgetService.java +++ b/dap-gateway/src/main/java/io/shinhanlife/dap/biz/mcp/gateway/tool/large/AgentResponseBudgetService.java @@ -1,5 +1,8 @@ package io.shinhanlife.dap.biz.mcp.gateway.tool.large; +import java.util.Iterator; +import java.util.Map; + import io.shinhanlife.dap.biz.mcp.gateway.config.AgentResponseBudgetProperties; import io.shinhanlife.dap.biz.mcp.gateway.guardrail.SensitiveDataMasker; import org.springframework.stereotype.Service; @@ -99,9 +102,9 @@ public class AgentResponseBudgetService { int copied = 0; int originalFields = 0; - java.util.Iterator> fields = masked.fields(); + Iterator> fields = masked.fields(); while (fields.hasNext()) { - java.util.Map.Entry entry = fields.next(); + Map.Entry entry = fields.next(); originalFields++; if (copied >= properties.maxFieldsPerItem()) { continue; @@ -135,9 +138,9 @@ public class AgentResponseBudgetService { ObjectNode source = (ObjectNode) item; ObjectNode limited = json.createObjectNode(); - java.util.Iterator> fields = source.fields(); + Iterator> fields = source.fields(); while (fields.hasNext()) { - java.util.Map.Entry entry = fields.next(); + Map.Entry entry = fields.next(); JsonNode value = entry.getValue(); if (value.isTextual()) { limited.put(entry.getKey(), truncateText(value.asText())); @@ -164,7 +167,7 @@ public class AgentResponseBudgetService { fallback.put("maxItemBytes", properties.maxItemBytes()); if (item.isObject()) { ArrayNode fieldNames = json.createArrayNode(); - java.util.Iterator fieldNamesIter = item.fieldNames(); + Iterator fieldNamesIter = item.fieldNames(); while (fieldNamesIter.hasNext()) { fieldNames.add(fieldNamesIter.next()); } @@ -188,9 +191,9 @@ public class AgentResponseBudgetService { private ObjectNode copyWithout(ObjectNode source, String... excludedFields) { ObjectNode copy = json.createObjectNode(); - java.util.Iterator> fields = source.fields(); + Iterator> fields = source.fields(); while (fields.hasNext()) { - java.util.Map.Entry entry = fields.next(); + Map.Entry entry = fields.next(); if (!excluded(entry.getKey(), excludedFields)) { copy.set(entry.getKey(), entry.getValue()); } diff --git a/dap-gateway/src/main/java/io/shinhanlife/dap/biz/mcp/gateway/tool/large/LargeToolResponseService.java b/dap-gateway/src/main/java/io/shinhanlife/dap/biz/mcp/gateway/tool/large/LargeToolResponseService.java index 3480f78..d7357a2 100644 --- a/dap-gateway/src/main/java/io/shinhanlife/dap/biz/mcp/gateway/tool/large/LargeToolResponseService.java +++ b/dap-gateway/src/main/java/io/shinhanlife/dap/biz/mcp/gateway/tool/large/LargeToolResponseService.java @@ -1,5 +1,7 @@ package io.shinhanlife.dap.biz.mcp.gateway.tool.large; +import java.util.Iterator; + import io.shinhanlife.dap.biz.mcp.gateway.config.McpGatewayProperties; import io.shinhanlife.dap.biz.mcp.gateway.guardrail.SensitiveDataMasker; import io.shinhanlife.dap.biz.mcp.gateway.resilience.FailureType; @@ -266,7 +268,7 @@ public class LargeToolResponseService { preview.put("maxItemBytes", properties.largeResponseMaxItemBytes()); if (masked.isObject()) { ArrayNode fieldNames = json.createArrayNode(); - java.util.Iterator fieldNamesIter = masked.fieldNames(); + Iterator fieldNamesIter = masked.fieldNames(); while (fieldNamesIter.hasNext()) { fieldNames.add(fieldNamesIter.next()); } @@ -309,7 +311,7 @@ public class LargeToolResponseService { private int count(JsonNode node) { int count = 0; - java.util.Iterator iter = node.elements(); + Iterator iter = node.elements(); while(iter.hasNext()) { iter.next(); count++;