From 5ef93640855f1fddd8422feb2edc403c54a5c8dd Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 11 Dec 2017 17:55:12 +0100 Subject: [PATCH] Polish --- .../web/server/ManagementContextAutoConfiguration.java | 1 + .../amqp/RabbitAnnotationDrivenConfiguration.java | 1 + .../autoconfigure/batch/BatchConfigurerConfiguration.java | 2 ++ .../http/GsonHttpMessageConvertersConfiguration.java | 6 +++--- .../autoconfigure/json/JsonTestersAutoConfiguration.java | 3 +++ 5 files changed, 10 insertions(+), 3 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/ManagementContextAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/ManagementContextAutoConfiguration.java index d54e90991c6..b08af79f2f6 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/ManagementContextAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/ManagementContextAutoConfiguration.java @@ -106,6 +106,7 @@ public class ManagementContextAutoConfiguration { }); } + @Configuration @EnableManagementContext(ManagementContextType.SAME) static class EnableSameManagementContextConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitAnnotationDrivenConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitAnnotationDrivenConfiguration.java index 6cafd04f939..d7c227fdce8 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitAnnotationDrivenConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitAnnotationDrivenConfiguration.java @@ -97,6 +97,7 @@ class RabbitAnnotationDrivenConfiguration { return factory; } + @Configuration @EnableRabbit @ConditionalOnMissingBean(name = RabbitListenerConfigUtils.RABBIT_LISTENER_ANNOTATION_PROCESSOR_BEAN_NAME) protected static class EnableRabbitConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchConfigurerConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchConfigurerConfiguration.java index d21d65372c7..e2ec403ea71 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchConfigurerConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchConfigurerConfiguration.java @@ -39,6 +39,7 @@ import org.springframework.transaction.PlatformTransactionManager; @Configuration class BatchConfigurerConfiguration { + @Configuration @ConditionalOnMissingBean(name = "entityManagerFactory") static class JdbcBatchConfiguration { @@ -52,6 +53,7 @@ class BatchConfigurerConfiguration { } + @Configuration @ConditionalOnClass(name = "javax.persistence.EntityManagerFactory") @ConditionalOnBean(name = "entityManagerFactory") static class JpaBatchConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/GsonHttpMessageConvertersConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/GsonHttpMessageConvertersConfiguration.java index 4e4bb8715ad..394a589f3dc 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/GsonHttpMessageConvertersConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/GsonHttpMessageConvertersConfiguration.java @@ -68,16 +68,16 @@ class GsonHttpMessageConvertersConfiguration { } - @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); } diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/JsonTestersAutoConfiguration.java b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/JsonTestersAutoConfiguration.java index f0eb7dd1571..70ab506e806 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/JsonTestersAutoConfiguration.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/JsonTestersAutoConfiguration.java @@ -75,6 +75,7 @@ public class JsonTestersAutoConfiguration { null); } + @Configuration @ConditionalOnClass(ObjectMapper.class) private static class JacksonJsonTestersConfiguration { @@ -88,6 +89,7 @@ public class JsonTestersAutoConfiguration { } + @Configuration @ConditionalOnClass(Gson.class) private static class GsonJsonTestersConfiguration { @@ -100,6 +102,7 @@ public class JsonTestersAutoConfiguration { } + @Configuration @ConditionalOnClass(Jsonb.class) private static class JsonbJsonTesterConfiguration {