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

Accommodate next execution time being unknown

Browse Source 
A task's next execution time is unknown if, for example, it's
currently running. When it's unknown the nextExecution.time will be
missing from the json describing the task. This commit updates the
documentation test to accommodate this possibility.

Closes gh-42351
This commit is contained in:
Andy Wilkinson
2024-09-18 11:53:11 +01:00
parent c1bd5bdc8b
commit 713afae013
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -63,8 +63,7 @@ class ScheduledTasksEndpointDocumentationTests extends MockMvcEndpointDocumentat
fieldWithPath("cron.[].expression").description("Cron expression."),
fieldWithPath("fixedDelay").description("Fixed delay tasks, if any."),
targetFieldWithPrefix("fixedDelay.[]."), initialDelayWithPrefix("fixedDelay.[]."),
nextExecutionWithPrefix("fixedDelay.[].")
.description("Time of the next scheduled execution."),
nextExecutionWithPrefix("fixedDelay.[]."),
fieldWithPath("fixedDelay.[].interval")
.description("Interval, in milliseconds, between the end of the last"
+ " execution and the start of the next."),
@@ -72,9 +71,7 @@ class ScheduledTasksEndpointDocumentationTests extends MockMvcEndpointDocumentat
targetFieldWithPrefix("fixedRate.[]."),
fieldWithPath("fixedRate.[].interval")
.description("Interval, in milliseconds, between the start of each execution."),
initialDelayWithPrefix("fixedRate.[]."),
nextExecutionWithPrefix("fixedRate.[].")
.description("Time of the next scheduled execution."),
initialDelayWithPrefix("fixedRate.[]."), nextExecutionWithPrefix("fixedRate.[]."),
fieldWithPath("custom").description("Tasks with custom triggers, if any."),
targetFieldWithPrefix("custom.[]."),
fieldWithPath("custom.[].trigger").description("Trigger for the task."))
@@ -93,7 +90,10 @@ class ScheduledTasksEndpointDocumentationTests extends MockMvcEndpointDocumentat
}
private FieldDescriptor nextExecutionWithPrefix(String prefix) {
return fieldWithPath(prefix + "nextExecution.time").description("Time of the next scheduled execution.");
return fieldWithPath(prefix + "nextExecution.time")
.description("Time of the next scheduled execution, if known.")
.type(JsonFieldType.STRING)
.optional();
}
private FieldDescriptor[] lastExecution() {