Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish

Browse Source
This commit is contained in:
Stephane Nicoll
2017-12-11 17:55:12 +01:00
parent ca35105480
commit 5ef9364085
5 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

@@ -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 {

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

@@ -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);
}

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

@@ -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 {