Merge pull request #1184 from olivierboudet

* pr/1184:
  Polish "Add hints for HealthContributors"
  Add hints for HealthContributors

Closes gh-1184

Author: snicoll

spring-aot/src/main/java/org/springframework/boot/actuate/endpoint/annotation/HealthContributorNativeConfigurationProcessor.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.nativex.hint.Flag;
+import org.springframework.util.ClassUtils;
+
+/**
+ * A {@link BeanFactoryNativeConfigurationProcessor} that register reflection access for
+ * actuator health contributor.
+ *
+ * @author Olivier Boudet
+ */
+class HealthContributorNativeConfigurationProcessor implements BeanFactoryNativeConfigurationProcessor {
+
+	private static final String HEALTH_CONTRIBUTOR_CLASS_NAME = "org.springframework.boot.actuate.health.HealthContributor";
+
+	@Override
+	public void process(ConfigurableListableBeanFactory beanFactory, NativeConfigurationRegistry registry) {
+		if (ClassUtils.isPresent(HEALTH_CONTRIBUTOR_CLASS_NAME, beanFactory.getBeanClassLoader())) {
+			String[] beanNames = beanFactory.getBeanNamesForType(HealthContributor.class);
+			for (String beanName : beanNames) {
+				Class<?> beanType = beanFactory.getBeanDefinition(beanName).getResolvableType().toClass();
+				registry.reflection().forType(beanType).withFlags(Flag.allDeclaredConstructors).build();
+			}
+		}
+	}
+}

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

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

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

@@ -0,0 +1,67 @@
+/*
+ * 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.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.boot.actuate.health.HealthContributor;
+import org.springframework.boot.actuate.health.PingHealthIndicator;
+import org.springframework.nativex.hint.Flag;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Tests for {@link HealthContributorNativeConfigurationProcessor}.
+ *
+ * @author Olivier Boudet
+ */
+class HealthContributorNativeConfigurationProcessorTests {
+
+	@Test
+	void registerHealthIndicator() {
+		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
+		beanFactory.registerBeanDefinition("noise", BeanDefinitionBuilder.rootBeanDefinition(String.class).getBeanDefinition());
+		beanFactory.registerBeanDefinition("healthIndicator", BeanDefinitionBuilder.rootBeanDefinition(PingHealthIndicator.class).getBeanDefinition());
+		NativeConfigurationRegistry registry = process(beanFactory);
+		assertThat(registry.reflection().getEntries()).singleElement().satisfies((entry) -> {
+			assertThat(entry.getType()).isEqualTo(PingHealthIndicator.class);
+			assertThat(entry.getFlags()).contains(Flag.allDeclaredConstructors);
+		});
+	}
+
+	@Test
+	void registerHealthContributor() {
+		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
+		beanFactory.registerBeanDefinition("noise", BeanDefinitionBuilder.rootBeanDefinition(String.class).getBeanDefinition());
+		beanFactory.registerBeanDefinition("healthContributor", BeanDefinitionBuilder.rootBeanDefinition(HealthContributor.class).getBeanDefinition());
+		NativeConfigurationRegistry registry = process(beanFactory);
+		assertThat(registry.reflection().getEntries()).singleElement().satisfies((entry) -> {
+			assertThat(entry.getType()).isEqualTo(HealthContributor.class);
+			assertThat(entry.getFlags()).contains(Flag.allDeclaredConstructors);
+		});
+	}
+
+	private NativeConfigurationRegistry process(DefaultListableBeanFactory beanFactory) {
+		NativeConfigurationRegistry registry = new NativeConfigurationRegistry();
+		new HealthContributorNativeConfigurationProcessor().process(beanFactory, registry);
+		return registry;
+	}
+
+}