Skip to content

Commit 74f988a

Browse files
committed
Merge pull request #18374 from dreis2211
* pr/18374: Simplify pipe escaping for reference doc tables Avoid need to escape pipe character in reference tables Closes gh-18374
2 parents a465ebe + 9102bad commit 74f988a

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

spring-boot-project/spring-boot-tools/spring-boot-configuration-docs/src/main/java/org/springframework/boot/configurationdocs/SingleConfigurationTableEntry.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ void write(AsciidocBuilder builder) {
6262

6363
private void writeDefaultValue(AsciidocBuilder builder) {
6464
String defaultValue = (this.defaultValue != null) ? this.defaultValue : "";
65-
defaultValue = defaultValue.replace("\\", "\\\\").replace("|", "{vbar}" + System.lineSeparator());
65+
defaultValue = defaultValue.replace("\\", "\\\\").replace("|", "\\|");
6666
if (defaultValue.isEmpty()) {
6767
builder.appendln("|");
6868
}

spring-boot-project/spring-boot-tools/spring-boot-configuration-docs/src/test/java/org/springframework/boot/configurationdocs/SingleConfigurationTableEntryTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ void defaultValueWithPipes() {
6868
SingleConfigurationTableEntry entry = new SingleConfigurationTableEntry(property);
6969
AsciidocBuilder builder = new AsciidocBuilder();
7070
entry.write(builder);
71-
assertThat(builder.toString()).isEqualTo("|`+spring.test.prop+`" + NEWLINE + "|`+first{vbar}" + NEWLINE
72-
+ "second+`" + NEWLINE + "|+++This is a description.+++" + NEWLINE);
71+
assertThat(builder.toString()).isEqualTo("|`+spring.test.prop+`" + NEWLINE + "|`+first\\|second+`" + NEWLINE
72+
+ "|+++This is a description.+++" + NEWLINE);
7373
}
7474

7575
@Test

0 commit comments

Comments
 (0)