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

Function wrapping BiConsumer improvements

Browse Source 
When a BiConsumer user function is provided, we wrap it inside a Function
when registering it in FunctionRegstration. FunctionInvocationWrapper sees
this as a Function and downstream clients (such as Spring Cloud Stream) does
not have visibility into the user function type from a FunctionInvocationWrapper
API perspective. This commit propagates the BiConsumer targer user function info
as part of FunctionInvocationWrapper API.

For more information, see: https://github.com/spring-cloud/spring-cloud-stream/issues/2670
Resolves #1016
This commit is contained in:
Soby Chacko
2023-03-23 18:32:51 -04:00
committed by Oleg Zhurakousky
parent 98e88e7314
commit 0ba011a903
4 changed files with 63 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistryTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2019 the original author or authors.
* Copyright 2012-2023 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.
@@ -28,6 +28,7 @@ import java.util.UUID;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.BiConsumer;
import java.util.function.Consumer;
import java.util.function.Function;
import java.util.function.Supplier;
@@ -77,7 +78,7 @@ import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Oleg Zhurakousky
*
* @author Soby Chacko
*/
public class SimpleFunctionRegistryTests {
@@ -574,6 +575,25 @@ public class SimpleFunctionRegistryTests {
assertThat(consumerDowncounter.get()).isZero();
}
@Test
void biConsumerUserFunctionTypeIsKnownInFunctionInvocationWrapper() {
BiConsumer<Object, Object> testBiConsumer = (a, b) -> { };
Function<Object, Object> wrappedFunction = x -> {
testBiConsumer.accept(null, null);
return null;
};
FunctionRegistration<Function<Object, Object>> registration = new FunctionRegistration<>(
wrappedFunction, "functionWrappingBiConsumer").type(Function.class);
registration.setUserFunction(testBiConsumer);
SimpleFunctionRegistry catalog = new SimpleFunctionRegistry(this.conversionService, this.messageConverter,
new JacksonMapper(new ObjectMapper()));
catalog.register(registration);
FunctionInvocationWrapper functionInvocationWrapper = catalog.lookup("functionWrappingBiConsumer");
assertThat(functionInvocationWrapper.isWrappedBiConsumer()).isTrue();
}
public Function<String, String> uppercase() {
return v -> v.toUpperCase();
}