Skip to content

Commit 5794ac2

Browse files
committed
Use inferred destroy method name where feasible
See https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/context/annotation/Bean.html#destroyMethod() >> This 'destroy method inference' is currently limited to detecting only public, no-arg methods named 'close' or 'shutdown'. Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
1 parent c4a4b63 commit 5794ac2

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/LettuceConnectionConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ class LettuceConnectionConfiguration extends RedisConnectionConfiguration {
7979
clusterConfigurationProvider);
8080
}
8181

82-
@Bean(destroyMethod = "shutdown")
82+
@Bean
8383
@ConditionalOnMissingBean(ClientResources.class)
8484
DefaultClientResources lettuceClientResources(ObjectProvider<ClientResourcesBuilderCustomizer> customizers) {
8585
DefaultClientResources.Builder builder = DefaultClientResources.builder();

module/spring-boot-flyway/src/test/java/org/springframework/boot/flyway/autoconfigure/FlywayAutoConfigurationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1163,7 +1163,7 @@ DSLContext dslContext() {
11631163
@EnableConfigurationProperties(DataSourceProperties.class)
11641164
abstract static class AbstractUserH2DataSourceConfiguration {
11651165

1166-
@Bean(destroyMethod = "shutdown")
1166+
@Bean
11671167
EmbeddedDatabase dataSource(DataSourceProperties properties) throws SQLException {
11681168
EmbeddedDatabase database = new EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseType.H2)
11691169
.setName(getDatabaseName(properties))

module/spring-boot-jdbc/src/main/java/org/springframework/boot/jdbc/autoconfigure/EmbeddedDataSourceConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public void setBeanClassLoader(ClassLoader classLoader) {
4646
this.classLoader = classLoader;
4747
}
4848

49-
@Bean(destroyMethod = "shutdown")
49+
@Bean
5050
public EmbeddedDatabase dataSource(DataSourceProperties properties) {
5151
EmbeddedDatabaseType type = EmbeddedDatabaseConnection.get(this.classLoader).getType();
5252
String databaseName = properties.determineDatabaseName();

module/spring-boot-liquibase/src/test/java/org/springframework/boot/liquibase/autoconfigure/LiquibaseAutoConfigurationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -637,7 +637,7 @@ static class CustomDataSourceConfiguration {
637637

638638
private final String name = UUID.randomUUID().toString();
639639

640-
@Bean(destroyMethod = "shutdown")
640+
@Bean
641641
EmbeddedDatabase dataSource() throws SQLException {
642642
EmbeddedDatabase database = new EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseType.H2)
643643
.setName(this.name)

0 commit comments

Comments
 (0)