Polish "Add hints for HealthContributors"

See gh-1184

Author: snicoll

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

@@ -4,7 +4,6 @@
 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;
 
@@ -14,15 +13,18 @@
  *
  * @author Olivier Boudet
  */
+class HealthContributorNativeConfigurationProcessor implements BeanFactoryNativeConfigurationProcessor {
 
-public class HealthContributorNativeConfigurationProcessor implements BeanFactoryNativeConfigurationProcessor {
-    @Override
-    public void process(ConfigurableListableBeanFactory beanFactory, NativeConfigurationRegistry registry) {
-        if (ClassUtils.isPresent("org.springframework.boot.actuate.health.HealthContributor", beanFactory.getBeanClassLoader())) {
-            String[] healthContributorBeanNames = beanFactory.getBeanNamesForType(HealthContributor.class);
-            for (String bean : healthContributorBeanNames) {
-                registry.reflection().forType(beanFactory.getBean(bean, HealthContributor.class).getClass()).withFlags(Flag.allDeclaredConstructors).build();
-            }
-        }
-    }
+	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/test/java/org/springframework/boot/actuate/endpoint/annotation/HealthContributorNativeConfigurationProcessorTests.java

@@ -17,16 +17,14 @@
 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.HealthIndicator;
+import org.springframework.boot.actuate.health.HealthContributor;
+import org.springframework.boot.actuate.health.PingHealthIndicator;
 import org.springframework.nativex.hint.Flag;
 
-import java.util.List;
-
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
@@ -40,14 +38,24 @@ class HealthContributorNativeConfigurationProcessorTests {
 	void registerHealthIndicator() {
 		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
 		beanFactory.registerBeanDefinition("noise", BeanDefinitionBuilder.rootBeanDefinition(String.class).getBeanDefinition());
-		beanFactory.registerBeanDefinition("healthIndicator", BeanDefinitionBuilder.rootBeanDefinition(TestHealthIndicator.class).getBeanDefinition());
+		beanFactory.registerBeanDefinition("healthIndicator", BeanDefinitionBuilder.rootBeanDefinition(PingHealthIndicator.class).getBeanDefinition());
 		NativeConfigurationRegistry registry = process(beanFactory);
-		List<NativeReflectionEntry> entries = registry.reflection().getEntries();
-		assertThat(entries).anySatisfy((entry) -> {
-			assertThat(entry.getType()).isEqualTo(TestHealthIndicator.class);
+		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);
 		});
-		assertThat(entries).hasSize(1);
 	}
 
 	private NativeConfigurationRegistry process(DefaultListableBeanFactory beanFactory) {
@@ -56,13 +64,4 @@ private NativeConfigurationRegistry process(DefaultListableBeanFactory beanFacto
 		return registry;
 	}
 
-	@SuppressWarnings("unused")
-	static class TestHealthIndicator implements HealthIndicator {
-
-		@Override
-		public Health health() {
-			return Health.up().build();
-		}
-	}
-
 }