diff --git a/web/src/main/java/com/navercorp/pinpoint/web/authorization/controller/AgentInfoController.java b/web/src/main/java/com/navercorp/pinpoint/web/authorization/controller/AgentInfoController.java index cc5ff625052a..13d89f6fb62e 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/authorization/controller/AgentInfoController.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/authorization/controller/AgentInfoController.java @@ -30,10 +30,10 @@ import com.navercorp.pinpoint.web.vo.tree.AgentsMapByApplication; import com.navercorp.pinpoint.web.vo.tree.AgentsMapByHost; import com.navercorp.pinpoint.web.vo.agent.AgentAndStatus; -import com.navercorp.pinpoint.web.vo.agent.AgentInfoFilter; -import com.navercorp.pinpoint.web.vo.agent.AgentInfoFilterChain; +import com.navercorp.pinpoint.web.vo.agent.AgentStatusFilter; +import com.navercorp.pinpoint.web.vo.agent.AgentStatusFilterChain; import com.navercorp.pinpoint.web.vo.agent.AgentStatus; -import com.navercorp.pinpoint.web.vo.agent.DefaultAgentInfoFilter; +import com.navercorp.pinpoint.web.vo.agent.DefaultAgentStatusFilter; import com.navercorp.pinpoint.web.vo.agent.DetailedAgentAndStatus; import com.navercorp.pinpoint.web.vo.timeline.inspector.InspectorTimeline; import com.navercorp.pinpoint.web.view.tree.SimpleTreeView; @@ -74,7 +74,7 @@ public TreeView> getAgentList() { public TreeView> getAgentList( @RequestParam("from") long from, @RequestParam("to") long to) { - AgentInfoFilter filter = new DefaultAgentInfoFilter(from); + AgentStatusFilter filter = new DefaultAgentStatusFilter(from); long timestamp = to; AgentsMapByApplication allAgentsList = this.agentInfoService.getAllAgentsList(filter, Range.between(from, to)); return treeView(allAgentsList); @@ -84,7 +84,7 @@ public TreeView> getAgentList( @GetMapping(value = "/getAgentList", params = {"!application", "timestamp"}) public TreeView> getAgentList( @RequestParam("timestamp") long timestamp) { - AgentsMapByApplication allAgentsList = this.agentInfoService.getAllAgentsList(AgentInfoFilter::accept, Range.between(timestamp, timestamp)); + AgentsMapByApplication allAgentsList = this.agentInfoService.getAllAgentsList(AgentStatusFilter::accept, Range.between(timestamp, timestamp)); return treeView(allAgentsList); } @@ -104,8 +104,8 @@ public TreeView> getAgentList( @RequestParam("application") String applicationName, @RequestParam("from") long from, @RequestParam("to") long to) { - AgentInfoFilter currentRunFilter = new AgentInfoFilterChain( - new DefaultAgentInfoFilter(from) + AgentStatusFilter currentRunFilter = new AgentStatusFilterChain( + new DefaultAgentStatusFilter(from) ); long timestamp = to; AgentsMapByHost list = this.agentInfoService.getAgentsListByApplicationName(currentRunFilter, applicationName, Range.between(from, to)); @@ -116,8 +116,8 @@ public TreeView> getAgentList( public TreeView> getAgentList( @RequestParam("application") String applicationName, @RequestParam("timestamp") long timestamp) { - AgentInfoFilter runningAgentFilter = new AgentInfoFilterChain( - AgentInfoFilter::filterRunning + AgentStatusFilter runningAgentFilter = new AgentStatusFilterChain( + AgentStatusFilter::filterRunning ); AgentsMapByHost list = this.agentInfoService.getAgentsListByApplicationName(runningAgentFilter, applicationName, Range.between(timestamp, timestamp)); return treeView(list); 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 cd75d52581df..77b416116a5b 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 @@ -5,10 +5,10 @@ import com.navercorp.pinpoint.web.view.tree.StaticTreeView; import com.navercorp.pinpoint.web.view.tree.TreeView; import com.navercorp.pinpoint.web.vo.agent.AgentAndStatus; -import com.navercorp.pinpoint.web.vo.agent.AgentInfoFilter; -import com.navercorp.pinpoint.web.vo.agent.AgentInfoFilterChain; +import com.navercorp.pinpoint.web.vo.agent.AgentStatusFilter; +import com.navercorp.pinpoint.web.vo.agent.AgentStatusFilterChain; import com.navercorp.pinpoint.web.vo.agent.AgentStatusAndLink; -import com.navercorp.pinpoint.web.vo.agent.DefaultAgentInfoFilter; +import com.navercorp.pinpoint.web.vo.agent.DefaultAgentStatusFilter; import com.navercorp.pinpoint.web.vo.tree.InstancesList; import com.navercorp.pinpoint.web.vo.tree.AgentsMapByApplication; import com.navercorp.pinpoint.web.vo.tree.AgentsMapByHost; @@ -40,7 +40,7 @@ public AgentListController(AgentInfoService agentInfoService) { public TreeView> getAllAgentsList() { long timestamp = System.currentTimeMillis(); AgentsMapByApplication allAgentsList = this.agentInfoService.getAllAgentsList( - AgentInfoFilter::accept, + AgentStatusFilter::accept, Range.between(timestamp, timestamp) ); return treeView(allAgentsList); @@ -50,7 +50,7 @@ public TreeView> getAllAgentsList() { public TreeView> getAllAgentsList( @RequestParam("from") long from, @RequestParam("to") long to) { - AgentInfoFilter filter = new DefaultAgentInfoFilter(from); + AgentStatusFilter filter = new DefaultAgentStatusFilter(from); AgentsMapByApplication allAgentsList = this.agentInfoService.getAllAgentsList( filter, Range.between(from, to) @@ -70,8 +70,8 @@ public TreeView> getAgentsList( @RequestParam(value = "sortBy") Optional sortBy) { SortByAgentInfo.Rules paramSortBy = sortBy.orElse(DEFAULT_SORTBY); long timestamp = System.currentTimeMillis(); - AgentInfoFilter runningAgentFilter = new AgentInfoFilterChain( - AgentInfoFilter::filterRunning + AgentStatusFilter runningAgentFilter = new AgentStatusFilterChain( + AgentStatusFilter::filterRunning ); AgentsMapByHost list = this.agentInfoService.getAgentsListByApplicationName( runningAgentFilter, @@ -89,8 +89,8 @@ public TreeView> getAgentsList( @RequestParam("to") long to, @RequestParam(value = "sortBy") Optional sortBy) { SortByAgentInfo.Rules paramSortBy = sortBy.orElse(DEFAULT_SORTBY); - AgentInfoFilter currentRunFilter = new AgentInfoFilterChain( - new DefaultAgentInfoFilter(from) + AgentStatusFilter currentRunFilter = new AgentStatusFilterChain( + new DefaultAgentStatusFilter(from) ); AgentsMapByHost list = this.agentInfoService.getAgentsListByApplicationName( currentRunFilter, diff --git a/web/src/main/java/com/navercorp/pinpoint/web/service/AgentInfoService.java b/web/src/main/java/com/navercorp/pinpoint/web/service/AgentInfoService.java index 6b3ce5475fd5..065e0f327a0f 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/service/AgentInfoService.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/service/AgentInfoService.java @@ -22,7 +22,7 @@ import com.navercorp.pinpoint.web.vo.tree.AgentsMapByHost; import com.navercorp.pinpoint.web.vo.agent.AgentAndStatus; import com.navercorp.pinpoint.web.vo.agent.AgentInfo; -import com.navercorp.pinpoint.web.vo.agent.AgentInfoFilter; +import com.navercorp.pinpoint.web.vo.agent.AgentStatusFilter; import com.navercorp.pinpoint.web.vo.agent.AgentStatus; import com.navercorp.pinpoint.web.vo.agent.AgentStatusQuery; import com.navercorp.pinpoint.web.vo.agent.DetailedAgentAndStatus; @@ -41,11 +41,11 @@ public interface AgentInfoService { int NO_DURATION = -1; - AgentsMapByApplication getAllAgentsList(AgentInfoFilter filter, Range range); + AgentsMapByApplication getAllAgentsList(AgentStatusFilter filter, Range range); - AgentsMapByHost getAgentsListByApplicationName(AgentInfoFilter filter, String applicationName, Range range); + AgentsMapByHost getAgentsListByApplicationName(AgentStatusFilter filter, String applicationName, Range range); - AgentsMapByHost getAgentsListByApplicationName(AgentInfoFilter filter, String applicationName, Range range, SortByAgentInfo.Rules sortBy); + AgentsMapByHost getAgentsListByApplicationName(AgentStatusFilter filter, String applicationName, Range range, SortByAgentInfo.Rules sortBy); ApplicationAgentHostList getApplicationAgentHostList(int offset, int limit, int durationDays); diff --git a/web/src/main/java/com/navercorp/pinpoint/web/service/AgentInfoServiceImpl.java b/web/src/main/java/com/navercorp/pinpoint/web/service/AgentInfoServiceImpl.java index 58193483a525..65ced75d21f9 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/service/AgentInfoServiceImpl.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/service/AgentInfoServiceImpl.java @@ -32,8 +32,8 @@ import com.navercorp.pinpoint.web.vo.Application; import com.navercorp.pinpoint.web.vo.agent.AgentAndStatus; import com.navercorp.pinpoint.web.vo.agent.AgentInfo; -import com.navercorp.pinpoint.web.vo.agent.AgentInfoFilter; -import com.navercorp.pinpoint.web.vo.agent.AgentInfoFilterChain; +import com.navercorp.pinpoint.web.vo.agent.AgentStatusFilter; +import com.navercorp.pinpoint.web.vo.agent.AgentStatusFilterChain; import com.navercorp.pinpoint.web.vo.agent.AgentStatus; import com.navercorp.pinpoint.web.vo.agent.AgentStatusAndLink; import com.navercorp.pinpoint.web.vo.agent.AgentStatusQuery; @@ -106,7 +106,7 @@ public AgentInfoServiceImpl(AgentEventService agentEventService, } @Override - public AgentsMapByApplication getAllAgentsList(AgentInfoFilter filter, Range range) { + public AgentsMapByApplication getAllAgentsList(AgentStatusFilter filter, Range range) { Objects.requireNonNull(filter, "filter"); List applications = applicationIndexDao.selectAllApplicationNames(); @@ -122,12 +122,12 @@ public AgentsMapByApplication getAllAgentsList(AgentInfoFilter filter, Range ran } @Override - public AgentsMapByHost getAgentsListByApplicationName(AgentInfoFilter filter, String applicationName, Range range) { + public AgentsMapByHost getAgentsListByApplicationName(AgentStatusFilter filter, String applicationName, Range range) { return getAgentsListByApplicationName(filter, applicationName, range, SortByAgentInfo.Rules.AGENT_ID_ASC); } @Override - public AgentsMapByHost getAgentsListByApplicationName(AgentInfoFilter filter, + public AgentsMapByHost getAgentsListByApplicationName(AgentStatusFilter filter, String applicationName, Range range, SortByAgentInfo.Rules sortBy) { @@ -135,9 +135,9 @@ public AgentsMapByHost getAgentsListByApplicationName(AgentInfoFilter filter, Objects.requireNonNull(applicationName, "applicationName"); Set agentInfoAndStatuses = getAgentsByApplicationName(applicationName, range.getTo()); - AgentInfoFilter activeAgentFilter = new AgentInfoFilterChain( + AgentStatusFilter activeAgentFilter = new AgentStatusFilterChain( filter, - x -> isActiveAgent(x.getAgentInfo().getAgentId(), range) + x -> isActiveAgent(x.getAgentId(), range) ); if (agentInfoAndStatuses.isEmpty()) { diff --git a/web/src/main/java/com/navercorp/pinpoint/web/vo/agent/AgentInfoFilterChain.java b/web/src/main/java/com/navercorp/pinpoint/web/vo/agent/AgentInfoFilterChain.java deleted file mode 100644 index ce94ef6cbbaa..000000000000 --- a/web/src/main/java/com/navercorp/pinpoint/web/vo/agent/AgentInfoFilterChain.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.navercorp.pinpoint.web.vo.agent; - -import java.util.Objects; - -public class AgentInfoFilterChain implements AgentInfoFilter { - private final AgentInfoFilter[] agentInfoFilters; - - public AgentInfoFilterChain(AgentInfoFilter... agentInfoFilters) { - this.agentInfoFilters = Objects.requireNonNull(agentInfoFilters, "agentFilters"); - } - - @Override - public boolean filter(AgentAndStatus agentAndStatus) { - for (AgentInfoFilter agentFilter : this.agentInfoFilters) { - if (agentFilter.filter(agentAndStatus) == REJECT) { - return REJECT; - } - } - return ACCEPT; - } -} diff --git a/web/src/main/java/com/navercorp/pinpoint/web/vo/agent/AgentInfoFilter.java b/web/src/main/java/com/navercorp/pinpoint/web/vo/agent/AgentStatusFilter.java similarity index 57% rename from web/src/main/java/com/navercorp/pinpoint/web/vo/agent/AgentInfoFilter.java rename to web/src/main/java/com/navercorp/pinpoint/web/vo/agent/AgentStatusFilter.java index aacacb244db5..37c1f1033bf4 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/vo/agent/AgentInfoFilter.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/vo/agent/AgentStatusFilter.java @@ -2,22 +2,21 @@ import com.navercorp.pinpoint.common.server.util.AgentLifeCycleState; -public interface AgentInfoFilter { +public interface AgentStatusFilter { boolean ACCEPT = true; boolean REJECT = false; - boolean filter(AgentAndStatus agentInfo); + boolean filter(AgentStatus agentStatus); - static boolean accept(AgentAndStatus agentAndStatus) { + static boolean accept(AgentStatus agentStatus) { return ACCEPT; } - static boolean reject(AgentAndStatus agentAndStatus) { + static boolean reject(AgentStatus agentStatus) { return REJECT; } - static boolean filterRunning(AgentAndStatus agentAndStatus) { - final AgentStatus agentStatus = agentAndStatus.getStatus(); + static boolean filterRunning(AgentStatus agentStatus) { if (agentStatus == null) { return REJECT; } diff --git a/web/src/main/java/com/navercorp/pinpoint/web/vo/agent/AgentStatusFilterChain.java b/web/src/main/java/com/navercorp/pinpoint/web/vo/agent/AgentStatusFilterChain.java new file mode 100644 index 000000000000..30177d6e1c99 --- /dev/null +++ b/web/src/main/java/com/navercorp/pinpoint/web/vo/agent/AgentStatusFilterChain.java @@ -0,0 +1,21 @@ +package com.navercorp.pinpoint.web.vo.agent; + +import java.util.Objects; + +public class AgentStatusFilterChain implements AgentStatusFilter { + private final AgentStatusFilter[] agentStatusFilters; + + public AgentStatusFilterChain(AgentStatusFilter... agentStatusFilters) { + this.agentStatusFilters = Objects.requireNonNull(agentStatusFilters, "agentFilters"); + } + + @Override + public boolean filter(AgentStatus agentStatus) { + for (AgentStatusFilter agentFilter : this.agentStatusFilters) { + if (agentFilter.filter(agentStatus) == REJECT) { + return REJECT; + } + } + return ACCEPT; + } +} diff --git a/web/src/main/java/com/navercorp/pinpoint/web/vo/agent/DefaultAgentInfoFilter.java b/web/src/main/java/com/navercorp/pinpoint/web/vo/agent/DefaultAgentStatusFilter.java similarity index 67% rename from web/src/main/java/com/navercorp/pinpoint/web/vo/agent/DefaultAgentInfoFilter.java rename to web/src/main/java/com/navercorp/pinpoint/web/vo/agent/DefaultAgentStatusFilter.java index aab259a19c98..9206df4b61f6 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/vo/agent/DefaultAgentInfoFilter.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/vo/agent/DefaultAgentStatusFilter.java @@ -2,16 +2,15 @@ import com.navercorp.pinpoint.common.server.util.AgentLifeCycleState; -public class DefaultAgentInfoFilter implements AgentInfoFilter { +public class DefaultAgentStatusFilter implements AgentStatusFilter { private final long from; - public DefaultAgentInfoFilter(long from) { + public DefaultAgentStatusFilter(long from) { this.from = from; } @Override - public boolean filter(AgentAndStatus agentAndStatus) { - final AgentStatus agentStatus = agentAndStatus.getStatus(); + public boolean filter(AgentStatus agentStatus) { if (agentStatus == null) { return REJECT; } diff --git a/web/src/main/java/com/navercorp/pinpoint/web/vo/tree/AgentsMapByApplication.java b/web/src/main/java/com/navercorp/pinpoint/web/vo/tree/AgentsMapByApplication.java index 482848c06688..c24734ae5702 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/vo/tree/AgentsMapByApplication.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/vo/tree/AgentsMapByApplication.java @@ -1,7 +1,7 @@ package com.navercorp.pinpoint.web.vo.tree; import com.navercorp.pinpoint.web.vo.agent.AgentAndStatus; -import com.navercorp.pinpoint.web.vo.agent.AgentInfoFilter; +import com.navercorp.pinpoint.web.vo.agent.AgentStatusFilter; import java.util.ArrayList; import java.util.Collection; @@ -21,7 +21,7 @@ public List> getAgentsListsList() { return new ArrayList<>(instancesListMap.getListMap()); } - public static AgentsMapByApplication newAgentsMapByApplication(AgentInfoFilter filter, + public static AgentsMapByApplication newAgentsMapByApplication(AgentStatusFilter filter, Collection agentCollection) { Objects.requireNonNull(filter, "filter"); Objects.requireNonNull(agentCollection, "agentCollection"); @@ -34,7 +34,7 @@ public static AgentsMapByApplication newAgentsMapByApplication(AgentInfoFilter f agentCollection ); - instancesListMapBuilder.withFilter(filter::filter); + instancesListMapBuilder.withFilter((AgentAndStatus a) -> filter.filter(a.getStatus())); return new AgentsMapByApplication(instancesListMapBuilder.build()); } diff --git a/web/src/main/java/com/navercorp/pinpoint/web/vo/tree/AgentsMapByHost.java b/web/src/main/java/com/navercorp/pinpoint/web/vo/tree/AgentsMapByHost.java index ae38569e7a55..2a4e71856245 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/vo/tree/AgentsMapByHost.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/vo/tree/AgentsMapByHost.java @@ -5,7 +5,7 @@ import com.navercorp.pinpoint.web.hyperlink.LinkSources; import com.navercorp.pinpoint.web.vo.agent.AgentAndStatus; import com.navercorp.pinpoint.web.vo.agent.AgentInfo; -import com.navercorp.pinpoint.web.vo.agent.AgentInfoFilter; +import com.navercorp.pinpoint.web.vo.agent.AgentStatusFilter; import com.navercorp.pinpoint.web.vo.agent.AgentStatus; import com.navercorp.pinpoint.web.vo.agent.AgentStatusAndLink; @@ -30,7 +30,7 @@ public List> getAgentsListsList() { return new ArrayList<>(instancesListMap.getListMap()); } - public static AgentsMapByHost newAgentsMapByHost(AgentInfoFilter filter, + public static AgentsMapByHost newAgentsMapByHost(AgentStatusFilter filter, SortByAgentInfo sortByAgentInfo, HyperLinkFactory hyperLinkFactory, Collection agentCollection) { @@ -45,7 +45,7 @@ public static AgentsMapByHost newAgentsMapByHost(AgentInfoFilter filter, sortByAgentInfo.getComparator(), agentCollection ); - instancesListMapBuilder.withFilter(filter::filter) + instancesListMapBuilder.withFilter((AgentAndStatus a) -> filter.filter(a.getStatus())) .withFinisher(x -> newAgentStatusAndLink(x, hyperLinkFactory)); return new AgentsMapByHost(instancesListMapBuilder.build()); diff --git a/web/src/test/java/com/navercorp/pinpoint/web/vo/AgentsMapByApplicationTest.java b/web/src/test/java/com/navercorp/pinpoint/web/vo/AgentsMapByApplicationTest.java index 583ac7b58318..aee477f76255 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/vo/AgentsMapByApplicationTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/vo/AgentsMapByApplicationTest.java @@ -2,7 +2,7 @@ import com.navercorp.pinpoint.web.vo.agent.AgentAndStatus; import com.navercorp.pinpoint.web.vo.agent.AgentInfo; -import com.navercorp.pinpoint.web.vo.agent.AgentInfoFilter; +import com.navercorp.pinpoint.web.vo.agent.AgentStatusFilter; import com.navercorp.pinpoint.web.vo.tree.InstancesList; import com.navercorp.pinpoint.web.vo.tree.AgentsMapByApplication; import org.junit.jupiter.api.Assertions; @@ -22,7 +22,7 @@ public void groupByApplicationName() { AgentAndStatus app2Agent2 = createAgentInfo("APP_2", "app2-agent2", "Host22", true); List agentAndStatusList = shuffleAgentInfos(app1Agent1, app1Agent2, app2Agent1, app2Agent2); - AgentsMapByApplication agentsMapByApplication = AgentsMapByApplication.newAgentsMapByApplication(AgentInfoFilter::accept, agentAndStatusList); + AgentsMapByApplication agentsMapByApplication = AgentsMapByApplication.newAgentsMapByApplication(AgentStatusFilter::accept, agentAndStatusList); List> instancesLists = agentsMapByApplication.getAgentsListsList(); Assertions.assertEquals(2, instancesLists.size()); diff --git a/web/src/test/java/com/navercorp/pinpoint/web/vo/AgentsMapByHostTest.java b/web/src/test/java/com/navercorp/pinpoint/web/vo/AgentsMapByHostTest.java index a74a68a7667f..8286ceeb6323 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/vo/AgentsMapByHostTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/vo/AgentsMapByHostTest.java @@ -3,7 +3,7 @@ import com.navercorp.pinpoint.web.hyperlink.HyperLinkFactory; import com.navercorp.pinpoint.web.vo.agent.AgentAndStatus; import com.navercorp.pinpoint.web.vo.agent.AgentInfo; -import com.navercorp.pinpoint.web.vo.agent.AgentInfoFilter; +import com.navercorp.pinpoint.web.vo.agent.AgentStatusFilter; import com.navercorp.pinpoint.web.vo.agent.AgentStatusAndLink; import com.navercorp.pinpoint.web.vo.tree.InstancesList; import com.navercorp.pinpoint.web.vo.tree.AgentsMapByHost; @@ -29,7 +29,7 @@ public void groupByHostNameShouldHaveContainersFirstAndGroupedSeparatelyByAgentI SortByAgentInfo sortBy = SortByAgentInfo.agentIdAsc(AgentStatusAndLink::getAgentInfo); - AgentsMapByHost agentsMapByHost = AgentsMapByHost.newAgentsMapByHost(AgentInfoFilter::accept, sortBy, hyperLinkFactory, agentAndStatusList); + AgentsMapByHost agentsMapByHost = AgentsMapByHost.newAgentsMapByHost(AgentStatusFilter::accept, sortBy, hyperLinkFactory, agentAndStatusList); List> instancesLists = agentsMapByHost.getAgentsListsList(); Assertions.assertEquals(3, instancesLists.size()); diff --git a/web/src/test/java/com/navercorp/pinpoint/web/vo/agent/AgentInfoFilterChainTest.java b/web/src/test/java/com/navercorp/pinpoint/web/vo/agent/AgentInfoFilterChainTest.java deleted file mode 100644 index 66f2d9065f9f..000000000000 --- a/web/src/test/java/com/navercorp/pinpoint/web/vo/agent/AgentInfoFilterChainTest.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.navercorp.pinpoint.web.vo.agent; - -import com.navercorp.pinpoint.common.server.util.AgentLifeCycleState; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; - -public class AgentInfoFilterChainTest { - - @Test - public void filter_running() { - final long current = System.currentTimeMillis(); - - AgentInfoFilter chain = new AgentInfoFilterChain( - AgentInfoFilter::filterRunning, - AgentInfoFilter::accept - ); - - AgentStatus status = new AgentStatus("testAgent", AgentLifeCycleState.RUNNING, current); - AgentAndStatus agentAndStatus = new AgentAndStatus(new AgentInfo(), status); - - Assertions.assertEquals(AgentInfoFilter.ACCEPT, chain.filter(agentAndStatus)); - } - - @Test - public void filter_from_accept() { - final long current = System.currentTimeMillis(); - - AgentInfoFilter chain = new AgentInfoFilterChain( - new DefaultAgentInfoFilter(current) - ); - - AgentStatus status = new AgentStatus("testAgent", AgentLifeCycleState.RUNNING, current); - AgentAndStatus agentAndStatus = new AgentAndStatus(new AgentInfo(), status); - Assertions.assertEquals(AgentInfoFilter.ACCEPT, chain.filter(agentAndStatus)); - } - - @Test - public void filter_from_reject() { - final long current = System.currentTimeMillis(); - - AgentInfoFilter chain = new AgentInfoFilterChain( - new DefaultAgentInfoFilter(Long.MAX_VALUE) - ); - - AgentStatus status = new AgentStatus("testAgent", AgentLifeCycleState.RUNNING, current); - AgentAndStatus agentAndStatus = new AgentAndStatus(new AgentInfo(), status); - Assertions.assertEquals(AgentInfoFilter.ACCEPT, chain.filter(agentAndStatus)); - } -} \ No newline at end of file diff --git a/web/src/test/java/com/navercorp/pinpoint/web/vo/agent/AgentStatusFilterChainTest.java b/web/src/test/java/com/navercorp/pinpoint/web/vo/agent/AgentStatusFilterChainTest.java new file mode 100644 index 000000000000..573ac6539096 --- /dev/null +++ b/web/src/test/java/com/navercorp/pinpoint/web/vo/agent/AgentStatusFilterChainTest.java @@ -0,0 +1,46 @@ +package com.navercorp.pinpoint.web.vo.agent; + +import com.navercorp.pinpoint.common.server.util.AgentLifeCycleState; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +public class AgentStatusFilterChainTest { + + @Test + public void filter_running() { + final long current = System.currentTimeMillis(); + + AgentStatusFilter chain = new AgentStatusFilterChain( + AgentStatusFilter::filterRunning, + AgentStatusFilter::accept + ); + + AgentStatus status = new AgentStatus("testAgent", AgentLifeCycleState.RUNNING, current); + + Assertions.assertEquals(AgentStatusFilter.ACCEPT, chain.filter(status)); + } + + @Test + public void filter_from_accept() { + final long current = System.currentTimeMillis(); + + AgentStatusFilter chain = new AgentStatusFilterChain( + new DefaultAgentStatusFilter(current) + ); + + AgentStatus status = new AgentStatus("testAgent", AgentLifeCycleState.RUNNING, current); + Assertions.assertEquals(AgentStatusFilter.ACCEPT, chain.filter(status)); + } + + @Test + public void filter_from_reject() { + final long current = System.currentTimeMillis(); + + AgentStatusFilter chain = new AgentStatusFilterChain( + new DefaultAgentStatusFilter(Long.MAX_VALUE) + ); + + AgentStatus status = new AgentStatus("testAgent", AgentLifeCycleState.RUNNING, current); + Assertions.assertEquals(AgentStatusFilter.ACCEPT, chain.filter(status)); + } +} \ No newline at end of file