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

Temporary fixes related to native AOT enablement

Browse Source
This commit is contained in:
Oleg Zhurakousky
2021-09-29 11:24:37 +02:00
parent ed50d7c252
commit 2295dee2e6
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/RequestProcessor.java
View File

@@ -59,9 +59,9 @@ public class RequestProcessor {
private final JsonMapper mapper; private final JsonMapper mapper;
public RequestProcessor(ObjectProvider<JsonMapper> mapper, public RequestProcessor(JsonMapper mapper,
ObjectProvider<ServerCodecConfigurer> codecs) { ObjectProvider<ServerCodecConfigurer> codecs) {
this.mapper = mapper.getIfAvailable(); this.mapper = mapper;
} }
public static FunctionWrapper wrapper(FunctionInvocationWrapper function) { public static FunctionWrapper wrapper(FunctionInvocationWrapper function) {

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

@@ -79,7 +79,7 @@ import static org.springframework.web.reactive.function.server.ServerResponse.st
* @since 2.0 * @since 2.0
* *
*/ */
class FunctionEndpointInitializer implements ApplicationContextInitializer<GenericApplicationContext> { public class FunctionEndpointInitializer implements ApplicationContextInitializer<GenericApplicationContext> {
private static boolean webflux = ClassUtils private static boolean webflux = ClassUtils
.isPresent("org.springframework.web.reactive.function.server.RouterFunction", null); .isPresent("org.springframework.web.reactive.function.server.RouterFunction", null);
@@ -104,7 +104,7 @@ class FunctionEndpointInitializer implements ApplicationContextInitializer<Gener
private void registerEndpoint(GenericApplicationContext context) { private void registerEndpoint(GenericApplicationContext context) {
context.registerBean(RequestProcessor.class, context.registerBean(RequestProcessor.class,
() -> new RequestProcessor(context.getBeanProvider(JsonMapper.class), () -> new RequestProcessor(context.getBeansOfType(JsonMapper.class).values().iterator().next(),
context.getBeanProvider(ServerCodecConfigurer.class))); context.getBeanProvider(ServerCodecConfigurer.class)));
context.registerBean(FunctionEndpointFactory.class, context.registerBean(FunctionEndpointFactory.class,
() -> new FunctionEndpointFactory(context.getBean(FunctionProperties.class), context.getBean(FunctionCatalog.class), () -> new FunctionEndpointFactory(context.getBean(FunctionProperties.class), context.getBean(FunctionCatalog.class),
@@ -114,7 +114,7 @@ class FunctionEndpointInitializer implements ApplicationContextInitializer<Gener
private HttpWebHandlerAdapter httpHandler(GenericApplicationContext context) { private HttpWebHandlerAdapter httpHandler(GenericApplicationContext context) {
return (HttpWebHandlerAdapter) RouterFunctions.toHttpHandler(context.getBean(RouterFunction.class), return (HttpWebHandlerAdapter) RouterFunctions.toHttpHandler(context.getBean(RouterFunction.class),
HandlerStrategies.empty().exceptionHandler(context.getBean(WebExceptionHandler.class)) HandlerStrategies.empty().exceptionHandler(context.getBeansOfType(WebExceptionHandler.class).values().iterator().next())
.codecs(config -> config.registerDefaults(true)).build()); .codecs(config -> config.registerDefaults(true)).build());
} }
@@ -124,7 +124,7 @@ class FunctionEndpointInitializer implements ApplicationContextInitializer<Gener
context.registerBean(Resources.class, () -> new Resources()); context.registerBean(Resources.class, () -> new Resources());
DefaultErrorWebExceptionHandler handler = new DefaultErrorWebExceptionHandler( DefaultErrorWebExceptionHandler handler = new DefaultErrorWebExceptionHandler(
context.getBean(ErrorAttributes.class), context.getBean(Resources.class), context.getBeansOfType(ErrorAttributes.class).values().iterator().next(), context.getBean(Resources.class),
context.getBean(ErrorProperties.class), context); context.getBean(ErrorProperties.class), context);
ServerCodecConfigurer codecs = ServerCodecConfigurer.create(); ServerCodecConfigurer codecs = ServerCodecConfigurer.create();
handler.setMessageWriters(codecs.getWriters()); handler.setMessageWriters(codecs.getWriters());
@@ -164,7 +164,7 @@ class FunctionEndpointInitializer implements ApplicationContextInitializer<Gener
Integer port = Integer.valueOf(context.getEnvironment().resolvePlaceholders("${server.port:${PORT:8080}}")); Integer port = Integer.valueOf(context.getEnvironment().resolvePlaceholders("${server.port:${PORT:8080}}"));
String address = context.getEnvironment().resolvePlaceholders("${server.address:0.0.0.0}"); String address = context.getEnvironment().resolvePlaceholders("${server.address:0.0.0.0}");
if (port >= 0) { if (port >= 0) {
HttpHandler handler = context.getBean(HttpHandler.class); HttpHandler handler = context.getBeansOfType(HttpHandler.class).values().iterator().next();
ReactorHttpHandlerAdapter adapter = new ReactorHttpHandlerAdapter(handler); ReactorHttpHandlerAdapter adapter = new ReactorHttpHandlerAdapter(handler);
HttpServer httpServer = HttpServer.create().host(address).port(port).handle(adapter); HttpServer httpServer = HttpServer.create().host(address).port(port).handle(adapter);
Thread thread = new Thread( Thread thread = new Thread(