SpringCloud/spring-cloud-function
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GH-363 Fixed NPE on AbstractBeanDefinition.getBeanClass() call

Browse Source 
Resolves #363
This commit is contained in:
Oleg Zhurakousky
2019-05-13 19:32:44 +02:00
parent 5965447a6b
commit 076aa6f880
3 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/AbstractComposableFunctionRegistry.java
View File

@@ -204,14 +204,14 @@ public abstract class AbstractComposableFunctionRegistry implements FunctionRegi
*/
protected void register(FunctionRegistration<?> registration, String key) {
Object target = registration.getTarget();
if (key.equals("uppercase")) {
System.out.println();
}
if (registration.getType() != null) {
this.addType(key, registration.getType());
}
else {
FunctionType functionType = findType(registration, key);
if (functionType == null) {
return; // TODO fixme
}
this.addType(key, functionType);
registration.type(functionType.getType());
}

9
spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfiguration.java
View File

@@ -16,6 +16,7 @@
package org.springframework.cloud.function.context.config;
import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -156,13 +157,17 @@ public class ContextFunctionCatalogAutoConfiguration {
if (functionType == null) {
functionType = functionByNameExist(name)
? new FunctionType(functionRegistration.getTarget().getClass())
: new FunctionType(
FunctionContextUtils.findType(name, this.beanFactory));
: this.findType(name);
}
return functionType;
}
private FunctionType findType(String name) {
Type type = FunctionContextUtils.findType(name, this.beanFactory);
return type == null ? null : new FunctionType(type);
}
// @checkstyle:off
/**
* @param initial a registration

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

@@ -67,16 +67,17 @@ public abstract class FunctionContextUtils {
param = type.getType();
}
else {
Class<?> beanClass = definition.getBeanClass();
Class<?> beanClass = definition.hasBeanClass() ? definition.getBeanClass() : null;
if (beanClass != null
&& !FunctionFactoryMetadata.class.isAssignableFrom(beanClass)) {
param = beanClass;
}
else {
// assume FunctionFactoryMetadata
FunctionFactoryMetadata<?> factory = (FunctionFactoryMetadata<?>) registry
.getBean(name);
param = factory.getFactoryMethod().getGenericReturnType();
Object bean = registry.getBean(name);
// could be FunctionFactoryMetadata. . . TODO investigate and fix
if (bean instanceof FunctionFactoryMetadata) {
param = ((FunctionFactoryMetadata<?>) bean).getFactoryMethod().getGenericReturnType();
}
}
}
}