Merge pull request #4674 from vpavic/improve-health-aggregating

* pr/4674:
  Add AbstractHealthAggregator.aggregateDetails

Author: philwebb

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/AbstractHealthAggregator.java

@@ -26,19 +26,20 @@
  * aggregating the {@link Status} instances and not deal with contextual details etc.
  *
  * @author Christian Dupuis
+ * @author Vedran Pavic
  * @since 1.1.0
  */
 public abstract class AbstractHealthAggregator implements HealthAggregator {
 
 	@Override
 	public final Health aggregate(Map<String, Health> healths) {
 		List<Status> statusCandidates = new ArrayList<Status>();
-		Map<String, Object> details = new LinkedHashMap<String, Object>();
 		for (Map.Entry<String, Health> entry : healths.entrySet()) {
-			details.put(entry.getKey(), entry.getValue());
 			statusCandidates.add(entry.getValue().getStatus());
 		}
-		return new Health.Builder(aggregateStatus(statusCandidates), details).build();
+		Status status = aggregateStatus(statusCandidates);
+		Map<String, Object> details = aggregateDetails(healths);
+		return new Health.Builder(status, details).build();
 	}
 
 	/**
@@ -49,4 +50,15 @@ public final Health aggregate(Map<String, Health> healths) {
 	 */
 	protected abstract Status aggregateStatus(List<Status> candidates);
 
+	/**
+	 * Return the map of 'aggregate' details that should be used from the specified
+	 * healths.
+	 * @param healths the health instances to aggregate
+	 * @return a map of details
+	 * @since 1.3.1
+	 */
+	protected Map<String, Object> aggregateDetails(Map<String, Health> healths) {
+		return new LinkedHashMap<String, Object>(healths);
+	}
+
 }