root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge pull request #33276 from hpoettker 

* pr/33276:
  Make `ScheduledBeanLazyInitializationExcludeFilter` conditional

Closes gh-33276
This commit is contained in:
Stephane Nicoll 2022-11-21 16:22:40 +01:00
parent a23c7df2df 330848d339
commit 48e77ee4ae
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/task/TaskSchedulingAutoConfiguration.java
View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -56,6 +56,7 @@ public class TaskSchedulingAutoConfiguration {
} }
@Bean @Bean
@ConditionalOnBean(name = TaskManagementConfigUtils.SCHEDULED_ANNOTATION_PROCESSOR_BEAN_NAME)
public static LazyInitializationExcludeFilter scheduledBeanLazyInitializationExcludeFilter() { public static LazyInitializationExcludeFilter scheduledBeanLazyInitializationExcludeFilter() {
return new ScheduledBeanLazyInitializationExcludeFilter(); return new ScheduledBeanLazyInitializationExcludeFilter();
} }

8
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/task/TaskSchedulingAutoConfigurationTests.java
View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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)); this.contextRunner.run((context) -> assertThat(context).doesNotHaveBean(TaskScheduler.class));
} }
@Test
void noSchedulingDoesNotExposeScheduledBeanLazyInitializationExcludeFilter() {
this.contextRunner.run(
(context) -> assertThat(context).doesNotHaveBean(ScheduledBeanLazyInitializationExcludeFilter.class));
}
@Test @Test
void enableSchedulingWithNoTaskExecutorAutoConfiguresOne() { void enableSchedulingWithNoTaskExecutorAutoConfiguresOne() {
this.contextRunner this.contextRunner