Add prefix to appendix property anchor links

Refactor property appendix generator code so that the complete section
is generated and anchors follow the expected naming.

Closes gh-26375

Author: philwebb

buildSrc/build.gradle

@@ -28,6 +28,7 @@ dependencies {
 	testImplementation("org.assertj:assertj-core:3.11.1")
 	testImplementation("org.apache.logging.log4j:log4j-core:2.12.1")
 	testImplementation("org.junit.jupiter:junit-jupiter:5.6.0")
+	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
 
 checkstyle {

buildSrc/src/main/java/org/springframework/boot/build/context/properties/AsciidocBuilder.java renamed to buildSrc/src/main/java/org/springframework/boot/build/context/properties/Asciidoc.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,36 +21,36 @@
  *
  * @author Phillip Webb
  */
-class AsciidocBuilder {
+class Asciidoc {
 
 	private final StringBuilder content;
 
-	AsciidocBuilder() {
+	Asciidoc() {
 		this.content = new StringBuilder();
 	}
 
-	AsciidocBuilder appendKey(Object... items) {
+	Asciidoc appendWithHardLineBreaks(Object... items) {
 		for (Object item : items) {
 			appendln("`+", item, "+` +");
 		}
 		return this;
 	}
 
-	AsciidocBuilder newLine() {
-		return append(System.lineSeparator());
-	}
-
-	AsciidocBuilder appendln(Object... items) {
+	Asciidoc appendln(Object... items) {
 		return append(items).newLine();
 	}
 
-	AsciidocBuilder append(Object... items) {
+	Asciidoc append(Object... items) {
 		for (Object item : items) {
 			this.content.append(item);
 		}
 		return this;
 	}
 
+	Asciidoc newLine() {
+		return append(System.lineSeparator());
+	}
+
 	@Override
 	public String toString() {
 		return this.content.toString();

buildSrc/src/main/java/org/springframework/boot/build/context/properties/CompoundConfigurationTableEntry.java

@@ -0,0 +1,55 @@
+/*
+ * Copyright 2012-2021 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.build.context.properties;
+
+import java.util.Set;
+import java.util.TreeSet;
+
+/**
+ * Table row regrouping a list of configuration properties sharing the same description.
+ *
+ * @author Brian Clozel
+ * @author Phillip Webb
+ */
+class CompoundRow extends Row {
+
+	private final Set<String> propertyNames;
+
+	private final String description;
+
+	CompoundRow(Snippet snippet, String prefix, String description) {
+		super(snippet, prefix);
+		this.description = description;
+		this.propertyNames = new TreeSet<>();
+	}
+
+	void addProperty(ConfigurationProperty property) {
+		this.propertyNames.add(property.getDisplayName());
+	}
+
+	@Override
+	void write(Asciidoc asciidoc) {
+		asciidoc.append("|");
+		asciidoc.append("[[" + getAnchor() + "]]");
+		asciidoc.append("<<" + getAnchor() + ",");
+		this.propertyNames.forEach(asciidoc::appendWithHardLineBreaks);
+		asciidoc.appendln(">>");
+		asciidoc.appendln("|+++", this.description, "+++");
+		asciidoc.appendln("|");
+	}
+
+}

buildSrc/src/main/java/org/springframework/boot/build/context/properties/CompoundRow.java

@@ -17,14 +17,13 @@
 package org.springframework.boot.build.context.properties;
 
 import java.io.File;
-import java.io.FileReader;
 import java.io.IOException;
-import java.io.Reader;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
@@ -33,35 +32,40 @@
  * {@code META-INF/spring-configuration-metadata.json} files.
  *
  * @author Andy Wilkinson
+ * @author Phillip Webb
  */
 final class ConfigurationProperties {
 
-	private ConfigurationProperties() {
+	private final Map<String, ConfigurationProperty> byName;
 
+	private ConfigurationProperties(List<ConfigurationProperty> properties) {
+		Map<String, ConfigurationProperty> byName = new LinkedHashMap<>();
+		for (ConfigurationProperty property : properties) {
+			byName.put(property.getName(), property);
+		}
+		this.byName = Collections.unmodifiableMap(byName);
+	}
+
+	ConfigurationProperty get(String propertyName) {
+		return this.byName.get(propertyName);
+	}
+
+	Stream<ConfigurationProperty> stream() {
+		return this.byName.values().stream();
 	}
 
 	@SuppressWarnings("unchecked")
-	static Map<String, ConfigurationProperty> fromFiles(Iterable<File> files) {
-		List<ConfigurationProperty> configurationProperties = new ArrayList<>();
+	static ConfigurationProperties fromFiles(Iterable<File> files) {
 		try {
 			ObjectMapper objectMapper = new ObjectMapper();
+			List<ConfigurationProperty> properties = new ArrayList<>();
 			for (File file : files) {
-				try (Reader reader = new FileReader(file)) {
-					Map<String, Object> json = objectMapper.readValue(file, Map.class);
-					List<Map<String, Object>> properties = (List<Map<String, Object>>) json.get("properties");
-					for (Map<String, Object> property : properties) {
-						String name = (String) property.get("name");
-						String type = (String) property.get("type");
-						Object defaultValue = property.get("defaultValue");
-						String description = (String) property.get("description");
-						boolean deprecated = property.containsKey("deprecated");
-						configurationProperties
-								.add(new ConfigurationProperty(name, type, defaultValue, description, deprecated));
-					}
+				Map<String, Object> json = objectMapper.readValue(file, Map.class);
+				for (Map<String, Object> property : (List<Map<String, Object>>) json.get("properties")) {
+					properties.add(ConfigurationProperty.fromJsonProperties(property));
 				}
 			}
-			return configurationProperties.stream()
-					.collect(Collectors.toMap(ConfigurationProperty::getName, Function.identity()));
+			return new ConfigurationProperties(properties);
 		}
 		catch (IOException ex) {
 			throw new RuntimeException("Failed to load configuration metadata", ex);