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

GH-609 Fix Flux to Mono and Mono to Flux transformation

Browse Source 
Given that s-c-f-web always produces input as Flux, Function<Mono, Mono> were having issues. This fixes it
This commit is contained in:
Oleg Zhurakousky
2020-11-20 12:00:41 +01:00
parent b29cf507cf
commit 6ee8205aea
2 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -544,6 +544,12 @@ public class SimpleFunctionRegistry implements FunctionRegistry, FunctionInspect
Object invocationResult = null;
if (this.target instanceof Function) {
if (FunctionTypeUtils.isMono(FunctionTypeUtils.getInputType(this.getFunctionType(), 0)) && input instanceof Flux) {
input = Mono.from((Publisher) input);
}
else if (FunctionTypeUtils.isFlux(FunctionTypeUtils.getInputType(this.getFunctionType(), 0)) && input instanceof Mono) {
input = Flux.from((Publisher) input);
}
invocationResult = ((Function) target).apply(input);
}
else if (this.target instanceof Supplier) {

12
spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistryTests.java
View File

@@ -32,6 +32,7 @@ import java.util.stream.Collectors;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.reactivestreams.Publisher;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import reactor.util.function.Tuple2;
@@ -519,6 +520,17 @@ public class BeanFactoryAwareFunctionRegistryTests {
assertThat(((Person) config.consumerInputRef.get()).getName()).isEqualTo("Ricky");
}
@Test
public void testGH_609() {
FunctionCatalog catalog = this.configureCatalog(SampleFunctionConfiguration.class);
Function<Publisher<String>, Publisher<String>> f = catalog.lookup("monoToMono");
Mono<String> result = (Mono<String>) f.apply(Mono.just("hello"));
assertThat(result.block()).isEqualTo("hello");
result = (Mono<String>) f.apply(Flux.just("hello"));
assertThat(result.block()).isEqualTo("hello");
}
@EnableAutoConfiguration
public static class PojoToMessageFunctionCompositionConfiguration {