Browse Source

Don't create unessary JMX beans

Align "spring.jmx.enabled" conditions by removing
`matchIfMissing = true`.

Closes gh-43706
pull/43739/head
Phillip Webb 12 months ago
parent
commit
b448d5e0a7
  1. 2
      spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfiguration.java
  2. 2
      spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceJmxConfiguration.java

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfiguration.java

@ -205,7 +205,7 @@ public class IntegrationAutoConfiguration { @@ -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

2
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; @@ -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);

Loading…
Cancel
Save