Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Formatting

Browse Source
This commit is contained in:
Phillip Webb
2016-02-19 16:07:10 -08:00
parent d3074a086c
commit a9afe0a944
10 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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,

3
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/JobLauncherCommandLineRunner.java
View File

@@ -66,7 +66,8 @@ import org.springframework.util.StringUtils;
public class JobLauncherCommandLineRunner
implements CommandLineRunner, ApplicationEventPublisherAware {
private static final Log logger = LogFactory.getLog(JobLauncherCommandLineRunner.class);
private static final Log logger = LogFactory
.getLog(JobLauncherCommandLineRunner.class);
private JobParametersConverter converter = new DefaultJobParametersConverter();

3
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchAutoConfiguration.java
View File

@@ -66,7 +66,8 @@ public class ElasticsearchAutoConfiguration implements DisposableBean {
DEFAULTS = Collections.unmodifiableMap(defaults);
}
private static final Log logger = LogFactory.getLog(ElasticsearchAutoConfiguration.class);
private static final Log logger = LogFactory
.getLog(ElasticsearchAutoConfiguration.class);
@Autowired
private ElasticsearchProperties properties;

3
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfiguration.java
View File

@@ -67,7 +67,8 @@ import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
@Import({ Registrar.class, DataSourcePoolMetadataProvidersConfiguration.class })
public class DataSourceAutoConfiguration {
private static final Log logger = LogFactory.getLog(DataSourceAutoConfiguration.class);
private static final Log logger = LogFactory
.getLog(DataSourceAutoConfiguration.class);
/**
* Determines if the {@code dataSource} being used by Spring was created from

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

@@ -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);
}

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

@@ -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)

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

@@ -214,8 +214,9 @@ 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");
assertTrue(this.context.containsBean("jmsListenerContainerFactory"));
JmsListenerContainerFactory<?> jmsListenerContainerFactory = this.context.getBean(
"customListenerContainerFactory", JmsListenerContainerFactory.class);
@@ -223,7 +224,8 @@ public class JmsAutoConfigurationTests {
jmsListenerContainerFactory.getClass());
DefaultMessageListenerContainer listenerContainer = ((DefaultJmsListenerContainerFactory) jmsListenerContainerFactory)
.createListenerContainer(mock(JmsListenerEndpoint.class));
assertEquals(DefaultMessageListenerContainer.CACHE_CONSUMER, listenerContainer.getCacheLevel());
assertEquals(DefaultMessageListenerContainer.CACHE_CONSUMER,
listenerContainer.getCacheLevel());
assertFalse(listenerContainer.isAutoStartup());
}