Remove carriage returns in TypeUtils.getJavaDoc()

Closes gh-13779
pull/13985/head
Johnny Lim 6 years ago committed by Stephane Nicoll
parent e556c04d83
commit 9fba2c4a62

@ -142,8 +142,7 @@ class TypeUtils {
String javadoc = (element != null String javadoc = (element != null
? this.env.getElementUtils().getDocComment(element) : null); ? this.env.getElementUtils().getDocComment(element) : null);
if (javadoc != null) { if (javadoc != null) {
javadoc = javadoc.replaceAll("\\n", ""); javadoc = javadoc.replaceAll("[\r\n]+", "").trim();
javadoc = javadoc.trim();
} }
return ("".equals(javadoc) ? null : javadoc); return ("".equals(javadoc) ? null : javadoc);
} }

@ -204,7 +204,7 @@ public class ConfigurationMetadataAnnotationProcessorTests {
assertThat(metadata).has(Metadata assertThat(metadata).has(Metadata
.withProperty("description.multi-line", String.class) .withProperty("description.multi-line", String.class)
.fromSource(DescriptionProperties.class).withDescription( .fromSource(DescriptionProperties.class).withDescription(
"This is a lengthy description that spans across multiple lines to showcase that the carriage return is cleaned automatically.")); "This is a lengthy description that spans across multiple lines to showcase that the line separators are cleaned automatically."));
} }
@Test @Test

@ -33,7 +33,7 @@ public class DescriptionProperties {
/** /**
* This is a lengthy description that spans across multiple lines to showcase that the * This is a lengthy description that spans across multiple lines to showcase that the
* carriage return is cleaned automatically. * line separators are cleaned automatically.
*/ */
private String multiLine; private String multiLine;

Loading…
Cancel
Save