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
46ea4a25
Commit
46ea4a25
authored
Aug 27, 2019
by
Madhura Bhave
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
isPublisherConfirms in RabbitProperties should not throw NPE
Fixes gh-17967
parent
fb846f43
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
1 deletion
+22
-1
RabbitProperties.java
...ngframework/boot/autoconfigure/amqp/RabbitProperties.java
+1
-1
RabbitPropertiesTests.java
...mework/boot/autoconfigure/amqp/RabbitPropertiesTests.java
+21
-0
No files found.
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitProperties.java
View file @
46ea4a25
...
...
@@ -278,7 +278,7 @@ public class RabbitProperties {
@DeprecatedConfigurationProperty
(
reason
=
"replaced to support additional confirm types"
,
replacement
=
"spring.rabbitmq.publisher-confirm-type"
)
public
boolean
isPublisherConfirms
()
{
return
this
.
publisherConfirmType
.
equals
(
ConfirmType
.
CORRELATED
);
return
ConfirmType
.
CORRELATED
.
equals
(
this
.
publisherConfirmType
);
}
@Deprecated
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitPropertiesTests.java
View file @
46ea4a25
...
...
@@ -20,6 +20,7 @@ import org.junit.jupiter.api.Test;
import
org.springframework.amqp.rabbit.config.DirectRabbitListenerContainerFactory
;
import
org.springframework.amqp.rabbit.config.SimpleRabbitListenerContainerFactory
;
import
org.springframework.amqp.rabbit.connection.CachingConnectionFactory
;
import
org.springframework.amqp.rabbit.listener.DirectMessageListenerContainer
;
import
org.springframework.amqp.rabbit.listener.SimpleMessageListenerContainer
;
...
...
@@ -240,4 +241,24 @@ class RabbitPropertiesTests {
assertThat
(
container
).
hasFieldOrPropertyWithValue
(
"missingQueuesFatal"
,
direct
.
isMissingQueuesFatal
());
}
@Test
@Deprecated
void
isPublisherConfirmsShouldDefaultToFalse
()
{
assertThat
(
this
.
properties
.
isPublisherConfirms
()).
isEqualTo
(
false
);
}
@Test
@Deprecated
void
isPublisherConfirmsWhenPublisherConfirmsTypeSimpleShouldBeFalse
()
{
this
.
properties
.
setPublisherConfirmType
(
CachingConnectionFactory
.
ConfirmType
.
SIMPLE
);
assertThat
(
this
.
properties
.
isPublisherConfirms
()).
isEqualTo
(
false
);
}
@Test
@Deprecated
void
isPublisherConfirmsWhenPublisherConfirmsTypeCorrelatedShouldBeTrue
()
{
this
.
properties
.
setPublisherConfirmType
(
CachingConnectionFactory
.
ConfirmType
.
CORRELATED
);
assertThat
(
this
.
properties
.
isPublisherConfirms
()).
isEqualTo
(
true
);
}
}
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