No real changes

2 files changed, 2 insertions, 17 deletions

diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/ContainerThreadFactory.java b/container-disc/src/main/java/com/yahoo/container/jdisc/ContainerThreadFactory.java
index 92969ef9e97..b087c4e80b3 100644
--- a/container-disc/src/main/java/com/yahoo/container/jdisc/ContainerThreadFactory.java
+++ b/container-disc/src/main/java/com/yahoo/container/jdisc/ContainerThreadFactory.java
@@ -3,7 +3,6 @@ package com.yahoo.container.jdisc;
 
 import com.yahoo.container.jdisc.metric.MetricConsumerProvider;
 import com.yahoo.jdisc.application.ContainerThread;
-import com.yahoo.jdisc.application.MetricConsumer;
 
 import java.util.concurrent.ThreadFactory;
 
@@ -15,14 +14,7 @@ public class ContainerThreadFactory implements ThreadFactory {
     private final ThreadFactory delegate;
 
     public ContainerThreadFactory(MetricConsumerProvider metricConsumerProvider) {
-        metricConsumerProvider.getClass(); // throws NullPointerException
-        delegate = new ContainerThread.Factory(new com.google.inject.Provider<MetricConsumer>() {
-
-            @Override
-            public MetricConsumer get() {
-                return metricConsumerProvider.newInstance();
-            }
-        });
+        delegate = new ContainerThread.Factory(metricConsumerProvider::newInstance);
     }
 
     @Override
diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/metric/MetricProvider.java b/container-disc/src/main/java/com/yahoo/container/jdisc/metric/MetricProvider.java
index b547b3dd897..1afe152a420 100644
--- a/container-disc/src/main/java/com/yahoo/container/jdisc/metric/MetricProvider.java
+++ b/container-disc/src/main/java/com/yahoo/container/jdisc/metric/MetricProvider.java
@@ -3,7 +3,6 @@ package com.yahoo.container.jdisc.metric;
 
 import com.yahoo.container.di.componentgraph.Provider;
 import com.yahoo.jdisc.Metric;
-import com.yahoo.jdisc.application.MetricConsumer;
 
 /**
  * An implementation of {@link Provider} component of <code>Metric</code>. Because this class depends on {@link
@@ -17,13 +16,7 @@ public final class MetricProvider implements Provider<Metric> {
     private final Metric metric;
 
     public MetricProvider(MetricConsumerProvider provider) {
-        metric = new com.yahoo.jdisc.application.MetricProvider(new com.google.inject.Provider<MetricConsumer>() {
-
-            @Override
-            public MetricConsumer get() {
-                return provider.newInstance();
-            }
-        }).get();
+        metric = new com.yahoo.jdisc.application.MetricProvider(provider::newInstance).get();
     }
 
     @Override