Add configuration option for channelRpcTimeout

This commit adds a configuration option to configure
RabbitConnectionFactory's channelRpcTimeout property.

See gh-23564

Author: jkhoward

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

@@ -149,6 +149,8 @@ private RabbitConnectionFactoryBean getRabbitConnectionFactoryBean(RabbitPropert
 			}
 			map.from(properties::getConnectionTimeout).whenNonNull().asInt(Duration::toMillis)
 					.to(factory::setConnectionTimeout);
+			map.from(properties::getChannelRpcTimeout).whenNonNull().asInt(Duration::toMillis)
+					.to(factory::setChannelRpcTimeout);
 			map.from(credentialsProvider::getIfUnique).whenNonNull().to(factory::setCredentialsProvider);
 			map.from(credentialsRefreshService::getIfUnique).whenNonNull().to(factory::setCredentialsRefreshService);
 			factory.afterPropertiesSet();

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitProperties.java

@@ -119,6 +119,11 @@ public class RabbitProperties {
 	 * Connection timeout. Set it to zero to wait forever.
 	 */
 	private Duration connectionTimeout;
+	
+	/**
+	 * Channel RPC timeout.
+	 */
+	private Duration channelRpcTimeout;
 
 	/**
 	 * Cache configuration.
@@ -323,6 +328,10 @@ public void setPublisherReturns(boolean publisherReturns) {
 	public Duration getConnectionTimeout() {
 		return this.connectionTimeout;
 	}
+	
+	public Duration getChannelRpcTimeout() {
+		return this.channelRpcTimeout;
+	}
 
 	public void setPublisherConfirmType(ConfirmType publisherConfirmType) {
 		this.publisherConfirmType = publisherConfirmType;
@@ -335,6 +344,10 @@ public ConfirmType getPublisherConfirmType() {
 	public void setConnectionTimeout(Duration connectionTimeout) {
 		this.connectionTimeout = connectionTimeout;
 	}
+	
+	public void setChannelRpcTimeout(Duration channelRpcTimeout) {
+		this.channelRpcTimeout = channelRpcTimeout;
+	}
 
 	public Cache getCache() {
 		return this.cache;

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

@@ -140,7 +140,7 @@ void testConnectionFactoryWithOverrides() {
 				.withPropertyValues("spring.rabbitmq.host:remote-server", "spring.rabbitmq.port:9000",
 						"spring.rabbitmq.address-shuffle-mode=random", "spring.rabbitmq.username:alice",
 						"spring.rabbitmq.password:secret", "spring.rabbitmq.virtual_host:/vhost",
-						"spring.rabbitmq.connection-timeout:123")
+						"spring.rabbitmq.connection-timeout:123", "spring.rabbitmq.channel-rpc-timeout:140")
 				.run((context) -> {
 					CachingConnectionFactory connectionFactory = context.getBean(CachingConnectionFactory.class);
 					assertThat(connectionFactory.getHost()).isEqualTo("remote-server");
@@ -150,6 +150,7 @@ void testConnectionFactoryWithOverrides() {
 					assertThat(connectionFactory.getVirtualHost()).isEqualTo("/vhost");
 					com.rabbitmq.client.ConnectionFactory rcf = connectionFactory.getRabbitConnectionFactory();
 					assertThat(rcf.getConnectionTimeout()).isEqualTo(123);
+					assertThat(rcf.getChannelRpcTimeout()).isEqualTo(140);
 					assertThat((List<Address>) ReflectionTestUtils.getField(connectionFactory, "addresses")).hasSize(1);
 				});
 	}