Skip to content

Commit 4f8d647

Browse files
committed
GH-1262 Ensure method is checked for being a factory method
Resolves #1262
1 parent 7fc81ca commit 4f8d647

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/FunctionContextUtils.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
import org.springframework.beans.factory.support.AbstractBeanDefinition;
2828
import org.springframework.beans.factory.support.RootBeanDefinition;
2929
import org.springframework.cloud.function.context.catalog.FunctionTypeUtils;
30+
import org.springframework.context.annotation.Bean;
31+
import org.springframework.core.annotation.AnnotationUtils;
3032
import org.springframework.core.io.Resource;
3133
import org.springframework.core.type.MethodMetadata;
3234
import org.springframework.util.ClassUtils;
@@ -96,7 +98,7 @@ public static Class<?>[] getParamTypesFromBeanDefinitionFactory(Class<?> factory
9698
if (definition instanceof RootBeanDefinition) {
9799
RootBeanDefinition root = (RootBeanDefinition) definition;
98100
for (Method method : getCandidateMethods(factory, root)) {
99-
if (method.getName().equals(methodName)) {
101+
if (method.getName().equals(methodName) && AnnotationUtils.findAnnotation(method, Bean.class) != null) {
100102
return method.getParameterTypes();
101103
}
102104
}

0 commit comments

Comments
 (0)