Merge branch '2.7.x' into 3.0.x

Closes gh-38150

Author: wilkinsona

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/ReactiveMultipartAutoConfiguration.java

@@ -62,7 +62,7 @@ CodecCustomizer defaultPartHttpMessageReaderCustomizer(ReactiveMultipartProperti
 					.asInt(DataSize::toBytes)
 					.to(defaultPartHttpMessageReader::setMaxHeadersSize);
 				map.from(multipartProperties::getMaxDiskUsagePerPart)
-					.asInt(DataSize::toBytes)
+					.as(DataSize::toBytes)
 					.to(defaultPartHttpMessageReader::setMaxDiskUsagePerPart);
 				map.from(multipartProperties::getMaxParts).to(defaultPartHttpMessageReader::setMaxParts);
 				map.from(multipartProperties::getFileStorageDirectory)

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/ReactiveMultipartAutoConfigurationTests.java

@@ -62,7 +62,7 @@ void shouldConfigureMultipartPropertiesForDefaultReader() {
 		this.contextRunner
 			.withPropertyValues("spring.webflux.multipart.max-in-memory-size=1GB",
 					"spring.webflux.multipart.max-headers-size=16KB",
-					"spring.webflux.multipart.max-disk-usage-per-part=100MB", "spring.webflux.multipart.max-parts=7",
+					"spring.webflux.multipart.max-disk-usage-per-part=3GB", "spring.webflux.multipart.max-parts=7",
 					"spring.webflux.multipart.headers-charset:UTF_16")
 			.run((context) -> {
 				CodecCustomizer customizer = context.getBean(CodecCustomizer.class);
@@ -76,7 +76,7 @@ void shouldConfigureMultipartPropertiesForDefaultReader() {
 				assertThat(partReader).hasFieldOrPropertyWithValue("maxInMemorySize",
 						Math.toIntExact(DataSize.ofGigabytes(1).toBytes()));
 				assertThat(partReader).hasFieldOrPropertyWithValue("maxDiskUsagePerPart",
-						DataSize.ofMegabytes(100).toBytes());
+						DataSize.ofGigabytes(3).toBytes());
 			});
 	}