Polish "Add configuration option for channelRpcTimeout"

See gh-23564
pull/23575/head
Stephane Nicoll 4 years ago
parent baa9d129f2
commit c4e1b4f5dd

@ -121,9 +121,9 @@ public class RabbitProperties {
private Duration connectionTimeout; private Duration connectionTimeout;
/** /**
* Channel RPC timeout. * Continuation timeout for RPC calls in channels. Set it to zero to wait forever.
*/ */
private Duration channelRpcTimeout; private Duration channelRpcTimeout = Duration.ofMinutes(10);
/** /**
* Cache configuration. * Cache configuration.
@ -329,10 +329,6 @@ public class RabbitProperties {
return this.connectionTimeout; return this.connectionTimeout;
} }
public Duration getChannelRpcTimeout() {
return this.channelRpcTimeout;
}
public void setPublisherConfirmType(ConfirmType publisherConfirmType) { public void setPublisherConfirmType(ConfirmType publisherConfirmType) {
this.publisherConfirmType = publisherConfirmType; this.publisherConfirmType = publisherConfirmType;
} }
@ -345,6 +341,10 @@ public class RabbitProperties {
this.connectionTimeout = connectionTimeout; this.connectionTimeout = connectionTimeout;
} }
public Duration getChannelRpcTimeout() {
return this.channelRpcTimeout;
}
public void setChannelRpcTimeout(Duration channelRpcTimeout) { public void setChannelRpcTimeout(Duration channelRpcTimeout) {
this.channelRpcTimeout = channelRpcTimeout; this.channelRpcTimeout = channelRpcTimeout;
} }

@ -108,6 +108,8 @@ class RabbitAutoConfigurationTests {
.isEqualTo(com.rabbitmq.client.ConnectionFactory.DEFAULT_CHANNEL_MAX); .isEqualTo(com.rabbitmq.client.ConnectionFactory.DEFAULT_CHANNEL_MAX);
assertThat(connectionFactory.isPublisherConfirms()).isFalse(); assertThat(connectionFactory.isPublisherConfirms()).isFalse();
assertThat(connectionFactory.isPublisherReturns()).isFalse(); assertThat(connectionFactory.isPublisherReturns()).isFalse();
assertThat(connectionFactory.getRabbitConnectionFactory().getChannelRpcTimeout())
.isEqualTo(com.rabbitmq.client.ConnectionFactory.DEFAULT_CHANNEL_RPC_TIMEOUT);
assertThat(context.containsBean("rabbitListenerContainerFactory")) assertThat(context.containsBean("rabbitListenerContainerFactory"))
.as("Listener container factory should be created by default").isTrue(); .as("Listener container factory should be created by default").isTrue();
}); });

Loading…
Cancel
Save