Try to auto discover health indicator

Author: olivierboudet

spring-aot/src/main/java/org/springframework/boot/actuate/endpoint/annotation/HealthIndicatorNativeConfigurationProcessor.java

@@ -0,0 +1,30 @@
+package org.springframework.boot.actuate.endpoint.annotation;
+
+import org.springframework.aot.context.bootstrap.generator.infrastructure.nativex.BeanFactoryNativeConfigurationProcessor;
+import org.springframework.aot.context.bootstrap.generator.infrastructure.nativex.NativeConfigurationRegistry;
+import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
+import org.springframework.boot.actuate.health.HealthContributor;
+import org.springframework.boot.actuate.health.HealthIndicator;
+import org.springframework.nativex.hint.Flag;
+import org.springframework.util.ClassUtils;
+
+/**
+ * A {@link BeanFactoryNativeConfigurationProcessor} that register reflection access for
+ * actuator health contributor.
+ *
+ * @author Olivier Boudet
+ */
+public class HealthIndicatorNativeConfigurationProcessor implements BeanFactoryNativeConfigurationProcessor {
+    @Override
+    public void process(ConfigurableListableBeanFactory beanFactory, NativeConfigurationRegistry registry) {
+        System.err.println("HealthIndicatorNativeConfigurationProcessor");
+        if (ClassUtils.isPresent("org.springframework.boot.actuate.health.HealthIndicator", beanFactory.getBeanClassLoader())) {
+            String[] healthIndicatorBeanNames = beanFactory.getBeanNamesForType(HealthIndicator.class);
+            System.err.println(healthIndicatorBeanNames.length);
+            for (String bean : healthIndicatorBeanNames) {
+                System.err.println(bean);
+                registry.reflection().forType(beanFactory.getBean(bean, HealthIndicator.class).getClass()).withFlags(Flag.allDeclaredConstructors).build();
+            }
+        }
+    }
+}

spring-aot/src/main/resources/META-INF/spring.factories

@@ -12,6 +12,7 @@ org.springframework.aot.context.bootstrap.generator.bean.DefaultBeanRegistration
 
 org.springframework.aot.context.bootstrap.generator.infrastructure.nativex.BeanFactoryNativeConfigurationProcessor=\
 org.springframework.boot.actuate.endpoint.annotation.EndpointNativeConfigurationProcessor,\
+org.springframework.boot.actuate.endpoint.annotation.HealthIndicatorNativeConfigurationProcessor,\
 org.springframework.boot.context.properties.ConfigurationPropertiesNativeConfigurationProcessor,\
 org.springframework.data.RepositoryDefinitionConfigurationProcessor  
 

spring-aot/src/test/java/org/springframework/boot/actuate/endpoint/annotation/HealthIndicatorNativeConfigurationProcessorTests.java

@@ -0,0 +1,69 @@
+/*
+ * Copyright 2019-2021 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.actuate.endpoint.annotation;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.aot.context.bootstrap.generator.infrastructure.nativex.NativeConfigurationRegistry;
+import org.springframework.aot.context.bootstrap.generator.infrastructure.nativex.NativeReflectionEntry;
+import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.boot.actuate.health.Health;
+import org.springframework.boot.actuate.health.HealthContributor;
+import org.springframework.boot.actuate.health.HealthIndicator;
+import org.springframework.nativex.hint.Flag;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Tests for {@link HealthIndicatorNativeConfigurationProcessor}.
+ *
+ * @author Olivier Boudet
+ */
+class HealthIndicatorNativeConfigurationProcessorTests {
+
+	@Test
+	void registerHealthIndicator() {
+		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
+		beanFactory.registerBeanDefinition("noise", BeanDefinitionBuilder.rootBeanDefinition(String.class).getBeanDefinition());
+		beanFactory.registerBeanDefinition("healthIndicator", BeanDefinitionBuilder.rootBeanDefinition(TestHealthIndicator.class).getBeanDefinition());
+		NativeConfigurationRegistry registry = process(beanFactory);
+		List<NativeReflectionEntry> entries = registry.reflection().getEntries();
+		assertThat(entries).anySatisfy((entry) -> {
+			assertThat(entry.getType()).isEqualTo(TestHealthIndicator.class);
+			assertThat(entry.getFlags()).contains(Flag.allDeclaredConstructors);
+		});
+		assertThat(entries).hasSize(1);
+	}
+
+	private NativeConfigurationRegistry process(DefaultListableBeanFactory beanFactory) {
+		NativeConfigurationRegistry registry = new NativeConfigurationRegistry();
+		new HealthIndicatorNativeConfigurationProcessor().process(beanFactory, registry);
+		return registry;
+	}
+
+	@SuppressWarnings("unused")
+	static class TestHealthIndicator implements HealthIndicator {
+
+		@Override
+		public Health health() {
+			return Health.up().build();
+		}
+	}
+
+}

spring-native-configuration/src/main/java/org/springframework/boot/actuate/autoconfigure/health/HealthContributorHints.java

@@ -37,7 +37,6 @@ org.springframework.boot.actuate.autoconfigure.endpoint.web.servlet.WebMvcEndpoi
 org.springframework.boot.actuate.autoconfigure.endpoint.web.reactive.WebFluxEndpointManagementContextConfigurationHints
 org.springframework.boot.actuate.autoconfigure.env.EnvironmentEndpointAutoConfigurationHints
 org.springframework.boot.actuate.autoconfigure.health.HealthEndpointAutoConfigurationHints
-org.springframework.boot.actuate.autoconfigure.health.HealthContributorHints
 org.springframework.boot.actuate.autoconfigure.info.InfoEndpointAutoConfigurationHints
 org.springframework.boot.actuate.autoconfigure.jolokia.JolokiaEndpointAutoConfigurationHints
 org.springframework.boot.actuate.autoconfigure.metrics.MetricsEndpointAutoConfigurationHints