Polish

Author: snicoll

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/ManagementContextAutoConfiguration.java

@@ -106,6 +106,7 @@ public Object getProperty(String name) {
 					});
 		}
 
+		@Configuration
 		@EnableManagementContext(ManagementContextType.SAME)
 		static class EnableSameManagementContextConfiguration {
 

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

@@ -97,6 +97,7 @@ public DirectRabbitListenerContainerFactory directRabbitListenerContainerFactory
 		return factory;
 	}
 
+	@Configuration
 	@EnableRabbit
 	@ConditionalOnMissingBean(name = RabbitListenerConfigUtils.RABBIT_LISTENER_ANNOTATION_PROCESSOR_BEAN_NAME)
 	protected static class EnableRabbitConfiguration {

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

@@ -39,6 +39,7 @@
 @Configuration
 class BatchConfigurerConfiguration {
 
+	@Configuration
 	@ConditionalOnMissingBean(name = "entityManagerFactory")
 	static class JdbcBatchConfiguration {
 
@@ -52,6 +53,7 @@ public BasicBatchConfigurer batchConfigurer(BatchProperties properties,
 
 	}
 
+	@Configuration
 	@ConditionalOnClass(name = "javax.persistence.EntityManagerFactory")
 	@ConditionalOnBean(name = "entityManagerFactory")
 	static class JpaBatchConfiguration {

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/GsonHttpMessageConvertersConfiguration.java

@@ -68,16 +68,16 @@ static class GsonPreferred {
 
 		}
 
-		@Conditional(JacksonAndJsonbUnavailable.class)
+		@Conditional(JacksonAndJsonbUnavailableCondition.class)
 		static class JacksonJsonbUnavailable {
 
 		}
 
 	}
 
-	private static class JacksonAndJsonbUnavailable extends NoneNestedConditions {
+	private static class JacksonAndJsonbUnavailableCondition extends NoneNestedConditions {
 
-		JacksonAndJsonbUnavailable() {
+		JacksonAndJsonbUnavailableCondition() {
 			super(ConfigurationPhase.REGISTER_BEAN);
 		}
 

spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/JsonTestersAutoConfiguration.java

@@ -75,6 +75,7 @@ public FactoryBean<BasicJsonTester> basicJsonTesterFactoryBean() {
 				null);
 	}
 
+	@Configuration
 	@ConditionalOnClass(ObjectMapper.class)
 	private static class JacksonJsonTestersConfiguration {
 
@@ -88,6 +89,7 @@ public FactoryBean<JacksonTester<?>> jacksonTesterFactoryBean(
 
 	}
 
+	@Configuration
 	@ConditionalOnClass(Gson.class)
 	private static class GsonJsonTestersConfiguration {
 
@@ -100,6 +102,7 @@ public FactoryBean<GsonTester<?>> gsonTesterFactoryBean(Gson gson) {
 
 	}
 
+	@Configuration
 	@ConditionalOnClass(Jsonb.class)
 	private static class JsonbJsonTesterConfiguration {