Ensure that @bean methods are only declared on @configuration classes

Closes spring-projectsgh-16190

Author: wilkinsona

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointAutoConfigurationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2019 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.
@@ -334,6 +334,7 @@ public void contribute(Info.Builder builder) {
 
 	}
 
+	@Configuration
 	static class DataSourceConfig {
 
 		@Bean

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcManagementContextConfigurationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 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.
@@ -198,6 +198,7 @@ public HealthMvcEndpoint testHealthMvcEndpoint(HealthEndpoint endpoint) {
 
 	}
 
+	@Configuration
 	static class EnvConfiguration {
 
 		@Bean
@@ -208,6 +209,7 @@ public EnvironmentMvcEndpoint testEnvironmentMvcEndpoint(
 
 	}
 
+	@Configuration
 	static class MetricsConfiguration {
 
 		@Bean
@@ -217,6 +219,7 @@ public MetricsMvcEndpoint testMetricsMvcEndpoint(MetricsEndpoint endpoint) {
 
 	}
 
+	@Configuration
 	static class LoggersConfiguration {
 
 		@Bean
@@ -236,6 +239,7 @@ public void beforeInitialize() {
 
 	}
 
+	@Configuration
 	static class LogFileConfiguration {
 
 		@Bean
@@ -245,6 +249,7 @@ public LogFileMvcEndpoint testLogFileMvcEndpoint() {
 
 	}
 
+	@Configuration
 	static class AuditEventsConfiguration {
 
 		@Bean
@@ -264,6 +269,7 @@ static class TestAuditEventRepository extends InMemoryAuditEventRepository {
 
 	}
 
+	@Configuration
 	static class HeapdumpConfiguration {
 
 		@Bean
@@ -273,6 +279,7 @@ public HeapdumpMvcEndpoint testHeapdumpMvcEndpoint() {
 
 	}
 
+	@Configuration
 	static class ShutdownConfiguration {
 
 		@Bean

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfigurationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2019 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.
@@ -627,6 +627,7 @@ public CouchbaseOperations couchbaseOperations() {
 
 	}
 
+	@Configuration
 	protected static class JestClientConfiguration {
 
 		@Bean

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/dao/PersistenceExceptionTranslationAutoConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 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.
@@ -22,6 +22,7 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.bind.RelaxedPropertyResolver;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.core.env.Environment;
 import org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor;
 
@@ -33,6 +34,7 @@
  * @author Stephane Nicoll
  * @since 1.2.0
  */
+@Configuration
 @ConditionalOnClass(PersistenceExceptionTranslationPostProcessor.class)
 public class PersistenceExceptionTranslationAutoConfiguration {
 

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hateoas/HypermediaHttpMessageConverterConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2019 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.
@@ -29,6 +29,7 @@
 import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.hateoas.mvc.TypeConstrainedMappingJackson2HttpMessageConverter;
 import org.springframework.http.MediaType;
 import org.springframework.http.converter.AbstractHttpMessageConverter;
@@ -41,6 +42,7 @@
  *
  * @author Andy Wilkinson
  */
+@Configuration
 public class HypermediaHttpMessageConverterConfiguration {
 
 	@Bean

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 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.
@@ -26,6 +26,7 @@
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.jdbc.DatabaseDriver;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 
 /**
  * Actual DataSource configurations imported by {@link DataSourceAutoConfiguration}.
@@ -45,6 +46,7 @@ protected static <T> T createDataSource(DataSourceProperties properties,
 	/**
 	 * Tomcat Pool DataSource configuration.
 	 */
+	@Configuration
 	@ConditionalOnClass(org.apache.tomcat.jdbc.pool.DataSource.class)
 	@ConditionalOnMissingBean(DataSource.class)
 	@ConditionalOnProperty(name = "spring.datasource.type", havingValue = "org.apache.tomcat.jdbc.pool.DataSource", matchIfMissing = true)
@@ -71,6 +73,7 @@ public org.apache.tomcat.jdbc.pool.DataSource dataSource(
 	/**
 	 * Hikari DataSource configuration.
 	 */
+	@Configuration
 	@ConditionalOnClass(HikariDataSource.class)
 	@ConditionalOnMissingBean(DataSource.class)
 	@ConditionalOnProperty(name = "spring.datasource.type", havingValue = "com.zaxxer.hikari.HikariDataSource", matchIfMissing = true)
@@ -89,6 +92,7 @@ public HikariDataSource dataSource(DataSourceProperties properties) {
 	 *
 	 * @deprecated as of 1.5 in favor of DBCP2
 	 */
+	@Configuration
 	@ConditionalOnClass(org.apache.commons.dbcp.BasicDataSource.class)
 	@ConditionalOnMissingBean(DataSource.class)
 	@ConditionalOnProperty(name = "spring.datasource.type", havingValue = "org.apache.commons.dbcp.BasicDataSource", matchIfMissing = true)
@@ -116,6 +120,7 @@ public org.apache.commons.dbcp.BasicDataSource dataSource(
 	/**
 	 * DBCP DataSource configuration.
 	 */
+	@Configuration
 	@ConditionalOnClass(org.apache.commons.dbcp2.BasicDataSource.class)
 	@ConditionalOnMissingBean(DataSource.class)
 	@ConditionalOnProperty(name = "spring.datasource.type", havingValue = "org.apache.commons.dbcp2.BasicDataSource", matchIfMissing = true)
@@ -134,6 +139,7 @@ public org.apache.commons.dbcp2.BasicDataSource dataSource(
 	/**
 	 * Generic DataSource configuration.
 	 */
+	@Configuration
 	@ConditionalOnMissingBean(DataSource.class)
 	@ConditionalOnProperty(name = "spring.datasource.type")
 	static class Generic {

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2019 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.
@@ -34,6 +34,7 @@
 import org.springframework.boot.jdbc.DatabaseDriver;
 import org.springframework.boot.jta.XADataSourceWrapper;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
@@ -46,6 +47,7 @@
  * @author Josh Long
  * @since 1.2.0
  */
+@Configuration
 @AutoConfigureBefore(DataSourceAutoConfiguration.class)
 @EnableConfigurationProperties(DataSourceProperties.class)
 @ConditionalOnClass({ DataSource.class, TransactionManager.class,

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfigurationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2019 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.
@@ -371,6 +371,7 @@ public JobExplorer getJobExplorer() throws Exception {
 	}
 
 	@EnableBatchProcessing
+	@Configuration
 	protected static class NamedJobConfigurationWithRegisteredJob {
 
 		@Autowired
@@ -413,6 +414,7 @@ protected void doExecute(JobExecution execution)
 	}
 
 	@EnableBatchProcessing
+	@Configuration
 	protected static class NamedJobConfigurationWithLocalJob {
 
 		@Autowired
@@ -444,6 +446,7 @@ protected void doExecute(JobExecution execution)
 
 	}
 
+	@Configuration
 	@EnableBatchProcessing
 	protected static class JobConfiguration {
 

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnPropertyTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2019 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.
@@ -434,6 +434,7 @@ public String foo() {
 
 	}
 
+	@Configuration
 	@ConditionalOnMyFeature
 	protected static class MetaAnnotation {
 
@@ -444,6 +445,7 @@ public String foo() {
 
 	}
 
+	@Configuration
 	@ConditionalOnMyFeature
 	@ConditionalOnProperty(prefix = "my.other.feature", name = "enabled", havingValue = "true", matchIfMissing = false)
 	protected static class MetaAnnotationAndDirectAnnotation {

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/JndiDataSourceAutoConfigurationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2019 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.
@@ -33,6 +33,7 @@
 import org.springframework.boot.test.util.EnvironmentTestUtils;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.jmx.export.MBeanExporter;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -167,7 +168,8 @@ private void configureJndi(String name, DataSource dataSource)
 		TestableInitialContextFactory.bind(name, dataSource);
 	}
 
-	private static class MBeanExporterConfiguration {
+	@Configuration
+	static class MBeanExporterConfiguration {
 
 		@Bean
 		MBeanExporter mbeanExporter() {
@@ -176,7 +178,8 @@ MBeanExporter mbeanExporter() {
 
 	}
 
-	private static class AnotherMBeanExporterConfiguration {
+	@Configuration
+	static class AnotherMBeanExporterConfiguration {
 
 		@Bean
 		MBeanExporter anotherMbeanExporter() {

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfigurationIntegrationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 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.
@@ -29,6 +29,7 @@
 import org.springframework.boot.test.util.EnvironmentTestUtils;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.kafka.annotation.KafkaListener;
 import org.springframework.kafka.core.KafkaTemplate;
 import org.springframework.kafka.support.KafkaHeaders;
@@ -98,6 +99,7 @@ private boolean isWindows() {
 		return File.separatorChar == '\\';
 	}
 
+	@Configuration
 	public static class KafkaConfig {
 
 		@Bean

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/ResourceServerTokenServicesConfigurationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2019 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.
@@ -324,6 +324,7 @@ public Object extractPrincipal(Map<String, Object> map) {
 
 	}
 
+	@Configuration
 	@Import({ OAuth2RestOperationsConfiguration.class })
 	protected static class ResourceNoClientConfiguration extends ResourceConfiguration {
 
@@ -351,6 +352,7 @@ public ResourceServerProperties resourceServerProperties() {
 
 	}
 
+	@Configuration
 	@Import({ FacebookAutoConfiguration.class, SocialWebAutoConfiguration.class })
 	protected static class SocialResourceConfiguration extends ResourceConfiguration {
 

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/MultipartAutoConfigurationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 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.
@@ -373,6 +373,7 @@ WebController webController() {
 
 	}
 
+	@Configuration
 	public static class ContainerWithCustomMultipartResolver {
 
 		@Bean
@@ -382,6 +383,7 @@ MultipartResolver multipartResolver() {
 
 	}
 
+	@Configuration
 	public static class ContainerWithCommonsMultipartResolver {
 
 		@Bean

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/websocket/WebSocketAutoConfigurationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2019 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.
@@ -89,6 +89,7 @@ private void serverContainerIsAvailableFromTheServletContext(
 
 	}
 
+	@Configuration
 	static class CommonConfiguration {
 
 		@Bean