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

Fix test for supplier exporter in functional application

Browse Source 
You need to look beyond the application context (now) since it
might still be of type GenericApplicationContext even in a webflux
app.
This commit is contained in:
Dave Syer
2019-04-01 15:19:19 +01:00
parent bb2f78cb36
commit 6eea43b266
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/source/FunctionExporterInitializer.java
View File

@@ -16,6 +16,7 @@
package org.springframework.cloud.function.web.source; package org.springframework.cloud.function.web.source;
import org.springframework.boot.web.reactive.context.ConfigurableReactiveWebEnvironment;
import org.springframework.boot.web.reactive.context.ReactiveWebApplicationContext; import org.springframework.boot.web.reactive.context.ReactiveWebApplicationContext;
import org.springframework.cloud.function.context.FunctionCatalog; import org.springframework.cloud.function.context.FunctionCatalog;
import org.springframework.cloud.function.context.FunctionRegistration; import org.springframework.cloud.function.context.FunctionRegistration;
@@ -23,6 +24,7 @@ import org.springframework.cloud.function.context.config.ContextFunctionCatalogI
import org.springframework.context.ApplicationContextInitializer; import org.springframework.context.ApplicationContextInitializer;
import org.springframework.context.support.GenericApplicationContext; import org.springframework.context.support.GenericApplicationContext;
import org.springframework.util.ClassUtils; import org.springframework.util.ClassUtils;
import org.springframework.web.context.ConfigurableWebEnvironment;
import org.springframework.web.context.WebApplicationContext; import org.springframework.web.context.WebApplicationContext;
import org.springframework.web.reactive.function.client.WebClient; import org.springframework.web.reactive.function.client.WebClient;
@@ -52,14 +54,18 @@ class FunctionExporterInitializer
} }
private boolean isExporting(GenericApplicationContext context) { private boolean isExporting(GenericApplicationContext context) {
if (context.getEnvironment().getProperty("spring.cloud.function.web.export", Boolean enabled = context.getEnvironment()
Boolean.class, false)) { .getProperty("spring.cloud.function.web.export.enabled", Boolean.class);
return true; if (enabled != null) {
return enabled;
} }
if (ClassUtils.isPresent("org.springframework.web.context.WebApplicationContext", if (ClassUtils.isPresent("org.springframework.web.context.WebApplicationContext",
getClass().getClassLoader())) { getClass().getClassLoader())) {
if (context instanceof WebApplicationContext if (context instanceof WebApplicationContext
|| context instanceof ReactiveWebApplicationContext) { || context instanceof ReactiveWebApplicationContext
|| context.getEnvironment() instanceof ConfigurableWebEnvironment
|| context
.getEnvironment() instanceof ConfigurableReactiveWebEnvironment) {
return false; return false;
} }
} }