Refactor MetricsGrapper to MetricsService (to match existing terminol…

…ogy and verbs in the package)
thelastpickle · Sep 19, 2018 · 22f6fca · 22f6fca
1 parent 68332c7
commit 22f6fca
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 17 deletions.
diff --git a/src/server/src/main/java/io/cassandrareaper/resources/NodeStatsResource.java b/src/server/src/main/java/io/cassandrareaper/resources/NodeStatsResource.java
@@ -22,7 +22,7 @@
 import io.cassandrareaper.core.Node;
 import io.cassandrareaper.core.StreamSession;
 import io.cassandrareaper.service.CompactionService;
-import io.cassandrareaper.service.MetricsGrabber;
+import io.cassandrareaper.service.MetricsService;
 import io.cassandrareaper.service.StreamManager;
 
 import java.util.List;
@@ -47,13 +47,13 @@ public final class NodeStatsResource {
 
   private final AppContext context;
   private final StreamManager streamManager;
-  private final MetricsGrabber metricsGrabber;
+  private final MetricsService metricsGrabber;
   private final CompactionService compactionService;
 
   public NodeStatsResource(AppContext context) {
     this.context = context;
     this.streamManager = StreamManager.create(context);
-    this.metricsGrabber = MetricsGrabber.create(context);
+    this.metricsGrabber = MetricsService.create(context);
     this.compactionService = CompactionService.create(context);
   }
 

diff --git a/...ssandrareaper/service/MetricsGrabber.java → ...ssandrareaper/service/MetricsService.java b/...ssandrareaper/service/MetricsGrabber.java → ...ssandrareaper/service/MetricsService.java
@@ -39,18 +39,18 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public final class MetricsGrabber {
+public final class MetricsService {
 
-  private static final Logger LOG = LoggerFactory.getLogger(MetricsGrabber.class);
+  private static final Logger LOG = LoggerFactory.getLogger(MetricsService.class);
 
   private final AppContext context;
 
-  private MetricsGrabber(AppContext context) {
+  private MetricsService(AppContext context) {
     this.context = context;
   }
 
-  public static MetricsGrabber create(AppContext context) {
-    return new MetricsGrabber(context);
+  public static MetricsService create(AppContext context) {
+    return new MetricsService(context);
   }
 
   public List<ThreadPoolStat> getTpStats(Node host) throws ReaperException {

diff --git a/...drareaper/service/MetricsGrabberTest.java → ...drareaper/service/MetricsServiceTest.java b/...drareaper/service/MetricsGrabberTest.java → ...drareaper/service/MetricsServiceTest.java
@@ -46,7 +46,7 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-public class MetricsGrabberTest {
+public class MetricsServiceTest {
 
   @Test
   public void testGetTpstats()
@@ -62,18 +62,18 @@ public void testGetTpstats()
     JmxProxyTest.mockGetMBeanServerConnection(jmx, serverConn);
 
     // @todo capture objectName and return valid set of objectNames,
-    // to properly test MetricsProxy.collectMetrics(..) and MetricsGrabber.convertToThreadPoolStats(..)
+    // to properly test MetricsProxy.collectMetrics(..) and MetricsService.convertToThreadPoolStats(..)
     when(serverConn.queryNames(Mockito.any(ObjectName.class), Mockito.isNull())).thenReturn(Collections.emptySet());
 
     Node node = Node.builder().withClusterName("test").withHostname("127.0.0.1").build();
-    MetricsGrabber.create(cxt).getTpStats(node);
+    MetricsService.create(cxt).getTpStats(node);
     Mockito.verify(serverConn, Mockito.times(2)).queryNames(Mockito.any(ObjectName.class), Mockito.isNull());
   }
 
   @Test
   public void testConvertToThreadPoolStats() {
     AppContext context = new AppContext();
-    final MetricsGrabber metricsGrabber = MetricsGrabber.create(context);
+    final MetricsService metricsGrabber = MetricsService.create(context);
 
     List<JmxStat> statList = Lists.newArrayList();
     statList.add(
@@ -147,18 +147,18 @@ public void testGetDroppedMessages()
     JmxProxyTest.mockGetMBeanServerConnection(jmx, serverConn);
 
     // @todo capture objectName and return valid set of objectNames,
-    // to properly test MetricsProxy.collectMetrics(..) and MetricsGrabber.convertToDroppedMessages(..)
+    // to properly test MetricsProxy.collectMetrics(..) and MetricsService.convertToDroppedMessages(..)
     when(serverConn.queryNames(Mockito.any(ObjectName.class), Mockito.isNull())).thenReturn(Collections.emptySet());
 
     Node node = Node.builder().withClusterName("test").withHostname("127.0.0.1").build();
-    MetricsGrabber.create(cxt).getDroppedMessages(node);
+    MetricsService.create(cxt).getDroppedMessages(node);
     Mockito.verify(serverConn, Mockito.times(1)).queryNames(Mockito.any(ObjectName.class), Mockito.isNull());
   }
 
   @Test
   public void testConvertToDroppedMessages() {
     AppContext context = new AppContext();
-    final MetricsGrabber metricsGrabber = MetricsGrabber.create(context);
+    final MetricsService metricsGrabber = MetricsService.create(context);
 
     List<JmxStat> statList = Lists.newArrayList();
     statList.add(
@@ -224,11 +224,11 @@ public void testGetClientRequestLatencies()
     JmxProxyTest.mockGetMBeanServerConnection(jmx, serverConn);
 
     // @todo capture objectName and return valid set of objectNames,
-    // to properly test MetricsProxy.collectMetrics(..) and MetricsGrabber.convertToMetricsHistogram(..)
+    // to properly test MetricsProxy.collectMetrics(..) and MetricsService.convertToMetricsHistogram(..)
     when(serverConn.queryNames(Mockito.any(ObjectName.class), Mockito.isNull())).thenReturn(Collections.emptySet());
 
     Node node = Node.builder().withClusterName("test").withHostname("127.0.0.1").build();
-    MetricsGrabber.create(cxt).getClientRequestLatencies(node);
+    MetricsService.create(cxt).getClientRequestLatencies(node);
     Mockito.verify(serverConn, Mockito.times(1)).queryNames(Mockito.any(ObjectName.class), Mockito.isNull());
   }
 }