From bcc333236452992f657bbfc15c22fa46f63595ed Mon Sep 17 00:00:00 2001 From: Bjørn Christian Seime Date: Thu, 2 Nov 2017 16:29:25 +0100 Subject: Work around akward semantics with TemporalAmount/Duration --- .../main/java/com/yahoo/container/jdisc/metric/MetricUpdater.java | 8 +++----- .../java/com/yahoo/container/jdisc/metric/MetricUpdaterTest.java | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/metric/MetricUpdater.java b/container-disc/src/main/java/com/yahoo/container/jdisc/metric/MetricUpdater.java index 9dbba6d351b..05445d26e27 100644 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/metric/MetricUpdater.java +++ b/container-disc/src/main/java/com/yahoo/container/jdisc/metric/MetricUpdater.java @@ -11,8 +11,6 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.time.Duration; -import java.time.temporal.ChronoUnit; -import java.time.temporal.TemporalAmount; import java.util.Timer; import java.util.TimerTask; @@ -121,8 +119,8 @@ public class MetricUpdater extends AbstractComponent { private final Timer timer = new Timer(); @Override - public void schedule(Runnable runnable, TemporalAmount frequency) { - long frequencyMillis = frequency.get(ChronoUnit.MILLIS); + public void schedule(Runnable runnable, Duration frequency) { + long frequencyMillis = frequency.toMillis(); timer.schedule(new TimerTask() { @Override public void run() { @@ -138,7 +136,7 @@ public class MetricUpdater extends AbstractComponent { } interface Scheduler { - void schedule(Runnable runnable, TemporalAmount frequency); + void schedule(Runnable runnable, Duration frequency); void cancel(); } } diff --git a/container-disc/src/test/java/com/yahoo/container/jdisc/metric/MetricUpdaterTest.java b/container-disc/src/test/java/com/yahoo/container/jdisc/metric/MetricUpdaterTest.java index c165757ecb1..66d0686244d 100644 --- a/container-disc/src/test/java/com/yahoo/container/jdisc/metric/MetricUpdaterTest.java +++ b/container-disc/src/test/java/com/yahoo/container/jdisc/metric/MetricUpdaterTest.java @@ -5,7 +5,7 @@ import com.yahoo.jdisc.Metric; import com.yahoo.jdisc.statistics.ActiveContainerMetrics; import org.junit.Test; -import java.time.temporal.TemporalAmount; +import java.time.Duration; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; @@ -29,7 +29,7 @@ public class MetricUpdaterTest { private static class MockScheduler implements MetricUpdater.Scheduler { @Override - public void schedule(Runnable runnable, TemporalAmount frequency) { + public void schedule(Runnable runnable, Duration frequency) { runnable.run(); } @Override -- cgit v1.2.3