mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-09-03 04:26:12 +08:00
Tidy up code formatting and address some compiler warnings
This commit is contained in:
parent
7dd8e8c4b8
commit
601c6aa305
@ -301,9 +301,8 @@ public final class ConditionMessage {
|
||||
if (StringUtils.isEmpty(reason)) {
|
||||
return new ConditionMessage(ConditionMessage.this, this.condition);
|
||||
}
|
||||
return new ConditionMessage(ConditionMessage.this,
|
||||
this.condition + (StringUtils.isEmpty(this.condition) ? "" : " ")
|
||||
+ reason);
|
||||
return new ConditionMessage(ConditionMessage.this, this.condition
|
||||
+ (StringUtils.isEmpty(this.condition) ? "" : " ") + reason);
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -295,7 +295,7 @@ public class RabbitAutoConfigurationTests {
|
||||
@Test
|
||||
public void testRabbitListenerContainerFactoryWithCustomSettings() {
|
||||
load(new Class<?>[] { MessageConvertersConfiguration.class,
|
||||
MessageRecoverersConfiguration.class },
|
||||
MessageRecoverersConfiguration.class },
|
||||
"spring.rabbitmq.listener.retry.enabled:true",
|
||||
"spring.rabbitmq.listener.retry.maxAttempts:4",
|
||||
"spring.rabbitmq.listener.retry.initialInterval:2000",
|
||||
@ -331,11 +331,11 @@ public class RabbitAutoConfigurationTests {
|
||||
dfa = new DirectFieldAccessor(adviceChain[0]);
|
||||
MessageRecoverer messageRecoverer = this.context.getBean("myMessageRecoverer",
|
||||
MessageRecoverer.class);
|
||||
MethodInvocationRecoverer mir = (MethodInvocationRecoverer) dfa
|
||||
MethodInvocationRecoverer<?> mir = (MethodInvocationRecoverer<?>) dfa
|
||||
.getPropertyValue("recoverer");
|
||||
Message message = mock(Message.class);
|
||||
Exception ex = new Exception("test");
|
||||
mir.recover(new Object[]{"foo", message}, ex);
|
||||
mir.recover(new Object[] { "foo", message }, ex);
|
||||
verify(messageRecoverer).recover(message, ex);
|
||||
RetryTemplate retryTemplate = (RetryTemplate) dfa
|
||||
.getPropertyValue("retryOperations");
|
||||
@ -415,8 +415,7 @@ public class RabbitAutoConfigurationTests {
|
||||
load(new Class<?>[] { config }, environment);
|
||||
}
|
||||
|
||||
private void load(Class<?>[] configs,
|
||||
String... environment) {
|
||||
private void load(Class<?>[] configs, String... environment) {
|
||||
AnnotationConfigApplicationContext applicationContext = new AnnotationConfigApplicationContext();
|
||||
applicationContext.register(configs);
|
||||
applicationContext.register(RabbitAutoConfiguration.class);
|
||||
|
Loading…
Reference in New Issue
Block a user