diff --git a/train-docs/src/main/java/org/springframework/cloud/internal/ConfigurationPropertiesAggregator.java b/train-docs/src/main/java/org/springframework/cloud/internal/ConfigurationPropertiesAggregator.java index 6ca7e67..48aeb3d 100644 --- a/train-docs/src/main/java/org/springframework/cloud/internal/ConfigurationPropertiesAggregator.java +++ b/train-docs/src/main/java/org/springframework/cloud/internal/ConfigurationPropertiesAggregator.java @@ -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) { diff --git a/train-docs/src/main/resources/templates/spring-cloud/configprops.hbs b/train-docs/src/main/resources/templates/spring-cloud/configprops.hbs index 267b519..c292132 100644 --- a/train-docs/src/main/resources/templates/spring-cloud/configprops.hbs +++ b/train-docs/src/main/resources/templates/spring-cloud/configprops.hbs @@ -1,7 +1,7 @@ |=== |Name | Default | Description -{{#each properties}} |{{name}} | {{defaultValue}} | {{description}} +{{#each properties}} |{{name}} | `{{defaultValue}}` | {{description}} {{/each}} |=== \ No newline at end of file diff --git a/train-docs/src/test/java/org/springframework/cloud/internal/GenerateReleaseTrainDocsTests.java b/train-docs/src/test/java/org/springframework/cloud/internal/GenerateReleaseTrainDocsTests.java index 95622a3..f9ca92d 100644 --- a/train-docs/src/test/java/org/springframework/cloud/internal/GenerateReleaseTrainDocsTests.java +++ b/train-docs/src/test/java/org/springframework/cloud/internal/GenerateReleaseTrainDocsTests.java @@ -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 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 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 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 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 { diff --git a/train-docs/src/test/resources/test/pom.xml b/train-docs/src/test/resources/test/pom.xml index 6b2e894..a1d91bc 100644 --- a/train-docs/src/test/resources/test/pom.xml +++ b/train-docs/src/test/resources/test/pom.xml @@ -15,26 +15,25 @@ pom ${basedir}/../.. - 3.0.0-SNAPSHOT - 3.0.0-SNAPSHOT - 3.0.0-SNAPSHOT - 3.0.0-SNAPSHOT - 2.0.0-SNAPSHOT - 3.0.0-SNAPSHOT - 3.0.0-SNAPSHOT - 3.0.0-SNAPSHOT - 3.1.0-SNAPSHOT - 3.0.0-SNAPSHOT - 2.0.0-SNAPSHOT - 3.0.0-SNAPSHOT - 3.0.0-SNAPSHOT - 3.0.0-SNAPSHOT - 3.0.0-SNAPSHOT - 3.1.0-SNAPSHOT - 2.3.0-SNAPSHOT - 3.0.0-SNAPSHOT - 3.0.0-SNAPSHOT - 3.0.0-SNAPSHOT + 2.2.3.RELEASE + 2.3.1.RELEASE + 2.2.3.RELEASE + 2.2.4.RELEASE + 1.0.4.RELEASE + 2.2.4.RELEASE + 2.2.4.RELEASE + 2.2.4.RELEASE + 3.0.8.RELEASE + 2.2.4.RELEASE + 1.1.4.RELEASE + 2.2.4.RELEASE + 2.2.4.RELEASE + 2.2.3.RELEASE + 2.2.4.RELEASE + 2.2.3.RELEASE + 2.2.4.RELEASE + 2.2.3.RELEASE + 2.2.1.RELEASE