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

Disconnect FunctionInspector from adapter request handlers and Kotlin module

Browse Source
This commit is contained in:
Oleg Zhurakousky
2020-10-20 13:57:26 +02:00
parent 86a0a5db3f
commit e47fc2d5cf
5 changed files with 25 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/SpringBootApiGatewayRequestHandler.java
View File

@@ -28,7 +28,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.commons.codec.binary.Base64;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.function.context.catalog.FunctionInspector;
import org.springframework.cloud.function.context.catalog.SimpleFunctionRegistry.FunctionInvocationWrapper;
import org.springframework.http.HttpStatus;
import org.springframework.messaging.Message;
@@ -50,9 +49,6 @@ public class SpringBootApiGatewayRequestHandler extends
@Autowired
private ObjectMapper mapper;
@Autowired
private FunctionInspector inspector;
public SpringBootApiGatewayRequestHandler(Class<?> configurationClass) {
super(configurationClass);
}

4
spring-cloud-function-adapters/spring-cloud-function-adapter-azure/src/main/java/org/springframework/cloud/function/adapter/azure/AzureSpringBootRequestHandler.java
View File

@@ -129,7 +129,7 @@ public class AzureSpringBootRequestHandler<I, O> extends AbstractSpringFunctionA
if (!(input instanceof Collection)) {
return true;
}
if (getInspector() != null) {
if (function != null) {
return Collection.class
.isAssignableFrom(((FunctionInvocationWrapper) function).getRawInputType());
}
@@ -140,7 +140,7 @@ public class AzureSpringBootRequestHandler<I, O> extends AbstractSpringFunctionA
if (!(output instanceof Collection)) {
return true;
}
if (getInspector() != null) {
if (function != null) {
Class<?> outputType = FunctionTypeUtils.getRawType(FunctionTypeUtils.getGenericType(((FunctionInvocationWrapper) function).getOutputType()));
return Collection.class.isAssignableFrom(outputType);
}