mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Polish "Make RabbitTemplate exchange and routingKey configurable"
Closes gh-10978
This commit is contained in:
parent
4e31d2041a
commit
6a4a0e3f29
@ -190,7 +190,6 @@ public class RabbitAutoConfiguration {
|
||||
}
|
||||
rabbitTemplate.setExchange(templateProperties.getExchange());
|
||||
rabbitTemplate.setRoutingKey(templateProperties.getRoutingKey());
|
||||
rabbitTemplate.setChannelTransacted(templateProperties.isChannelTransacted());
|
||||
return rabbitTemplate;
|
||||
}
|
||||
|
||||
|
@ -713,11 +713,6 @@ public class RabbitProperties {
|
||||
*/
|
||||
private String routingKey = "";
|
||||
|
||||
/**
|
||||
* Enable transactional channels.
|
||||
*/
|
||||
private boolean channelTransacted;
|
||||
|
||||
public Retry getRetry() {
|
||||
return this.retry;
|
||||
}
|
||||
@ -762,14 +757,6 @@ public class RabbitProperties {
|
||||
this.routingKey = routingKey;
|
||||
}
|
||||
|
||||
public boolean isChannelTransacted() {
|
||||
return this.channelTransacted;
|
||||
}
|
||||
|
||||
public void setChannelTransacted(boolean channelTransacted) {
|
||||
this.channelTransacted = channelTransacted;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public static class Retry {
|
||||
|
@ -113,8 +113,6 @@ public class RabbitAutoConfigurationTests {
|
||||
.isEqualTo(defaultRabbitTemplate.getRoutingKey());
|
||||
assertThat(rabbitTemplate.getExchange())
|
||||
.isEqualTo(defaultRabbitTemplate.getExchange());
|
||||
assertThat(rabbitTemplate.isChannelTransacted())
|
||||
.isEqualTo(defaultRabbitTemplate.isChannelTransacted());
|
||||
});
|
||||
}
|
||||
|
||||
@ -239,6 +237,18 @@ public class RabbitAutoConfigurationTests {
|
||||
});
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testRabbitTemplateExchangeAndRoutingKey() {
|
||||
this.contextRunner.withUserConfiguration(TestConfiguration.class)
|
||||
.withPropertyValues("spring.rabbitmq.template.exchange:my-exchange",
|
||||
"spring.rabbitmq.template.routing-key:my-routing-key")
|
||||
.run((context) -> {
|
||||
RabbitTemplate rabbitTemplate = context.getBean(RabbitTemplate.class);
|
||||
assertThat(rabbitTemplate.getExchange()).isEqualTo("my-exchange");
|
||||
assertThat(rabbitTemplate.getRoutingKey()).isEqualTo("my-routing-key");
|
||||
});
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testRabbitTemplateMandatory() {
|
||||
this.contextRunner.withUserConfiguration(TestConfiguration.class)
|
||||
|
@ -1058,6 +1058,7 @@ content into your application. Rather, pick only the properties that you need.
|
||||
spring.rabbitmq.ssl.trust-store-password= # Password used to access the trust store.
|
||||
spring.rabbitmq.ssl.trust-store-type=JKS # Trust store type.
|
||||
spring.rabbitmq.ssl.algorithm= # SSL algorithm to use. By default, configured by the Rabbit client library.
|
||||
spring.rabbitmq.template.exchange= # Name of the default exchange to use for send operations.
|
||||
spring.rabbitmq.template.mandatory=false # Whether to enable mandatory messages.
|
||||
spring.rabbitmq.template.receive-timeout=0 # Timeout for `receive()` methods.
|
||||
spring.rabbitmq.template.reply-timeout=5000 # Timeout for `sendAndReceive()` methods.
|
||||
@ -1066,6 +1067,7 @@ content into your application. Rather, pick only the properties that you need.
|
||||
spring.rabbitmq.template.retry.max-attempts=3 # Maximum number of attempts to publish a message.
|
||||
spring.rabbitmq.template.retry.max-interval=10000 # Maximum number of attempts to publish a message.
|
||||
spring.rabbitmq.template.retry.multiplier=1.0 # Multiplier to apply to the previous publishing retry interval.
|
||||
spring.rabbitmq.template.routing-key= # Value of a default routing key to use for send operations.
|
||||
spring.rabbitmq.username= # Login user to authenticate to the broker.
|
||||
spring.rabbitmq.virtual-host= # Virtual host to use when connecting to the broker.
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user