Clean up unused MetricsPresentationConfig

5 files changed, 6 insertions, 10 deletions

diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricsPacketsHandler.java b/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricsPacketsHandler.java
index 824323af3d6..8d63dc54d80 100644
--- a/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricsPacketsHandler.java
+++ b/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricsPacketsHandler.java
@@ -67,11 +67,10 @@ public class MetricsPacketsHandler extends AbstractRequestHandler {
     public MetricsPacketsHandler(StateMonitor monitor,
                                  Timer timer,
                                  ComponentRegistry<SnapshotProvider> preprocessors,
-                                 MetricsPresentationConfig presentation,
                                  MetricsPacketsHandlerConfig config) {
         this.monitor = monitor;
         this.timer = timer;
-        snapshotPreprocessor = getSnapshotPreprocessor(preprocessors, presentation);
+        snapshotPreprocessor = getSnapshotPreprocessor(preprocessors);
         applicationName = config.application();
     }
 
diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/state/StateHandler.java b/container-core/src/main/java/com/yahoo/container/jdisc/state/StateHandler.java
index 5ac2871d9dd..572742d11e1 100644
--- a/container-core/src/main/java/com/yahoo/container/jdisc/state/StateHandler.java
+++ b/container-core/src/main/java/com/yahoo/container/jdisc/state/StateHandler.java
@@ -58,14 +58,14 @@ public class StateHandler extends AbstractRequestHandler {
 
     @Inject
     public StateHandler(StateMonitor monitor, Timer timer, ApplicationMetadataConfig config,
-                        ComponentRegistry<SnapshotProvider> preprocessors, MetricsPresentationConfig presentation) {
+                        ComponentRegistry<SnapshotProvider> preprocessors) {
         this.monitor = monitor;
         this.timer = timer;
         this.config = buildConfigOutput(config);
-        snapshotPreprocessor = getSnapshotPreprocessor(preprocessors, presentation);
+        snapshotPreprocessor = getSnapshotPreprocessor(preprocessors);
     }
 
-    static SnapshotProvider getSnapshotPreprocessor(ComponentRegistry<SnapshotProvider> preprocessors, MetricsPresentationConfig presentation) {
+    static SnapshotProvider getSnapshotPreprocessor(ComponentRegistry<SnapshotProvider> preprocessors) {
         List<SnapshotProvider> allPreprocessors = preprocessors.allComponents();
         return (allPreprocessors.size() > 0) ? allPreprocessors.get(0) : null;
     }
diff --git a/container-core/src/test/java/com/yahoo/container/jdisc/state/MetricsPacketsHandlerTest.java b/container-core/src/test/java/com/yahoo/container/jdisc/state/MetricsPacketsHandlerTest.java
index 89bde3eeb5b..5a386ed2d89 100644
--- a/container-core/src/test/java/com/yahoo/container/jdisc/state/MetricsPacketsHandlerTest.java
+++ b/container-core/src/test/java/com/yahoo/container/jdisc/state/MetricsPacketsHandlerTest.java
@@ -34,8 +34,7 @@ public class MetricsPacketsHandlerTest extends StateHandlerTestBase {
     public void setupHandler() {
         metricsPacketsHandlerConfig = new MetricsPacketsHandlerConfig(new MetricsPacketsHandlerConfig.Builder()
                                                                               .application(APPLICATION_NAME));
-        metricsPacketsHandler = new MetricsPacketsHandler(monitor, timer, snapshotProviderRegistry,
-                                                          metricsPresentationConfig, metricsPacketsHandlerConfig);
+        metricsPacketsHandler = new MetricsPacketsHandler(monitor, timer, snapshotProviderRegistry, metricsPacketsHandlerConfig);
         testDriver = new RequestHandlerTestDriver(metricsPacketsHandler);
     }
 
diff --git a/container-core/src/test/java/com/yahoo/container/jdisc/state/StateHandlerTest.java b/container-core/src/test/java/com/yahoo/container/jdisc/state/StateHandlerTest.java
index 385eb627427..0b7bf572e64 100644
--- a/container-core/src/test/java/com/yahoo/container/jdisc/state/StateHandlerTest.java
+++ b/container-core/src/test/java/com/yahoo/container/jdisc/state/StateHandlerTest.java
@@ -25,7 +25,7 @@ public class StateHandlerTest extends StateHandlerTestBase {
 
     @Before
     public void setupHandler() {
-        stateHandler = new StateHandler(monitor, timer, applicationMetadataConfig, snapshotProviderRegistry , metricsPresentationConfig);
+        stateHandler = new StateHandler(monitor, timer, applicationMetadataConfig, snapshotProviderRegistry);
         testDriver = new RequestHandlerTestDriver(stateHandler);
     }
 
diff --git a/container-core/src/test/java/com/yahoo/container/jdisc/state/StateHandlerTestBase.java b/container-core/src/test/java/com/yahoo/container/jdisc/state/StateHandlerTestBase.java
index 68c1ae10ec6..3dc8627ca74 100644
--- a/container-core/src/test/java/com/yahoo/container/jdisc/state/StateHandlerTestBase.java
+++ b/container-core/src/test/java/com/yahoo/container/jdisc/state/StateHandlerTestBase.java
@@ -31,7 +31,6 @@ public class StateHandlerTestBase {
 
     static HealthMonitorConfig healthMonitorConfig;
     static ApplicationMetadataConfig applicationMetadataConfig;
-    static MetricsPresentationConfig metricsPresentationConfig;
     static MetricsPacketsHandlerConfig metricsPacketsHandlerConfig;
 
     final AtomicLong currentTimeMillis = new AtomicLong(0);
@@ -42,7 +41,6 @@ public class StateHandlerTestBase {
 
     @BeforeClass
     public static void setupClass() {
-        metricsPresentationConfig = new MetricsPresentationConfig(new MetricsPresentationConfig.Builder());
         healthMonitorConfig = new HealthMonitorConfig(new HealthMonitorConfig.Builder()
                                                               .initialStatus("up"));
         applicationMetadataConfig = new ApplicationMetadataConfig(new ApplicationMetadataConfig.Builder()