Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-08-29 03:06:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.2.x'

Browse Source 
Closes gh-20114
This commit is contained in:
Madhura Bhave 2020-02-10 17:11:33 -08:00
commit 19b7dc8e4f
2 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -1,5 +1,5 @@
/* /*
* 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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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 <C> the contributor type
* @param <T> the contributed health component type * @param <T> the contributed health component type
* @author Phillip Webb * @author Phillip Webb
* @author Madhura Bhave
*/ */
abstract class HealthEndpointSupportTests<R extends ContributorRegistry<C>, C, T> { 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(); 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 HealthEndpointSupport<C, T> create(R registry, HealthEndpointGroups groups);
protected abstract R createRegistry(); protected abstract R createRegistry();