root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Set JMX export on by default

This commit is contained in:
Christian Dupuis 2013-12-19 08:47:22 +01:00
parent d04248a845
commit b694556483
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jmx/JmxAutoConfiguration.java
View File

@ -25,18 +25,18 @@ import org.springframework.context.annotation.EnableMBeanExport;
import org.springframework.jmx.export.MBeanExporter;
/**
* {@link EnableAutoConfiguration Auto-configuration} to enable/disiable Spring's
* {@link EnableAutoConfiguration Auto-configuration} to enable/disable Spring's
* {@link EnableMBeanExport} mechanism based on configuration properties.
*
* <p>
* To enable auto export of annotation beans set <code>spring.jmx.enabled: true</code>.
* To disable auto export of annotation beans set <code>spring.jmx.enabled: false</code>.
*
* @author Christian Dupuis
*/
@Configuration
@ConditionalOnClass({ MBeanExporter.class })
@ConditionalOnMissingBean({ MBeanExporter.class })
@ConditionalOnExpression("${spring.jmx.enabled:false}")
@ConditionalOnExpression("${spring.jmx.enabled:true}")
public class JmxAutoConfiguration {
@Configuration

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

@ -56,8 +56,7 @@ public class JmxAutoConfigurationTests {
this.context = new AnnotationConfigApplicationContext();
this.context.register(JmxAutoConfiguration.class);
this.context.refresh();
this.thrown.expect(NoSuchBeanDefinitionException.class);
this.context.getBean(MBeanExporter.class);
assertNotNull(this.context.getBean(MBeanExporter.class));
}
@Test