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;

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

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

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

24-
import org.springframework.boot.actuate.health.HealthContributor;
2524
import org.springframework.boot.actuate.health.HealthContributorRegistry;
25+
import org.springframework.boot.health.HealthIndicator;
2626

2727
import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
2828
import static org.mockito.Mockito.mock;
@@ -38,7 +38,7 @@ class AutoConfiguredHealthContributorRegistryTests {
3838
void createWhenContributorsClashesWithGroupNameThrowsException() {
3939
assertThatIllegalStateException()
4040
.isThrownBy(() -> new AutoConfiguredHealthContributorRegistry(
41-
Collections.singletonMap("boot", mock(HealthContributor.class)), Arrays.asList("spring", "boot")))
41+
Collections.singletonMap("boot", mock(HealthIndicator.class)), Arrays.asList("spring", "boot")))
4242
.withMessage("HealthContributor with name \"boot\" clashes with group");
4343
}
4444

@@ -47,7 +47,7 @@ void registerContributorWithGroupNameThrowsException() {
4747
HealthContributorRegistry registry = new AutoConfiguredHealthContributorRegistry(Collections.emptyMap(),
4848
Arrays.asList("spring", "boot"));
4949
assertThatIllegalStateException()
50-
.isThrownBy(() -> registry.registerContributor("spring", mock(HealthContributor.class)))
50+
.isThrownBy(() -> registry.registerContributor("spring", mock(HealthIndicator.class)))
5151
.withMessage("HealthContributor with name \"spring\" clashes with group");
5252
}
5353

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@
3131
import org.springframework.boot.actuate.health.HttpCodeStatusMapper;
3232
import org.springframework.boot.actuate.health.SimpleHttpCodeStatusMapper;
3333
import org.springframework.boot.actuate.health.SimpleStatusAggregator;
34-
import org.springframework.boot.actuate.health.Status;
3534
import org.springframework.boot.actuate.health.StatusAggregator;
3635
import org.springframework.boot.autoconfigure.AutoConfigurations;
3736
import org.springframework.boot.context.properties.EnableConfigurationProperties;
37+
import org.springframework.boot.health.Status;
3838
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
3939
import org.springframework.context.ConfigurableApplicationContext;
4040
import org.springframework.context.annotation.Bean;

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

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

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

24-
import org.springframework.boot.actuate.health.ReactiveHealthContributor;
2524
import org.springframework.boot.actuate.health.ReactiveHealthContributorRegistry;
25+
import org.springframework.boot.health.ReactiveHealthIndicator;
2626

2727
import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
2828
import static org.mockito.Mockito.mock;
@@ -38,7 +38,7 @@ class AutoConfiguredReactiveHealthContributorRegistryTests {
3838
void createWhenContributorsClashesWithGroupNameThrowsException() {
3939
assertThatIllegalStateException()
4040
.isThrownBy(() -> new AutoConfiguredReactiveHealthContributorRegistry(
41-
Collections.singletonMap("boot", mock(ReactiveHealthContributor.class)),
41+
Collections.singletonMap("boot", mock(ReactiveHealthIndicator.class)),
4242
Arrays.asList("spring", "boot")))
4343
.withMessage("ReactiveHealthContributor with name \"boot\" clashes with group");
4444
}
@@ -48,7 +48,7 @@ void registerContributorWithGroupNameThrowsException() {
4848
ReactiveHealthContributorRegistry registry = new AutoConfiguredReactiveHealthContributorRegistry(
4949
Collections.emptyMap(), Arrays.asList("spring", "boot"));
5050
assertThatIllegalStateException()
51-
.isThrownBy(() -> registry.registerContributor("spring", mock(ReactiveHealthContributor.class)))
51+
.isThrownBy(() -> registry.registerContributor("spring", mock(ReactiveHealthIndicator.class)))
5252
.withMessage("ReactiveHealthContributor with name \"spring\" clashes with group");
5353
}
5454

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
package org.springframework.boot.actuate.autoconfigure.health;
1818

1919
import org.springframework.boot.actuate.autoconfigure.health.CompositeHealthContributorConfigurationTests.TestHealthIndicator;
20-
import org.springframework.boot.actuate.health.AbstractHealthIndicator;
21-
import org.springframework.boot.actuate.health.Health.Builder;
22-
import org.springframework.boot.actuate.health.HealthContributor;
20+
import org.springframework.boot.health.AbstractHealthIndicator;
21+
import org.springframework.boot.health.Health;
22+
import org.springframework.boot.health.HealthContributor;
2323

2424
/**
2525
* Tests for {@link CompositeHealthContributorConfiguration}.
@@ -49,7 +49,7 @@ static class TestHealthIndicator extends AbstractHealthIndicator {
4949
}
5050

5151
@Override
52-
protected void doHealthCheck(Builder builder) throws Exception {
52+
protected void doHealthCheck(Health.Builder builder) throws Exception {
5353
builder.up();
5454
}
5555

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,9 @@
1919
import reactor.core.publisher.Mono;
2020

2121
import org.springframework.boot.actuate.autoconfigure.health.CompositeReactiveHealthContributorConfigurationTests.TestReactiveHealthIndicator;
22-
import org.springframework.boot.actuate.health.AbstractReactiveHealthIndicator;
23-
import org.springframework.boot.actuate.health.Health;
24-
import org.springframework.boot.actuate.health.Health.Builder;
25-
import org.springframework.boot.actuate.health.ReactiveHealthContributor;
22+
import org.springframework.boot.health.AbstractReactiveHealthIndicator;
23+
import org.springframework.boot.health.Health;
24+
import org.springframework.boot.health.ReactiveHealthContributor;
2625

2726
/**
2827
* Tests for {@link CompositeReactiveHealthContributorConfiguration}.
@@ -52,7 +51,7 @@ static class TestReactiveHealthIndicator extends AbstractReactiveHealthIndicator
5251
}
5352

5453
@Override
55-
protected Mono<Health> doHealthCheck(Builder builder) {
54+
protected Mono<Health> doHealthCheck(Health.Builder builder) {
5655
return Mono.just(builder.up().build());
5756
}
5857

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818

1919
import org.junit.jupiter.api.Test;
2020

21-
import org.springframework.boot.actuate.health.Health;
22-
import org.springframework.boot.actuate.health.HealthIndicator;
2321
import org.springframework.boot.actuate.health.PingHealthIndicator;
2422
import org.springframework.boot.autoconfigure.AutoConfigurations;
23+
import org.springframework.boot.health.Health;
24+
import org.springframework.boot.health.HealthIndicator;
2525
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
2626
import org.springframework.context.annotation.Bean;
2727
import org.springframework.context.annotation.Configuration;

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,26 +30,26 @@
3030
import org.springframework.boot.actuate.endpoint.SecurityContext;
3131
import org.springframework.boot.actuate.endpoint.web.WebEndpointResponse;
3232
import org.springframework.boot.actuate.endpoint.web.WebServerNamespace;
33-
import org.springframework.boot.actuate.health.CompositeHealthContributor;
3433
import org.springframework.boot.actuate.health.DefaultHealthContributorRegistry;
3534
import org.springframework.boot.actuate.health.DefaultReactiveHealthContributorRegistry;
36-
import org.springframework.boot.actuate.health.Health;
37-
import org.springframework.boot.actuate.health.HealthComponent;
3835
import org.springframework.boot.actuate.health.HealthContributorRegistry;
3936
import org.springframework.boot.actuate.health.HealthEndpoint;
4037
import org.springframework.boot.actuate.health.HealthEndpointGroups;
4138
import org.springframework.boot.actuate.health.HealthEndpointGroupsPostProcessor;
4239
import org.springframework.boot.actuate.health.HealthEndpointWebExtension;
43-
import org.springframework.boot.actuate.health.HealthIndicator;
4440
import org.springframework.boot.actuate.health.HttpCodeStatusMapper;
45-
import org.springframework.boot.actuate.health.NamedContributor;
4641
import org.springframework.boot.actuate.health.ReactiveHealthContributorRegistry;
4742
import org.springframework.boot.actuate.health.ReactiveHealthEndpointWebExtension;
48-
import org.springframework.boot.actuate.health.ReactiveHealthIndicator;
49-
import org.springframework.boot.actuate.health.Status;
5043
import org.springframework.boot.actuate.health.StatusAggregator;
51-
import org.springframework.boot.actuate.health.SystemHealth;
5244
import org.springframework.boot.autoconfigure.AutoConfigurations;
45+
import org.springframework.boot.health.CompositeHealth;
46+
import org.springframework.boot.health.CompositeHealthContributor;
47+
import org.springframework.boot.health.Health;
48+
import org.springframework.boot.health.HealthComponent;
49+
import org.springframework.boot.health.HealthIndicator;
50+
import org.springframework.boot.health.NamedContributor;
51+
import org.springframework.boot.health.ReactiveHealthIndicator;
52+
import org.springframework.boot.health.Status;
5353
import org.springframework.boot.test.context.FilteredClassLoader;
5454
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
5555
import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner;
@@ -317,7 +317,7 @@ void runWithIndicatorsInParentContextFindsIndicators() {
317317
.withParent(parent)
318318
.run((context) -> {
319319
HealthComponent health = context.getBean(HealthEndpoint.class).health();
320-
Map<String, HealthComponent> components = ((SystemHealth) health).getComponents();
320+
Map<String, HealthComponent> components = ((CompositeHealth) health).getComponents();
321321
assertThat(components).containsKeys("additional", "ping", "simple");
322322
}));
323323
}
@@ -332,7 +332,7 @@ void runWithReactiveContextAndIndicatorsInParentContextFindsIndicators() {
332332
.withParent(parent)
333333
.run((context) -> {
334334
HealthComponent health = context.getBean(HealthEndpoint.class).health();
335-
Map<String, HealthComponent> components = ((SystemHealth) health).getComponents();
335+
Map<String, HealthComponent> components = ((CompositeHealth) health).getComponents();
336336
assertThat(components).containsKeys("additional", "ping", "simple");
337337
}));
338338
}

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/ssl/SslHealthContributorAutoConfigurationTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@
2222
import org.junit.jupiter.api.Test;
2323

2424
import org.springframework.boot.actuate.autoconfigure.ssl.SslHealthContributorAutoConfigurationTests.CustomSslInfoConfiguration.CustomSslHealthIndicator;
25-
import org.springframework.boot.actuate.health.Health;
26-
import org.springframework.boot.actuate.health.HealthIndicator;
27-
import org.springframework.boot.actuate.health.Status;
2825
import org.springframework.boot.actuate.ssl.SslHealthIndicator;
2926
import org.springframework.boot.autoconfigure.AutoConfigurations;
3027
import org.springframework.boot.autoconfigure.ssl.SslAutoConfiguration;
28+
import org.springframework.boot.health.Health;
29+
import org.springframework.boot.health.HealthIndicator;
30+
import org.springframework.boot.health.Status;
3131
import org.springframework.boot.info.SslInfo;
3232
import org.springframework.boot.info.SslInfo.CertificateChainInfo;
3333
import org.springframework.boot.ssl.SslBundles;

‎spring-boot-project/spring-boot-actuator-docs/src/test/java/org/springframework/boot/actuate/docs/health/HealthEndpointDocumentationTests.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,23 +29,23 @@
2929
import org.springframework.boot.actuate.docs.MockMvcEndpointDocumentationTests;
3030
import org.springframework.boot.actuate.endpoint.SecurityContext;
3131
import org.springframework.boot.actuate.health.AdditionalHealthEndpointPath;
32-
import org.springframework.boot.actuate.health.CompositeHealthContributor;
3332
import org.springframework.boot.actuate.health.DefaultHealthContributorRegistry;
34-
import org.springframework.boot.actuate.health.Health;
35-
import org.springframework.boot.actuate.health.HealthContributor;
3633
import org.springframework.boot.actuate.health.HealthContributorRegistry;
3734
import org.springframework.boot.actuate.health.HealthEndpoint;
3835
import org.springframework.boot.actuate.health.HealthEndpointGroup;
3936
import org.springframework.boot.actuate.health.HealthEndpointGroups;
40-
import org.springframework.boot.actuate.health.HealthIndicator;
4137
import org.springframework.boot.actuate.health.HttpCodeStatusMapper;
4238
import org.springframework.boot.actuate.health.SimpleHttpCodeStatusMapper;
4339
import org.springframework.boot.actuate.health.SimpleStatusAggregator;
4440
import org.springframework.boot.actuate.health.StatusAggregator;
4541
import org.springframework.boot.actuate.system.DiskSpaceHealthIndicator;
4642
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
47-
import org.springframework.boot.jdbc.actuate.health.DataSourceHealthIndicator;
43+
import org.springframework.boot.health.CompositeHealthContributor;
44+
import org.springframework.boot.health.Health;
45+
import org.springframework.boot.health.HealthContributor;
46+
import org.springframework.boot.health.HealthIndicator;
4847
import org.springframework.boot.jdbc.autoconfigure.DataSourceAutoConfiguration;
48+
import org.springframework.boot.jdbc.health.DataSourceHealthIndicator;
4949
import org.springframework.context.annotation.Bean;
5050
import org.springframework.context.annotation.Configuration;
5151
import org.springframework.http.MediaType;

0 commit comments

Comments
 (0)