tweaking hints on actuators

Author: aclement

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

@@ -40,22 +40,26 @@
 // Hitting /health endpoint
 @NativeImageHint(trigger = HealthEndpointAutoConfiguration.class, typeInfos = { 
 	@TypeInfo(types = {
-		SimpleHttpCodeStatusMapper.class,
-		SimpleStatusAggregator.class,
-		PingHealthIndicator.class,
 		// TODO [0.9.0] these two should be more conditional? surely it is one or the other
 		ReactiveHealthEndpointWebExtension.class,
 		HealthEndpointWebExtension.class,
-		Status.class,
+	},access=AccessBits.LOAD_AND_CONSTRUCT),
+	@TypeInfo(types = {
 		StatusAggregator.class,
+		SimpleStatusAggregator.class,
+		HttpCodeStatusMapper.class,
+		SimpleHttpCodeStatusMapper.class,
+	},access=AccessBits.LOAD_AND_CONSTRUCT|AccessBits.PUBLIC_METHODS),
+	@TypeInfo(types = {
+//		PingHealthIndicator.class,
+		Status.class,
 		SystemHealth.class,
 		CompositeHealth.class,
 		HealthIndicator.class,
-		HttpCodeStatusMapper.class,
 		NamedContributors.class,
 		HealthComponent.class,	
-		HealthContributorAutoConfiguration.class,
-		HealthEndpointProperties.class,
+//		HealthContributorAutoConfiguration.class,
+//		HealthEndpointProperties.class,
 		HealthProperties.class,
 		HealthContributor.class,
 		HealthComponent.class,
@@ -71,7 +75,7 @@
 //		"org.springframework.boot.actuate.autoconfigure.health.AutoConfiguredHealthContributorRegistry",
 //		"org.springframework.boot.actuate.autoconfigure.health.AutoConfiguredReactiveHealthContributorRegistry",
 		"org.springframework.boot.actuate.autoconfigure.health.HealthContributorRegistryHealthIndicatorRegistryAdapter"
-	}),
+	},access=AccessBits.LOAD_AND_CONSTRUCT|AccessBits.PUBLIC_METHODS),
 //	@TypeInfo(types = {
 //		HealthContributorRegistry.class, DefaultHealthContributorRegistry.class,
 //		AutoConfiguredHealthContributorRegistry.class,

spring-graalvm-native-feature/src/main/java/org/springframework/graalvm/support/ResourcesHandler.java

@@ -1042,6 +1042,34 @@ private boolean checkJmxConstraint(Type type, ProcessingContext pc) {
 		}
 		return true;
 	}
+
+
+	private boolean checkConditionalOnClass(Type type) {
+		boolean isOK = true;//type.testAnyConditionalOnClass();
+		if (!isOK) {
+			SpringFeature.log(type.getDottedName()+" FAILED ConditionalOnClass check - returning FALSE");
+			return false;
+		}
+		return true;
+	}
+
+	private boolean checkConditionalOnBean(Type type) {
+		boolean isOK = true;//type.testAnyConditionalOnBean();
+		if (!isOK) {
+			SpringFeature.log(type.getDottedName()+" FAILED ConditionalOnBean check - returning FALSE");
+			return false;
+		}
+		return true;
+	}
+
+	private boolean checkConditionalOnEnabledMetricsExport(Type type) {
+		boolean isOK = true;//type.testAnyConditionalOnEnabledMetricsExport();
+		if (!isOK) {
+			SpringFeature.log(type.getDottedName()+" FAILED ConditionalOnEnabledMetricsExport check - returning FALSE");
+			return false;
+		}
+		return true;
+	}
 
 	private boolean checkConditionalOnPropertyAndConditionalOnAvailableEndpointConstraints(Type type) {
 		if (ConfigOptions.isEvaluateCOP()) {

spring-graalvm-native-feature/src/main/java/org/springframework/graalvm/type/Type.java

@@ -74,9 +74,12 @@ public class Type {
 	public final static String AtBean = "Lorg/springframework/context/annotation/Bean;";
 	public final static String AtConditionalOnClass = "Lorg/springframework/boot/autoconfigure/condition/ConditionalOnClass;";
 	public final static String AtConditionalOnProperty = "Lorg/springframework/boot/autoconfigure/condition/ConditionalOnProperty;";
+	public final static String AtConditionalOnEnabledMetricsExport = "Lorg/springframework/boot/actuate/autoconfigure/metrics/export/ConditionalOnEnabledMetricsExport;";
+	public final static String AtConditionalOnCloudPlatform = "Lorg/springframework/boot/autoconfigure/condition/ConditionalOnCloudPlatform;";
 	public final static String AtConditionalOnAvailableEndpoint = "Lorg/springframework/boot/actuate/autoconfigure/endpoint/condition/ConditionalOnAvailableEndpoint;";
 	public final static String AtConditionalOnEnabledHealthIndicator = "Lorg/springframework/boot/actuate/autoconfigure/health/ConditionalOnEnabledHealthIndicator;";
 	public final static String AtConditionalOnMissingBean = "Lorg/springframework/boot/autoconfigure/condition/ConditionalOnMissingBean;";
+	public final static String AtConditionalOnBean = "Lorg/springframework/boot/autoconfigure/condition/ConditionalOnBean;";
 	public final static String AtConfiguration = "Lorg/springframework/context/annotation/Configuration;";
 	public final static String AtImportAutoConfiguration = "Lorg/springframework/boot/autoconfigure/ImportAutoConfiguration;";
 	public final static String AtConfigurationProperties = "Lorg/springframework/boot/context/properties/ConfigurationProperties;";