Skip to content

Commit 5460911

Browse files
committed
Revert "Include interfaces for runtime hints scan."
This reverts commit 738f2e8.
1 parent 5ca9b9b commit 5460911

File tree

1 file changed

+1
-13
lines changed

1 file changed

+1
-13
lines changed

spring-cloud-gateway-server-mvc/src/main/java/org/springframework/cloud/gateway/server/mvc/config/GatewayMvcRuntimeHintsProcessor.java

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import org.springframework.aot.hint.MemberCategory;
3030
import org.springframework.aot.hint.ReflectionHints;
3131
import org.springframework.aot.hint.TypeReference;
32-
import org.springframework.beans.factory.annotation.AnnotatedBeanDefinition;
3332
import org.springframework.beans.factory.aot.BeanFactoryInitializationAotContribution;
3433
import org.springframework.beans.factory.aot.BeanFactoryInitializationAotProcessor;
3534
import org.springframework.beans.factory.config.BeanDefinition;
@@ -87,7 +86,7 @@ public BeanFactoryInitializationAotContribution processAheadOfTime(ConfigurableL
8786

8887
private static Set<Class<?>> getTypesToRegister(String packageName) {
8988
Set<Class<?>> classesToAdd = new HashSet<>();
90-
ClassPathScanningCandidateComponentProvider provider = buildProvider();
89+
ClassPathScanningCandidateComponentProvider provider = new ClassPathScanningCandidateComponentProvider(false);
9190
provider.addIncludeFilter(new AssignableTypeFilter(Object.class));
9291
provider.addExcludeFilter(new AssignableTypeFilter(FilterAutoConfiguration.class));
9392
provider.addExcludeFilter(new AssignableTypeFilter(PredicateAutoConfiguration.class));
@@ -109,17 +108,6 @@ private static Set<Class<?>> getTypesToRegister(String packageName) {
109108
return classesToAdd;
110109
}
111110

112-
private static ClassPathScanningCandidateComponentProvider buildProvider() {
113-
return new ClassPathScanningCandidateComponentProvider(false) {
114-
@SuppressWarnings("NullableProblems")
115-
@Override
116-
protected boolean isCandidateComponent(AnnotatedBeanDefinition beanDefinition) {
117-
// Include both concrete classes and interfaces
118-
return beanDefinition.getMetadata().isIndependent() && !beanDefinition.getMetadata().isAnnotation();
119-
}
120-
};
121-
}
122-
123111
private static boolean shouldRegisterClass(Class<?> clazz) {
124112
Set<String> conditionClasses = beansConditionalOnClasses.getOrDefault(clazz.getName(), Collections.emptySet());
125113
for (String conditionClass : conditionClasses) {

0 commit comments

Comments
 (0)