Merge branch '2.2.x'

Closes gh-20114

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

@@ -72,7 +72,7 @@ abstract class HealthEndpointSupport<C, T> {
 		}
 		Object contributor = getContributor(path, pathOffset);
 		T health = getContribution(apiVersion, group, contributor, showComponents, showDetails,
-				isSystemHealth ? this.groups.getNames() : null);
+				isSystemHealth ? this.groups.getNames() : null, false);
 		return (health != null) ? new HealthResult<>(health, group) : null;
 	}
 
@@ -91,23 +91,24 @@ abstract class HealthEndpointSupport<C, T> {
 
 	@SuppressWarnings("unchecked")
 	private T getContribution(ApiVersion apiVersion, HealthEndpointGroup group, Object contributor,
-			boolean showComponents, boolean showDetails, Set<String> groupNames) {
+			boolean showComponents, boolean showDetails, Set<String> groupNames, boolean isNested) {
 		if (contributor instanceof NamedContributors) {
 			return getAggregateHealth(apiVersion, group, (NamedContributors<C>) contributor, showComponents,
-					showDetails, groupNames);
+					showDetails, groupNames, isNested);
 		}
 		return (contributor != null) ? getHealth((C) contributor, showDetails) : null;
 	}
 
 	private T getAggregateHealth(ApiVersion apiVersion, HealthEndpointGroup group,
-			NamedContributors<C> namedContributors, boolean showComponents, boolean showDetails,
-			Set<String> groupNames) {
+			NamedContributors<C> namedContributors, boolean showComponents, boolean showDetails, Set<String> groupNames,
+			boolean isNested) {
 		Map<String, T> contributions = new LinkedHashMap<>();
 		for (NamedContributor<C> namedContributor : namedContributors) {
 			String name = namedContributor.getName();
 			C contributor = namedContributor.getContributor();
-			if (group.isMember(name)) {
-				T contribution = getContribution(apiVersion, group, contributor, showComponents, showDetails, null);
+			if (group.isMember(name) || isNested) {
+				T contribution = getContribution(apiVersion, group, contributor, showComponents, showDetails, null,
+						true);
 				if (contribution != null) {
 					contributions.put(name, contribution);
 				}

spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/HealthEndpointSupportTests.java

 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2020 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.
@@ -38,6 +38,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException
  * @param <C> the contributor type
  * @param <T> the contributed health component type
  * @author Phillip Webb
+ * @author Madhura Bhave
  */
 abstract class HealthEndpointSupportTests<R extends ContributorRegistry<C>, C, T> {
 
@@ -215,6 +216,20 @@ abstract class HealthEndpointSupportTests<R extends ContributorRegistry<C>, C, T
 		assertThat(result).isNull();
 	}
 
+	@Test
+	void getHealthWhenGroupContainsCompositeContributorReturnsHealth() {
+		C contributor = createContributor(this.up);
+		C compositeContributor = createCompositeContributor(Collections.singletonMap("spring", contributor));
+		this.registry.registerContributor("test", compositeContributor);
+		TestHealthEndpointGroup testGroup = new TestHealthEndpointGroup((name) -> name.startsWith("test"));
+		HealthEndpointGroups groups = HealthEndpointGroups.of(this.primaryGroup,
+				Collections.singletonMap("testGroup", testGroup));
+		HealthResult<T> result = create(this.registry, groups).getHealth(ApiVersion.V3, SecurityContext.NONE, false,
+				"testGroup");
+		CompositeHealth health = (CompositeHealth) getHealth(result);
+		assertThat(health.getComponents()).containsKey("test");
+	}
+
 	protected abstract HealthEndpointSupport<C, T> create(R registry, HealthEndpointGroups groups);
 
 	protected abstract R createRegistry();