root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Polish "Add config prop for Rabbit's max inbound message body size" 

See gh-37603
This commit is contained in:
Andy Wilkinson 2023-09-27 19:21:17 +01:00
parent 954f56287f
commit 4e5f16f2bc
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitConnectionFactoryBeanConfigurer.java
View File

@ -26,6 +26,7 @@ import org.springframework.boot.autoconfigure.amqp.RabbitConnectionDetails.Addre
import org.springframework.boot.context.properties.PropertyMapper;
import org.springframework.core.io.ResourceLoader;
import org.springframework.util.Assert;
import org.springframework.util.unit.DataSize;
/**
* Configures {@link RabbitConnectionFactoryBean} with sensible defaults.
@ -135,7 +136,8 @@ public class RabbitConnectionFactoryBeanConfigurer {
map.from(this.credentialsRefreshService).whenNonNull().to(factory::setCredentialsRefreshService);
map.from(this.rabbitProperties.getMaxInboundMessageBodySize())
.whenNonNull()
.to((mimbs) -> factory.setMaxInboundMessageBodySize(Math.toIntExact(mimbs.toBytes())));
.asInt(DataSize::toBytes)
.to(factory::setMaxInboundMessageBodySize);
}
}

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

@ -132,9 +132,9 @@ public class RabbitProperties {
private Duration channelRpcTimeout = Duration.ofMinutes(10);
/**
* Maximum body size of inbound (received) messages in bytes.
* Maximum size of the body of inbound (received) messages.
*/
private DataSize maxInboundMessageBodySize;
private DataSize maxInboundMessageBodySize = DataSize.ofMegabytes(64);
/**
* Cache configuration.

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

@ -150,9 +150,8 @@ class RabbitAutoConfigurationTests {
com.rabbitmq.client.ConnectionFactory rabbitConnectionFactory = getTargetConnectionFactory(context);
assertThat(rabbitConnectionFactory.getUsername()).isEqualTo(properties.getUsername());
assertThat(rabbitConnectionFactory.getPassword()).isEqualTo(properties.getPassword());
com.rabbitmq.client.ConnectionFactory defaultCf = new com.rabbitmq.client.ConnectionFactory();
assertThat(rabbitConnectionFactory).hasFieldOrPropertyWithValue("maxInboundMessageBodySize",
ReflectionTestUtils.getField(defaultCf, "maxInboundMessageBodySize"));
assertThat(rabbitConnectionFactory).extracting("maxInboundMessageBodySize")
.isEqualTo((int) properties.getMaxInboundMessageBodySize().toBytes());
});
}