Pārlūkot izejas kodu

Rename TestGangliaMetricsHelper to GangliaMetricsTestHelper.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.20-security@1145524 13f79535-47bb-0310-9956-ffa450edef68
Luke Lu 14 gadi atpakaļ
vecāks
revīzija
13d195298a

+ 6 - 18
src/core/org/apache/hadoop/metrics2/sink/ganglia/GangliaMetricVisitor.java

@@ -51,18 +51,14 @@ class GangliaMetricVisitor implements MetricsVisitor {
     return slope;
   }
 
-  /* (non-Javadoc)
-   * @see org.apache.hadoop.metrics2.MetricsVisitor#gauge(org.apache.hadoop.metrics2.MetricGauge, int)
-   */
+  @Override
   public void gauge(MetricGauge<Integer> metric, int value) {
     // MetricGaugeInt.class ==> "int32"
     type = INT32;
     slope = null; // set to null as cannot figure out from Metric
   }
 
-  /* (non-Javadoc)
-   * @see org.apache.hadoop.metrics2.MetricsVisitor#counter(org.apache.hadoop.metrics2.MetricCounter, int)
-   */
+  @Override
   public void counter(MetricCounter<Integer> metric, int value) {
     // MetricCounterInt.class ==> "int32"
     type = INT32;
@@ -71,18 +67,14 @@ class GangliaMetricVisitor implements MetricsVisitor {
     slope = GangliaSlope.positive;
   }
 
-  /* (non-Javadoc)
-   * @see org.apache.hadoop.metrics2.MetricsVisitor#gauge(org.apache.hadoop.metrics2.MetricGauge, long)
-   */
+  @Override
   public void gauge(MetricGauge<Long> metric, long value) {
     // MetricGaugeLong.class ==> "float"
     type = FLOAT;
     slope = null; // set to null as cannot figure out from Metric
   }
 
-  /* (non-Javadoc)
-   * @see org.apache.hadoop.metrics2.MetricsVisitor#counter(org.apache.hadoop.metrics2.MetricCounter, long)
-   */
+  @Override
   public void counter(MetricCounter<Long> metric, long value) {
     // MetricCounterLong.class ==> "float"
     type = FLOAT;
@@ -91,18 +83,14 @@ class GangliaMetricVisitor implements MetricsVisitor {
     slope = GangliaSlope.positive;
   }
 
-  /* (non-Javadoc)
-   * @see org.apache.hadoop.metrics2.MetricsVisitor#gauge(org.apache.hadoop.metrics2.MetricGauge, float)
-   */
+  @Override
   public void gauge(MetricGauge<Float> metric, float value) {
     // MetricGaugeFloat.class ==> "float"
     type = FLOAT;
     slope = null; // set to null as cannot figure out from Metric
   }
 
-  /* (non-Javadoc)
-   * @see org.apache.hadoop.metrics2.MetricsVisitor#gauge(org.apache.hadoop.metrics2.MetricGauge, double)
-   */
+  @Override
   public void gauge(MetricGauge<Double> metric, double value) {
     // MetricGaugeDouble.class ==> "double"
     type = DOUBLE;

+ 3 - 3
src/test/org/apache/hadoop/metrics2/impl/TestGangliaMetrics.java

@@ -36,7 +36,7 @@ import org.apache.hadoop.metrics2.lib.MetricMutableStat;
 import org.apache.hadoop.metrics2.sink.ganglia.AbstractGangliaSink;
 import org.apache.hadoop.metrics2.sink.ganglia.GangliaSink30;
 import org.apache.hadoop.metrics2.sink.ganglia.GangliaSink31;
-import org.apache.hadoop.metrics2.sink.ganglia.TestGangliaMetricsHelper;
+import org.apache.hadoop.metrics2.sink.ganglia.GangliaMetricsTestHelper;
 import org.junit.Test;
 
 public class TestGangliaMetrics {
@@ -61,12 +61,12 @@ public class TestGangliaMetrics {
     AbstractGangliaSink gsink30 = new GangliaSink30();
     gsink30.init(cb.subset("test"));
     MockDatagramSocket mockds30 = new MockDatagramSocket();
-    TestGangliaMetricsHelper.setDatagramSocket(gsink30, mockds30);
+    GangliaMetricsTestHelper.setDatagramSocket(gsink30, mockds30);
 
     AbstractGangliaSink gsink31 = new GangliaSink31();
     gsink31.init(cb.subset("test"));
     MockDatagramSocket mockds31 = new MockDatagramSocket();
-    TestGangliaMetricsHelper.setDatagramSocket(gsink31, mockds31);
+    GangliaMetricsTestHelper.setDatagramSocket(gsink31, mockds31);
 
     ms.register("gsink30", "gsink30 desc", gsink30);
     ms.register("gsink31", "gsink31 desc", gsink31);

+ 1 - 1
src/test/org/apache/hadoop/metrics2/sink/ganglia/TestGangliaMetricsHelper.java → src/test/org/apache/hadoop/metrics2/sink/ganglia/GangliaMetricsTestHelper.java

@@ -23,7 +23,7 @@ import java.net.DatagramSocket;
 /**
  * Helper class in the same package as ganglia sinks to be used by unit tests
  */
-public class TestGangliaMetricsHelper {
+public class GangliaMetricsTestHelper {
 
   /**
    * Helper method to access package private method to set DatagramSocket