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

Merge branch 'Hoxton'

Browse Source
This commit is contained in:
Marcin Grzejszczak
2020-11-16 14:12:38 +01:00
parent 23e3e70c55 ac966b7be5
commit e765df4700
4 changed files with 39 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -39,8 +39,14 @@ class ConfigurationPropertiesAggregator {
// |foo|bar|baz -> foo|bar|baz -> split ->
// foo,bar,baz
String[] strings = s.substring(1).split("\\|");
return new ConfigurationProperty(strings[0].trim(), strings[1].trim(),
strings[2].trim());
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(), "", "");
});
}
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}}
|===

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

@@ -23,7 +23,6 @@ import java.nio.file.Files;
import java.util.Arrays;
import java.util.List;
import org.apache.maven.model.Model;
import org.assertj.core.api.BDDAssertions;
import org.junit.jupiter.api.Test;
@@ -34,18 +33,17 @@ public class GenerateReleaseTrainDocsTests {
@Test
void should_return_a_list_of_docs_modules_to_download() throws URISyntaxException {
File testPom = new File(GenerateReleaseTrainDocsTests.class.getResource("/test/pom.xml").toURI());
Model pom = PomReader.readPom(testPom);
String busVersion = pom.getProperties().getProperty("spring-cloud-bus.version");
List<Project> projects = new GenerateReleaseTrainDocs().mavenPropertiesToDocsProjects(testPom);
BDDAssertions.then(projects).extracting("name").containsOnly("spring-cloud-bus", "spring-cloud-build",
"spring-cloud-cloudfoundry", "spring-cloud-commons", "spring-cloud-circuitbreaker",
"spring-cloud-config", "spring-cloud-consul", "spring-cloud-contract", "spring-cloud-function",
"spring-cloud-gateway", "spring-cloud-kubernetes", "spring-cloud-netflix", "spring-cloud-openfeign",
"spring-cloud-security", "spring-cloud-sleuth", "spring-cloud-stream", "spring-cloud-task",
"spring-cloud-vault", "spring-cloud-zookeeper", "spring-cloud-cli");
BDDAssertions.then(projects).contains(new Project("spring-cloud-bus", busVersion));
BDDAssertions.then(projects).extracting("name").containsOnly("spring-cloud-foo-bus", "spring-cloud-foo-build",
"spring-cloud-foo-cloudfoundry", "spring-cloud-foo-commons", "spring-cloud-foo-circuitbreaker",
"spring-cloud-foo-config", "spring-cloud-foo-consul", "spring-cloud-foo-contract",
"spring-cloud-foo-function", "spring-cloud-foo-gateway", "spring-cloud-foo-kubernetes",
"spring-cloud-foo-netflix", "spring-cloud-foo-openfeign", "spring-cloud-foo-security",
"spring-cloud-foo-sleuth", "spring-cloud-foo-task", "spring-cloud-foo-vault",
"spring-cloud-foo-zookeeper", "spring-cloud-foo-cli");
BDDAssertions.then(projects).contains(new Project("spring-cloud-foo-bus", "2.2.3.RELEASE"));
}
@Test
@@ -63,8 +61,8 @@ public class GenerateReleaseTrainDocsTests {
void should_generate_adocs_from_templates() {
File file = new File("target/test-train-docs");
FileSystemUtils.deleteRecursively(file);
List<Project> projects = Arrays.asList(new Project("spring-cloud-foo", "1.0.0"),
new Project("spring-cloud-bar", "2.0.0"), new Project("spring-boot", "3.0.0"),
List<Project> projects = Arrays.asList(new Project("spring-cloud-foo-foo", "1.0.0"),
new Project("spring-cloud-foo-bar", "2.0.0"), new Project("spring-boot", "3.0.0"),
new Project("spring-cloud", "4.0.0"));
List<ConfigurationProperty> configurationProperties = Arrays.asList(
new ConfigurationProperty("first", "firstDefault", "firstDescription"),
@@ -88,7 +86,7 @@ public class GenerateReleaseTrainDocsTests {
BDDAssertions.then(generatedAdocs).isNotEmptyDirectory();
BDDAssertions.then(configProps(generatedAdocs))
.contains("|spring.sleuth.async.configurer.enabled | true | Enable default AsyncConfigurer.");
.contains("|spring.sleuth.async.configurer.enabled | `true` | Enable default AsyncConfigurer.");
}
private String configProps(File file) throws IOException {

39
train-docs/src/test/resources/test/pom.xml
View File

@@ -15,26 +15,25 @@
<packaging>pom</packaging>
<properties>
<main.basedir>${basedir}/../..</main.basedir>
<spring-cloud-bus.version>3.0.0-SNAPSHOT</spring-cloud-bus.version>
<spring-cloud-build.version>3.0.0-SNAPSHOT</spring-cloud-build.version>
<spring-cloud-cloudfoundry.version>3.0.0-SNAPSHOT</spring-cloud-cloudfoundry.version>
<spring-cloud-commons.version>3.0.0-SNAPSHOT</spring-cloud-commons.version>
<spring-cloud-circuitbreaker.version>2.0.0-SNAPSHOT</spring-cloud-circuitbreaker.version>
<spring-cloud-config.version>3.0.0-SNAPSHOT</spring-cloud-config.version>
<spring-cloud-consul.version>3.0.0-SNAPSHOT</spring-cloud-consul.version>
<spring-cloud-contract.version>3.0.0-SNAPSHOT</spring-cloud-contract.version>
<spring-cloud-function.version>3.1.0-SNAPSHOT</spring-cloud-function.version>
<spring-cloud-gateway.version>3.0.0-SNAPSHOT</spring-cloud-gateway.version>
<spring-cloud-kubernetes.version>2.0.0-SNAPSHOT</spring-cloud-kubernetes.version>
<spring-cloud-netflix.version>3.0.0-SNAPSHOT</spring-cloud-netflix.version>
<spring-cloud-openfeign.version>3.0.0-SNAPSHOT</spring-cloud-openfeign.version>
<spring-cloud-security.version>3.0.0-SNAPSHOT</spring-cloud-security.version>
<spring-cloud-sleuth.version>3.0.0-SNAPSHOT</spring-cloud-sleuth.version>
<spring-cloud-stream.version>3.1.0-SNAPSHOT</spring-cloud-stream.version>
<spring-cloud-task.version>2.3.0-SNAPSHOT</spring-cloud-task.version>
<spring-cloud-vault.version>3.0.0-SNAPSHOT</spring-cloud-vault.version>
<spring-cloud-zookeeper.version>3.0.0-SNAPSHOT</spring-cloud-zookeeper.version>
<spring-cloud-cli.version>3.0.0-SNAPSHOT</spring-cloud-cli.version>
<spring-cloud-foo-bus.version>2.2.3.RELEASE</spring-cloud-foo-bus.version>
<spring-cloud-foo-build.version>2.3.1.RELEASE</spring-cloud-foo-build.version>
<spring-cloud-foo-cloudfoundry.version>2.2.3.RELEASE</spring-cloud-foo-cloudfoundry.version>
<spring-cloud-foo-commons.version>2.2.4.RELEASE</spring-cloud-foo-commons.version>
<spring-cloud-foo-circuitbreaker.version>1.0.4.RELEASE</spring-cloud-foo-circuitbreaker.version>
<spring-cloud-foo-config.version>2.2.4.RELEASE</spring-cloud-foo-config.version>
<spring-cloud-foo-consul.version>2.2.4.RELEASE</spring-cloud-foo-consul.version>
<spring-cloud-foo-contract.version>2.2.4.RELEASE</spring-cloud-foo-contract.version>
<spring-cloud-foo-function.version>3.0.8.RELEASE</spring-cloud-foo-function.version>
<spring-cloud-foo-gateway.version>2.2.4.RELEASE</spring-cloud-foo-gateway.version>
<spring-cloud-foo-kubernetes.version>1.1.4.RELEASE</spring-cloud-foo-kubernetes.version>
<spring-cloud-foo-netflix.version>2.2.4.RELEASE</spring-cloud-foo-netflix.version>
<spring-cloud-foo-openfeign.version>2.2.4.RELEASE</spring-cloud-foo-openfeign.version>
<spring-cloud-foo-security.version>2.2.3.RELEASE</spring-cloud-foo-security.version>
<spring-cloud-foo-sleuth.version>2.2.4.RELEASE</spring-cloud-foo-sleuth.version>
<spring-cloud-foo-task.version>2.2.3.RELEASE</spring-cloud-foo-task.version>
<spring-cloud-foo-vault.version>2.2.4.RELEASE</spring-cloud-foo-vault.version>
<spring-cloud-foo-zookeeper.version>2.2.3.RELEASE</spring-cloud-foo-zookeeper.version>
<spring-cloud-foo-cli.version>2.2.1.RELEASE</spring-cloud-foo-cli.version>
</properties>
<dependencyManagement>
<dependencies>