Drop the health check singleton methods.

codahale · codahale · commit 2991f905fe7d · 2012-10-19T14:02:37.000-07:00
diff --git a/metrics-core/src/main/java/com/yammer/metrics/HealthChecks.java b/metrics-core/src/main/java/com/yammer/metrics/HealthChecks.java
@@ -1,37 +1,15 @@
 package com.yammer.metrics;
 
-import com.yammer.metrics.core.HealthCheck;
-import com.yammer.metrics.core.HealthCheck.Result;
 import com.yammer.metrics.core.HealthCheckRegistry;
 
-import java.util.Map;
-
 /**
- * A manager class for health checks.
+ * A default health check registry.
  */
 public class HealthChecks {
     private static final HealthCheckRegistry DEFAULT_REGISTRY = new HealthCheckRegistry();
 
     private HealthChecks() { /* unused */ }
 
-    /**
-     * Registers an application {@link HealthCheck} with a given name.
-     *
-     * @param healthCheck the {@link HealthCheck} instance
-     */
-    public static void register(HealthCheck healthCheck) {
-        DEFAULT_REGISTRY.register(healthCheck);
-    }
-
-    /**
-     * Runs the registered health checks and returns a map of the results.
-     *
-     * @return a map of the health check results
-     */
-    public static Map<String, Result> runHealthChecks() {
-        return DEFAULT_REGISTRY.runHealthChecks();
-    }
-
     /**
      * Returns the (static) default registry.
      *
diff --git a/metrics-core/src/test/java/com/yammer/metrics/tests/HealthChecksTest.java b/metrics-core/src/test/java/com/yammer/metrics/tests/HealthChecksTest.java
@@ -8,11 +8,12 @@
 
 import java.util.Map;
 
-import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertThat;
 
 public class HealthChecksTest {
+    private final HealthCheckRegistry registry = HealthChecks.defaultRegistry();
+
     private static class ExampleHealthCheck extends HealthCheck {
         private ExampleHealthCheck() {
             super("example");
@@ -26,20 +27,14 @@ protected Result check() throws Exception {
 
     @Before
     public void setUp() throws Exception {
-        HealthChecks.register(new ExampleHealthCheck());
+        registry.register(new ExampleHealthCheck());
     }
 
     @Test
     public void runsRegisteredHealthChecks() throws Exception {
-        final Map<String, HealthCheck.Result> results = HealthChecks.runHealthChecks();
+        final Map<String, HealthCheck.Result> results = registry.runHealthChecks();
 
         assertThat(results.get("example"),
                    is(HealthCheck.Result.healthy("whee")));
     }
-
-    @Test
-    public void hasADefaultRegistry() throws Exception {
-        assertThat(HealthChecks.defaultRegistry(),
-                   is(instanceOf(HealthCheckRegistry.class)));
-    }
 }
