Merge remote-tracking branch '1.3.x'

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitListenerContainerFactoryConfigurer.java

@@ -42,8 +42,8 @@ public final class RabbitListenerContainerFactoryConfigurer {
 	}
 
 	/**
-	 * Create a new and pre-configured {@link SimpleRabbitListenerContainerFactory} instance
-	 * for the specified {@link ConnectionFactory}.
+	 * Create a new and pre-configured {@link SimpleRabbitListenerContainerFactory}
+	 * instance for the specified {@link ConnectionFactory}.
 	 * @param connectionFactory the {@link ConnectionFactory} to use.
 	 * @return a pre-configured {@link SimpleRabbitListenerContainerFactory}
 	 */
@@ -57,7 +57,8 @@ public final class RabbitListenerContainerFactoryConfigurer {
 	/**
 	 * Apply the default settings for the specified jms listener container factory. The
 	 * factory can be further tuned and default settings can be overridden.
-	 * @param factory the {@link SimpleRabbitListenerContainerFactory} instance to configure
+	 * @param factory the {@link SimpleRabbitListenerContainerFactory} instance to
+	 * configure
 	 * @param connectionFactory the {@link ConnectionFactory} to use
 	 */
 	public void configure(SimpleRabbitListenerContainerFactory factory,

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

@@ -49,7 +49,8 @@ class JmsAnnotationDrivenConfiguration {
 	@Bean
 	@ConditionalOnMissingBean(name = "jmsListenerContainerFactory")
 	public DefaultJmsListenerContainerFactory jmsListenerContainerFactory(
-			JmsListenerContainerFactoryConfigurer configurer, ConnectionFactory connectionFactory) {
+			JmsListenerContainerFactoryConfigurer configurer,
+			ConnectionFactory connectionFactory) {
 		return configurer.createJmsListenerContainerFactory(connectionFactory);
 	}
 

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

@@ -50,8 +50,8 @@ public final class JmsListenerContainerFactoryConfigurer {
 	}
 
 	/**
-	 * Set the {@link JtaTransactionManager} to use or {@code null} if the JTA
-	 * support should not be used.
+	 * Set the {@link JtaTransactionManager} to use or {@code null} if the JTA support
+	 * should not be used.
 	 * @param transactionManager the {@link JtaTransactionManager}
 	 */
 	@Autowired(required = false)

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

@@ -204,15 +204,18 @@ public class JmsAutoConfigurationTests {
 
 	@Test
 	public void testCustomContainerFactoryWithConfigurer() {
-		this.context = doLoad(new Class<?>[]{TestConfiguration9.class,
-				EnableJmsConfiguration.class}, "spring.jms.listener.autoStartup=false");
+		this.context = doLoad(
+				new Class<?>[] { TestConfiguration9.class, EnableJmsConfiguration.class },
+				"spring.jms.listener.autoStartup=false");
 		assertThat(this.context.containsBean("jmsListenerContainerFactory")).isTrue();
 		JmsListenerContainerFactory<?> jmsListenerContainerFactory = this.context.getBean(
 				"customListenerContainerFactory", JmsListenerContainerFactory.class);
-		assertThat(jmsListenerContainerFactory).isInstanceOf(DefaultJmsListenerContainerFactory.class);
+		assertThat(jmsListenerContainerFactory)
+				.isInstanceOf(DefaultJmsListenerContainerFactory.class);
 		DefaultMessageListenerContainer listenerContainer = ((DefaultJmsListenerContainerFactory) jmsListenerContainerFactory)
 				.createListenerContainer(mock(JmsListenerEndpoint.class));
-		assertThat(listenerContainer.getCacheLevel()).isEqualTo(DefaultMessageListenerContainer.CACHE_CONSUMER);
+		assertThat(listenerContainer.getCacheLevel())
+				.isEqualTo(DefaultMessageListenerContainer.CACHE_CONSUMER);
 		assertThat(listenerContainer.isAutoStartup()).isFalse();
 	}