Remove unwanted option

Author: aclement

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

@@ -40,8 +40,6 @@ public abstract class ConfigOptions {
 
 	private static List<String> BUILD_TIME_PROPERTIES_CHECKS;
 
-	private static List<String> IGNORED_TYPES;
-	
 	private final static boolean BUILD_TIME_PROPERTIES_MATCH_IF_MISSING;
 
 	private final static boolean REMOVE_UNUSED_AUTOCONFIG;
@@ -75,16 +73,6 @@ public abstract class ConfigOptions {
 	private static Boolean SPRING_INIT_ACTIVE = null;
 
 	static {
-		String ignoredTypes = System.getProperty("spring.native.ignore-types");
-		if (ignoredTypes != null) {
-			String[] splits = ignoredTypes.split(",");
-			if (splits != null) {
-				IGNORED_TYPES = new ArrayList<>();
-				for (String split: splits) {
-					IGNORED_TYPES.add(split);
-				}
-			}	
-		}
 		String propChecks = System.getProperty("spring.native.build-time-properties-checks");
 		if (propChecks != null) {
 			// default-include-all/default-exclude-all and then a series of patterns
@@ -384,27 +372,4 @@ public static boolean buildTimeCheckableProperty(String key) {
 			return true;
 		}
 	}
-	
-	public static List<String> getIgnoredTypes() {
-		return IGNORED_TYPES;
-	}
-	
-	public static boolean shouldIgnoreType(String typename) {
-		if (IGNORED_TYPES==null) {
-			return false;
-		}
-		for (String ignoredType: IGNORED_TYPES) {
-			if (ignoredType.endsWith(".")) {
-				// its a package
-				if (typename.startsWith(ignoredType)) {
-					return true;
-				}
-			} else {
-				if (ignoredType.equals(typename)) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
 }

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

@@ -1046,33 +1046,6 @@ private boolean checkJmxConstraint(Type type, ProcessingContext pc) {
 	}
 
 
-	private boolean checkConditionalOnClass(Type type) {
-		boolean isOK = type.testAnyConditionalOnClass();
-		if (!isOK) {
-			SpringFeature.log(type.getDottedName()+" FAILED ConditionalOnClass check - returning FALSE");
-			return false;
-		}
-		return true;
-	}
-
-	private boolean checkConditionalOnBean(Type type) {
-		boolean isOK = type.testAnyConditionalOnBean();
-		if (!isOK) {
-			SpringFeature.log(type.getDottedName()+" FAILED ConditionalOnBean check - returning FALSE");
-			return false;
-		}
-		return true;
-	}
-
-	private boolean checkConditionalOnMissingBean(Type type) {
-		boolean isOK = type.testAnyConditionalOnMissingBean();
-		if (!isOK) {
-			SpringFeature.log(type.getDottedName()+" FAILED ConditionalOnMissingBean check - returning FALSE");
-			return false;
-		}
-		return true;
-	}
-
 //	private boolean checkConditionalOnEnabledMetricsExport(Type type) {
 //		boolean isOK = type.testAnyConditionalOnEnabledMetricsExport();
 //		if (!isOK) {

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

@@ -2570,57 +2570,6 @@ private AnnotationNode getAnnotation(String Ldescriptor) {
 		return null;
 	}
 
-	public boolean testAnyConditionalOnBean() {
-		// Examples:
-		// @ConditionalOnBean({ CacheMeterBinderProvider.class, MeterRegistry.class })
-		AnnotationNode annotation = getAnnotation(AtConditionalOnBean);
-		if (annotation != null) {
-			List<String> classDescriptors = findConditionalOnBeanValue(); // Lfoo/Bar;
-			for (String classDescriptor: classDescriptors) {
-				String typename = fromLdescriptorToDotted(classDescriptor);
-				Type resolved = typeSystem.resolveDotted(typename,true);
-				if (/*resolved==null ||*/ ConfigOptions.shouldIgnoreType(typename)) {
-					return false;
-				}
-			}
-		}
-		return true;
-	}
-	
-	public boolean testAnyConditionalOnMissingBean() {
-		// Examples:
-		// @ConditionalOnMissingBean({ CacheMeterBinderProvider.class, MeterRegistry.class })
-		AnnotationNode annotation = getAnnotation(AtConditionalOnMissingBean);
-		if (annotation != null) {
-			List<String> classDescriptors = findConditionalOnBeanValue(); // Lfoo/Bar;
-			for (String classDescriptor: classDescriptors) {
-				String typename = fromLdescriptorToDotted(classDescriptor);
-				Type resolved = typeSystem.resolveDotted(typename,true);
-				if (/*resolved==null ||*/ ConfigOptions.shouldIgnoreType(typename)) {
-					return false;
-				}
-			}
-		}
-		return true;
-	}
-
-	public boolean testAnyConditionalOnClass() {
-		// Examples:
-		// @ConditionalOnClass(MeterRegistry.class)
-		AnnotationNode annotation = getAnnotation(AtConditionalOnClass);
-		if (annotation != null) {
-			List<String> classDescriptors = findConditionalOnClassValue(); // Lfoo/Bar;
-			for (String classDescriptor: classDescriptors) {
-				String typename = fromLdescriptorToDotted(classDescriptor);
-				Type resolved = typeSystem.resolveDotted(typename,true);
-				if (/*resolved==null ||*/ ConfigOptions.shouldIgnoreType(typename)) {
-					return false;
-				}
-			}
-		}
-		return true;
-	}
-
 	/**
 	 * Find any @ConditionalOnProperty and see if the specified property should be checked at build time. If it should be and
 	 * fails the check, return the property name in question.