Skip to content

Commit d64cc08

Browse files
committed
Harmonize property name
The property default format is lower case using hyphen. The JMX default domain property has been harmonized to that format. Fixes gh-2427
1 parent c346e99 commit d64cc08

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointMBeanExportProperties.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
@ConfigurationProperties(prefix = "endpoints.jmx")
3131
public class EndpointMBeanExportProperties {
3232

33-
@Value("${spring.jmx.default_domain:}")
33+
@Value("${spring.jmx.default-domain:}")
3434
private String domain;
3535

3636
private boolean uniqueNames = false;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ protected static class IntegrationConfiguration {
5252
@ConditionalOnClass(EnableIntegrationMBeanExport.class)
5353
@ConditionalOnMissingBean(value = IntegrationMBeanExporter.class, search = SearchStrategy.CURRENT)
5454
@ConditionalOnExpression("${spring.jmx.enabled:true}")
55-
@EnableIntegrationMBeanExport(defaultDomain = "${spring.jmx.default_domain:}", server = "${spring.jmx.server:mbeanServer}")
55+
@EnableIntegrationMBeanExport(defaultDomain = "${spring.jmx.default-domain:}", server = "${spring.jmx.server:mbeanServer}")
5656
protected static class IntegrationJmxConfiguration {
5757
}
5858

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jmx/JmxAutoConfigurationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public void testDisabledMBeanExport() {
9292
public void testDefaultDomainConfiguredOnMBeanExport() {
9393
MockEnvironment env = new MockEnvironment();
9494
env.setProperty("spring.jmx.enabled", "true");
95-
env.setProperty("spring.jmx.default_domain", "my-test-domain");
95+
env.setProperty("spring.jmx.default-domain", "my-test-domain");
9696
this.context = new AnnotationConfigApplicationContext();
9797
this.context.setEnvironment(env);
9898
this.context.register(TestConfiguration.class, JmxAutoConfiguration.class);

0 commit comments

Comments
 (0)