Skip to content

Commit af66fc9

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

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;
@@ -85,7 +84,7 @@ public BeanFactoryInitializationAotContribution processAheadOfTime(ConfigurableL
8584

8685
private static Set<Class<?>> getTypesToRegister(String packageName) {
8786
Set<Class<?>> classesToAdd = new HashSet<>();
88-
ClassPathScanningCandidateComponentProvider provider = buildProvider();
87+
ClassPathScanningCandidateComponentProvider provider = new ClassPathScanningCandidateComponentProvider(false);
8988
provider.addIncludeFilter(new AssignableTypeFilter(Object.class));
9089
Set<BeanDefinition> components = provider.findCandidateComponents(packageName);
9190
for (BeanDefinition component : components) {
@@ -105,17 +104,6 @@ private static Set<Class<?>> getTypesToRegister(String packageName) {
105104
return classesToAdd;
106105
}
107106

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

0 commit comments

Comments
 (0)