SpringCloud/spring-cloud-release
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added guards on config splitting and default value is now code

Browse Source
This commit is contained in:
Marcin Grzejszczak
2020-11-16 14:08:52 +01:00
parent 17aa219a0d
commit ac966b7be5
3 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
train-docs/src/main/java/org/springframework/cloud/internal/ConfigurationPropertiesAggregator.java
View File

@@ -43,9 +43,18 @@ class ConfigurationPropertiesAggregator {
// |foo|bar|baz -> foo|bar|baz -> split ->
// foo,bar,baz
String[] strings = s.substring(1).split("\\|");
if (strings.length == 3) {
return new ConfigurationProperty(
strings[0].trim(), strings[1].trim(),
strings[2].trim());
}
else if (strings.length == 2) {
return new ConfigurationProperty(
strings[0].trim(), strings[1].trim(),
"");
}
return new ConfigurationProperty(
strings[0].trim(), strings[1].trim(),
strings[2].trim());
strings[0].trim(), "", "");
});
}
catch (IOException e) {

2
train-docs/src/main/resources/templates/spring-cloud/configprops.hbs
View File

@@ -1,7 +1,7 @@
|===
|Name | Default | Description
{{#each properties}} |{{name}} | {{defaultValue}} | {{description}}
{{#each properties}} |{{name}} | `{{defaultValue}}` | {{description}}
{{/each}}
|===

2
train-docs/src/test/java/org/springframework/cloud/internal/GenerateReleaseTrainDocsTests.java
View File

@@ -104,7 +104,7 @@ public class GenerateReleaseTrainDocsTests {
BDDAssertions.then(generatedAdocs).isNotEmptyDirectory();
BDDAssertions.then(configProps(generatedAdocs)).contains(
"|spring.sleuth.async.configurer.enabled | true | Enable default AsyncConfigurer.");
"|spring.sleuth.async.configurer.enabled | `true` | Enable default AsyncConfigurer.");
}
private String configProps(File file) throws IOException {