mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-09-03 04:26:12 +08:00
Merge branch '1.1.x'
Conflicts: spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointMBeanExportProperties.java spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfiguration.java
This commit is contained in:
commit
763a735bd5
@ -33,7 +33,7 @@ public class EndpointMBeanExportProperties {
|
||||
/**
|
||||
* JMX domain name. Initialized with the value of 'spring.jmx.default-domain' if set.
|
||||
*/
|
||||
@Value("${spring.jmx.default_domain:}")
|
||||
@Value("${spring.jmx.default-domain:}")
|
||||
private String domain;
|
||||
|
||||
/**
|
||||
|
@ -52,7 +52,7 @@ public class IntegrationAutoConfiguration {
|
||||
@ConditionalOnClass(EnableIntegrationMBeanExport.class)
|
||||
@ConditionalOnMissingBean(value = IntegrationMBeanExporter.class, search = SearchStrategy.CURRENT)
|
||||
@ConditionalOnProperty(prefix = "spring.jmx", name = "enabled", havingValue = "true", matchIfMissing = true)
|
||||
@EnableIntegrationMBeanExport(defaultDomain = "${spring.jmx.default_domain:}", server = "${spring.jmx.server:mbeanServer}")
|
||||
@EnableIntegrationMBeanExport(defaultDomain = "${spring.jmx.default-domain:}", server = "${spring.jmx.server:mbeanServer}")
|
||||
protected static class IntegrationJmxConfiguration {
|
||||
}
|
||||
|
||||
|
@ -96,7 +96,7 @@ public class JmxAutoConfigurationTests {
|
||||
public void testDefaultDomainConfiguredOnMBeanExport() {
|
||||
MockEnvironment env = new MockEnvironment();
|
||||
env.setProperty("spring.jmx.enabled", "true");
|
||||
env.setProperty("spring.jmx.default_domain", "my-test-domain");
|
||||
env.setProperty("spring.jmx.default-domain", "my-test-domain");
|
||||
this.context = new AnnotationConfigApplicationContext();
|
||||
this.context.setEnvironment(env);
|
||||
this.context.register(TestConfiguration.class, JmxAutoConfiguration.class);
|
||||
|
Loading…
Reference in New Issue
Block a user