/*
 * 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.
 * 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.autoconfigure.jdbc;

import javax.sql.DataSource;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
import org.springframework.jdbc.datasource.lookup.JndiDataSourceLookup;
import org.springframework.jmx.export.MBeanExporter;
import org.springframework.jmx.support.JmxUtils;

/**
 * {@link EnableAutoConfiguration Auto-configuration} for a JNDI located
 * {@link DataSource}.
 *
 * @author Phillip Webb
 * @author Andy Wilkinson
 * @since 1.2.0
 */
@Configuration
@AutoConfigureBefore({ XADataSourceAutoConfiguration.class,
		DataSourceAutoConfiguration.class })
@ConditionalOnClass({ DataSource.class, EmbeddedDatabaseType.class })
@ConditionalOnProperty(prefix = DataSourceProperties.PREFIX, name = "jndi-name")
@EnableConfigurationProperties(DataSourceProperties.class)
public class JndiDataSourceAutoConfiguration {

	@Autowired(required = false)
	private MBeanExporter mbeanExporter;

	@Bean(destroyMethod = "")
	@ConditionalOnMissingBean
	public DataSource dataSource(DataSourceProperties properties) {
		JndiDataSourceLookup dataSourceLookup = new JndiDataSourceLookup();
		DataSource dataSource = dataSourceLookup.getDataSource(properties.getJndiName());
		excludeMBeanIfNecessary(dataSource, "dataSource");
		return dataSource;
	}

	private void excludeMBeanIfNecessary(Object candidate, String beanName) {
		if (this.mbeanExporter != null && JmxUtils.isMBean(candidate.getClass())) {
			this.mbeanExporter.addExcludedBean(beanName);
		}
	}

}

@@ -699,16 +699,88 @@
 ource;%0A%0A
+import org.springframework.beans.factory.NoSuchBeanDefinitionException;%0A
 import o
@@ -834,16 +834,16 @@
 owired;%0A
-
 import o
@@ -1291,16 +1291,71 @@
 erties;%0A
+import org.springframework.context.ApplicationContext;%0A
 import o
@@ -2268,63 +2268,44 @@
 ired
-(required = false)%0A%09private MBeanExporter mbeanExporter
+%0A%09private ApplicationContext context
 ;%0A%0A%09
@@ -2735,17 +2735,31 @@
 %7B%0A%09%09
-if (this.
+try %7B%0A%09%09%09MBeanExporter 
 mbea
@@ -2772,19 +2772,60 @@
 ter 
-!
 = 
-null && 
+this.context.getBean(MBeanExporter.class);%0A%09%09%09if (
 JmxU
@@ -2865,21 +2865,17 @@
 )) %7B%0A%09%09%09
+%09
-this.
 mbeanExp
@@ -2907,16 +2907,114 @@
 nName);%0A
+%09%09%09%7D%0A%09%09%7D%0A%09%09catch (NoSuchBeanDefinitionException ex) %7B%0A%09%09%09// No exporter. Exclusion is unnecessary%0A
 %09%09%7D%0A%09%7D%0A%0A

Break cycle caused by JndiDataSourceAutoConfiguration