Browse Source

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
pull/18413/head
Phillip Webb 6 years ago
parent
commit
ec747d6b2e
  1. 2
      spring-boot-project/spring-boot-tools/spring-boot-configuration-docs/src/main/java/org/springframework/boot/configurationdocs/SingleConfigurationTableEntry.java
  2. 4
      spring-boot-project/spring-boot-tools/spring-boot-configuration-docs/src/test/java/org/springframework/boot/configurationdocs/SingleConfigurationTableEntryTests.java

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

@ -62,7 +62,7 @@ class SingleConfigurationTableEntry extends ConfigurationTableEntry { @@ -62,7 +62,7 @@ class SingleConfigurationTableEntry extends ConfigurationTableEntry {
private void writeDefaultValue(AsciidocBuilder builder) {
String defaultValue = (this.defaultValue != null) ? this.defaultValue : "";
defaultValue = defaultValue.replace("\\", "\\\\").replace("|", "{vbar}" + System.lineSeparator());
defaultValue = defaultValue.replace("\\", "\\\\").replace("|", "\\|");
if (defaultValue.isEmpty()) {
builder.appendln("|");
}

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

@ -68,8 +68,8 @@ class SingleConfigurationTableEntryTests { @@ -68,8 +68,8 @@ class SingleConfigurationTableEntryTests {
SingleConfigurationTableEntry entry = new SingleConfigurationTableEntry(property);
AsciidocBuilder builder = new AsciidocBuilder();
entry.write(builder);
assertThat(builder.toString()).isEqualTo("|`+spring.test.prop+`" + NEWLINE + "|`+first{vbar}" + NEWLINE
+ "second+`" + NEWLINE + "|+++This is a description.+++" + NEWLINE);
assertThat(builder.toString()).isEqualTo("|`+spring.test.prop+`" + NEWLINE + "|`+first\\|second+`" + NEWLINE
+ "|+++This is a description.+++" + NEWLINE);
}
@Test

Loading…
Cancel
Save