diff --git a/web/src/main/java/com/navercorp/pinpoint/web/authorization/controller/AgentListController.java b/web/src/main/java/com/navercorp/pinpoint/web/authorization/controller/AgentListController.java index f71bb70ceaed..a001a08ea5af 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/authorization/controller/AgentListController.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/authorization/controller/AgentListController.java @@ -32,13 +32,14 @@ public AgentListController(AgentInfoService agentInfoService) { this.agentInfoService = Objects.requireNonNull(agentInfoService, "agentInfoService"); } - @GetMapping(value = "/all") + @GetMapping() public TreeView> getAllAgentsList() { long timestamp = System.currentTimeMillis(); - return getAllAgentsList(timestamp); + AgentsMapByApplication allAgentsList = this.agentInfoService.getAllAgentsList(AgentInfoFilter::accept, timestamp); + return treeView(allAgentsList); } - @GetMapping(value = "/all", params = {"from", "to"}) + @GetMapping(params = {"from", "to"}) public TreeView> getAllAgentsList( @RequestParam("from") long from, @RequestParam("to") long to) { @@ -48,28 +49,25 @@ public TreeView> getAllAgentsList( return treeView(allAgentsList); } - @GetMapping(value = "/all", params = {"timestamp"}) - public TreeView> getAllAgentsList( - @RequestParam("timestamp") long timestamp) { - AgentsMapByApplication allAgentsList = this.agentInfoService.getAllAgentsList(AgentInfoFilter::accept, timestamp); - return treeView(allAgentsList); - } - private static TreeView> treeView(AgentsMapByApplication agentsListsList) { List> list = agentsListsList.getAgentsListsList(); return new StaticTreeView<>(list); } - @GetMapping(value = "/v1", params = {"application", "sortBy"}) + @GetMapping(params = {"application", "sortBy"}) public TreeView> getAgentsList( @RequestParam("application") String applicationName, @RequestParam("sortBy") SortByAgentInfo.Rules sortBy) { long timestamp = System.currentTimeMillis(); - return getAgentsList(applicationName, timestamp, sortBy); + AgentInfoFilter runningAgentFilter = new AgentInfoFilterChain( + AgentInfoFilter::filterRunning + ); + AgentsMapByHost list = this.agentInfoService.getAgentsListByApplicationName(runningAgentFilter, applicationName, timestamp, sortBy); + return treeView(list); } - @GetMapping(value = "/v1", params = {"application", "from", "to", "sortBy"}) + @GetMapping(params = {"application", "from", "to", "sortBy"}) public TreeView> getAgentsList( @RequestParam("application") String applicationName, @RequestParam("from") long from, @@ -83,18 +81,6 @@ public TreeView> getAgentsList( return treeView(list); } - @GetMapping(value = "/v1", params = {"application", "timestamp", "sortBy"}) - public TreeView> getAgentsList( - @RequestParam("application") String applicationName, - @RequestParam("timestamp") long timestamp, - @RequestParam("sortBy") SortByAgentInfo.Rules sortBy) { - AgentInfoFilter runningAgentFilter = new AgentInfoFilterChain( - AgentInfoFilter::filterRunning - ); - AgentsMapByHost list = this.agentInfoService.getAgentsListByApplicationName(runningAgentFilter, applicationName, timestamp, sortBy); - return treeView(list); - } - private static TreeView> treeView(AgentsMapByHost agentsMapByHost) { List> list = agentsMapByHost.getAgentsListsList(); return new StaticTreeView<>(list);