Update auto-configuration @Bean methods to return most specific type

Closes gh-2536
Closes gh-2403

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/AuditAutoConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2013 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.
@@ -60,7 +60,7 @@ public class AuditAutoConfiguration {
 	@ConditionalOnMissingBean(AuditEventRepository.class)
 	protected static class AuditEventRepositoryConfiguration {
 		@Bean
-		public AuditEventRepository auditEventRepository() throws Exception {
+		public InMemoryAuditEventRepository auditEventRepository() throws Exception {
 			return new InMemoryAuditEventRepository();
 		}
 	}

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/CrshAutoConfiguration.java

@@ -124,28 +124,28 @@ public class CrshAutoConfiguration {
 
 	@Bean
 	@ConditionalOnProperty(prefix = "shell", name = "auth", havingValue = "jaas")
-	@ConditionalOnMissingBean({ CrshShellAuthenticationProperties.class })
+	@ConditionalOnMissingBean(CrshShellAuthenticationProperties.class)
-	public CrshShellAuthenticationProperties jaasAuthenticationProperties() {
+	public JaasAuthenticationProperties jaasAuthenticationProperties() {
 		return new JaasAuthenticationProperties();
 	}
 
 	@Bean
 	@ConditionalOnProperty(prefix = "shell", name = "auth", havingValue = "key")
-	@ConditionalOnMissingBean({ CrshShellAuthenticationProperties.class })
+	@ConditionalOnMissingBean(CrshShellAuthenticationProperties.class)
-	public CrshShellAuthenticationProperties keyAuthenticationProperties() {
+	public KeyAuthenticationProperties keyAuthenticationProperties() {
 		return new KeyAuthenticationProperties();
 	}
 
 	@Bean
 	@ConditionalOnProperty(prefix = "shell", name = "auth", havingValue = "simple", matchIfMissing = true)
-	@ConditionalOnMissingBean({ CrshShellAuthenticationProperties.class })
+	@ConditionalOnMissingBean(CrshShellAuthenticationProperties.class)
-	public CrshShellAuthenticationProperties simpleAuthenticationProperties() {
+	public SimpleAuthenticationProperties simpleAuthenticationProperties() {
 		return new SimpleAuthenticationProperties();
 	}
 
 	@Bean
-	@ConditionalOnMissingBean({ PluginLifeCycle.class })
+	@ConditionalOnMissingBean(PluginLifeCycle.class)
-	public PluginLifeCycle shellBootstrap() {
+	public CrshBootstrapBean shellBootstrap() {
 		CrshBootstrapBean bootstrapBean = new CrshBootstrapBean();
 		bootstrapBean.setConfig(this.properties.asCrshShellConfig());
 		return bootstrapBean;
@@ -156,7 +156,7 @@ public class CrshAutoConfiguration {
 	 */
 	@Configuration
 	@ConditionalOnProperty(prefix = "shell", name = "auth", havingValue = "spring", matchIfMissing = true)
-	@ConditionalOnBean({ AuthenticationManager.class })
+	@ConditionalOnBean(AuthenticationManager.class)
 	@AutoConfigureAfter(CrshAutoConfiguration.class)
 	public static class AuthenticationManagerAdapterAutoConfiguration {
 
@@ -164,13 +164,13 @@ public class CrshAutoConfiguration {
 		private ManagementServerProperties management;
 
 		@Bean
-		public CRaSHPlugin<?> shellAuthenticationManager() {
+		public AuthenticationManagerAdapter shellAuthenticationManager() {
 			return new AuthenticationManagerAdapter();
 		}
 
 		@Bean
-		@ConditionalOnMissingBean({ CrshShellAuthenticationProperties.class })
+		@ConditionalOnMissingBean(CrshShellAuthenticationProperties.class)
-		public CrshShellAuthenticationProperties springAuthenticationProperties() {
+		public SpringAuthenticationProperties springAuthenticationProperties() {
 			// In case no shell.auth property is provided fall back to Spring Security
 			// based authentication and get role to access shell from
 			// ManagementServerProperties.

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java

@@ -18,7 +18,6 @@ package org.springframework.boot.actuate.autoconfigure;
 
 import java.io.IOException;
 
-import javax.servlet.Filter;
 import javax.servlet.FilterChain;
 import javax.servlet.Servlet;
 import javax.servlet.ServletException;
@@ -92,10 +91,11 @@ import org.springframework.web.servlet.DispatcherServlet;
 @ConditionalOnWebApplication
 @AutoConfigureAfter({ PropertyPlaceholderAutoConfiguration.class,
 		EmbeddedServletContainerAutoConfiguration.class, WebMvcAutoConfiguration.class,
-	ManagementServerPropertiesAutoConfiguration.class, RepositoryRestMvcAutoConfiguration.class,
+		ManagementServerPropertiesAutoConfiguration.class,
-	HypermediaAutoConfiguration.class, HttpMessageConvertersAutoConfiguration.class })
+		RepositoryRestMvcAutoConfiguration.class, HypermediaAutoConfiguration.class,
+		HttpMessageConvertersAutoConfiguration.class })
 public class EndpointWebMvcAutoConfiguration implements ApplicationContextAware,
-BeanFactoryAware, SmartInitializingSingleton {
+		BeanFactoryAware, SmartInitializingSingleton {
 
 	private static final Log logger = LogFactory
 			.getLog(EndpointWebMvcAutoConfiguration.class);
@@ -193,7 +193,8 @@ BeanFactoryAware, SmartInitializingSingleton {
 	protected static class ApplicationContextFilterConfiguration {
 
 		@Bean
-		public Filter applicationContextIdFilter(ApplicationContext context) {
+		public ApplicationContextHeaderFilter applicationContextIdFilter(
+				ApplicationContext context) {
 			return new ApplicationContextHeaderFilter(context);
 		}
 

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcHypermediaManagementContextConfiguration.java

@@ -16,8 +16,6 @@
 
 package org.springframework.boot.actuate.autoconfigure;
 
-import static org.springframework.hateoas.mvc.ControllerLinkBuilder.linkTo;
-
 import java.io.IOException;
 import java.lang.reflect.Type;
 import java.util.Map;
@@ -84,6 +82,8 @@ import com.fasterxml.jackson.annotation.JsonUnwrapped;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
 
+import static org.springframework.hateoas.mvc.ControllerLinkBuilder.linkTo;
+
 /**
  * Configuration for hypermedia in HTTP endpoints.
  *

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfiguration.java

@@ -92,8 +92,8 @@ public class HealthIndicatorAutoConfiguration {
 	private HealthIndicatorAutoConfigurationProperties configurationProperties = new HealthIndicatorAutoConfigurationProperties();
 
 	@Bean
-	@ConditionalOnMissingBean
+	@ConditionalOnMissingBean(HealthAggregator.class)
-	public HealthAggregator healthAggregator() {
+	public OrderedHealthAggregator healthAggregator() {
 		OrderedHealthAggregator healthAggregator = new OrderedHealthAggregator();
 		if (this.configurationProperties.getOrder() != null) {
 			healthAggregator.setStatusOrder(this.configurationProperties.getOrder());
@@ -103,7 +103,7 @@ public class HealthIndicatorAutoConfiguration {
 
 	@Bean
 	@ConditionalOnMissingBean(HealthIndicator.class)
-	public HealthIndicator applicationHealthIndicator() {
+	public ApplicationHealthIndicator applicationHealthIndicator() {
 		return new ApplicationHealthIndicator();
 	}
 
@@ -264,7 +264,7 @@ public class HealthIndicatorAutoConfiguration {
 
 		@Bean
 		@ConditionalOnMissingBean(name = "diskSpaceHealthIndicator")
-		public HealthIndicator diskSpaceHealthIndicator(
+		public DiskSpaceHealthIndicator diskSpaceHealthIndicator(
 				DiskSpaceHealthIndicatorProperties properties) {
 			return new DiskSpaceHealthIndicator(properties);
 		}

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricFilterAutoConfiguration.java

@@ -16,7 +16,6 @@
 
 package org.springframework.boot.actuate.autoconfigure;
 
-import javax.servlet.Filter;
 import javax.servlet.Servlet;
 import javax.servlet.ServletRegistration;
 
@@ -56,7 +55,7 @@ public class MetricFilterAutoConfiguration {
 	private GaugeService gaugeService;
 
 	@Bean
-	public Filter metricFilter() {
+	public MetricsFilter metricFilter() {
 		return new MetricsFilter(this.counterService, this.gaugeService);
 	}
 

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java

@@ -91,14 +91,14 @@ public class MetricRepositoryAutoConfiguration {
 		private MetricWriter writer;
 
 		@Bean
-		@ConditionalOnMissingBean
+		@ConditionalOnMissingBean(CounterService.class)
-		public CounterService counterService() {
+		public DefaultCounterService counterService() {
 			return new DefaultCounterService(this.writer);
 		}
 
 		@Bean
-		@ConditionalOnMissingBean
+		@ConditionalOnMissingBean(GaugeService.class)
-		public GaugeService gaugeService() {
+		public DefaultGaugeService gaugeService() {
 			return new DefaultGaugeService(this.writer);
 		}
 
@@ -130,14 +130,14 @@ public class MetricRepositoryAutoConfiguration {
 		}
 
 		@Bean
-		@ConditionalOnMissingBean
+		@ConditionalOnMissingBean(CounterService.class)
-		public CounterService counterService(CounterBuffers writer) {
+		public BufferCounterService counterService(CounterBuffers writer) {
 			return new BufferCounterService(writer);
 		}
 
 		@Bean
-		@ConditionalOnMissingBean
+		@ConditionalOnMissingBean(GaugeService.class)
-		public GaugeService gaugeService(GaugeBuffers writer) {
+		public BufferGaugeService gaugeService(GaugeBuffers writer) {
 			return new BufferGaugeService(writer);
 		}
 	}

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricsDropwizardAutoConfiguration.java

@@ -17,7 +17,6 @@
 package org.springframework.boot.actuate.autoconfigure;
 
 import org.springframework.boot.actuate.endpoint.MetricReaderPublicMetrics;
-import org.springframework.boot.actuate.endpoint.PublicMetrics;
 import org.springframework.boot.actuate.metrics.CounterService;
 import org.springframework.boot.actuate.metrics.GaugeService;
 import org.springframework.boot.actuate.metrics.dropwizard.DropwizardMetricServices;
@@ -56,7 +55,7 @@ public class MetricsDropwizardAutoConfiguration {
 	}
 
 	@Bean
-	public PublicMetrics dropwizardPublicMetrics(MetricRegistry metricRegistry) {
+	public MetricReaderPublicMetrics dropwizardPublicMetrics(MetricRegistry metricRegistry) {
 		MetricRegistryMetricReader reader = new MetricRegistryMetricReader(metricRegistry);
 		return new MetricReaderPublicMetrics(reader);
 	}

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/TraceRepositoryAutoConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2013 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.
@@ -31,9 +31,9 @@ import org.springframework.context.annotation.Configuration;
 @Configuration
 public class TraceRepositoryAutoConfiguration {
 
-	@ConditionalOnMissingBean
+	@ConditionalOnMissingBean(TraceRepository.class)
 	@Bean
-	public TraceRepository traceRepository() {
+	public InMemoryTraceRepository traceRepository() {
 		return new InMemoryTraceRepository();
 	}
 

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfiguration.java

@@ -106,7 +106,7 @@ public class RabbitAutoConfiguration {
 	protected static class RabbitConnectionFactoryCreator {
 
 		@Bean
-		public ConnectionFactory rabbitConnectionFactory(RabbitProperties config)
+		public CachingConnectionFactory rabbitConnectionFactory(RabbitProperties config)
 				throws Exception {
 			RabbitConnectionFactoryBean factory = new RabbitConnectionFactoryBean();
 			if (config.getHost() != null) {

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfiguration.java

@@ -29,7 +29,6 @@ import org.springframework.batch.core.launch.JobOperator;
 import org.springframework.batch.core.launch.support.SimpleJobOperator;
 import org.springframework.batch.core.repository.JobRepository;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.ExitCodeGenerator;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
@@ -93,7 +92,7 @@ public class BatchAutoConfiguration {
 
 	@Bean
 	@ConditionalOnMissingBean
-	public ExitCodeGenerator jobExecutionExitCodeGenerator() {
+	public JobExecutionExitCodeGenerator jobExecutionExitCodeGenerator() {
 		return new JobExecutionExitCodeGenerator();
 	}
 
@@ -112,9 +111,10 @@ public class BatchAutoConfiguration {
 	}
 
 	@Bean
-	@ConditionalOnMissingBean
+	@ConditionalOnMissingBean(JobOperator.class)
-	public JobOperator jobOperator(JobExplorer jobExplorer, JobLauncher jobLauncher,
+	public SimpleJobOperator jobOperator(JobExplorer jobExplorer,
-			ListableJobLocator jobRegistry, JobRepository jobRepository) throws Exception {
+			JobLauncher jobLauncher, ListableJobLocator jobRegistry,
+			JobRepository jobRepository) throws Exception {
 		SimpleJobOperator factory = new SimpleJobOperator();
 		factory.setJobExplorer(jobExplorer);
 		factory.setJobLauncher(jobLauncher);
@@ -139,7 +139,7 @@ public class BatchAutoConfiguration {
 		// Boot in the JPA auto configuration.
 		@Bean
 		@ConditionalOnBean(name = "entityManagerFactory")
-		public BatchConfigurer jpaBatchConfigurer(DataSource dataSource,
+		public BasicBatchConfigurer jpaBatchConfigurer(DataSource dataSource,
 				EntityManagerFactory entityManagerFactory) {
 			return new BasicBatchConfigurer(this.properties, dataSource,
 					entityManagerFactory);
@@ -147,7 +147,7 @@ public class BatchAutoConfiguration {
 
 		@Bean
 		@ConditionalOnMissingBean(name = "entityManagerFactory")
-		public BatchConfigurer basicBatchConfigurer(DataSource dataSource) {
+		public BasicBatchConfigurer basicBatchConfigurer(DataSource dataSource) {
 			return new BasicBatchConfigurer(this.properties, dataSource);
 		}
 

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfiguration.java

@@ -66,7 +66,7 @@ public class CacheAutoConfiguration {
 
 	@Bean
 	@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
-	public static BeanFactoryPostProcessor cacheAutoConfigurationValidatorPostProcessor() {
+	public static CacheManagerValidatorPostProcessor cacheAutoConfigurationValidatorPostProcessor() {
 		return new CacheManagerValidatorPostProcessor();
 	}
 

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/InfinispanCacheConfiguration.java

@@ -54,7 +54,8 @@ public class InfinispanCacheConfiguration {
 	private ConfigurationBuilder defaultConfigurationBuilder;
 
 	@Bean
-	public CacheManager cacheManager(EmbeddedCacheManager embeddedCacheManager) {
+	public SpringEmbeddedCacheManager cacheManager(
+			EmbeddedCacheManager embeddedCacheManager) {
 		return new SpringEmbeddedCacheManager(embeddedCacheManager);
 	}
 

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfiguration.java

@@ -97,7 +97,7 @@ public class JacksonAutoConfiguration {
 		private JacksonProperties jacksonProperties;
 
 		@Bean
-		public Module jodaDateTimeSerializationModule() {
+		public SimpleModule jodaDateTimeSerializationModule() {
 			SimpleModule module = new SimpleModule();
 			JacksonJodaDateFormat jacksonJodaFormat = getJacksonJodaDateFormat();
 			if (jacksonJodaFormat != null) {

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java

@@ -52,9 +52,9 @@ public class DataSourceTransactionManagerAutoConfiguration implements Ordered {
 	private DataSource dataSource;
 
 	@Bean
-	@ConditionalOnMissingBean
+	@ConditionalOnMissingBean(PlatformTransactionManager.class)
 	@ConditionalOnBean(DataSource.class)
-	public PlatformTransactionManager transactionManager() {
+	public DataSourceTransactionManager transactionManager() {
 		return new DataSourceTransactionManager(this.dataSource);
 	}
 

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/EmbeddedDataSourceConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2013 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.
@@ -17,7 +17,6 @@
 package org.springframework.boot.autoconfigure.jdbc;
 
 import javax.annotation.PreDestroy;
-import javax.sql.DataSource;
 
 import org.springframework.beans.factory.BeanClassLoaderAware;
 import org.springframework.beans.factory.annotation.Value;
@@ -48,7 +47,7 @@ public class EmbeddedDataSourceConfiguration implements BeanClassLoaderAware {
 	}
 
 	@Bean
-	public DataSource dataSource() {
+	public EmbeddedDatabase dataSource() {
 		EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder()
 				.setType(EmbeddedDatabaseConnection.get(this.classLoader).getType());
 		this.database = builder.setName(this.name).build();

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsAnnotationDrivenConfiguration.java

@@ -79,8 +79,8 @@ class JmsAnnotationDrivenConfiguration {
 	protected static class JndiConfiguration {
 
 		@Bean
-		@ConditionalOnMissingBean
+		@ConditionalOnMissingBean(DestinationResolver.class)
-		public DestinationResolver destinationResolver() {
+		public JndiDestinationResolver destinationResolver() {
 			JndiDestinationResolver resolver = new JndiDestinationResolver();
 			resolver.setFallbackToDynamicDestination(true);
 			return resolver;

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQConnectionFactoryConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-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.
@@ -20,7 +20,9 @@ import javax.jms.ConnectionFactory;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.pool.PooledConnectionFactory;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -30,22 +32,34 @@ import org.springframework.context.annotation.Configuration;
  * @author Greg Turnquist
  * @author Stephane Nicoll
  * @author Phillip Webb
+ * @author Andy Wilkinson
  * @since 1.1.0
  */
 @Configuration
 @ConditionalOnMissingBean(ConnectionFactory.class)
 class ActiveMQConnectionFactoryConfiguration {
 
+	@ConditionalOnClass(PooledConnectionFactory.class)
+	static class PooledConnectionFactoryConfiguration {
+
 		@Bean
-	public ConnectionFactory jmsConnectionFactory(ActiveMQProperties properties) {
+		@ConditionalOnProperty(prefix = "spring.activemq", name = "pooled", havingValue = "true", matchIfMissing = false)
-		ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactoryFactory(
+		public PooledConnectionFactory pooledJmsConnectionFactory(
-				properties).createConnectionFactory(ActiveMQConnectionFactory.class);
+				ActiveMQProperties properties) {
-		if (properties.isPooled()) {
+			PooledConnectionFactory pooledConnectionFactory = new PooledConnectionFactory();
-			PooledConnectionFactory pool = new PooledConnectionFactory();
+			pooledConnectionFactory
-			pool.setConnectionFactory(connectionFactory);
+					.setConnectionFactory(new ActiveMQConnectionFactoryFactory(properties)
-			return pool;
+							.createConnectionFactory(ActiveMQConnectionFactory.class));
+			return pooledConnectionFactory;
+
 		}
-		return connectionFactory;
+	}
+
+	@Bean
+	@ConditionalOnProperty(prefix = "spring.activemq", name = "pooled", havingValue = "false", matchIfMissing = true)
+	public ActiveMQConnectionFactory jmsConnectionFactory(ActiveMQProperties properties) {
+		return new ActiveMQConnectionFactoryFactory(properties)
+				.createConnectionFactory(ActiveMQConnectionFactory.class);
 	}
 
 }

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisConnectionFactoryConfiguration.java

@@ -35,8 +35,8 @@ import org.springframework.context.annotation.Configuration;
 class ArtemisConnectionFactoryConfiguration {
 
 	@Bean
-	public ConnectionFactory jmsConnectionFactory(ListableBeanFactory beanFactory,
+	public ActiveMQConnectionFactory jmsConnectionFactory(
-			ArtemisProperties properties) {
+			ListableBeanFactory beanFactory, ArtemisProperties properties) {
 		return new ArtemisConnectionFactoryFactory(beanFactory, properties)
 				.createConnectionFactory(ActiveMQConnectionFactory.class);
 	}

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisXAConnectionFactoryConfiguration.java

@@ -53,8 +53,8 @@ class ArtemisXAConnectionFactoryConfiguration {
 	}
 
 	@Bean
-	public ConnectionFactory nonXaJmsConnectionFactory(ListableBeanFactory beanFactory,
+	public ActiveMQXAConnectionFactory nonXaJmsConnectionFactory(
-			ArtemisProperties properties) {
+			ListableBeanFactory beanFactory, ArtemisProperties properties) {
 		return new ArtemisConnectionFactoryFactory(beanFactory, properties)
 				.createConnectionFactory(ActiveMQXAConnectionFactory.class);
 	}

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/hornetq/HornetQConnectionFactoryConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-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.
@@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration;
 class HornetQConnectionFactoryConfiguration {
 
 	@Bean
-	public ConnectionFactory jmsConnectionFactory(ListableBeanFactory beanFactory,
+	public HornetQConnectionFactory jmsConnectionFactory(ListableBeanFactory beanFactory,
 			HornetQProperties properties) {
 		return new HornetQConnectionFactoryFactory(beanFactory, properties)
 				.createConnectionFactory(HornetQConnectionFactory.class);

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/hornetq/HornetQXAConnectionFactoryConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-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.
@@ -53,8 +53,8 @@ class HornetQXAConnectionFactoryConfiguration {
 	}
 
 	@Bean
-	public ConnectionFactory nonXaJmsConnectionFactory(ListableBeanFactory beanFactory,
+	public HornetQConnectionFactory nonXaJmsConnectionFactory(
-			HornetQProperties properties) {
+			ListableBeanFactory beanFactory, HornetQProperties properties) {
 		return new HornetQConnectionFactoryFactory(beanFactory, properties)
 				.createConnectionFactory(HornetQConnectionFactory.class);
 	}

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jooq/JooqAutoConfiguration.java

@@ -64,12 +64,13 @@ public class JooqAutoConfiguration {
 
 	@Bean
 	@ConditionalOnBean(PlatformTransactionManager.class)
-	public TransactionProvider transactionProvider(PlatformTransactionManager txManager) {
+	public SpringTransactionProvider transactionProvider(
+			PlatformTransactionManager txManager) {
 		return new SpringTransactionProvider(txManager);
 	}
 
 	@Bean
-	public ExecuteListenerProvider jooqExceptionTranslatorExecuteListenerProvider() {
+	public DefaultExecuteListenerProvider jooqExceptionTranslatorExecuteListenerProvider() {
 		return new DefaultExecuteListenerProvider(new JooqExceptionTranslator());
 	}
 

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoDataAutoConfiguration.java

@@ -102,8 +102,8 @@ public class MongoDataAutoConfiguration implements BeanClassLoaderAware {
 	}
 
 	@Bean
-	@ConditionalOnMissingBean
+	@ConditionalOnMissingBean(MongoDbFactory.class)
-	public MongoDbFactory mongoDbFactory(MongoClient mongo) throws Exception {
+	public SimpleMongoDbFactory mongoDbFactory(MongoClient mongo) throws Exception {
 		String database = this.properties.getMongoClientDatabase();
 		return new SimpleMongoDbFactory(mongo, database);
 	}

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/redis/RedisAutoConfiguration.java

@@ -132,8 +132,8 @@ public class RedisAutoConfiguration {
 			AbstractRedisConfiguration {
 
 		@Bean
-		@ConditionalOnMissingBean
+		@ConditionalOnMissingBean(RedisConnectionFactory.class)
-		public RedisConnectionFactory redisConnectionFactory()
+		public JedisConnectionFactory redisConnectionFactory()
 				throws UnknownHostException {
 			return applyProperties(new JedisConnectionFactory(getSentinelConfig()));
 		}
@@ -149,8 +149,8 @@ public class RedisAutoConfiguration {
 			AbstractRedisConfiguration {
 
 		@Bean
-		@ConditionalOnMissingBean
+		@ConditionalOnMissingBean(RedisConnectionFactory.class)
-		public RedisConnectionFactory redisConnectionFactory()
+		public JedisConnectionFactory redisConnectionFactory()
 				throws UnknownHostException {
 			return applyProperties(createJedisConnectionFactory());
 		}

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityAutoConfiguration.java

@@ -54,8 +54,8 @@ import org.springframework.security.config.annotation.web.configuration.WebSecur
 public class SecurityAutoConfiguration {
 
 	@Bean
-	@ConditionalOnMissingBean
+	@ConditionalOnMissingBean(AuthenticationEventPublisher.class)
-	public AuthenticationEventPublisher authenticationEventPublisher(
+	public DefaultAuthenticationEventPublisher authenticationEventPublisher(
 			ApplicationEventPublisher publisher) {
 		return new DefaultAuthenticationEventPublisher(publisher);
 	}

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SpringBootWebSecurityConfiguration.java

@@ -94,7 +94,7 @@ public class SpringBootWebSecurityConfiguration {
 
 	@Bean
 	@ConditionalOnMissingBean({ IgnoredPathsWebSecurityConfigurerAdapter.class })
-	public WebSecurityConfigurer<WebSecurity> ignoredPathsWebSecurityConfigurerAdapter() {
+	public IgnoredPathsWebSecurityConfigurerAdapter ignoredPathsWebSecurityConfigurerAdapter() {
 		return new IgnoredPathsWebSecurityConfigurerAdapter();
 	}
 

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2RestOperationsConfiguration.java

@@ -102,7 +102,7 @@ public class OAuth2RestOperationsConfiguration {
 		}
 
 		@Bean
-		public OAuth2ClientContext oauth2ClientContext() {
+		public DefaultOAuth2ClientContext oauth2ClientContext() {
 			return new DefaultOAuth2ClientContext(new DefaultAccessTokenRequest());
 		}
 
@@ -119,7 +119,7 @@ public class OAuth2RestOperationsConfiguration {
 
 		@Bean
 		@Scope(value = "session", proxyMode = ScopedProxyMode.INTERFACES)
-		public OAuth2ClientContext oauth2ClientContext() {
+		public DefaultOAuth2ClientContext oauth2ClientContext() {
 			return new DefaultOAuth2ClientContext(this.accessTokenRequest);
 		}
 
@@ -147,7 +147,7 @@ public class OAuth2RestOperationsConfiguration {
 
 		@Bean
 		@Scope(value = "request", proxyMode = ScopedProxyMode.INTERFACES)
-		public OAuth2ClientContext oauth2ClientContext() {
+		public DefaultOAuth2ClientContext oauth2ClientContext() {
 			DefaultOAuth2ClientContext context = new DefaultOAuth2ClientContext(
 					new DefaultAccessTokenRequest());
 			Authentication principal = SecurityContextHolder.getContext()

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/ResourceServerTokenServicesConfiguration.java

@@ -146,7 +146,7 @@ public class ResourceServerTokenServicesConfiguration {
 			private ResourceServerProperties resource;
 
 			@Bean
-			public ResourceServerTokenServices remoteTokenServices() {
+			public RemoteTokenServices remoteTokenServices() {
 				RemoteTokenServices services = new RemoteTokenServices();
 				services.setCheckTokenEndpointUrl(this.resource.getTokenInfoUri());
 				services.setClientId(this.resource.getClientId());
@@ -182,7 +182,7 @@ public class ResourceServerTokenServicesConfiguration {
 			@Bean
 			@ConditionalOnMissingBean({ ConnectionFactoryLocator.class,
 					ResourceServerTokenServices.class })
-			public ResourceServerTokenServices userInfoTokenServices() {
+			public UserInfoTokenServices userInfoTokenServices() {
 				UserInfoTokenServices services = new UserInfoTokenServices(
 						this.sso.getUserInfoUri(), this.sso.getClientId());
 				services.setTokenType(this.sso.getTokenType());
@@ -206,7 +206,7 @@ public class ResourceServerTokenServicesConfiguration {
 
 			@Bean
 			@ConditionalOnMissingBean(ResourceServerTokenServices.class)
-			public ResourceServerTokenServices userInfoTokenServices() {
+			public UserInfoTokenServices userInfoTokenServices() {
 				UserInfoTokenServices services = new UserInfoTokenServices(
 						this.sso.getUserInfoUri(), this.sso.getClientId());
 				services.setRestTemplate(this.restTemplate);
@@ -233,7 +233,7 @@ public class ResourceServerTokenServicesConfiguration {
 
 		@Bean
 		@ConditionalOnMissingBean(ResourceServerTokenServices.class)
-		public ResourceServerTokenServices jwtTokenServices() {
+		public DefaultTokenServices jwtTokenServices() {
 			DefaultTokenServices services = new DefaultTokenServices();
 			services.setTokenStore(jwtTokenStore());
 			return services;

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/social/FacebookAutoConfiguration.java

@@ -38,7 +38,6 @@ import org.springframework.social.connect.ConnectionRepository;
 import org.springframework.social.connect.web.GenericConnectionStatusView;
 import org.springframework.social.facebook.api.Facebook;
 import org.springframework.social.facebook.connect.FacebookConnectionFactory;
-import org.springframework.web.servlet.View;
 
 /**
  * {@link EnableAutoConfiguration Auto-configuration} for Spring Social connectivity with
@@ -74,7 +73,7 @@ public class FacebookAutoConfiguration {
 
 		@Bean(name = { "connect/facebookConnect", "connect/facebookConnected" })
 		@ConditionalOnProperty(prefix = "spring.social", name = "auto-connection-views")
-		public View facebookConnectView() {
+		public GenericConnectionStatusView facebookConnectView() {
 			return new GenericConnectionStatusView("facebook", "Facebook");
 		}
 

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/social/LinkedInAutoConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-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.
@@ -38,7 +38,6 @@ import org.springframework.social.connect.ConnectionRepository;
 import org.springframework.social.connect.web.GenericConnectionStatusView;
 import org.springframework.social.linkedin.api.LinkedIn;
 import org.springframework.social.linkedin.connect.LinkedInConnectionFactory;
-import org.springframework.web.servlet.View;
 
 /**
  * {@link EnableAutoConfiguration Auto-configuration} for Spring Social connectivity with
@@ -74,7 +73,7 @@ public class LinkedInAutoConfiguration {
 
 		@Bean(name = { "connect/linkedinConnect", "connect/linkedinConnected" })
 		@ConditionalOnProperty(prefix = "spring.social", name = "auto-connection-views")
-		public View linkedInConnectView() {
+		public GenericConnectionStatusView linkedInConnectView() {
 			return new GenericConnectionStatusView("linkedin", "LinkedIn");
 		}
 

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/social/SocialWebAutoConfiguration.java

@@ -50,7 +50,6 @@ import org.springframework.social.connect.web.SignInAdapter;
 import org.springframework.social.connect.web.thymeleaf.SpringSocialDialect;
 import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
-import org.springframework.web.servlet.ViewResolver;
 import org.springframework.web.servlet.view.BeanNameViewResolver;
 import org.thymeleaf.spring4.SpringTemplateEngine;
 
@@ -98,9 +97,9 @@ public class SocialWebAutoConfiguration {
 		}
 
 		@Bean
-		@ConditionalOnMissingBean(BeanNameViewResolver.class)
+		@ConditionalOnMissingBean
 		@ConditionalOnProperty(prefix = "spring.social", name = "auto-connection-views")
-		public ViewResolver beanNameViewResolver() {
+		public BeanNameViewResolver beanNameViewResolver() {
 			BeanNameViewResolver viewResolver = new BeanNameViewResolver();
 			viewResolver.setOrder(Integer.MIN_VALUE);
 			return viewResolver;
@@ -108,7 +107,7 @@ public class SocialWebAutoConfiguration {
 
 		@Bean
 		@ConditionalOnBean(SignInAdapter.class)
-		@ConditionalOnMissingBean(ProviderSignInController.class)
+		@ConditionalOnMissingBean
 		public ProviderSignInController signInController(
 				ConnectionFactoryLocator factoryLocator,
 				UsersConnectionRepository usersRepository, SignInAdapter signInAdapter) {

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/social/TwitterAutoConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-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.
@@ -39,7 +39,6 @@ import org.springframework.social.connect.web.GenericConnectionStatusView;
 import org.springframework.social.twitter.api.Twitter;
 import org.springframework.social.twitter.api.impl.TwitterTemplate;
 import org.springframework.social.twitter.connect.TwitterConnectionFactory;
-import org.springframework.web.servlet.View;
 
 /**
  * {@link EnableAutoConfiguration Auto-configuration} for Spring Social connectivity with
@@ -79,7 +78,7 @@ public class TwitterAutoConfiguration {
 
 		@Bean(name = { "connect/twitterConnect", "connect/twitterConnected" })
 		@ConditionalOnProperty(prefix = "spring.social", name = "auto-connection-views")
-		public View twitterConnectView() {
+		public GenericConnectionStatusView twitterConnectView() {
 			return new GenericConnectionStatusView("twitter", "Twitter");
 		}
 

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/AtomikosJtaConfiguration.java

@@ -68,8 +68,8 @@ class AtomikosJtaConfiguration {
 	}
 
 	@Bean(initMethod = "init", destroyMethod = "shutdownForce")
-	@ConditionalOnMissingBean
+	@ConditionalOnMissingBean(UserTransactionService.class)
-	public UserTransactionService userTransactionService(
+	public UserTransactionServiceImp userTransactionService(
 			AtomikosProperties atomikosProperties) {
 		Properties properties = new Properties();
 		if (StringUtils.hasText(this.jtaProperties.getTransactionManagerId())) {
@@ -100,8 +100,8 @@ class AtomikosJtaConfiguration {
 	}
 
 	@Bean
-	@ConditionalOnMissingBean
+	@ConditionalOnMissingBean(XADataSourceWrapper.class)
-	public XADataSourceWrapper xaDataSourceWrapper() {
+	public AtomikosXADataSourceWrapper xaDataSourceWrapper() {
 		return new AtomikosXADataSourceWrapper();
 	}
 
@@ -122,8 +122,8 @@ class AtomikosJtaConfiguration {
 	static class AtomikosJtaJmsConfiguration {
 
 		@Bean
-		@ConditionalOnMissingBean
+		@ConditionalOnMissingBean(XAConnectionFactoryWrapper.class)
-		public XAConnectionFactoryWrapper xaConnectionFactoryWrapper() {
+		public AtomikosXAConnectionFactoryWrapper xaConnectionFactoryWrapper() {
 			return new AtomikosXAConnectionFactoryWrapper();
 		}
 

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/BitronixJtaConfiguration.java

@@ -37,6 +37,7 @@ import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.jta.JtaTransactionManager;
 import org.springframework.util.StringUtils;
 
+import bitronix.tm.BitronixTransactionManager;
 import bitronix.tm.TransactionManagerServices;
 import bitronix.tm.jndi.BitronixContext;
 
@@ -80,16 +81,16 @@ class BitronixJtaConfiguration {
 	}
 
 	@Bean
-	@ConditionalOnMissingBean
+	@ConditionalOnMissingBean(TransactionManager.class)
-	public TransactionManager bitronixTransactionManager(
+	public BitronixTransactionManager bitronixTransactionManager(
 			bitronix.tm.Configuration configuration) {
 		// Inject configuration to force ordering
 		return TransactionManagerServices.getTransactionManager();
 	}
 
 	@Bean
-	@ConditionalOnMissingBean
+	@ConditionalOnMissingBean(XADataSourceWrapper.class)
-	public XADataSourceWrapper xaDataSourceWrapper() {
+	public BitronixXADataSourceWrapper xaDataSourceWrapper() {
 		return new BitronixXADataSourceWrapper();
 	}
 
@@ -108,8 +109,8 @@ class BitronixJtaConfiguration {
 	static class BitronixJtaJmsConfiguration {
 
 		@Bean
-		@ConditionalOnMissingBean
+		@ConditionalOnMissingBean(XAConnectionFactoryWrapper.class)
-		public XAConnectionFactoryWrapper xaConnectionFactoryWrapper() {
+		public BitronixXAConnectionFactoryWrapper xaConnectionFactoryWrapper() {
 			return new BitronixXAConnectionFactoryWrapper();
 		}
 	}

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/velocity/VelocityAutoConfiguration.java

@@ -45,7 +45,6 @@ import org.springframework.util.Assert;
 import org.springframework.web.servlet.resource.ResourceUrlEncodingFilter;
 import org.springframework.web.servlet.view.velocity.VelocityConfig;
 import org.springframework.web.servlet.view.velocity.VelocityConfigurer;
-import org.springframework.web.servlet.view.velocity.VelocityViewResolver;
 
 /**
  * {@link EnableAutoConfiguration Auto-configuration} for Velocity.
@@ -130,7 +129,7 @@ public class VelocityAutoConfiguration {
 		@Bean
 		@ConditionalOnMissingBean(name = "velocityViewResolver")
 		@ConditionalOnProperty(name = "spring.velocity.enabled", matchIfMissing = true)
-		public VelocityViewResolver velocityViewResolver() {
+		public EmbeddedVelocityViewResolver velocityViewResolver() {
 			EmbeddedVelocityViewResolver resolver = new EmbeddedVelocityViewResolver();
 			this.properties.applyToViewResolver(resolver);
 			return resolver;

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/MultipartAutoConfiguration.java

@@ -62,7 +62,7 @@ public class MultipartAutoConfiguration {
 	}
 
 	@Bean(name = DispatcherServlet.MULTIPART_RESOLVER_BEAN_NAME)
-	@ConditionalOnMissingBean(value = MultipartResolver.class)
+	@ConditionalOnMissingBean(MultipartResolver.class)
 	public StandardServletMultipartResolver multipartResolver() {
 		return new StandardServletMultipartResolver();
 	}

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfiguration.java

@@ -147,7 +147,7 @@ public class WebMvcAutoConfiguration {
 		}
 
 		@Bean
-		@ConditionalOnMissingBean(InternalResourceViewResolver.class)
+		@ConditionalOnMissingBean
 		public InternalResourceViewResolver defaultViewResolver() {
 			InternalResourceViewResolver resolver = new InternalResourceViewResolver();
 			resolver.setPrefix(this.mvcProperties.getView().getPrefix());
@@ -156,7 +156,7 @@ public class WebMvcAutoConfiguration {
 		}
 
 		@Bean
-		@ConditionalOnMissingBean(RequestContextListener.class)
+		@ConditionalOnMissingBean
 		public RequestContextListener requestContextListener() {
 			return new RequestContextListener();
 		}
@@ -183,7 +183,7 @@ public class WebMvcAutoConfiguration {
 		}
 
 		@Bean
-		@ConditionalOnMissingBean(LocaleResolver.class)
+		@ConditionalOnMissingBean
 		@ConditionalOnProperty(prefix = "spring.mvc", name = "locale")
 		public LocaleResolver localeResolver() {
 			return new FixedLocaleResolver(this.mvcProperties.getLocale());

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/websocket/WebSocketAutoConfiguration.java

@@ -25,7 +25,6 @@ import org.springframework.boot.autoconfigure.AutoConfigureBefore;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.web.EmbeddedServletContainerAutoConfiguration;
-import org.springframework.boot.context.embedded.EmbeddedServletContainerCustomizer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -60,7 +59,7 @@ public class WebSocketAutoConfiguration {
 
 		@Bean
 		@ConditionalOnMissingBean(name = "websocketContainerCustomizer")
-		public EmbeddedServletContainerCustomizer websocketContainerCustomizer() {
+		public TomcatWebSocketContainerCustomizer websocketContainerCustomizer() {
 			return new TomcatWebSocketContainerCustomizer();
 		}
 
@@ -72,7 +71,7 @@ public class WebSocketAutoConfiguration {
 
 		@Bean
 		@ConditionalOnMissingBean(name = "websocketContainerCustomizer")
-		public EmbeddedServletContainerCustomizer websocketContainerCustomizer() {
+		public JettyWebSocketContainerCustomizer websocketContainerCustomizer() {
 			return new JettyWebSocketContainerCustomizer();
 		}
 
@@ -84,7 +83,7 @@ public class WebSocketAutoConfiguration {
 
 		@Bean
 		@ConditionalOnMissingBean(name = "websocketContainerCustomizer")
-		public EmbeddedServletContainerCustomizer websocketContainerCustomizer() {
+		public UndertowWebSocketContainerCustomizer websocketContainerCustomizer() {
 			return new UndertowWebSocketContainerCustomizer();
 		}