From 7b8adfab41242e929c1e3bbdfd7d4a065079d1f7 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Thu, 30 Nov 2017 18:00:43 +0100 Subject: [PATCH] Polish --- .../boot/actuate/autoconfigure/AuditAutoConfiguration.java | 1 + .../cloudfoundry/CloudFoundryActuatorAutoConfiguration.java | 1 + .../autoconfigure/jms/JmsAnnotationDrivenConfiguration.java | 2 ++ .../boot/autoconfigure/jms/JmsAutoConfiguration.java | 1 + .../jms/activemq/ActiveMQConnectionFactoryConfiguration.java | 1 + .../autoconfigure/kafka/KafkaAnnotationDrivenConfiguration.java | 1 + .../autoconfigure/transaction/jta/BitronixJtaConfiguration.java | 1 + 7 files changed, 8 insertions(+) diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/AuditAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/AuditAutoConfiguration.java index 25841c64e6..2117fd8c91 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/AuditAutoConfiguration.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/AuditAutoConfiguration.java @@ -68,6 +68,7 @@ public class AuditAutoConfiguration { return new AuthorizationAuditListener(); } + @Configuration @ConditionalOnMissingBean(AuditEventRepository.class) protected static class AuditEventRepositoryConfiguration { diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundryActuatorAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundryActuatorAutoConfiguration.java index 460891dec2..d96d4401bd 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundryActuatorAutoConfiguration.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundryActuatorAutoConfiguration.java @@ -107,6 +107,7 @@ public class CloudFoundryActuatorAutoConfiguration { /** * Nested configuration for ignored requests if Spring Security is present. */ + @Configuration @ConditionalOnClass(WebSecurity.class) static class CloudFoundryIgnoredRequestConfiguration { diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsAnnotationDrivenConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsAnnotationDrivenConfiguration.java index 5a83a02792..dbc5a51e5a 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsAnnotationDrivenConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsAnnotationDrivenConfiguration.java @@ -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 { diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsAutoConfiguration.java index 3c76d05c6b..21c162e7ab 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsAutoConfiguration.java @@ -104,6 +104,7 @@ public class JmsAutoConfiguration { } + @Configuration @ConditionalOnClass(JmsMessagingTemplate.class) @Import(JmsTemplateConfiguration.class) protected static class MessagingTemplateConfiguration { diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQConnectionFactoryConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQConnectionFactoryConfiguration.java index 1b7a941814..298f928746 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQConnectionFactoryConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQConnectionFactoryConfiguration.java @@ -54,6 +54,7 @@ class ActiveMQConnectionFactoryConfiguration { .createConnectionFactory(ActiveMQConnectionFactory.class); } + @Configuration @ConditionalOnClass(PooledConnectionFactory.class) static class PooledConnectionFactoryConfiguration { diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaAnnotationDrivenConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaAnnotationDrivenConfiguration.java index 882119a60f..124afe3f8d 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaAnnotationDrivenConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaAnnotationDrivenConfiguration.java @@ -59,6 +59,7 @@ class KafkaAnnotationDrivenConfiguration { return factory; } + @Configuration @EnableKafka @ConditionalOnMissingBean(name = KafkaListenerConfigUtils.KAFKA_LISTENER_ANNOTATION_PROCESSOR_BEAN_NAME) protected static class EnableKafkaConfiguration { diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/BitronixJtaConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/BitronixJtaConfiguration.java index b732295f59..4f38acc09f 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/BitronixJtaConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/BitronixJtaConfiguration.java @@ -123,6 +123,7 @@ class BitronixJtaConfiguration { return jtaTransactionManager; } + @Configuration @ConditionalOnClass(Message.class) static class BitronixJtaJmsConfiguration {