summaryrefslogtreecommitdiffstats
path: root/container-disc/src
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@oath.com>2017-11-02 16:29:25 +0100
committerBjørn Christian Seime <bjorncs@oath.com>2017-11-02 16:29:25 +0100
commitbcc333236452992f657bbfc15c22fa46f63595ed (patch)
tree22bab0a35218af7e5656127844a082dfa90022a2 /container-disc/src
parent25a2dc312d6b1b8e8dbefce9e06f9bd4619bd176 (diff)
Work around akward semantics with TemporalAmount/Duration
Diffstat (limited to 'container-disc/src')
-rw-r--r--container-disc/src/main/java/com/yahoo/container/jdisc/metric/MetricUpdater.java8
-rw-r--r--container-disc/src/test/java/com/yahoo/container/jdisc/metric/MetricUpdaterTest.java4
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