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

17
spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/AbstractSpringFunctionAdapterInitializer.java
View File

@@ -35,7 +35,6 @@ import reactor.core.publisher.Mono;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.WebApplicationType;
import org.springframework.cloud.function.context.catalog.FunctionInspector;
import org.springframework.cloud.function.context.catalog.FunctionTypeUtils;
import org.springframework.cloud.function.context.catalog.SimpleFunctionRegistry.FunctionInvocationWrapper;
import org.springframework.cloud.function.context.config.FunctionContextUtils;
@@ -55,7 +54,10 @@ import org.springframework.util.CollectionUtils;
*
* @author Oleg Zhurakousky
* @since 2.1
*
* @deprecated since 3.1 in favor of individual implementations of invokers
*/
@Deprecated
public abstract class AbstractSpringFunctionAdapterInitializer<C> implements Closeable {
private static Log logger = LogFactory.getLog(AbstractSpringFunctionAdapterInitializer.class);
@@ -77,9 +79,6 @@ public abstract class AbstractSpringFunctionAdapterInitializer<C> implements Clo
private AtomicBoolean initialized = new AtomicBoolean();
@Autowired(required = false)
private FunctionInspector inspector;
@Autowired(required = false)
protected FunctionCatalog catalog;
@@ -140,11 +139,6 @@ public abstract class AbstractSpringFunctionAdapterInitializer<C> implements Clo
}
}
@Deprecated
protected FunctionInspector getInspector() {
return inspector;
}
protected Class<?> getInputType() {
Object func = function();
@@ -240,7 +234,8 @@ public abstract class AbstractSpringFunctionAdapterInitializer<C> implements Clo
if (!(input instanceof Collection)) {
return true;
}
if (getInspector() != null) {
if (function != null) {
return Collection.class
.isAssignableFrom(((FunctionInvocationWrapper) function).getRawInputType());
}
@@ -251,7 +246,7 @@ public abstract class AbstractSpringFunctionAdapterInitializer<C> implements Clo
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);
}

7
spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java
View File

@@ -77,7 +77,7 @@ import org.springframework.util.StringUtils;
* @author Oleg Zhurakousky
*
*/
public class SimpleFunctionRegistry implements FunctionRegistry, FunctionInspector {
public class SimpleFunctionRegistry implements FunctionRegistry {
protected Log logger = LogFactory.getLog(this.getClass());
/*
* - do we care about FunctionRegistration after it's been registered? What additional value does it bring?
@@ -122,11 +122,6 @@ public class SimpleFunctionRegistry implements FunctionRegistry, FunctionInspect
return (T) function;
}
@Override
public FunctionRegistration<?> getRegistration(Object function) {
throw new UnsupportedOperationException();
}
@Override
public <T> void register(FunctionRegistration<T> registration) {
this.functionRegistrations.add(registration);