Moved MetricsRegistry and HealthCheckRegistry into core.

tomdz · Aug 15, 2011 · 203e43a · 203e43a
1 parent eae8897
commit 203e43a
Show file tree

Hide file tree

Showing 21 changed files with 24 additions and 30 deletions.
diff --git a/metrics-core/src/main/java/com/yammer/metrics/HealthChecks.java b/metrics-core/src/main/java/com/yammer/metrics/HealthChecks.java
@@ -2,6 +2,7 @@
 
 import com.yammer.metrics.core.HealthCheck;
 import com.yammer.metrics.core.HealthCheck.Result;
+import com.yammer.metrics.core.HealthCheckRegistry;
 
 import java.util.Map;
 

diff --git a/...m/yammer/metrics/HealthCheckRegistry.java → ...mer/metrics/core/HealthCheckRegistry.java b/...m/yammer/metrics/HealthCheckRegistry.java → ...mer/metrics/core/HealthCheckRegistry.java
@@ -1,4 +1,4 @@
-package com.yammer.metrics;
+package com.yammer.metrics.core;
 
 import com.yammer.metrics.core.HealthCheck;
 import com.yammer.metrics.core.HealthCheck.Result;

diff --git a/metrics-core/src/main/java/com/yammer/metrics/core/MeterMetric.java b/metrics-core/src/main/java/com/yammer/metrics/core/MeterMetric.java
@@ -1,7 +1,6 @@
 package com.yammer.metrics.core;
 
 import com.yammer.metrics.Metrics;
-import com.yammer.metrics.MetricsRegistry;
 import com.yammer.metrics.stats.EWMA;
 import com.yammer.metrics.util.Utils;
 

diff --git a/...a/com/yammer/metrics/MetricsRegistry.java → .../yammer/metrics/core/MetricsRegistry.java b/...a/com/yammer/metrics/MetricsRegistry.java → .../yammer/metrics/core/MetricsRegistry.java
@@ -1,4 +1,4 @@
-package com.yammer.metrics;
+package com.yammer.metrics.core;
 
 import com.yammer.metrics.core.*;
 import com.yammer.metrics.core.HistogramMetric.SampleType;

diff --git a/metrics-core/src/main/java/com/yammer/metrics/core/TimerMetric.java b/metrics-core/src/main/java/com/yammer/metrics/core/TimerMetric.java
@@ -1,7 +1,6 @@
 package com.yammer.metrics.core;
 
 import com.yammer.metrics.Metrics;
-import com.yammer.metrics.MetricsRegistry;
 import com.yammer.metrics.core.HistogramMetric.SampleType;
 
 import java.util.ArrayList;

diff --git a/metrics-core/src/main/java/com/yammer/metrics/reporting/ConsoleReporter.java b/metrics-core/src/main/java/com/yammer/metrics/reporting/ConsoleReporter.java
@@ -1,7 +1,7 @@
 package com.yammer.metrics.reporting;
 
 import com.yammer.metrics.Metrics;
-import com.yammer.metrics.MetricsRegistry;
+import com.yammer.metrics.core.MetricsRegistry;
 import com.yammer.metrics.core.*;
 import com.yammer.metrics.util.Utils;
 

diff --git a/metrics-core/src/main/java/com/yammer/metrics/reporting/JmxReporter.java b/metrics-core/src/main/java/com/yammer/metrics/reporting/JmxReporter.java
@@ -1,7 +1,6 @@
 package com.yammer.metrics.reporting;
 
-import com.yammer.metrics.Metrics;
-import com.yammer.metrics.MetricsRegistry;
+import com.yammer.metrics.core.MetricsRegistry;
 import com.yammer.metrics.core.*;
 
 import javax.management.*;

diff --git a/metrics-core/src/main/java/com/yammer/metrics/util/Utils.java b/metrics-core/src/main/java/com/yammer/metrics/util/Utils.java
@@ -1,6 +1,5 @@
 package com.yammer.metrics.util;
 
-import com.yammer.metrics.MetricsRegistry;
 import com.yammer.metrics.core.Metric;
 import com.yammer.metrics.core.MetricName;
 
@@ -40,15 +39,15 @@ public static Map<String, Map<String, Metric>> sortMetrics(Map<MetricName, Metri
      * @param poolSize the number of threads to create
      * @param name the name of the pool
      * @return a new {@link ScheduledExecutorService}
-     * @deprecated Get a thread pool via {@link MetricsRegistry#threadPools()} instead
+     * @deprecated Get a thread pool via {@link com.yammer.metrics.core.MetricsRegistry#threadPools()} instead
      */
     public static ScheduledExecutorService newScheduledThreadPool(int poolSize, String name) {
         return THREAD_POOLS.newScheduledThreadPool(poolSize, name);
     }
 
     /**
      * Shuts down all thread pools created by this class in an orderly fashion.
-     * @deprecated Shut down the thread pools object of the relevant {@link MetricsRegistry} instead
+     * @deprecated Shut down the thread pools object of the relevant {@link com.yammer.metrics.core.MetricsRegistry} instead
      */
     public static void shutdownThreadPools() {
         THREAD_POOLS.shutdownThreadPools();

diff --git a/metrics-graphite/src/main/java/com/yammer/metrics/reporting/GraphiteReporter.java b/metrics-graphite/src/main/java/com/yammer/metrics/reporting/GraphiteReporter.java
@@ -1,7 +1,7 @@
 package com.yammer.metrics.reporting;
 
 import com.yammer.metrics.Metrics;
-import com.yammer.metrics.MetricsRegistry;
+import com.yammer.metrics.core.MetricsRegistry;
 import com.yammer.metrics.core.*;
 import com.yammer.metrics.util.Utils;
 

diff --git a/metrics-guice/src/main/java/com/yammer/metrics/guice/GaugeInjectionListener.java b/metrics-guice/src/main/java/com/yammer/metrics/guice/GaugeInjectionListener.java
@@ -2,7 +2,7 @@
 
 import com.google.inject.TypeLiteral;
 import com.google.inject.spi.InjectionListener;
-import com.yammer.metrics.MetricsRegistry;
+import com.yammer.metrics.core.MetricsRegistry;
 import com.yammer.metrics.core.GaugeMetric;
 
 import java.lang.reflect.Method;

diff --git a/metrics-guice/src/main/java/com/yammer/metrics/guice/GaugeListener.java b/metrics-guice/src/main/java/com/yammer/metrics/guice/GaugeListener.java
@@ -3,7 +3,7 @@
 import com.google.inject.TypeLiteral;
 import com.google.inject.spi.TypeEncounter;
 import com.google.inject.spi.TypeListener;
-import com.yammer.metrics.MetricsRegistry;
+import com.yammer.metrics.core.MetricsRegistry;
 
 import java.lang.reflect.Method;
 

diff --git a/metrics-guice/src/main/java/com/yammer/metrics/guice/InstrumentationModule.java b/metrics-guice/src/main/java/com/yammer/metrics/guice/InstrumentationModule.java
@@ -2,8 +2,8 @@
 
 import com.google.inject.AbstractModule;
 import com.google.inject.matcher.Matchers;
-import com.yammer.metrics.HealthCheckRegistry;
-import com.yammer.metrics.MetricsRegistry;
+import com.yammer.metrics.core.HealthCheckRegistry;
+import com.yammer.metrics.core.MetricsRegistry;
 import com.yammer.metrics.reporting.JmxReporter;
 
 /**

diff --git a/metrics-guice/src/main/java/com/yammer/metrics/guice/JmxReporterProvider.java b/metrics-guice/src/main/java/com/yammer/metrics/guice/JmxReporterProvider.java
@@ -2,7 +2,7 @@
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;
-import com.yammer.metrics.MetricsRegistry;
+import com.yammer.metrics.core.MetricsRegistry;
 import com.yammer.metrics.reporting.JmxReporter;
 
 public class JmxReporterProvider implements Provider<JmxReporter>

diff --git a/metrics-guice/src/main/java/com/yammer/metrics/guice/MeteredListener.java b/metrics-guice/src/main/java/com/yammer/metrics/guice/MeteredListener.java
@@ -4,7 +4,7 @@
 import com.google.inject.matcher.Matchers;
 import com.google.inject.spi.TypeEncounter;
 import com.google.inject.spi.TypeListener;
-import com.yammer.metrics.MetricsRegistry;
+import com.yammer.metrics.core.MetricsRegistry;
 import com.yammer.metrics.core.MeterMetric;
 
 import java.lang.reflect.Method;

diff --git a/metrics-guice/src/main/java/com/yammer/metrics/guice/TimedListener.java b/metrics-guice/src/main/java/com/yammer/metrics/guice/TimedListener.java
@@ -4,7 +4,7 @@
 import com.google.inject.matcher.Matchers;
 import com.google.inject.spi.TypeEncounter;
 import com.google.inject.spi.TypeListener;
-import com.yammer.metrics.MetricsRegistry;
+import com.yammer.metrics.core.MetricsRegistry;
 import com.yammer.metrics.core.TimerMetric;
 
 import java.lang.reflect.Method;

diff --git a/metrics-guice/src/test/scala/com/yammer/metrics/guice/tests/GaugeSpec.scala b/metrics-guice/src/test/scala/com/yammer/metrics/guice/tests/GaugeSpec.scala
@@ -4,8 +4,7 @@ import com.codahale.simplespec.Spec
 import com.codahale.simplespec.annotation.test
 import com.yammer.metrics.guice.{InstrumentationModule, Gauge}
 import com.google.inject.Guice
-import com.yammer.metrics.MetricsRegistry
-import com.yammer.metrics.core.{GaugeMetric, MetricName}
+import com.yammer.metrics.core.{MetricsRegistry, GaugeMetric, MetricName}
 
 class InstrumentedWithGauge {
   @Gauge(name = "things")

diff --git a/metrics-guice/src/test/scala/com/yammer/metrics/guice/tests/MeteredSpec.scala b/metrics-guice/src/test/scala/com/yammer/metrics/guice/tests/MeteredSpec.scala
@@ -1,12 +1,11 @@
 package com.yammer.metrics.guice.tests
 
 import com.codahale.simplespec.Spec
+import com.codahale.simplespec.annotation.test
 import java.util.concurrent.TimeUnit
 import com.google.inject.Guice
 import com.yammer.metrics.guice.{InstrumentationModule, Metered}
-import com.yammer.metrics.MetricsRegistry
-import com.yammer.metrics.core.{MeterMetric, MetricName}
-import com.codahale.simplespec.annotation.test
+import com.yammer.metrics.core.{MetricsRegistry, MeterMetric, MetricName}
 
 class InstrumentedWithMetered {
   @Metered(name = "things", eventType = "poops", rateUnit = TimeUnit.MINUTES)

diff --git a/metrics-guice/src/test/scala/com/yammer/metrics/guice/tests/TimedSpec.scala b/metrics-guice/src/test/scala/com/yammer/metrics/guice/tests/TimedSpec.scala
@@ -5,8 +5,7 @@ import com.codahale.simplespec.annotation.test
 import java.util.concurrent.TimeUnit
 import com.google.inject.Guice
 import com.yammer.metrics.guice.{InstrumentationModule, Timed}
-import com.yammer.metrics.MetricsRegistry
-import com.yammer.metrics.core.{TimerMetric, MetricName}
+import com.yammer.metrics.core.{MetricsRegistry, TimerMetric, MetricName}
 
 class InstrumentedWithTimed {
   @Timed(name = "things", rateUnit = TimeUnit.MINUTES, durationUnit = TimeUnit.MICROSECONDS)

diff --git a/metrics-servlet/src/main/java/com/yammer/metrics/reporting/MetricsServlet.java b/metrics-servlet/src/main/java/com/yammer/metrics/reporting/MetricsServlet.java
@@ -1,9 +1,9 @@
 package com.yammer.metrics.reporting;
 
-import com.yammer.metrics.HealthCheckRegistry;
+import com.yammer.metrics.core.HealthCheckRegistry;
 import com.yammer.metrics.HealthChecks;
 import com.yammer.metrics.Metrics;
-import com.yammer.metrics.MetricsRegistry;
+import com.yammer.metrics.core.MetricsRegistry;
 import com.yammer.metrics.core.*;
 import com.yammer.metrics.core.HealthCheck.Result;
 import com.yammer.metrics.util.Utils;

diff --git a/...ics-servlet/src/main/java/com/yammer/metrics/reporting/MetricsServletContextListener.java b/...ics-servlet/src/main/java/com/yammer/metrics/reporting/MetricsServletContextListener.java
@@ -1,6 +1,6 @@
 package com.yammer.metrics.reporting;
 
-import com.yammer.metrics.MetricsRegistry;
+import com.yammer.metrics.core.MetricsRegistry;
 import com.yammer.metrics.util.Utils;
 
 import javax.servlet.ServletContext;

diff --git a/metrics-servlet/src/main/java/com/yammer/metrics/reporting/guice/MetricsServletProvider.java b/metrics-servlet/src/main/java/com/yammer/metrics/reporting/guice/MetricsServletProvider.java
@@ -2,13 +2,13 @@
 
 import java.util.Set;
 
+import com.yammer.metrics.core.HealthCheckRegistry;
+import com.yammer.metrics.core.MetricsRegistry;
 import org.codehaus.jackson.JsonFactory;
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;
 import com.google.inject.name.Named;
-import com.yammer.metrics.HealthCheckRegistry;
-import com.yammer.metrics.MetricsRegistry;
 import com.yammer.metrics.core.HealthCheck;
 import com.yammer.metrics.reporting.MetricsServlet;