Add FunctionInspector to deployer so types can be inspected
ALso added a bunch of DEBUG logging because it's hard to debug the deployer app. Fixed gh-53
This commit is contained in:
@@ -20,6 +20,9 @@ import java.util.function.Consumer;
|
||||
import java.util.function.Function;
|
||||
import java.util.function.Supplier;
|
||||
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.cloud.function.context.FunctionInspector;
|
||||
import org.springframework.cloud.function.support.FluxSupplier;
|
||||
@@ -44,7 +47,9 @@ import reactor.core.publisher.Mono;
|
||||
*/
|
||||
@Component
|
||||
public class FunctionController {
|
||||
|
||||
|
||||
private static Log logger = LogFactory.getLog(FunctionController.class);
|
||||
|
||||
private FunctionInspector inspector;
|
||||
|
||||
@Value("${debug:${DEBUG:false}}")
|
||||
@@ -62,11 +67,17 @@ public class FunctionController {
|
||||
@RequestBody FluxRequest<?> body) {
|
||||
if (function != null) {
|
||||
Flux<?> result = (Flux<?>) function.apply(body.flux());
|
||||
if (logger.isDebugEnabled()) {
|
||||
logger.debug("Handled POST with function");
|
||||
}
|
||||
return ResponseEntity.ok().body(debug ? result.log() : result);
|
||||
}
|
||||
if (consumer != null) {
|
||||
Flux<?> flux = body.flux().cache(); // send a copy back to the caller
|
||||
consumer.accept(flux);
|
||||
if (logger.isDebugEnabled()) {
|
||||
logger.debug("Handled POST with consumer");
|
||||
}
|
||||
return ResponseEntity.status(HttpStatus.ACCEPTED).body(flux);
|
||||
}
|
||||
throw new IllegalArgumentException("no such function");
|
||||
@@ -90,6 +101,9 @@ public class FunctionController {
|
||||
supplier = new FluxSupplier(supplier);
|
||||
}
|
||||
Flux<?> result = supplier.get();
|
||||
if (logger.isDebugEnabled()) {
|
||||
logger.debug("Handled GET with supplier");
|
||||
}
|
||||
return debug ? result.log() : result;
|
||||
}
|
||||
|
||||
@@ -97,6 +111,9 @@ public class FunctionController {
|
||||
@PathVariable String value) {
|
||||
Object input = inspector.convert(inspector.getName(function), value);
|
||||
Mono<?> result = Mono.from(function.apply(Flux.just(input)));
|
||||
if (logger.isDebugEnabled()) {
|
||||
logger.debug("Handled GET with function");
|
||||
}
|
||||
return debug ? result.log() : result;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -61,6 +61,7 @@ public class FunctionHandlerMapping extends RequestMappingHandlerMapping
|
||||
@Autowired
|
||||
public FunctionHandlerMapping(FunctionCatalog catalog, FunctionInspector inspector) {
|
||||
this.functions = catalog;
|
||||
logger.info("FunctionCatalog: " + catalog + ", FunctionInspector: " + inspector);
|
||||
setOrder(super.getOrder() - 5);
|
||||
this.controller = new FunctionController(inspector);
|
||||
}
|
||||
@@ -91,11 +92,17 @@ public class FunctionHandlerMapping extends RequestMappingHandlerMapping
|
||||
}
|
||||
Object function = findFunctionForGet(request, path);
|
||||
if (function != null) {
|
||||
if (logger.isDebugEnabled()) {
|
||||
logger.debug("Found function for GET: " + path);
|
||||
}
|
||||
request.setAttribute(FluxHandlerMethodArgumentResolver.HANDLER, function);
|
||||
return handler;
|
||||
}
|
||||
function = findFunctionForPost(request, path);
|
||||
if (function != null) {
|
||||
if (logger.isDebugEnabled()) {
|
||||
logger.debug("Found function for POST: " + path);
|
||||
}
|
||||
request.setAttribute(FluxHandlerMethodArgumentResolver.HANDLER, function);
|
||||
return handler;
|
||||
}
|
||||
|
||||
@@ -22,6 +22,8 @@ import java.util.List;
|
||||
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
import org.reactivestreams.Publisher;
|
||||
|
||||
import org.springframework.cloud.function.context.FunctionInspector;
|
||||
@@ -48,6 +50,9 @@ import reactor.core.publisher.Mono;
|
||||
*/
|
||||
public class FluxReturnValueHandler implements AsyncHandlerMethodReturnValueHandler {
|
||||
|
||||
private static Log logger = LogFactory
|
||||
.getLog(FluxReturnValueHandler.class);
|
||||
|
||||
private ResponseBodyEmitterReturnValueHandler delegate;
|
||||
private long timeout = 1000L;
|
||||
private static final MediaType EVENT_STREAM = MediaType.valueOf("text/event-stream");
|
||||
@@ -126,6 +131,9 @@ public class FluxReturnValueHandler implements AsyncHandlerMethodReturnValueHand
|
||||
} else {
|
||||
mediaType = findMediaType(webRequest);
|
||||
}
|
||||
if (logger.isDebugEnabled()) {
|
||||
logger.debug("Handling return value " + type + " with media type: " + mediaType);
|
||||
}
|
||||
delegate.handleReturnValue(getEmitter(timeout, flux, mediaType), returnType,
|
||||
mavContainer, webRequest);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user