Skip to content

Commit edafe4c

Browse files
philwebbphilwebb
committed
Create spring-boot-health module
1 parent 4d9e2d1 commit edafe4c

File tree

218 files changed

+938
-649
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

218 files changed

+938
-649
lines changed

‎settings.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ include "spring-boot-project:spring-boot-gson"
7979
include "spring-boot-project:spring-boot-h2console"
8080
include "spring-boot-project:spring-boot-hateoas"
8181
include "spring-boot-project:spring-boot-hazelcast"
82+
include "spring-boot-project:spring-boot-health"
8283
include "spring-boot-project:spring-boot-hibernate"
8384
include "spring-boot-project:spring-boot-http-client"
8485
include "spring-boot-project:spring-boot-http-converter"

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/jackson/JacksonEndpointAutoConfiguration.java

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616

1717
package org.springframework.boot.actuate.autoconfigure.endpoint.jackson;
1818

19+
import java.util.HashSet;
20+
import java.util.Set;
21+
1922
import com.fasterxml.jackson.annotation.JsonInclude.Include;
2023
import com.fasterxml.jackson.databind.ObjectMapper;
2124
import com.fasterxml.jackson.databind.SerializationFeature;
@@ -25,6 +28,7 @@
2528
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
2629
import org.springframework.boot.autoconfigure.condition.ConditionalOnBooleanProperty;
2730
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
31+
import org.springframework.boot.health.HealthComponent;
2832
import org.springframework.context.annotation.Bean;
2933
import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
3034

@@ -47,7 +51,22 @@ public EndpointObjectMapper endpointObjectMapper() {
4751
SerializationFeature.WRITE_DURATIONS_AS_TIMESTAMPS)
4852
.serializationInclusion(Include.NON_NULL)
4953
.build();
50-
return () -> objectMapper;
54+
Set<Class<?>> supportedTypes = new HashSet<>(EndpointObjectMapper.DEFAULT_SUPPORTED_TYPES);
55+
supportedTypes.add(HealthComponent.class);
56+
return new EndpointObjectMapper() {
57+
58+
@Override
59+
public ObjectMapper get() {
60+
return objectMapper;
61+
}
62+
63+
@Override
64+
public Set<Class<?>> getSupportedTypes() {
65+
return supportedTypes;
66+
}
67+
68+
};
69+
5170
}
5271

5372
}

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/AutoConfiguredHealthContributorRegistry.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
import java.util.Map;
2121

2222
import org.springframework.boot.actuate.health.DefaultHealthContributorRegistry;
23-
import org.springframework.boot.actuate.health.HealthContributor;
2423
import org.springframework.boot.actuate.health.HealthContributorRegistry;
24+
import org.springframework.boot.health.HealthContributor;
2525
import org.springframework.util.Assert;
2626

2727
/**

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/AutoConfiguredReactiveHealthContributorRegistry.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
import org.springframework.boot.actuate.health.DefaultReactiveHealthContributorRegistry;
2323
import org.springframework.boot.actuate.health.HealthContributorRegistry;
24-
import org.springframework.boot.actuate.health.ReactiveHealthContributor;
24+
import org.springframework.boot.health.ReactiveHealthContributor;
2525
import org.springframework.util.Assert;
2626

2727
/**

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/CompositeHealthContributorConfiguration.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
import java.util.Map;
2020
import java.util.function.Function;
2121

22-
import org.springframework.boot.actuate.health.CompositeHealthContributor;
23-
import org.springframework.boot.actuate.health.HealthContributor;
24-
import org.springframework.boot.actuate.health.HealthIndicator;
22+
import org.springframework.boot.health.CompositeHealthContributor;
23+
import org.springframework.boot.health.HealthContributor;
24+
import org.springframework.boot.health.HealthIndicator;
2525

2626
/**
2727
* Base class for health contributor configurations that can combine source beans into a

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/CompositeReactiveHealthContributorConfiguration.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
import java.util.Map;
2020
import java.util.function.Function;
2121

22-
import org.springframework.boot.actuate.health.CompositeReactiveHealthContributor;
23-
import org.springframework.boot.actuate.health.ReactiveHealthContributor;
24-
import org.springframework.boot.actuate.health.ReactiveHealthIndicator;
22+
import org.springframework.boot.health.CompositeReactiveHealthContributor;
23+
import org.springframework.boot.health.ReactiveHealthContributor;
24+
import org.springframework.boot.health.ReactiveHealthIndicator;
2525

2626
/**
2727
* Base class for health contributor configurations that can combine source beans into a

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/HealthContributorAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616

1717
package org.springframework.boot.actuate.autoconfigure.health;
1818

19-
import org.springframework.boot.actuate.health.HealthContributor;
2019
import org.springframework.boot.actuate.health.PingHealthIndicator;
2120
import org.springframework.boot.autoconfigure.AutoConfiguration;
2221
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
22+
import org.springframework.boot.health.HealthContributor;
2323
import org.springframework.context.annotation.Bean;
2424

2525
/**

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/HealthEndpointConfiguration.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,25 +26,25 @@
2626
import org.springframework.beans.factory.ObjectProvider;
2727
import org.springframework.beans.factory.SmartInitializingSingleton;
2828
import org.springframework.beans.factory.config.BeanPostProcessor;
29-
import org.springframework.boot.actuate.health.CompositeHealthContributor;
30-
import org.springframework.boot.actuate.health.CompositeReactiveHealthContributor;
31-
import org.springframework.boot.actuate.health.Health;
32-
import org.springframework.boot.actuate.health.HealthContributor;
3329
import org.springframework.boot.actuate.health.HealthContributorRegistry;
3430
import org.springframework.boot.actuate.health.HealthEndpoint;
3531
import org.springframework.boot.actuate.health.HealthEndpointGroups;
3632
import org.springframework.boot.actuate.health.HealthEndpointGroupsPostProcessor;
37-
import org.springframework.boot.actuate.health.HealthIndicator;
3833
import org.springframework.boot.actuate.health.HttpCodeStatusMapper;
39-
import org.springframework.boot.actuate.health.NamedContributor;
40-
import org.springframework.boot.actuate.health.NamedContributors;
41-
import org.springframework.boot.actuate.health.ReactiveHealthContributor;
42-
import org.springframework.boot.actuate.health.ReactiveHealthIndicator;
4334
import org.springframework.boot.actuate.health.SimpleHttpCodeStatusMapper;
4435
import org.springframework.boot.actuate.health.SimpleStatusAggregator;
4536
import org.springframework.boot.actuate.health.StatusAggregator;
4637
import org.springframework.boot.autoconfigure.condition.ConditionalOnBooleanProperty;
4738
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
39+
import org.springframework.boot.health.CompositeHealthContributor;
40+
import org.springframework.boot.health.CompositeReactiveHealthContributor;
41+
import org.springframework.boot.health.Health;
42+
import org.springframework.boot.health.HealthContributor;
43+
import org.springframework.boot.health.HealthIndicator;
44+
import org.springframework.boot.health.NamedContributor;
45+
import org.springframework.boot.health.NamedContributors;
46+
import org.springframework.boot.health.ReactiveHealthContributor;
47+
import org.springframework.boot.health.ReactiveHealthIndicator;
4848
import org.springframework.context.ApplicationContext;
4949
import org.springframework.context.annotation.Bean;
5050
import org.springframework.context.annotation.Configuration;

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/ReactiveHealthEndpointConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@
2121

2222
import reactor.core.publisher.Flux;
2323

24-
import org.springframework.boot.actuate.health.HealthContributor;
2524
import org.springframework.boot.actuate.health.HealthEndpoint;
2625
import org.springframework.boot.actuate.health.HealthEndpointGroups;
27-
import org.springframework.boot.actuate.health.ReactiveHealthContributor;
2826
import org.springframework.boot.actuate.health.ReactiveHealthContributorRegistry;
2927
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
3028
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
3129
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
30+
import org.springframework.boot.health.HealthContributor;
31+
import org.springframework.boot.health.ReactiveHealthContributor;
3232
import org.springframework.context.annotation.Bean;
3333
import org.springframework.context.annotation.Configuration;
3434

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/health/AbstractCompositeHealthContributorConfigurationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222

2323
import org.junit.jupiter.api.Test;
2424

25-
import org.springframework.boot.actuate.health.NamedContributor;
26-
import org.springframework.boot.actuate.health.NamedContributors;
25+
import org.springframework.boot.health.NamedContributor;
26+
import org.springframework.boot.health.NamedContributors;
2727
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
2828
import org.springframework.context.annotation.Bean;
2929
import org.springframework.context.annotation.Configuration;

0 commit comments

Comments
 (0)