From b448d5e0a7c60fb7a1d5235ff470fd23c7e91f85 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Wed, 8 Jan 2025 13:45:01 -0800 Subject: [PATCH] Don't create unessary JMX beans Align "spring.jmx.enabled" conditions by removing `matchIfMissing = true`. Closes gh-43706 --- .../autoconfigure/integration/IntegrationAutoConfiguration.java | 2 +- .../boot/autoconfigure/jdbc/DataSourceJmxConfiguration.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfiguration.java index 51f46f599a..3abe6c4c41 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfiguration.java @@ -205,7 +205,7 @@ public class IntegrationAutoConfiguration { @ConditionalOnClass(EnableIntegrationMBeanExport.class) @ConditionalOnMissingBean(value = IntegrationMBeanExporter.class, search = SearchStrategy.CURRENT) @ConditionalOnBean(MBeanServer.class) - @ConditionalOnBooleanProperty(name = "spring.jmx.enabled", matchIfMissing = true) + @ConditionalOnBooleanProperty("spring.jmx.enabled") protected static class IntegrationJmxConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceJmxConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceJmxConfiguration.java index 00e02a5c6a..2dfce930e2 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceJmxConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceJmxConfiguration.java @@ -43,7 +43,7 @@ import org.springframework.jmx.export.MBeanExporter; * @author Stephane Nicoll */ @Configuration(proxyBeanMethods = false) -@ConditionalOnBooleanProperty(name = "spring.jmx.enabled", matchIfMissing = true) +@ConditionalOnBooleanProperty("spring.jmx.enabled") class DataSourceJmxConfiguration { private static final Log logger = LogFactory.getLog(DataSourceJmxConfiguration.class);