[FLINK-21758][metrics] Remove unnecessary method implementations

mbalassi · Mar 30, 2021 · 47af443 · 47af443
1 parent 9c3c01e
commit 47af443
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 120 deletions.
diff --git a/flink-core/src/test/java/org/apache/flink/api/common/eventtime/WatermarkStrategyTest.java b/flink-core/src/test/java/org/apache/flink/api/common/eventtime/WatermarkStrategyTest.java
@@ -180,31 +180,16 @@ public MetricGroup getMetricGroup() {
  */
  public static class DummyMetricGroup implements MetricGroup {
 
- @Override
- public Counter counter(int name) {
- return null;
- }
-
  @Override
  public Counter counter(String name) {
  return null;
  }
 
- @Override
- public <C extends Counter> C counter(int name, C counter) {
- return null;
- }
-
  @Override
  public <C extends Counter> C counter(String name, C counter) {
  return null;
  }
 
- @Override
- public <T, G extends Gauge<T>> G gauge(int name, G gauge) {
- return null;
- }
-
  @Override
  public <T, G extends Gauge<T>> G gauge(String name, G gauge) {
  return null;
@@ -215,26 +200,11 @@ public <H extends Histogram> H histogram(String name, H histogram) {
  return null;
  }
 
- @Override
- public <H extends Histogram> H histogram(int name, H histogram) {
- return null;
- }
-
  @Override
  public <M extends Meter> M meter(String name, M meter) {
  return null;
  }
 
- @Override
- public <M extends Meter> M meter(int name, M meter) {
- return null;
- }
-
- @Override
- public MetricGroup addGroup(int name) {
- return null;
- }
-
  @Override
  public MetricGroup addGroup(String name) {
  return null;

diff --git a/...-metrics-core/src/main/java/org/apache/flink/metrics/groups/UnregisteredMetricsGroup.java b/...-metrics-core/src/main/java/org/apache/flink/metrics/groups/UnregisteredMetricsGroup.java
@@ -35,61 +35,31 @@
  */
 public class UnregisteredMetricsGroup implements MetricGroup {
 
- @Override
- public Counter counter(int name) {
- return new SimpleCounter();
- }
-
  @Override
  public Counter counter(String name) {
  return new SimpleCounter();
  }
 
- @Override
- public <C extends Counter> C counter(int name, C counter) {
- return counter;
- }
-
  @Override
  public <C extends Counter> C counter(String name, C counter) {
  return counter;
  }
 
- @Override
- public <T, G extends Gauge<T>> G gauge(int name, G gauge) {
- return gauge;
- }
-
  @Override
  public <T, G extends Gauge<T>> G gauge(String name, G gauge) {
  return gauge;
  }
 
- @Override
- public <H extends Histogram> H histogram(int name, H histogram) {
- return histogram;
- }
-
  @Override
  public <M extends Meter> M meter(String name, M meter) {
  return meter;
  }
 
- @Override
- public <M extends Meter> M meter(int name, M meter) {
- return meter;
- }
-
  @Override
  public <H extends Histogram> H histogram(String name, H histogram) {
  return histogram;
  }
 
- @Override
- public MetricGroup addGroup(int name) {
- return addGroup(String.valueOf(name));
- }
-
  @Override
  public MetricGroup addGroup(String name) {
  return new UnregisteredMetricsGroup();

diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/groups/AbstractMetricGroup.java b/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/groups/AbstractMetricGroup.java
@@ -345,54 +345,29 @@ public final boolean isClosed() {
  // Metrics
  // -----------------------------------------------------------------------------------------------------------------
 
- @Override
- public Counter counter(int name) {
- return counter(String.valueOf(name));
- }
-
  @Override
  public Counter counter(String name) {
  return counter(name, new SimpleCounter());
  }
 
- @Override
- public <C extends Counter> C counter(int name, C counter) {
- return counter(String.valueOf(name), counter);
- }
-
  @Override
  public <C extends Counter> C counter(String name, C counter) {
  addMetric(name, counter);
  return counter;
  }
 
- @Override
- public <T, G extends Gauge<T>> G gauge(int name, G gauge) {
- return gauge(String.valueOf(name), gauge);
- }
-
  @Override
  public <T, G extends Gauge<T>> G gauge(String name, G gauge) {
  addMetric(name, gauge);
  return gauge;
  }
 
- @Override
- public <H extends Histogram> H histogram(int name, H histogram) {
- return histogram(String.valueOf(name), histogram);
- }
-
  @Override
  public <H extends Histogram> H histogram(String name, H histogram) {
  addMetric(name, histogram);
  return histogram;
  }
 
- @Override
- public <M extends Meter> M meter(int name, M meter) {
- return meter(String.valueOf(name), meter);
- }
-
  @Override
  public <M extends Meter> M meter(String name, M meter) {
  addMetric(name, meter);
@@ -458,11 +433,6 @@ protected void addMetric(String name, Metric metric) {
  // Groups
  // ------------------------------------------------------------------------
 
- @Override
- public MetricGroup addGroup(int name) {
- return addGroup(String.valueOf(name), ChildType.GENERIC);
- }
-
  @Override
  public MetricGroup addGroup(String name) {
  return addGroup(name, ChildType.GENERIC);

diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/groups/ProxyMetricGroup.java b/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/groups/ProxyMetricGroup.java
@@ -42,31 +42,16 @@ public ProxyMetricGroup(P parentMetricGroup) {
  this.parentMetricGroup = checkNotNull(parentMetricGroup);
  }
 
- @Override
- public final Counter counter(int name) {
- return parentMetricGroup.counter(name);
- }
-
  @Override
  public final Counter counter(String name) {
  return parentMetricGroup.counter(name);
  }
 
- @Override
- public final <C extends Counter> C counter(int name, C counter) {
- return parentMetricGroup.counter(name, counter);
- }
-
  @Override
  public final <C extends Counter> C counter(String name, C counter) {
  return parentMetricGroup.counter(name, counter);
  }
 
- @Override
- public final <T, G extends Gauge<T>> G gauge(int name, G gauge) {
- return parentMetricGroup.gauge(name, gauge);
- }
-
  @Override
  public final <T, G extends Gauge<T>> G gauge(String name, G gauge) {
  return parentMetricGroup.gauge(name, gauge);
@@ -77,26 +62,11 @@ public final <H extends Histogram> H histogram(String name, H histogram) {
  return parentMetricGroup.histogram(name, histogram);
  }
 
- @Override
- public final <H extends Histogram> H histogram(int name, H histogram) {
- return parentMetricGroup.histogram(name, histogram);
- }
-
  @Override
  public <M extends Meter> M meter(String name, M meter) {
  return parentMetricGroup.meter(name, meter);
  }
 
- @Override
- public <M extends Meter> M meter(int name, M meter) {
- return parentMetricGroup.meter(name, meter);
- }
-
- @Override
- public final MetricGroup addGroup(int name) {
- return parentMetricGroup.addGroup(name);
- }
-
  @Override
  public final MetricGroup addGroup(String name) {
  return parentMetricGroup.addGroup(name);