Browse Source

Merge remote-tracking branch 'origin/3.1.x'

pull/1057/merge
Olga Maciaszek-Sharma 3 years ago
parent
commit
14dd6425e7
  1. 7
      spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/health/DiscoveryCompositeHealthContributor.java

7
spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/health/DiscoveryCompositeHealthContributor.java

@ -17,6 +17,7 @@
package org.springframework.cloud.client.discovery.health; package org.springframework.cloud.client.discovery.health;
import java.util.Collection; import java.util.Collection;
import java.util.Collections;
import java.util.Iterator; import java.util.Iterator;
import java.util.Map; import java.util.Map;
import java.util.function.Function; import java.util.function.Function;
@ -72,7 +73,11 @@ public class DiscoveryCompositeHealthContributor implements CompositeHealthContr
} }
private HealthIndicator asHealthIndicator(DiscoveryHealthIndicator indicator) { private HealthIndicator asHealthIndicator(DiscoveryHealthIndicator indicator) {
return (indicator != null) ? () -> indicator.health() : null; return (indicator != null) ? indicator::health : null;
}
public Map<String, DiscoveryHealthIndicator> getIndicators() {
return Collections.unmodifiableMap(indicators);
} }
} }

Loading…
Cancel
Save