Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
601c6aa3
Commit
601c6aa3
authored
Feb 09, 2017
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Tidy up code formatting and address some compiler warnings
parent
7dd8e8c4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
8 deletions
+6
-8
ConditionMessage.java
...mework/boot/autoconfigure/condition/ConditionMessage.java
+2
-3
RabbitAutoConfigurationTests.java
...boot/autoconfigure/amqp/RabbitAutoConfigurationTests.java
+4
-5
No files found.
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionMessage.java
View file @
601c6aa3
...
...
@@ -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
);
}
}
...
...
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfigurationTests.java
View file @
601c6aa3
...
...
@@ -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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment