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

Adapt to deprecations in Framework's scheduling APIs

Browse Source 
See gh-31241
This commit is contained in:
Andy Wilkinson
2022-07-08 17:53:55 +01:00
parent fa43e1f378
commit efc5391496
5 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/ScheduledTasksEndpointDocumentationTests.java
View File

@@ -16,8 +16,8 @@
package org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation;
import java.time.Instant;
import java.util.Collection;
import java.util.Date;
import java.util.regex.Pattern;
import org.junit.jupiter.api.Test;
@@ -117,8 +117,8 @@ class ScheduledTasksEndpointDocumentationTests extends MockMvcEndpointDocumentat
static class CustomTrigger implements Trigger {
@Override
public Date nextExecutionTime(TriggerContext triggerContext) {
return new Date();
public Instant nextExecution(TriggerContext triggerContext) {
return Instant.now();
}
}

8
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/scheduling/ScheduledTasksEndpoint.java
View File

@@ -168,14 +168,14 @@ public class ScheduledTasksEndpoint {
protected IntervalTaskDescription(TaskType type, IntervalTask task) {
super(type, task.getRunnable());
this.initialDelay = task.getInitialDelay();
this.interval = task.getInterval();
this.initialDelay = task.getInitialDelayDuration().toMillis();
this.interval = task.getIntervalDuration().toMillis();
}
protected IntervalTaskDescription(TaskType type, TriggerTask task, PeriodicTrigger trigger) {
super(type, task.getRunnable());
this.initialDelay = trigger.getInitialDelay();
this.interval = trigger.getPeriod();
this.initialDelay = trigger.getInitialDelayDuration().toMillis();
this.interval = trigger.getPeriodDuration().toMillis();
}
public long getInitialDelay() {

16
spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/scheduling/ScheduledTasksEndpointTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2019 the original author or authors.
* Copyright 2012-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,9 +16,9 @@
package org.springframework.boot.actuate.scheduling;
import java.time.Duration;
import java.time.Instant;
import java.util.Collection;
import java.util.Date;
import java.util.concurrent.TimeUnit;
import java.util.function.Consumer;
import org.junit.jupiter.api.Test;
@@ -196,8 +196,8 @@ class ScheduledTasksEndpointTests {
@Override
public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
PeriodicTrigger trigger = new PeriodicTrigger(1, TimeUnit.SECONDS);
trigger.setInitialDelay(2);
PeriodicTrigger trigger = new PeriodicTrigger(Duration.ofSeconds(1));
trigger.setInitialDelay(Duration.ofSeconds(2));
taskRegistrar.addTriggerTask(new FixedDelayTriggerRunnable(), trigger);
}
@@ -207,8 +207,8 @@ class ScheduledTasksEndpointTests {
@Override
public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
PeriodicTrigger trigger = new PeriodicTrigger(2, TimeUnit.SECONDS);
trigger.setInitialDelay(3);
PeriodicTrigger trigger = new PeriodicTrigger(Duration.ofSeconds(2));
trigger.setInitialDelay(Duration.ofSeconds(3));
trigger.setFixedRate(true);
taskRegistrar.addTriggerTask(new FixedRateTriggerRunnable(), trigger);
}
@@ -226,7 +226,7 @@ class ScheduledTasksEndpointTests {
static class CustomTriggerTask implements SchedulingConfigurer {
private static final Trigger trigger = (context) -> new Date();
private static final Trigger trigger = (context) -> Instant.now();
@Override
public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {

4
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfiguration.java
View File

@@ -149,9 +149,9 @@ public class IntegrationAutoConfiguration {
}
private Trigger createPeriodicTrigger(Duration period, Duration initialDelay, boolean fixedRate) {
PeriodicTrigger trigger = new PeriodicTrigger(period.toMillis());
PeriodicTrigger trigger = new PeriodicTrigger(period);
if (initialDelay != null) {
trigger.setInitialDelay(initialDelay.toMillis());
trigger.setInitialDelay(initialDelay);
}
trigger.setFixedRate(fixedRate);
return trigger;

5
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfigurationTests.java
View File

@@ -16,6 +16,7 @@
package org.springframework.boot.autoconfigure.integration;
import java.time.Duration;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeUnit;
@@ -455,7 +456,7 @@ class IntegrationAutoConfigurationTests {
assertThat(metadata.getTrigger())
.asInstanceOf(InstanceOfAssertFactories.type(PeriodicTrigger.class))
.satisfies((trigger) -> {
assertThat(trigger.getPeriod()).isEqualTo(5000L);
assertThat(trigger.getPeriodDuration()).isEqualTo(Duration.ofSeconds(5));
assertThat(trigger.isFixedRate()).isFalse();
});
});
@@ -470,7 +471,7 @@ class IntegrationAutoConfigurationTests {
assertThat(metadata.getTrigger())
.asInstanceOf(InstanceOfAssertFactories.type(PeriodicTrigger.class))
.satisfies((trigger) -> {
assertThat(trigger.getPeriod()).isEqualTo(5000L);
assertThat(trigger.getPeriodDuration()).isEqualTo(Duration.ofSeconds(5));
assertThat(trigger.isFixedRate()).isTrue();
});
});