Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16480 from dreis2211

Browse Source 
* appendix-properties-styling:
  Polish "Separate compound properties in appendices"
  Separate compound properties in appendices
This commit is contained in:
Brian Clozel
2019-04-30 15:34:48 +02:00
parent c4b018705d c4938055b4
commit 0b27f7c70e
4 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-parent/pom.xml
View File

@@ -29,7 +29,7 @@
<testcontainers.version>1.10.6</testcontainers.version>
<testng.version>6.14.3</testng.version>
<dependency-management-plugin.version>1.0.6.RELEASE</dependency-management-plugin.version>
<spring-doc-resources.version>0.1.0.RELEASE</spring-doc-resources.version>
<spring-doc-resources.version>0.1.1.RELEASE</spring-doc-resources.version>
</properties>
<scm>
<url>https://github.com/spring-projects/spring-boot</url>

12
spring-boot-project/spring-boot-tools/spring-boot-configuration-docs/src/main/java/org/springframework/boot/configurationdocs/AsciidocBuilder.java
View File

@@ -31,6 +31,18 @@ class AsciidocBuilder {
this.content = new StringBuilder();
}
public AsciidocBuilder appendKey(Object... items) {
for (Object item : items) {
append("`+", item, "+` +", NEWLINE);
}
return this;
}
public AsciidocBuilder newLine() {
append(NEWLINE);
return this;
}
public AsciidocBuilder appendln(Object... items) {
append(items);
append(NEWLINE);

7
spring-boot-project/spring-boot-tools/spring-boot-configuration-docs/src/main/java/org/springframework/boot/configurationdocs/CompoundConfigurationTableEntry.java
View File

@@ -46,10 +46,9 @@ class CompoundConfigurationTableEntry extends ConfigurationTableEntry {
@Override
public void write(AsciidocBuilder builder) {
builder.append("|`+++");
this.configurationKeys.forEach(builder::appendln);
builder.appendln("+++`");
builder.appendln("|");
builder.append("|");
this.configurationKeys.forEach(builder::appendKey);
builder.newLine().appendln("|");
builder.appendln("|+++", this.description, "+++");
}

7
spring-boot-project/spring-boot-tools/spring-boot-configuration-docs/src/test/java/org/springframework/boot/configurationdocs/CompoundConfigurationTableEntryTests.java
View File

@@ -47,9 +47,10 @@ public class CompoundConfigurationTableEntryTests {
entry.addConfigurationKeys(firstProp, secondProp, thirdProp);
AsciidocBuilder builder = new AsciidocBuilder();
entry.write(builder);
assertThat(builder.toString()).isEqualTo("|`+++spring.test.first" + NEWLINE
+ "spring.test.second" + NEWLINE + "spring.test.third" + NEWLINE + "+++`"
+ NEWLINE + "|" + NEWLINE + "|+++This is a description.+++" + NEWLINE);
assertThat(builder.toString()).isEqualTo(
"|`+spring.test.first+` +" + NEWLINE + "`+spring.test.second+` +"
+ NEWLINE + "`+spring.test.third+` +" + NEWLINE + NEWLINE + "|"
+ NEWLINE + "|+++This is a description.+++" + NEWLINE);
}
}