Merge branch '4.0.x'

Closes gh-49061

Author: philwebb

configuration-metadata/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/TypeUtils.java

@@ -272,8 +272,9 @@ private String cleanUpJavaDoc(String javadoc) {
 		char lastChar = '.';
 		for (int i = 0; i < javadoc.length(); i++) {
 			char ch = javadoc.charAt(i);
-			boolean repeatedSpace = ch == ' ' && lastChar == ' ';
-			if (ch != '\r' && ch != '\n' && !repeatedSpace) {
+			ch = (ch == '\r' || ch == '\n') ? ' ' : ch;
+			boolean repeatedSpace = (ch == ' ' && lastChar == ' ');
+			if (!repeatedSpace) {
 				result.append(ch);
 				lastChar = ch;
 			}

configuration-metadata/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessorTests.java

@@ -234,6 +234,9 @@ void descriptionProperties() {
 			.fromSource(DescriptionProperties.class)
 			.withDescription(
 					"This is a lengthy description that spans across multiple lines to showcase that the line separators are cleaned automatically."));
+		assertThat(metadata).has(Metadata.withProperty("description.multi-line-whitespace", String.class)
+			.fromSource(DescriptionProperties.class)
+			.withDescription("This is an example of a description with unusual whitespace after a new line."));
 	}
 
 	@Test

configuration-metadata/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/DescriptionProperties.java

@@ -37,6 +37,14 @@ public class DescriptionProperties {
 	 */
 	private String multiLine;
 
+	// @formatter:off
+	/**
+	 * This is an example of a description
+	 *with unusual whitespace after a new line.
+	 */
+	private String multiLineWhitespace;
+	// @formatter:on
+
 	public String getSimple() {
 		return this.simple;
 	}
@@ -53,4 +61,12 @@ public void setMultiLine(String multiLine) {
 		this.multiLine = multiLine;
 	}
 
+	public String getMultiLineWhitespace() {
+		return this.multiLineWhitespace;
+	}
+
+	public void setMultiLineWhitespace(String multiLineWhitespace) {
+		this.multiLineWhitespace = multiLineWhitespace;
+	}
+
 }