/*
 * Copyright 2013 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.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package org.springframework.boot.actuate.autoconfigure;

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.ConditionalOnBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.jmx.export.MBeanExporter;

/**
 * {@link EnableAutoConfiguration Auto-configuration} to enable JMX export for
 * {@link Endpoint}s.
 * 
 * @author Christian Dupuis
 */
@Configuration
@ConditionalOnBean({ MBeanExporter.class })
@AutoConfigureAfter({ EndpointAutoConfiguration.class })
@ConditionalOnExpression("${endpoints.jmx.enabled:true}")
class EndpointMBeanExportAutoConfiguration {

	@Bean
	public EndpointMBeanExporter endpointMBeanExporter() {
		// TODO add configuration for domain name
		return new EndpointMBeanExporter();
	}

}
@@ -667,16 +667,79 @@
 igure;%0A%0A
+import org.springframework.beans.factory.annotation.Autowired;%0A
 import o
@@ -1154,24 +1154,86 @@
 Expression;%0A
+import org.springframework.boot.bind.RelaxedPropertyResolver;%0A
 import org.s
@@ -1325,32 +1325,81 @@
 .Configuration;%0A
+import org.springframework.core.env.Environment;%0A
 import org.sprin
@@ -1434,16 +1434,61 @@
 xporter;
+%0Aimport org.springframework.util.StringUtils;
 %0A%0A/**%0A *
@@ -1847,153 +1847,648 @@
 %7B%0A%0A%09
-@Bean%0A%09public EndpointMBeanExporter endpointMBeanExporter() %7B%0A%09%09// TODO add configuration for 
+private RelaxedPropertyResolver environment;%0A%0A%09@Autowired%0A%09public void setEnvironment(Environment environment) %7B%0A%09%09this.environment = new RelaxedPropertyResolver(environment);%0A%09%7D%0A%0A%09@Bean%0A%09public EndpointMBeanExporter endpointMBeanExporter() %7B%0A%09%09EndpointMBeanExporter mbeanExporter = new EndpointMBeanExporter();%0A%09%09String domainName = this.environment.getProperty(%22endpoints.jmx.domain_name%22);%0A%09%09if (StringUtils.hasText(domainName)) %7B%0A%09%09%09mbeanExporter.setDomainName(
 domain
- n
+N
 ame
+);
 %0A%09%09
-return new EndpointMBeanExporter(
+%7D%0A%09%09String key = this.environment.getProperty(%22endpoints.jmx.key%22);%0A%09%09if (StringUtils.hasText(key)) %7B%0A%09%09%09mbeanExporter.setKey(key
 );%0A
+%09
 %09%7D%0A
+%09%09return mbeanExporter;%0A%09%7D
 %0A%7D

Allow configuration of domainName and key for endpoint JMX export