From 9820fa9c8818018363add806a27ce2c910d1fb44 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Sat, 21 Mar 2015 16:50:58 +0100 Subject: [PATCH] Remove dead code Fixes gh-2686 --- .../EndpointMBeanExportAutoConfiguration.java | 22 +------------------ 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointMBeanExportAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointMBeanExportAutoConfiguration.java index ab141a0ea3..c81900cc9d 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointMBeanExportAutoConfiguration.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointMBeanExportAutoConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2014 the original author or authors. + * Copyright 2012-2015 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,16 +23,12 @@ import org.springframework.boot.actuate.endpoint.Endpoint; import org.springframework.boot.actuate.endpoint.jmx.EndpointMBeanExporter; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.autoconfigure.condition.ConditionOutcome; import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; -import org.springframework.boot.autoconfigure.condition.SpringBootCondition; import org.springframework.boot.autoconfigure.jmx.JmxAutoConfiguration; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Configuration; -import org.springframework.core.type.AnnotatedTypeMetadata; import org.springframework.util.StringUtils; /** @@ -69,20 +65,4 @@ public class EndpointMBeanExportAutoConfiguration { return new JmxAutoConfiguration().mbeanServer(); } - static class JmxCondition extends SpringBootCondition { - - @Override - public ConditionOutcome getMatchOutcome(ConditionContext context, - AnnotatedTypeMetadata metadata) { - String endpointEnabled = context.getEnvironment().getProperty( - "endpoints.jmx.enabled", "true"); - String jmxEnabled = context.getEnvironment().getProperty( - "spring.jmx.enabled", "true"); - return new ConditionOutcome("true".equalsIgnoreCase(endpointEnabled) - && "true".equalsIgnoreCase(jmxEnabled), - "JMX endpoint and JMX enabled"); - - } - - } }