Polish

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

@@ -41,7 +41,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata;
  * @since 1.1.0
  */
 @Configuration
-@AutoConfigureBefore(JmsTemplateAutoConfiguration.class)
+@AutoConfigureBefore(JmsAutoConfiguration.class)
 @ConditionalOnClass({ ConnectionFactory.class, ActiveMQConnectionFactory.class })
 @ConditionalOnMissingBean(ConnectionFactory.class)
 public class ActiveMQAutoConfiguration {

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

@@ -29,24 +29,24 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.jms.core.JmsTemplate;
 
 /**
- * {@link EnableAutoConfiguration Auto-configuration} for {@link JmsTemplate}.
+ * {@link EnableAutoConfiguration Auto-configuration} for Spring JMS.
  * 
  * @author Greg Turnquist
  */
 @Configuration
 @ConditionalOnClass(JmsTemplate.class)
 @ConditionalOnBean(ConnectionFactory.class)
-@EnableConfigurationProperties(JmsTemplateProperties.class)
-public class JmsTemplateAutoConfiguration {
+@EnableConfigurationProperties(JmsProperties.class)
+public class JmsAutoConfiguration {
 
 	@Autowired
-	private JmsTemplateProperties properties;
+	private JmsProperties properties;
 
 	@Autowired
 	private ConnectionFactory connectionFactory;
 
 	@Bean
-	@ConditionalOnMissingBean(JmsTemplate.class)
+	@ConditionalOnMissingBean
 	public JmsTemplate jmsTemplate() {
 		JmsTemplate jmsTemplate = new JmsTemplate(this.connectionFactory);
 		jmsTemplate.setPubSubDomain(this.properties.isPubSubDomain());

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

@@ -18,8 +18,14 @@ package org.springframework.boot.autoconfigure.jms;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
+/**
+ * Configuration properties for JMS.
+ * 
+ * @author Greg Turnquist
+ * @author Phillip Webb
+ */
 @ConfigurationProperties(prefix = "spring.jms")
-public class JmsTemplateProperties {
+public class JmsProperties {
 
 	private boolean pubSubDomain = false;
 

spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories

@@ -19,7 +19,7 @@ org.springframework.boot.autoconfigure.integration.IntegrationAutoConfiguration,
 org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,\
 org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration,\
 org.springframework.boot.autoconfigure.jms.ActiveMQAutoConfiguration,\
-org.springframework.boot.autoconfigure.jms.JmsTemplateAutoConfiguration,\
+org.springframework.boot.autoconfigure.jms.JmsAutoConfiguration,\
 org.springframework.boot.autoconfigure.jmx.JmxAutoConfiguration,\
 org.springframework.boot.autoconfigure.flyway.FlywayAutoConfiguration,\
 org.springframework.boot.autoconfigure.groovy.template.GroovyTemplateAutoConfiguration,\

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/JmsAutoConfigurationTests.java

@@ -35,11 +35,11 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
 /**
- * Tests for {@link JmsTemplateAutoConfiguration}.
+ * Tests for {@link JmsAutoConfiguration}.
  * 
  * @author Greg Turnquist
  */
-public class JmsTemplateAutoConfigurationTests {
+public class JmsAutoConfigurationTests {
 
 	private AnnotationConfigApplicationContext context;
 
@@ -206,7 +206,7 @@ public class JmsTemplateAutoConfigurationTests {
 		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
 		context.register(additionalClasses);
 		context.register(ActiveMQAutoConfiguration.class,
-				JmsTemplateAutoConfiguration.class);
+				JmsAutoConfiguration.class);
 		return context;
 	}