From 9c6c7d09d462ec01051c92bcd427e9575a1ee712 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Mon, 12 Nov 2018 12:02:55 +0000 Subject: [PATCH] Ensure ContextRunner class can be loaded Even if FunctionalSpringApplication is not available. --- .../cloud/function/deployer/ContextRunner.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/spring-cloud-function-deployer/src/main/java/org/springframework/cloud/function/deployer/ContextRunner.java b/spring-cloud-function-deployer/src/main/java/org/springframework/cloud/function/deployer/ContextRunner.java index e6cb946c0..b510ed013 100644 --- a/spring-cloud-function-deployer/src/main/java/org/springframework/cloud/function/deployer/ContextRunner.java +++ b/spring-cloud-function-deployer/src/main/java/org/springframework/cloud/function/deployer/ContextRunner.java @@ -121,14 +121,13 @@ public class ContextRunner { return this.error; } - private static SpringApplication builder(Class type, - StandardEnvironment environment) { + private SpringApplication builder(Class type, StandardEnvironment environment) { SpringApplication application; if (!isFunctional(environment)) { application = new SpringApplication(type); } else { - application = new FunctionalSpringApplication(type); + application = FunctionalSpringApplicationCreator.create(type); } application.setEnvironment(environment); application.setRegisterShutdownHook(false); @@ -144,4 +143,12 @@ public class ContextRunner { return environment.resolvePlaceholders("${spring.functional.enabled:true}") .equals("true"); } + + private static class FunctionalSpringApplicationCreator { + + public static SpringApplication create(Class type) { + return new FunctionalSpringApplication(type); + } + + } }