Browse Source

Polish

pull/11378/head
Stephane Nicoll 8 years ago
parent
commit
7b8adfab41
  1. 1
      spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/AuditAutoConfiguration.java
  2. 1
      spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundryActuatorAutoConfiguration.java
  3. 2
      spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsAnnotationDrivenConfiguration.java
  4. 1
      spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsAutoConfiguration.java
  5. 1
      spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQConnectionFactoryConfiguration.java
  6. 1
      spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaAnnotationDrivenConfiguration.java
  7. 1
      spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/BitronixJtaConfiguration.java

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Loading…
Cancel
Save