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

GH-437 Pass ExecutionContext via MessageHeader

Browse Source 
Caching it as part of ApplicationContext was not the right idea so this changes it
This commit is contained in:
Oleg Zhurakousky
2021-03-10 18:53:25 +01:00
parent cf7a990480
commit 29ad49cbf6
5 changed files with 65 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -109,7 +109,9 @@ public class AzureSpringBootHttpRequestHandler<I> extends
.createResponseBuilder(com.microsoft.azure.functions.HttpStatus.OK)
.body(message.getPayload());
for (Map.Entry<String, Object> entry : message.getHeaders().entrySet()) {
builder = builder.header(entry.getKey(), entry.getValue().toString());
if (entry.getValue() != null) {
builder = builder.header(entry.getKey(), entry.getValue().toString());
}
}
return builder.build();
}

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

@@ -21,6 +21,7 @@ import java.util.function.Function;
import java.util.logging.Logger;
import com.microsoft.azure.functions.ExecutionContext;
import com.microsoft.azure.functions.HttpRequestMessage;
import com.microsoft.azure.functions.OutputBinding;
import org.reactivestreams.Publisher;
import reactor.core.publisher.Flux;
@@ -29,6 +30,8 @@ import reactor.core.publisher.Mono;
import org.springframework.cloud.function.context.AbstractSpringFunctionAdapterInitializer;
import org.springframework.cloud.function.context.catalog.FunctionTypeUtils;
import org.springframework.cloud.function.context.catalog.SimpleFunctionRegistry.FunctionInvocationWrapper;
import org.springframework.messaging.Message;
import org.springframework.messaging.support.MessageBuilder;
/**
* @param <I> input type
@@ -36,6 +39,7 @@ import org.springframework.cloud.function.context.catalog.SimpleFunctionRegistry
* @author Soby Chacko
* @author Oleg Zhurakousky
*/
@SuppressWarnings("deprecation")
public class AzureSpringBootRequestHandler<I, O> extends AbstractSpringFunctionAdapterInitializer<ExecutionContext> {
@SuppressWarnings("rawtypes")
@@ -86,6 +90,9 @@ public class AzureSpringBootRequestHandler<I, O> extends AbstractSpringFunctionA
}
else {
Publisher<?> events = input == null ? Mono.empty() : extract(convertEvent(input));
if (events instanceof Flux) {
events = Flux.from(events).map(v -> this.toMessage(v, context));
}
Publisher<?> output = thisInitializer.apply(events);
O result = result(input, output);
if (context != null) {
@@ -102,6 +109,23 @@ public class AzureSpringBootRequestHandler<I, O> extends AbstractSpringFunctionA
}
}
private Message<?> toMessage(Object value, ExecutionContext context) {
if (value instanceof Message) {
return (Message<?>) value;
}
else {
Object payload = value;
if (value instanceof HttpRequestMessage) {
payload = ((HttpRequestMessage) value).getBody();
if (payload == null) {
payload = ((HttpRequestMessage) value).getQueryParameters();
}
}
return MessageBuilder.withPayload(payload)
.setHeader(AbstractSpringFunctionAdapterInitializer.TARGET_EXECUTION_CTX_NAME, context).build();
}
}
@Override
protected String doResolveName(Object targetContext) {
return ((ExecutionContext) targetContext).getFunctionName();

19
spring-cloud-function-adapters/spring-cloud-function-adapter-azure/src/test/java/org/springframework/cloud/function/adapter/azure/AzureSpringBootRequestHandlerTests.java
View File

@@ -32,6 +32,7 @@ import reactor.core.publisher.Flux;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.messaging.Message;
import static org.assertj.core.api.Assertions.assertThat;
@@ -194,8 +195,10 @@ public class AzureSpringBootRequestHandlerTests {
protected static class AutoConfig {
@Bean
public Function<Foo, Bar> uppercase(ExecutionContext targetContext) {
return foo -> {
public Function<Message<Foo>, Bar> uppercase() {
return message -> {
Foo foo = message.getPayload();
ExecutionContext targetContext = (ExecutionContext) message.getHeaders().get("executionContext");
targetContext.getLogger().info("Invoking 'uppercase' on " + foo.getValue());
return new Bar(foo.getValue().toUpperCase());
};
@@ -232,17 +235,21 @@ public class AzureSpringBootRequestHandlerTests {
protected static class MultiConfig {
@Bean
public Function<Foo, Bar> uppercase(ExecutionContext context) {
public Function<Message<Foo>, Bar> uppercase() {
return foo -> {
return message -> {
ExecutionContext context = (ExecutionContext) message.getHeaders().get("executionContext");
Foo foo = message.getPayload();
context.getLogger().info("Executing uppercase function");
return new Bar(foo.getValue().toUpperCase());
};
}
@Bean
public Function<Bar, Foo> lowercase(ExecutionContext context) {
return bar -> {
public Function<Message<Bar>, Foo> lowercase() {
return message -> {
ExecutionContext context = (ExecutionContext) message.getHeaders().get("executionContext");
Bar bar = message.getPayload();
context.getLogger().info("Executing lowercase function");
return new Foo(bar.getValue().toLowerCase());
};