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

Adapt to Rabbit internal change

Browse Source 
See gh-15271
This commit is contained in:
Stephane Nicoll
2018-11-27 08:31:46 +01:00
parent cf525dabd2
commit a240e22593
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfiguration.java
View File

@@ -196,7 +196,8 @@ public class RabbitAutoConfiguration {
.to(template::setReplyTimeout);
map.from(properties::getExchange).to(template::setExchange);
map.from(properties::getRoutingKey).to(template::setRoutingKey);
map.from(properties::getQueue).whenNonNull().to(template::setQueue);
map.from(properties::getQueue).whenNonNull()
.to(template::setDefaultReceiveQueue);
return template;
}

4
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfigurationTests.java
View File

@@ -326,8 +326,8 @@ public class RabbitAutoConfigurationTests {
.withPropertyValues("spring.rabbitmq.template.queue:default-queue")
.run((context) -> {
RabbitTemplate rabbitTemplate = context.getBean(RabbitTemplate.class);
assertThat(rabbitTemplate).hasFieldOrPropertyWithValue("queue",
"default-queue");
assertThat(rabbitTemplate).hasFieldOrPropertyWithValue(
"defaultReceiveQueue", "default-queue");
});
}