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

GH-208 polishing ec68f64 commit

Browse Source 
Ensured that the composed Supplier is of type Mono<Void>
Fix tests
This commit is contained in:
Oleg Zhurakousky
2018-10-14 20:29:13 -04:00
parent 8c2fdfd193
commit 31e689b108
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfiguration.java
View File

@@ -71,6 +71,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.gson.Gson; import com.google.gson.Gson;
import reactor.core.publisher.Flux; import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
/** /**
* @author Dave Syer * @author Dave Syer
@@ -333,10 +334,10 @@ public class ContextFunctionCatalogAutoConfiguration {
if (b instanceof FluxConsumer) { if (b instanceof FluxConsumer) {
if (supplier instanceof FluxSupplier) { if (supplier instanceof FluxSupplier) {
FluxConsumer<Object> fConsumer = ((FluxConsumer<Object>)b); FluxConsumer<Object> fConsumer = ((FluxConsumer<Object>)b);
return (Supplier<Flux<Void>>) () -> supplier.get().compose(v -> fConsumer.apply(supplier.get())); return (Supplier<Mono<Void>>) () -> Mono.from(supplier.get().compose(v -> fConsumer.apply(supplier.get())));
} }
else { else {
throw new IllegalStateException("The provided supplier is terminal (i.e., already composed with Consumer) " throw new IllegalStateException("The provided supplier is finite (i.e., already composed with Consumer) "
+ "therefore it can not be composed with another consumer"); + "therefore it can not be composed with another consumer");
} }
} }

4
spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/config/BeanFactoryFunctionCatalogTests.java
View File

@@ -162,8 +162,8 @@ public class BeanFactoryFunctionCatalogTests {
processor.register(new FunctionRegistration<>(s, "supplier")); processor.register(new FunctionRegistration<>(s, "supplier"));
Consumer<String> c = x -> ref.set(x.toUpperCase()); Consumer<String> c = x -> ref.set(x.toUpperCase());
processor.register(new FunctionRegistration<>(c, "consumer")); processor.register(new FunctionRegistration<>(c, "consumer"));
Supplier<Flux<Void>> f = processor.lookup("supplier|consumer"); Supplier<Mono<Void>> f = processor.lookup("supplier|consumer");
f.get().blockFirst(); ((Mono<Void>)f.get()).block();
assertThat(ref.get()).isEqualTo("HELLO"); assertThat(ref.get()).isEqualTo("HELLO");
} }

4
spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/config/ContextFunctionPostProcessorTests.java
View File

@@ -121,8 +121,8 @@ public class ContextFunctionPostProcessorTests {
public void supplierAndConsumer() { public void supplierAndConsumer() {
processor.register(new FunctionRegistration<Supplier<String>>(() -> "foo", "supplier")); processor.register(new FunctionRegistration<Supplier<String>>(() -> "foo", "supplier"));
processor.register(new FunctionRegistration<Consumer<String>>(System.out::println, "consumer")); processor.register(new FunctionRegistration<Consumer<String>>(System.out::println, "consumer"));
Supplier<Flux<Void>> supplier = (Supplier<Flux<Void>>) processor.lookupSupplier("supplier|consumer"); Supplier<Mono<Void>> supplier = (Supplier<Mono<Void>>) processor.lookupSupplier("supplier|consumer");
assertNull(supplier.get().blockFirst()); assertNull(supplier.get().block());
} }
@Test @Test