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

GH-423 Ensure that SupplierExporter assumes generic Publisher

Browse Source 
Resolves #423
This commit is contained in:
Oleg Zhurakousky
2019-12-11 13:44:32 +01:00
parent d87b1f0922
commit a3a08919e0
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/source/SupplierExporter.java
View File

@@ -24,6 +24,7 @@ import java.util.function.Supplier;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.reactivestreams.Publisher;
import reactor.core.Disposable;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
@@ -90,7 +91,7 @@ public class SupplierExporter implements SmartLifecycle {
Set<String> names = this.supplier == null ? this.catalog.getNames(Supplier.class)
: Collections.singleton(this.supplier);
for (String name : names) {
Supplier<Flux<Object>> supplier = this.catalog.lookup(Supplier.class, name);
Supplier<Publisher<Object>> supplier = this.catalog.lookup(Supplier.class, name);
if (supplier == null) {
logger.warn("No such Supplier: " + name);
continue;
@@ -156,8 +157,8 @@ public class SupplierExporter implements SmartLifecycle {
callback.run();
}
private Flux<ClientResponse> forward(Supplier<Flux<Object>> supplier, String name) {
return supplier.get().flatMap(value -> {
private Flux<ClientResponse> forward(Supplier<Publisher<Object>> supplier, String name) {
return Flux.from(supplier.get()).flatMap(value -> {
String destination = this.destinationResolver.destination(supplier, name,
value);
if (this.debug) {