Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
import org.springframework.context.annotation.ConditionContext;
import org.springframework.context.annotation.Conditional;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.ConfigurationCondition;
import org.springframework.core.type.AnnotatedTypeMetadata;
import org.springframework.scheduling.annotation.EnableScheduling;

Expand Down Expand Up @@ -129,7 +130,12 @@ public ConditionOutcome getMatchOutcome(ConditionContext context, AnnotatedTypeM

}

static class OnHealthDefaultEnablementCondition extends SpringBootCondition {
static class OnHealthDefaultEnablementCondition extends SpringBootCondition implements ConfigurationCondition {

@Override
public ConfigurationCondition.ConfigurationPhase getConfigurationPhase() {
return ConfigurationCondition.ConfigurationPhase.REGISTER_BEAN;
}

@Override
public ConditionOutcome getMatchOutcome(ConditionContext context, AnnotatedTypeMetadata metadata) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;

import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.autoconfigure.task.TaskSchedulingAutoConfiguration;
import org.springframework.boot.grpc.server.autoconfigure.health.GrpcServerHealthAutoConfiguration.ActuatorHealthAdapterConfiguration;
Expand All @@ -36,6 +37,7 @@
import org.springframework.boot.test.context.FilteredClassLoader;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.grpc.server.GrpcServerFactory;
import org.springframework.util.StringUtils;

Expand Down Expand Up @@ -181,6 +183,24 @@ private String beanDefinitionNameForConfigClass(Class<?> configClass) {
return StringUtils.uncapitalize(fullName);
}

@Test
void whenBindableServiceRegisteredViaAutoConfigurationHealthIsEnabled() {
new ApplicationContextRunner()
.withConfiguration(AutoConfigurations.of(LateBindableServiceAutoConfiguration.class,
GrpcServerHealthAutoConfiguration.class))
.run((context) -> assertThat(context).hasSingleBean(GrpcServerHealthAutoConfiguration.class));
}

@AutoConfiguration(before = GrpcServerHealthAutoConfiguration.class)
static class LateBindableServiceAutoConfiguration {

@Bean
BindableService bindableService() {
return Mockito.mock(BindableService.class);
}

}

@Nested
class ActuatorHealthAdapterConfigurationTests {

Expand Down
Loading