Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update scheduling package to use java.time

Browse Source 
This commit deprecates all methods in org.springframework.scheduling
that use

- Date, in favor of variants that take an Instant.
- long & TimeUnit, in favor of variants that take a Duration.

Closes: gh-28714
This commit is contained in:
Arjen Poutsma
2022-07-05 10:32:47 +02:00
parent 8ccf05adee
commit 9b739a2310
38 changed files with 791 additions and 412 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-context/src/test/java/org/springframework/scheduling/annotation/EnableSchedulingTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2020 the original author or authors.
* Copyright 2002-2022 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,8 +16,10 @@
package org.springframework.scheduling.annotation;
import java.time.Duration;
import java.time.Instant;
import java.time.temporal.ChronoUnit;
import java.util.Arrays;
import java.util.Date;
import java.util.concurrent.atomic.AtomicInteger;
import org.junit.jupiter.api.AfterEach;
@@ -176,7 +178,7 @@ public class EnableSchedulingTests {
@Override
public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
taskRegistrar.addFixedRateTask(() -> {}, 100);
taskRegistrar.addFixedRateTask(() -> {}, Duration.ofMillis(100));
}
@Bean
@@ -423,7 +425,7 @@ public class EnableSchedulingTests {
taskRegistrar.setScheduler(taskScheduler());
taskRegistrar.addFixedRateTask(new IntervalTask(
() -> worker().executedByThread = Thread.currentThread().getName(),
10, 0));
Duration.ofMillis(10)));
}
}
@@ -441,7 +443,7 @@ public class EnableSchedulingTests {
ThreadPoolTaskScheduler scheduler = new ThreadPoolTaskScheduler();
scheduler.initialize();
scheduler.schedule(() -> counter().incrementAndGet(),
triggerContext -> new Date(new Date().getTime()+10));
triggerContext -> Instant.now().plus(10, ChronoUnit.MILLIS));
return scheduler;
}
}

67
spring-context/src/test/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessorTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2021 the original author or authors.
* Copyright 2002-2022 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -22,13 +22,14 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import java.lang.reflect.Method;
import java.util.Calendar;
import java.util.Date;
import java.time.Duration;
import java.time.Instant;
import java.time.ZoneId;
import java.time.ZonedDateTime;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.TimeZone;
import java.util.concurrent.TimeUnit;
import org.junit.jupiter.api.AfterEach;
@@ -118,8 +119,8 @@ class ScheduledAnnotationBeanPostProcessorTests {
Method targetMethod = runnable.getMethod();
assertThat(targetObject).isEqualTo(target);
assertThat(targetMethod.getName()).isEqualTo("fixedDelay");
assertThat(task.getInitialDelay()).isEqualTo(0L);
assertThat(task.getInterval()).isEqualTo(expectedInterval);
assertThat(task.getInitialDelayDuration()).isZero();
assertThat(task.getIntervalDuration()).isEqualTo(Duration.ofMillis(expectedInterval));
}
@ParameterizedTest
@@ -152,8 +153,8 @@ class ScheduledAnnotationBeanPostProcessorTests {
assertThat(targetObject).isEqualTo(target);
assertThat(targetMethod.getName()).isEqualTo("fixedRate");
assertSoftly(softly -> {
softly.assertThat(task.getInitialDelay()).as("initial delay").isEqualTo(0);
softly.assertThat(task.getInterval()).as("interval").isEqualTo(expectedInterval);
softly.assertThat(task.getInitialDelayDuration()).as("initial delay").isZero();
softly.assertThat(task.getIntervalDuration()).as("interval").isEqualTo(Duration.ofMillis(expectedInterval));
});
}
@@ -187,8 +188,8 @@ class ScheduledAnnotationBeanPostProcessorTests {
assertThat(targetObject).isEqualTo(target);
assertThat(targetMethod.getName()).isEqualTo("fixedRate");
assertSoftly(softly -> {
softly.assertThat(task.getInitialDelay()).as("initial delay").isEqualTo(expectedInitialDelay);
softly.assertThat(task.getInterval()).as("interval").isEqualTo(expectedInterval);
softly.assertThat(task.getInitialDelayDuration()).as("initial delay").isEqualTo(Duration.ofMillis(expectedInitialDelay));
softly.assertThat(task.getIntervalDuration()).as("interval").isEqualTo(Duration.ofMillis(expectedInterval));
});
}
@@ -251,16 +252,16 @@ class ScheduledAnnotationBeanPostProcessorTests {
Method targetMethod = runnable1.getMethod();
assertThat(targetObject).isEqualTo(target);
assertThat(targetMethod.getName()).isEqualTo("fixedRate");
assertThat(task1.getInitialDelay()).isEqualTo(0);
assertThat(task1.getInterval()).isEqualTo(4_000L);
assertThat(task1.getInitialDelayDuration()).isZero();
assertThat(task1.getIntervalDuration()).isEqualTo(Duration.ofMillis(4_000L));
IntervalTask task2 = fixedRateTasks.get(1);
ScheduledMethodRunnable runnable2 = (ScheduledMethodRunnable) task2.getRunnable();
targetObject = runnable2.getTarget();
targetMethod = runnable2.getMethod();
assertThat(targetObject).isEqualTo(target);
assertThat(targetMethod.getName()).isEqualTo("fixedRate");
assertThat(task2.getInitialDelay()).isEqualTo(2_000L);
assertThat(task2.getInterval()).isEqualTo(4_000L);
assertThat(task2.getInitialDelayDuration()).isEqualTo(Duration.ofMillis(2_000L));
assertThat(task2.getIntervalDuration()).isEqualTo(Duration.ofMillis(4_000L));
}
@Test
@@ -320,20 +321,20 @@ class ScheduledAnnotationBeanPostProcessorTests {
boolean condition = trigger instanceof CronTrigger;
assertThat(condition).isTrue();
CronTrigger cronTrigger = (CronTrigger) trigger;
Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("GMT+10"));
cal.clear();
cal.set(2013, 3, 15, 4, 0); // 15-04-2013 4:00 GMT+10
Date lastScheduledExecutionTime = cal.getTime();
Date lastActualExecutionTime = cal.getTime();
cal.add(Calendar.MINUTE, 30); // 4:30
Date lastCompletionTime = cal.getTime();
ZonedDateTime dateTime = ZonedDateTime.of(2013, 4, 15, 4, 0, 0, 0, ZoneId.of("GMT+10"));
// Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("GMT+10"));
// cal.clear();
// cal.set(2013, 3, 15, 4, 0); // 15-04-2013 4:00 GMT+10;
Instant lastScheduledExecution = dateTime.toInstant();
Instant lastActualExecution = dateTime.toInstant();
dateTime = dateTime.plusMinutes(30);
Instant lastCompletion = dateTime.toInstant();
TriggerContext triggerContext = new SimpleTriggerContext(
lastScheduledExecutionTime, lastActualExecutionTime, lastCompletionTime);
cal.add(Calendar.MINUTE, 30);
cal.add(Calendar.HOUR_OF_DAY, 1); // 6:00
Date nextExecutionTime = cronTrigger.nextExecutionTime(triggerContext);
lastScheduledExecution, lastActualExecution, lastCompletion);
dateTime = dateTime.plusMinutes(90); // 6:00
Instant nextExecutionTime = cronTrigger.nextExecution(triggerContext);
// assert that 6:00 is next execution time
assertThat(nextExecutionTime).isEqualTo(cal.getTime());
assertThat(nextExecutionTime).isEqualTo(dateTime.toInstant());
}
@Test
@@ -407,7 +408,7 @@ class ScheduledAnnotationBeanPostProcessorTests {
Method targetMethod = runnable.getMethod();
assertThat(targetObject).isEqualTo(target);
assertThat(targetMethod.getName()).isEqualTo("checkForUpdates");
assertThat(task.getInterval()).isEqualTo(5_000L);
assertThat(task.getIntervalDuration()).isEqualTo(Duration.ofMillis(5_000L));
}
@Test
@@ -434,8 +435,8 @@ class ScheduledAnnotationBeanPostProcessorTests {
Method targetMethod = runnable.getMethod();
assertThat(targetObject).isEqualTo(target);
assertThat(targetMethod.getName()).isEqualTo("checkForUpdates");
assertThat(task.getInterval()).isEqualTo(5_000L);
assertThat(task.getInitialDelay()).isEqualTo(1_000L);
assertThat(task.getIntervalDuration()).isEqualTo(Duration.ofMillis(5_000L));
assertThat(task.getInitialDelayDuration()).isEqualTo(Duration.ofMillis(1_000L));
}
@Test
@@ -555,8 +556,8 @@ class ScheduledAnnotationBeanPostProcessorTests {
assertThat(targetObject).isEqualTo(target);
assertThat(targetMethod.getName()).isEqualTo("fixedDelay");
assertSoftly(softly -> {
softly.assertThat(task.getInitialDelay()).as("initial delay").isEqualTo(expectedInitialDelay);
softly.assertThat(task.getInterval()).as("interval").isEqualTo(expectedInterval);
softly.assertThat(task.getInitialDelayDuration()).as("initial delay").isEqualTo(Duration.ofMillis(expectedInitialDelay));
softly.assertThat(task.getIntervalDuration()).as("interval").isEqualTo(Duration.ofMillis(expectedInterval));
});
}
@@ -599,8 +600,8 @@ class ScheduledAnnotationBeanPostProcessorTests {
assertThat(targetObject).isEqualTo(target);
assertThat(targetMethod.getName()).isEqualTo("fixedRate");
assertSoftly(softly -> {
softly.assertThat(task.getInitialDelay()).as("initial delay").isEqualTo(expectedInitialDelay);
softly.assertThat(task.getInterval()).as("interval").isEqualTo(expectedInterval);
softly.assertThat(task.getInitialDelayDuration()).as("initial delay").isEqualTo(Duration.ofMillis(expectedInitialDelay));
softly.assertThat(task.getIntervalDuration()).as("interval").isEqualTo(Duration.ofMillis(expectedInterval));
});
}

7
spring-context/src/test/java/org/springframework/scheduling/concurrent/ThreadPoolTaskSchedulerTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2020 the original author or authors.
* Copyright 2002-2022 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
package org.springframework.scheduling.concurrent;
import java.time.Instant;
import java.util.Date;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutionException;
@@ -182,11 +183,11 @@ public class ThreadPoolTaskSchedulerTests extends AbstractSchedulingTaskExecutor
}
@Override
public Date nextExecutionTime(TriggerContext triggerContext) {
public Instant nextExecution(TriggerContext triggerContext) {
if (this.actualRunCount.incrementAndGet() > this.maxRunCount) {
return null;
}
return new Date();
return Instant.now();
}
}

29
spring-context/src/test/java/org/springframework/scheduling/config/ScheduledTasksBeanDefinitionParserTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2022 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,7 +17,8 @@
package org.springframework.scheduling.config;
import java.lang.reflect.Method;
import java.util.Date;
import java.time.Duration;
import java.time.Instant;
import java.util.List;
import org.junit.jupiter.api.BeforeEach;
@@ -78,28 +79,28 @@ public class ScheduledTasksBeanDefinitionParserTests {
public void fixedRateTasks() {
List<IntervalTask> tasks = (List<IntervalTask>) new DirectFieldAccessor(
this.registrar).getPropertyValue("fixedRateTasks");
assertThat(tasks.size()).isEqualTo(3);
assertThat(tasks.get(0).getInterval()).isEqualTo(1000L);
assertThat(tasks.get(1).getInterval()).isEqualTo(2000L);
assertThat(tasks.get(2).getInterval()).isEqualTo(4000L);
assertThat(tasks.get(2).getInitialDelay()).isEqualTo(500);
assertThat(tasks).hasSize(3);
assertThat(tasks.get(0).getIntervalDuration()).isEqualTo(Duration.ofMillis(1000L));
assertThat(tasks.get(1).getIntervalDuration()).isEqualTo(Duration.ofMillis(2000L));
assertThat(tasks.get(2).getIntervalDuration()).isEqualTo(Duration.ofMillis(4000L));
assertThat(tasks.get(2).getInitialDelayDuration()).isEqualTo(Duration.ofMillis(500));
}
@Test
public void fixedDelayTasks() {
List<IntervalTask> tasks = (List<IntervalTask>) new DirectFieldAccessor(
this.registrar).getPropertyValue("fixedDelayTasks");
assertThat(tasks.size()).isEqualTo(2);
assertThat(tasks.get(0).getInterval()).isEqualTo(3000L);
assertThat(tasks.get(1).getInterval()).isEqualTo(3500L);
assertThat(tasks.get(1).getInitialDelay()).isEqualTo(250);
assertThat(tasks).hasSize(2);
assertThat(tasks.get(0).getIntervalDuration()).isEqualTo(Duration.ofMillis(3000L));
assertThat(tasks.get(1).getIntervalDuration()).isEqualTo(Duration.ofMillis(3500L));
assertThat(tasks.get(1).getInitialDelayDuration()).isEqualTo(Duration.ofMillis(250));
}
@Test
public void cronTasks() {
List<CronTask> tasks = (List<CronTask>) new DirectFieldAccessor(
this.registrar).getPropertyValue("cronTasks");
assertThat(tasks.size()).isEqualTo(1);
assertThat(tasks).hasSize(1);
assertThat(tasks.get(0).getExpression()).isEqualTo("*/4 * 9-17 * * MON-FRI");
}
@@ -107,7 +108,7 @@ public class ScheduledTasksBeanDefinitionParserTests {
public void triggerTasks() {
List<TriggerTask> tasks = (List<TriggerTask>) new DirectFieldAccessor(
this.registrar).getPropertyValue("triggerTasks");
assertThat(tasks.size()).isEqualTo(1);
assertThat(tasks).hasSize(1);
assertThat(tasks.get(0).getTrigger()).isInstanceOf(TestTrigger.class);
}
@@ -122,7 +123,7 @@ public class ScheduledTasksBeanDefinitionParserTests {
static class TestTrigger implements Trigger {
@Override
public Date nextExecutionTime(TriggerContext triggerContext) {
public Instant nextExecution(TriggerContext triggerContext) {
return null;
}
}

151
spring-context/src/test/java/org/springframework/scheduling/support/PeriodicTriggerTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2022 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,11 +16,13 @@
package org.springframework.scheduling.support;
import java.util.Date;
import java.util.concurrent.TimeUnit;
import java.time.Duration;
import java.time.Instant;
import java.time.temporal.ChronoUnit;
import org.junit.jupiter.api.Test;
import org.springframework.lang.Nullable;
import org.springframework.scheduling.TriggerContext;
import org.springframework.util.NumberUtils;
@@ -34,149 +36,149 @@ public class PeriodicTriggerTests {
@Test
public void fixedDelayFirstExecution() {
Date now = new Date();
PeriodicTrigger trigger = new PeriodicTrigger(5000);
Date next = trigger.nextExecutionTime(context(null, null, null));
Instant now = Instant.now();
PeriodicTrigger trigger = new PeriodicTrigger(Duration.ofMillis(5000));
Instant next = trigger.nextExecution(context(null, null, null));
assertNegligibleDifference(now, next);
}
@Test
public void fixedDelayWithInitialDelayFirstExecution() {
Date now = new Date();
Instant now = Instant.now();
long period = 5000;
long initialDelay = 30000;
PeriodicTrigger trigger = new PeriodicTrigger(period);
PeriodicTrigger trigger = new PeriodicTrigger(Duration.ofMillis(period));
trigger.setInitialDelay(initialDelay);
Date next = trigger.nextExecutionTime(context(null, null, null));
Instant next = trigger.nextExecution(context(null, null, null));
assertApproximateDifference(now, next, initialDelay);
}
@Test
public void fixedDelayWithTimeUnitFirstExecution() {
Date now = new Date();
PeriodicTrigger trigger = new PeriodicTrigger(5, TimeUnit.SECONDS);
Date next = trigger.nextExecutionTime(context(null, null, null));
Instant now = Instant.now();
PeriodicTrigger trigger = new PeriodicTrigger(Duration.ofSeconds(5));
Instant next = trigger.nextExecution(context(null, null, null));
assertNegligibleDifference(now, next);
}
@Test
public void fixedDelayWithTimeUnitAndInitialDelayFirstExecution() {
Date now = new Date();
Instant now = Instant.now();
long period = 5;
long initialDelay = 30;
PeriodicTrigger trigger = new PeriodicTrigger(period, TimeUnit.SECONDS);
trigger.setInitialDelay(initialDelay);
Date next = trigger.nextExecutionTime(context(null, null, null));
PeriodicTrigger trigger = new PeriodicTrigger(Duration.ofSeconds(period));
trigger.setInitialDelay(Duration.ofSeconds(initialDelay));
Instant next = trigger.nextExecution(context(null, null, null));
assertApproximateDifference(now, next, initialDelay * 1000);
}
@Test
public void fixedDelaySubsequentExecution() {
Date now = new Date();
Instant now = Instant.now();
long period = 5000;
PeriodicTrigger trigger = new PeriodicTrigger(period);
Date next = trigger.nextExecutionTime(context(now, 500, 3000));
PeriodicTrigger trigger = new PeriodicTrigger(Duration.ofMillis(period));
Instant next = trigger.nextExecution(context(now, 500, 3000));
assertApproximateDifference(now, next, period + 3000);
}
@Test
public void fixedDelayWithInitialDelaySubsequentExecution() {
Date now = new Date();
Instant now = Instant.now();
long period = 5000;
long initialDelay = 30000;
PeriodicTrigger trigger = new PeriodicTrigger(period);
PeriodicTrigger trigger = new PeriodicTrigger(Duration.ofMillis(period));
trigger.setInitialDelay(initialDelay);
Date next = trigger.nextExecutionTime(context(now, 500, 3000));
Instant next = trigger.nextExecution(context(now, 500, 3000));
assertApproximateDifference(now, next, period + 3000);
}
@Test
public void fixedDelayWithTimeUnitSubsequentExecution() {
Date now = new Date();
Instant now = Instant.now();
long period = 5;
PeriodicTrigger trigger = new PeriodicTrigger(period, TimeUnit.SECONDS);
Date next = trigger.nextExecutionTime(context(now, 500, 3000));
PeriodicTrigger trigger = new PeriodicTrigger(Duration.ofSeconds(period));
Instant next = trigger.nextExecution(context(now, 500, 3000));
assertApproximateDifference(now, next, (period * 1000) + 3000);
}
@Test
public void fixedRateFirstExecution() {
Date now = new Date();
PeriodicTrigger trigger = new PeriodicTrigger(5000);
Instant now = Instant.now();
PeriodicTrigger trigger = new PeriodicTrigger(Duration.ofMillis(5000));
trigger.setFixedRate(true);
Date next = trigger.nextExecutionTime(context(null, null, null));
Instant next = trigger.nextExecution(context(null, null, null));
assertNegligibleDifference(now, next);
}
@Test
public void fixedRateWithTimeUnitFirstExecution() {
Date now = new Date();
PeriodicTrigger trigger = new PeriodicTrigger(5, TimeUnit.SECONDS);
Instant now = Instant.now();
PeriodicTrigger trigger = new PeriodicTrigger(Duration.ofSeconds(5));
trigger.setFixedRate(true);
Date next = trigger.nextExecutionTime(context(null, null, null));
Instant next = trigger.nextExecution(context(null, null, null));
assertNegligibleDifference(now, next);
}
@Test
public void fixedRateWithInitialDelayFirstExecution() {
Date now = new Date();
Instant now = Instant.now();
long period = 5000;
long initialDelay = 30000;
PeriodicTrigger trigger = new PeriodicTrigger(period);
PeriodicTrigger trigger = new PeriodicTrigger(Duration.ofMillis(period));
trigger.setFixedRate(true);
trigger.setInitialDelay(initialDelay);
Date next = trigger.nextExecutionTime(context(null, null, null));
Instant next = trigger.nextExecution(context(null, null, null));
assertApproximateDifference(now, next, initialDelay);
}
@Test
public void fixedRateWithTimeUnitAndInitialDelayFirstExecution() {
Date now = new Date();
Instant now = Instant.now();
long period = 5;
long initialDelay = 30;
PeriodicTrigger trigger = new PeriodicTrigger(period, TimeUnit.MINUTES);
PeriodicTrigger trigger = new PeriodicTrigger(Duration.ofMinutes(period));
trigger.setFixedRate(true);
trigger.setInitialDelay(initialDelay);
Date next = trigger.nextExecutionTime(context(null, null, null));
trigger.setInitialDelay(Duration.ofMinutes(initialDelay));
Instant next = trigger.nextExecution(context(null, null, null));
assertApproximateDifference(now, next, (initialDelay * 60 * 1000));
}
@Test
public void fixedRateSubsequentExecution() {
Date now = new Date();
Instant now = Instant.now();
long period = 5000;
PeriodicTrigger trigger = new PeriodicTrigger(period);
PeriodicTrigger trigger = new PeriodicTrigger(Duration.ofMillis(period));
trigger.setFixedRate(true);
Date next = trigger.nextExecutionTime(context(now, 500, 3000));
Instant next = trigger.nextExecution(context(now, 500, 3000));
assertApproximateDifference(now, next, period);
}
@Test
public void fixedRateWithInitialDelaySubsequentExecution() {
Date now = new Date();
Instant now = Instant.now();
long period = 5000;
long initialDelay = 30000;
PeriodicTrigger trigger = new PeriodicTrigger(period);
PeriodicTrigger trigger = new PeriodicTrigger(Duration.ofMillis(period));
trigger.setFixedRate(true);
trigger.setInitialDelay(initialDelay);
Date next = trigger.nextExecutionTime(context(now, 500, 3000));
Instant next = trigger.nextExecution(context(now, 500, 3000));
assertApproximateDifference(now, next, period);
}
@Test
public void fixedRateWithTimeUnitSubsequentExecution() {
Date now = new Date();
Instant now = Instant.now();
long period = 5;
PeriodicTrigger trigger = new PeriodicTrigger(period, TimeUnit.HOURS);
PeriodicTrigger trigger = new PeriodicTrigger(Duration.ofHours(period));
trigger.setFixedRate(true);
Date next = trigger.nextExecutionTime(context(now, 500, 3000));
Instant next = trigger.nextExecution(context(now, 500, 3000));
assertApproximateDifference(now, next, (period * 60 * 60 * 1000));
}
@Test
public void equalsVerification() {
PeriodicTrigger trigger1 = new PeriodicTrigger(3000);
PeriodicTrigger trigger2 = new PeriodicTrigger(3000);
PeriodicTrigger trigger1 = new PeriodicTrigger(Duration.ofMillis(3000));
PeriodicTrigger trigger2 = new PeriodicTrigger(Duration.ofMillis(3000));
assertThat(trigger1.equals(new String("not a trigger"))).isFalse();
assertThat(trigger1.equals(null)).isFalse();
assertThat(trigger1).isEqualTo(trigger1);
@@ -192,44 +194,46 @@ public class PeriodicTriggerTests {
assertThat(trigger2.equals(trigger1)).isFalse();
trigger1.setFixedRate(true);
assertThat(trigger2).isEqualTo(trigger1);
PeriodicTrigger trigger3 = new PeriodicTrigger(3, TimeUnit.SECONDS);
trigger3.setInitialDelay(7);
PeriodicTrigger trigger3 = new PeriodicTrigger(Duration.ofSeconds(3));
trigger3.setInitialDelay(Duration.ofSeconds(7));
trigger3.setFixedRate(true);
assertThat(trigger1.equals(trigger3)).isFalse();
assertThat(trigger3.equals(trigger1)).isFalse();
trigger1.setInitialDelay(7000);
trigger1.setInitialDelay(Duration.ofMillis(7000));
assertThat(trigger3).isEqualTo(trigger1);
}
// utility methods
private static void assertNegligibleDifference(Date d1, Date d2) {
long diff = Math.abs(d1.getTime() - d2.getTime());
assertThat(diff < 100).as("difference exceeds threshold: " + diff).isTrue();
private static void assertNegligibleDifference(Instant d1, @Nullable Instant d2) {
assertThat(Duration.between(d1, d2)).isLessThan(Duration.ofMillis(100));
}
private static void assertApproximateDifference(Date lesser, Date greater, long expected) {
long diff = greater.getTime() - lesser.getTime();
private static void assertApproximateDifference(Instant lesser, Instant greater, long expected) {
long diff = greater.toEpochMilli() - lesser.toEpochMilli();
long variance = Math.abs(expected - diff);
assertThat(variance < 100).as("expected approximate difference of " + expected +
", but actual difference was " + diff).isTrue();
}
private static TriggerContext context(Object scheduled, Object actual, Object completion) {
return new TestTriggerContext(asDate(scheduled), asDate(actual), asDate(completion));
private static TriggerContext context(@Nullable Object scheduled, @Nullable Object actual,
@Nullable Object completion) {
return new TestTriggerContext(toInstant(scheduled), toInstant(actual), toInstant(completion));
}
private static Date asDate(Object o) {
@Nullable
private static Instant toInstant(@Nullable Object o) {
if (o == null) {
return null;
}
if (o instanceof Date) {
return (Date) o;
if (o instanceof Instant) {
return (Instant) o;
}
if (o instanceof Number) {
return new Date(System.currentTimeMillis() +
NumberUtils.convertNumberToTargetClass((Number) o, Long.class));
return Instant.now()
.plus(NumberUtils.convertNumberToTargetClass((Number) o, Long.class),
ChronoUnit.MILLIS);
}
throw new IllegalArgumentException(
"expected Date or Number, but actual type was: " + o.getClass());
@@ -240,30 +244,35 @@ public class PeriodicTriggerTests {
private static class TestTriggerContext implements TriggerContext {
private final Date scheduled;
@Nullable
private final Instant scheduled;
private final Date actual;
@Nullable
private final Instant actual;
private final Date completion;
@Nullable
private final Instant completion;
TestTriggerContext(@Nullable Instant scheduled,
@Nullable Instant actual, @Nullable Instant completion) {
TestTriggerContext(Date scheduled, Date actual, Date completion) {
this.scheduled = scheduled;
this.actual = actual;
this.completion = completion;
}
@Override
public Date lastActualExecutionTime() {
public Instant lastActualExecution() {
return this.actual;
}
@Override
public Date lastCompletionTime() {
public Instant lastCompletion() {
return this.completion;
}
@Override
public Date lastScheduledExecutionTime() {
public Instant lastScheduledExecution() {
return this.scheduled;
}
}