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

GH-600 Fix logic in Azure adapter to ensure proper handling of sveral functions

Browse Source 
This also addresses re-initialization of AC when the second function is invoked
Added second function to the azure examples

Resolves #600
This commit is contained in:
Oleg Zhurakousky
2021-03-11 15:26:06 +01:00
parent 3c5d905eab
commit b0ef4522d4
6 changed files with 112 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
/*
* Copyright 2019-2019 the original author or authors.
* Copyright 2019-2021 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -62,6 +62,7 @@ import org.springframework.util.CollectionUtils;
*
* @deprecated since 3.1 in favor of individual implementations of invokers
*/
@SuppressWarnings("rawtypes")
@Deprecated
public abstract class AbstractSpringFunctionAdapterInitializer<C> implements Closeable {
@@ -74,11 +75,11 @@ public abstract class AbstractSpringFunctionAdapterInitializer<C> implements Clo
private final Class<?> configurationClass;
private Function<Publisher<?>, Publisher<?>> function;
private Function function;
private Consumer<Publisher<?>> consumer;
private Consumer consumer;
private Supplier<Publisher<?>> supplier;
private Supplier supplier;
private FunctionRegistration<?> functionRegistration;
@@ -145,6 +146,7 @@ public abstract class AbstractSpringFunctionAdapterInitializer<C> implements Clo
return Object.class;
}
@SuppressWarnings("unchecked")
protected Function<Publisher<?>, Publisher<?>> getFunction() {
return function;
}
@@ -162,6 +164,7 @@ public abstract class AbstractSpringFunctionAdapterInitializer<C> implements Clo
return null;
}
@SuppressWarnings("unchecked")
protected Publisher<?> apply(Publisher<?> input) {
if (this.function != null) {
Object result = this.function.apply(input);
@@ -223,6 +226,19 @@ public abstract class AbstractSpringFunctionAdapterInitializer<C> implements Clo
return CollectionUtils.isEmpty(result) ? null : value;
}
protected void clear(String name) {
FunctionInvocationWrapper f = this.catalog.lookup(name);
if (f.isFunction()) {
this.function = f;
}
else if (f.isConsumer()) {
this.consumer = f;
}
else {
this.supplier = f;
}
}
private boolean isSingleInput(Function<?, ?> function, Object input) {
if (!(input instanceof Collection)) {
return true;
@@ -263,7 +279,7 @@ public abstract class AbstractSpringFunctionAdapterInitializer<C> implements Clo
throw new IllegalStateException("Unknown type " + type);
}
@SuppressWarnings({ "unchecked", "rawtypes" })
@SuppressWarnings({ "unchecked" })
private <T> T getAndInstrumentFromContext(String name) {
this.functionRegistration =
new FunctionRegistration(context.getBean(name), name);

6
spring-cloud-function-context/src/main/java/org/springframework/cloud/function/utils/FunctionClassUtils.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2019-2020 the original author or authors.
* Copyright 2019-2021 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -90,7 +90,9 @@ public final class FunctionClassUtils {
}
private static Class<?> getStartClass(List<URL> list, ClassLoader classLoader) {
logger.info("Searching manifests: " + list);
if (logger.isTraceEnabled()) {
logger.trace("Searching manifests: " + list);
}
for (URL url : list) {
try {
InputStream inputStream = null;