mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-09-03 04:26:12 +08:00
Merge branch '2.6.x' into 2.7.x
Closes gh-33283
This commit is contained in:
commit
78d8bfdc52
@ -54,6 +54,7 @@ public class TaskSchedulingAutoConfiguration {
|
||||
}
|
||||
|
||||
@Bean
|
||||
@ConditionalOnBean(name = TaskManagementConfigUtils.SCHEDULED_ANNOTATION_PROCESSOR_BEAN_NAME)
|
||||
public static LazyInitializationExcludeFilter scheduledBeanLazyInitializationExcludeFilter() {
|
||||
return new ScheduledBeanLazyInitializationExcludeFilter();
|
||||
}
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2012-2021 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.
|
||||
@ -61,6 +61,12 @@ class TaskSchedulingAutoConfigurationTests {
|
||||
this.contextRunner.run((context) -> assertThat(context).doesNotHaveBean(TaskScheduler.class));
|
||||
}
|
||||
|
||||
@Test
|
||||
void noSchedulingDoesNotExposeScheduledBeanLazyInitializationExcludeFilter() {
|
||||
this.contextRunner.run(
|
||||
(context) -> assertThat(context).doesNotHaveBean(ScheduledBeanLazyInitializationExcludeFilter.class));
|
||||
}
|
||||
|
||||
@Test
|
||||
void enableSchedulingWithNoTaskExecutorAutoConfiguresOne() {
|
||||
this.contextRunner
|
||||
|
Loading…
Reference in New Issue
Block a user