SpringCloud/spring-cloud-stream
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Minor refactoring to KafkaBinderHealthIndicator

Browse Source 
- Instead of implementing HealthIndicator directlry,
   extend from AbstractHealthIndicator provided by Spring Boot.
This commit is contained in:
Soby Chacko
2023-06-14 16:52:42 -04:00
parent 2093cb6a99
commit 3059a8af6c
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
binders/kafka-binder/spring-cloud-stream-binder-kafka/src/main/java/org/springframework/cloud/stream/binder/kafka/KafkaBinderHealthIndicator.java
View File

@@ -34,6 +34,7 @@ import org.apache.kafka.clients.consumer.Consumer;
import org.apache.kafka.common.PartitionInfo;
import org.springframework.beans.factory.DisposableBean;
import org.springframework.boot.actuate.health.AbstractHealthIndicator;
import org.springframework.boot.actuate.health.Health;
import org.springframework.boot.actuate.health.Status;
import org.springframework.boot.actuate.health.StatusAggregator;
@@ -54,7 +55,7 @@ import org.springframework.scheduling.concurrent.CustomizableThreadFactory;
* @author Chukwubuikem Ume-Ugwa
* @author Taras Danylchuk
*/
public class KafkaBinderHealthIndicator implements KafkaBinderHealth, DisposableBean {
public class KafkaBinderHealthIndicator extends AbstractHealthIndicator implements DisposableBean {
private static final int DEFAULT_TIMEOUT = 60;
@@ -90,19 +91,19 @@ public class KafkaBinderHealthIndicator implements KafkaBinderHealth, Disposable
}
@Override
public Health health() {
protected void doHealthCheck(Health.Builder builder) {
Health topicsHealth = safelyBuildTopicsHealth();
Health listenerContainersHealth = buildListenerContainersHealth();
return merge(topicsHealth, listenerContainersHealth);
merge(topicsHealth, listenerContainersHealth, builder);
}
private Health merge(Health topicsHealth, Health listenerContainersHealth) {
private void merge(Health topicsHealth, Health listenerContainersHealth, Health.Builder builder) {
Status aggregatedStatus = StatusAggregator.getDefault()
.getAggregateStatus(topicsHealth.getStatus(), listenerContainersHealth.getStatus());
Map<String, Object> aggregatedDetails = new HashMap<>();
aggregatedDetails.putAll(topicsHealth.getDetails());
aggregatedDetails.putAll(listenerContainersHealth.getDetails());
return Health.status(aggregatedStatus).withDetails(aggregatedDetails).build();
builder.status(aggregatedStatus).withDetails(aggregatedDetails);
}
private Health safelyBuildTopicsHealth() {