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

GH-466 Fix SupplierExporter to avoid starting if Supplier is not present

Browse Source 
Added condition to the start method of the SupplierExporter to prevent it from starting for cases where there are no Suppliers in catalog

Resolves #466
This commit is contained in:
Oleg Zhurakousky
2020-03-31 16:40:31 +02:00
parent 21d68ff3c8
commit 949f5fb023
2 changed files with 39 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/function/FunctionEndpointInitializer.java
View File

@@ -243,23 +243,20 @@ class FunctionEndpointFactory {
}) })
.andRoute(GET("/**"), request -> { .andRoute(GET("/**"), request -> {
Object functionComponent = extract(request); Object functionComponent = extract(request);
if (functionComponent instanceof Supplier || functionComponent instanceof Function) { Class<T> outputType = (Class<T>) this.inspector.getOutputType(functionComponent);
Class<T> outputType = (Class<T>) this.inspector.getOutputType(functionComponent); if (functionComponent instanceof Supplier) {
if (functionComponent instanceof Supplier) { Supplier<? extends Flux<?>> supplier = (Supplier<Flux<?>>) functionComponent;
Supplier<? extends Flux<?>> supplier = (Supplier<Flux<?>>) functionComponent; FunctionWrapper wrapper = RequestProcessor.wrapper(null, null, supplier);
FunctionWrapper wrapper = RequestProcessor.wrapper(null, null, supplier); return ServerResponse.ok().body(wrapper.supplier().get(), outputType);
return ServerResponse.ok().body(wrapper.supplier().get(), outputType); }
} else {
else if (functionComponent instanceof Function) { Function<Flux<?>, Flux<?>> function = (Function<Flux<?>, Flux<?>>) functionComponent;
Function<Flux<?>, Flux<?>> function = (Function<Flux<?>, Flux<?>>) functionComponent; FunctionWrapper wrapper = RequestProcessor.wrapper(function, null, null);
FunctionWrapper wrapper = RequestProcessor.wrapper(function, null, null); wrapper.headers(request.headers().asHttpHeaders());
wrapper.headers(request.headers().asHttpHeaders()); String argument = (String) request.attribute(WebRequestConstants.ARGUMENT).get();
String argument = (String) request.attribute(WebRequestConstants.ARGUMENT).get(); wrapper.argument(Flux.just(argument));
wrapper.argument(Flux.just(argument)); return ServerResponse.ok().body(wrapper.function().apply(wrapper.argument()), outputType);
return ServerResponse.ok().body(wrapper.function().apply(wrapper.argument()), outputType);
}
} }
throw new UnsupportedOperationException("Consumer is not supported for GET");
}); });
} }
} }

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

@@ -90,6 +90,8 @@ public class SupplierExporter implements SmartLifecycle {
Flux<Object> streams = Flux.empty(); Flux<Object> streams = Flux.empty();
Set<String> names = this.supplier == null ? this.catalog.getNames(Supplier.class) Set<String> names = this.supplier == null ? this.catalog.getNames(Supplier.class)
: Collections.singleton(this.supplier); : Collections.singleton(this.supplier);
boolean suppliersPresent = false;
for (String name : names) { for (String name : names) {
Supplier<Publisher<Object>> supplier = this.catalog.lookup(Supplier.class, name); Supplier<Publisher<Object>> supplier = this.catalog.lookup(Supplier.class, name);
if (supplier == null) { if (supplier == null) {
@@ -97,32 +99,34 @@ public class SupplierExporter implements SmartLifecycle {
continue; continue;
} }
streams = streams.mergeWith(forward(supplier, name)); streams = streams.mergeWith(forward(supplier, name));
suppliersPresent = true;
} }
if (suppliersPresent) {
this.subscription = streams this.subscription = streams
.retry(error -> { .retry(error -> {
/* /*
* The ConnectException may happen if a server is not yet available/reachable * The ConnectException may happen if a server is not yet available/reachable
* The ClassCast is to handle delayed Mono issued by HttpSupplier.transform for non-2xx responses * The ClassCast is to handle delayed Mono issued by HttpSupplier.transform for non-2xx responses
*/ */
boolean retry = error instanceof ConnectException || error instanceof ClassCastException boolean retry = error instanceof ConnectException || error instanceof ClassCastException
&& this.running; && this.running;
if (!retry) { if (!retry) {
this.ok = false; this.ok = false;
if (!this.debug) { if (!this.debug) {
logger.info(error); logger.info(error);
}
stop();
} }
return retry;
})
.doOnComplete(() -> {
stop(); stop();
} })
return retry; .subscribe();
})
.doOnComplete(() -> {
stop();
})
.subscribe();
this.ok = true; this.ok = true;
this.running = true; this.running = true;
}
} }
public boolean isOk() { public boolean isOk() {