Prevent endpoint's shutdown() method from being a destroy method

Closes gh-17407
spring-projects · Jul 2, 2019 · e575794 · e575794
1 parent 5997886
commit e575794
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/...springframework/boot/actuate/autoconfigure/context/ShutdownEndpointAutoConfiguration.java b/...springframework/boot/actuate/autoconfigure/context/ShutdownEndpointAutoConfiguration.java
@@ -33,7 +33,7 @@
 @ConditionalOnEnabledEndpoint(endpoint = ShutdownEndpoint.class)
 public class ShutdownEndpointAutoConfiguration {
 
-	@Bean
+	@Bean(destroyMethod = "")
 	@ConditionalOnMissingBean
 	public ShutdownEndpoint shutdownEndpoint() {
 		return new ShutdownEndpoint();

diff --git a/...gframework/boot/actuate/autoconfigure/context/ShutdownEndpointAutoConfigurationTests.java b/...gframework/boot/actuate/autoconfigure/context/ShutdownEndpointAutoConfigurationTests.java
@@ -16,11 +16,15 @@
 
 package org.springframework.boot.actuate.autoconfigure.context;
 
+import java.util.Map;
+
 import org.junit.Test;
 
+import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.boot.actuate.context.ShutdownEndpoint;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
+import org.springframework.test.util.ReflectionTestUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -35,9 +39,15 @@ public class ShutdownEndpointAutoConfigurationTests {
 			.withConfiguration(AutoConfigurations.of(ShutdownEndpointAutoConfiguration.class));
 
 	@Test
-	public void runShouldHaveEndpointBean() {
-		this.contextRunner.withPropertyValues("management.endpoint.shutdown.enabled:true")
-				.run((context) -> assertThat(context).hasSingleBean(ShutdownEndpoint.class));
+	@SuppressWarnings("unchecked")
+	public void runShouldHaveEndpointBeanThatIsNotDisposable() {
+		this.contextRunner.withPropertyValues("management.endpoint.shutdown.enabled:true").run((context) -> {
+			assertThat(context).hasSingleBean(ShutdownEndpoint.class);
+			ConfigurableListableBeanFactory beanFactory = context.getBeanFactory();
+			Map<String, Object> disposableBeans = (Map<String, Object>) ReflectionTestUtils.getField(beanFactory,
+					"disposableBeans");
+			assertThat(disposableBeans).isEmpty();
+		});
 	}
 
 	@Test