Merge branch 'main' into 4.0.x

snicoll · snicoll · commit fa4240ae7e80 · 2025-06-02T20:17:06.000+02:00
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/codec/CodecProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/codec/CodecProperties.java
@@ -45,7 +45,7 @@ public class CodecProperties {
 	 */
 	private DataSize maxInMemorySize;
 
-	@DeprecatedConfigurationProperty(since = "3.5.0", replacement = "spring.http.codec.log-request-details")
+	@DeprecatedConfigurationProperty(since = "3.5.0", replacement = "spring.http.codecs.log-request-details")
 	public boolean isLogRequestDetails() {
 		return this.logRequestDetails;
 	}
@@ -54,7 +54,7 @@ public void setLogRequestDetails(boolean logRequestDetails) {
 		this.logRequestDetails = logRequestDetails;
 	}
 
-	@DeprecatedConfigurationProperty(since = "3.5.0", replacement = "spring.http.codec.max-in-memory-size")
+	@DeprecatedConfigurationProperty(since = "3.5.0", replacement = "spring.http.codecs.max-in-memory-size")
 	public DataSize getMaxInMemorySize() {
 		return this.maxInMemorySize;
 	}

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public class CodecProperties {`
`45`	`45`	`*/`
`46`	`46`	`private DataSize maxInMemorySize;`
`47`	`47`
`48`		`- @DeprecatedConfigurationProperty(since = "3.5.0", replacement = "spring.http.codec.log-request-details")`
	`48`	`+ @DeprecatedConfigurationProperty(since = "3.5.0", replacement = "spring.http.codecs.log-request-details")`
`49`	`49`	`public boolean isLogRequestDetails() {`
`50`	`50`	`return this.logRequestDetails;`
`51`	`51`	`}`
`@@ -54,7 +54,7 @@ public void setLogRequestDetails(boolean logRequestDetails) {`
`54`	`54`	`this.logRequestDetails = logRequestDetails;`
`55`	`55`	`}`
`56`	`56`
`57`		`- @DeprecatedConfigurationProperty(since = "3.5.0", replacement = "spring.http.codec.max-in-memory-size")`
	`57`	`+ @DeprecatedConfigurationProperty(since = "3.5.0", replacement = "spring.http.codecs.max-in-memory-size")`
`58`	`58`	`public DataSize getMaxInMemorySize() {`
`59`	`59`	`return this.maxInMemorySize;`
`60`	`60`	`}`