mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Merge pull request #22604 from ttddyy
* gh-22604: Polish "Use milliseconds when configuring awaitTerminationPeriod" Use milliseconds when configuring awaitTerminationPeriod Closes gh-22604
This commit is contained in:
commit
f4afd076c9
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2012-2019 the original author or authors.
|
||||
* Copyright 2012-2020 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.
|
||||
@ -308,7 +308,7 @@ public class TaskExecutorBuilder {
|
||||
map.from(this.keepAlive).asInt(Duration::getSeconds).to(taskExecutor::setKeepAliveSeconds);
|
||||
map.from(this.allowCoreThreadTimeOut).to(taskExecutor::setAllowCoreThreadTimeOut);
|
||||
map.from(this.awaitTermination).to(taskExecutor::setWaitForTasksToCompleteOnShutdown);
|
||||
map.from(this.awaitTerminationPeriod).asInt(Duration::getSeconds).to(taskExecutor::setAwaitTerminationSeconds);
|
||||
map.from(this.awaitTerminationPeriod).as(Duration::toMillis).to(taskExecutor::setAwaitTerminationMillis);
|
||||
map.from(this.threadNamePrefix).whenHasText().to(taskExecutor::setThreadNamePrefix);
|
||||
map.from(this.taskDecorator).to(taskExecutor::setTaskDecorator);
|
||||
if (!CollectionUtils.isEmpty(this.customizers)) {
|
||||
|
@ -61,8 +61,8 @@ class TaskExecutorBuilderTests {
|
||||
}
|
||||
|
||||
@Test
|
||||
void awaitTerminationPeriodShouldApply() {
|
||||
Duration period = Duration.ofMinutes(1);
|
||||
void awaitTerminationPeriodShouldApplyWithMillisecondPrecision() {
|
||||
Duration period = Duration.ofMillis(50);
|
||||
ThreadPoolTaskExecutor executor = this.builder.awaitTerminationPeriod(period).build();
|
||||
assertThat(executor).hasFieldOrPropertyWithValue("awaitTerminationMillis", period.toMillis());
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user