Fix tests

Signed-off-by: Fabio Di Fabio <[email protected]>
hyperledger · Nov 25, 2024 · b0d9cc3 · b0d9cc3
1 parent 64dde71
commit b0d9cc3
Showing 1 changed file with 3 additions and 36 deletions.
diff --git a/metrics/core/src/main/java/org/hyperledger/besu/metrics/noop/NoOpMetricsSystem.java b/metrics/core/src/main/java/org/hyperledger/besu/metrics/noop/NoOpMetricsSystem.java
@@ -66,22 +66,6 @@ public class NoOpMetricsSystem implements ObservableMetricsSystem {
   public static final LabelledMetric<OperationTimer> NO_OP_LABELLED_1_OPERATION_TIMER =
       new LabelCountingNoOpMetric<>(1, NO_OP_OPERATION_TIMER);
 
-  /** The constant NO_OP_LABELLED_1_GAUGE. */
-  public static final LabelledSuppliedMetric NO_OP_LABELLED_1_GAUGE =
-      new LabelledSuppliedNoOpMetric(1);
-
-  /** The constant NO_OP_LABELLED_2_GAUGE. */
-  public static final LabelledSuppliedMetric NO_OP_LABELLED_2_GAUGE =
-      new LabelledSuppliedNoOpMetric(2);
-
-  /** The constant NO_OP_LABELLED_3_GAUGE. */
-  public static final LabelledSuppliedMetric NO_OP_LABELLED_3_GAUGE =
-      new LabelledSuppliedNoOpMetric(3);
-
-  /** The constant NO_OP_LABELLED_1_SUMMARY. */
-  public static final LabelledSuppliedSummary NO_OP_LABELLED_1_SUMMARY =
-      new LabelledSuppliedNoOpMetric(1);
-
   /** Default constructor */
   public NoOpMetricsSystem() {}
 
@@ -101,12 +85,7 @@ public LabelledMetric<Counter> createLabelledCounter(
    * @return the counter labelled metric
    */
   public static LabelledMetric<Counter> getCounterLabelledMetric(final int labelCount) {
-    return switch (labelCount) {
-      case 1 -> NO_OP_LABELLED_1_COUNTER;
-      case 2 -> NO_OP_LABELLED_2_COUNTER;
-      case 3 -> NO_OP_LABELLED_3_COUNTER;
-      default -> new LabelCountingNoOpMetric<>(labelCount, NO_OP_COUNTER);
-    };
+    return new LabelCountingNoOpMetric<>(labelCount, NO_OP_COUNTER);
   }
 
   @Override
@@ -144,11 +123,7 @@ public LabelledMetric<OperationTimer> createLabelledTimer(
    */
   public static LabelledMetric<OperationTimer> getOperationTimerLabelledMetric(
       final int labelCount) {
-    if (labelCount == 1) {
-      return NO_OP_LABELLED_1_OPERATION_TIMER;
-    } else {
       return new LabelCountingNoOpMetric<>(labelCount, NO_OP_OPERATION_TIMER);
-    }
   }
 
   @Override
@@ -187,12 +162,7 @@ public LabelledSuppliedMetric createLabelledSuppliedGauge(
    * @return the labelled gauge
    */
   public static LabelledSuppliedMetric getLabelledSuppliedMetric(final int labelCount) {
-    return switch (labelCount) {
-      case 1 -> NO_OP_LABELLED_1_GAUGE;
-      case 2 -> NO_OP_LABELLED_2_GAUGE;
-      case 3 -> NO_OP_LABELLED_3_GAUGE;
-      default -> new LabelledSuppliedNoOpMetric(labelCount);
-    };
+      return new LabelledSuppliedNoOpMetric(labelCount);
   }
 
   /**
@@ -202,10 +172,7 @@ public static LabelledSuppliedMetric getLabelledSuppliedMetric(final int labelCo
    * @return the labelled gauge
    */
   public static LabelledSuppliedSummary getLabelledSuppliedSummary(final int labelCount) {
-    return switch (labelCount) {
-      case 1 -> NO_OP_LABELLED_1_SUMMARY;
-      default -> new LabelledSuppliedNoOpMetric(labelCount);
-    };
+      return new LabelledSuppliedNoOpMetric(labelCount);
   }
 
   @Override