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-11-30 18:00:43 +01:00
parent a491727b7c
commit 7b8adfab41
7 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -68,6 +68,7 @@ public class AuditAutoConfiguration {
return new AuthorizationAuditListener(); return new AuthorizationAuditListener();
} }
@Configuration
@ConditionalOnMissingBean(AuditEventRepository.class) @ConditionalOnMissingBean(AuditEventRepository.class)
protected static class AuditEventRepositoryConfiguration { protected static class AuditEventRepositoryConfiguration {

1
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundryActuatorAutoConfiguration.java
View File

@@ -107,6 +107,7 @@ public class CloudFoundryActuatorAutoConfiguration {
/** /**
* Nested configuration for ignored requests if Spring Security is present. * Nested configuration for ignored requests if Spring Security is present.
*/ */
@Configuration
@ConditionalOnClass(WebSecurity.class) @ConditionalOnClass(WebSecurity.class)
static class CloudFoundryIgnoredRequestConfiguration { static class CloudFoundryIgnoredRequestConfiguration {

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

@@ -82,12 +82,14 @@ class JmsAnnotationDrivenConfiguration {
return factory; return factory;
} }
@Configuration
@EnableJms @EnableJms
@ConditionalOnMissingBean(name = JmsListenerConfigUtils.JMS_LISTENER_ANNOTATION_PROCESSOR_BEAN_NAME) @ConditionalOnMissingBean(name = JmsListenerConfigUtils.JMS_LISTENER_ANNOTATION_PROCESSOR_BEAN_NAME)
protected static class EnableJmsConfiguration { protected static class EnableJmsConfiguration {
} }
@Configuration
@ConditionalOnJndi @ConditionalOnJndi
protected static class JndiConfiguration { protected static class JndiConfiguration {

1
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsAutoConfiguration.java
View File

@@ -104,6 +104,7 @@ public class JmsAutoConfiguration {
} }
@Configuration
@ConditionalOnClass(JmsMessagingTemplate.class) @ConditionalOnClass(JmsMessagingTemplate.class)
@Import(JmsTemplateConfiguration.class) @Import(JmsTemplateConfiguration.class)
protected static class MessagingTemplateConfiguration { protected static class MessagingTemplateConfiguration {

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

@@ -54,6 +54,7 @@ class ActiveMQConnectionFactoryConfiguration {
.createConnectionFactory(ActiveMQConnectionFactory.class); .createConnectionFactory(ActiveMQConnectionFactory.class);
} }
@Configuration
@ConditionalOnClass(PooledConnectionFactory.class) @ConditionalOnClass(PooledConnectionFactory.class)
static class PooledConnectionFactoryConfiguration { static class PooledConnectionFactoryConfiguration {

1
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaAnnotationDrivenConfiguration.java
View File

@@ -59,6 +59,7 @@ class KafkaAnnotationDrivenConfiguration {
return factory; return factory;
} }
@Configuration
@EnableKafka @EnableKafka
@ConditionalOnMissingBean(name = KafkaListenerConfigUtils.KAFKA_LISTENER_ANNOTATION_PROCESSOR_BEAN_NAME) @ConditionalOnMissingBean(name = KafkaListenerConfigUtils.KAFKA_LISTENER_ANNOTATION_PROCESSOR_BEAN_NAME)
protected static class EnableKafkaConfiguration { protected static class EnableKafkaConfiguration {

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

@@ -123,6 +123,7 @@ class BitronixJtaConfiguration {
return jtaTransactionManager; return jtaTransactionManager;
} }
@Configuration
@ConditionalOnClass(Message.class) @ConditionalOnClass(Message.class)
static class BitronixJtaJmsConfiguration { static class BitronixJtaJmsConfiguration {