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

Ensure ContextRunner can be used to run a non-functional application

Browse Source
This commit is contained in:
Dave Syer
2018-11-12 11:07:36 +00:00
parent aba50816f7
commit 10f446d6b5
1 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
spring-cloud-function-deployer/src/main/java/org/springframework/cloud/function/deployer/ContextRunner.java
View File

@@ -24,6 +24,7 @@ import org.springframework.boot.SpringApplication;
import org.springframework.cloud.function.context.FunctionalSpringApplication; import org.springframework.cloud.function.context.FunctionalSpringApplication;
import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.core.env.MapPropertySource; import org.springframework.core.env.MapPropertySource;
import org.springframework.core.env.SimpleCommandLinePropertySource;
import org.springframework.core.env.StandardEnvironment; import org.springframework.core.env.StandardEnvironment;
import org.springframework.util.ClassUtils; import org.springframework.util.ClassUtils;
import org.springframework.util.ReflectionUtils; import org.springframework.util.ReflectionUtils;
@@ -54,11 +55,13 @@ public class ContextRunner {
environment.getPropertySources().addAfter( environment.getPropertySources().addAfter(
StandardEnvironment.SYSTEM_ENVIRONMENT_PROPERTY_SOURCE_NAME, StandardEnvironment.SYSTEM_ENVIRONMENT_PROPERTY_SOURCE_NAME,
new MapPropertySource("appDeployer", properties)); new MapPropertySource("appDeployer", properties));
if (args != null && args.length > 0) {
environment.getPropertySources().addFirst(
new SimpleCommandLinePropertySource("args", args));
}
running = true; running = true;
Class<?> sourceClass = ClassUtils.resolveClassName(source, null); Class<?> sourceClass = ClassUtils.resolveClassName(source, null);
SpringApplication builder = builder(sourceClass); SpringApplication builder = builder(sourceClass, environment);
builder.setEnvironment(environment);
builder.setRegisterShutdownHook(false);
context = builder.run(args); context = builder.run(args);
} }
catch (Throwable ex) { catch (Throwable ex) {
@@ -118,9 +121,27 @@ public class ContextRunner {
return this.error; return this.error;
} }
private static SpringApplication builder(Class<?> type) { private static SpringApplication builder(Class<?> type,
SpringApplication application = new FunctionalSpringApplication(type); StandardEnvironment environment) {
SpringApplication application;
if (!isFunctional(environment)) {
application = new SpringApplication(type);
}
else {
application = new FunctionalSpringApplication(type);
}
application.setEnvironment(environment);
application.setRegisterShutdownHook(false);
return application; return application;
} }
private static boolean isFunctional(StandardEnvironment environment) {
if (!ClassUtils.isPresent(
"org.springframework.cloud.function.context.FunctionalSpringApplication",
null)) {
return false;
}
return environment.resolvePlaceholders("${spring.functional.enabled:true}")
.equals("true");
}
} }