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

Use web-application-type=reactive by default if webflux present

Browse Source 
We want the default application type to be REACTIVE if webflux is
present (formerly it was NONE). In AWS and Azure we also want
the webflux beans to be switched off in a "lite" application
context (formerly they were unconditional).
This commit is contained in:
Dave Syer
2018-10-23 09:52:45 +01:00
parent 9e2cbf49dd
commit c3b03a1b11
9 changed files with 39 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/FunctionalSpringApplication.java
View File

@@ -30,12 +30,14 @@ import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.support.GenericApplicationContext;
import org.springframework.core.env.MapPropertySource;
import org.springframework.core.env.MutablePropertySources;
import org.springframework.util.ClassUtils;
/**
* @author Dave Syer
*
*/
public class FunctionalSpringApplication extends org.springframework.boot.SpringApplication {
public class FunctionalSpringApplication
extends org.springframework.boot.SpringApplication {
/**
* Name of default property source.
@@ -45,7 +47,12 @@ public class FunctionalSpringApplication extends org.springframework.boot.Spring
/**
* Flag to say that context is functional beans.
*/
private static final String SPRING_FUNCTIONAL_ENABLED = "spring.functional.enabled";
public static final String SPRING_FUNCTIONAL_ENABLED = "spring.functional.enabled";
/**
* Enumeration of web application types.
*/
public static final String SPRING_WEB_APPLICATION_TYPE = "spring.main.web-application-type";
public static ConfigurableApplicationContext run(Class<?> primarySource,
String... args) {
@@ -59,9 +66,13 @@ public class FunctionalSpringApplication extends org.springframework.boot.Spring
public FunctionalSpringApplication(Class<?>... primarySources) {
super(primarySources);
// Prefer non-web applications, even if a server is on the classpath
setWebApplicationType(WebApplicationType.NONE);
setApplicationContextClass(GenericApplicationContext.class);
if (ClassUtils.isPresent("org.springframework.web.reactive.DispatcherHandler",
null)) {
setWebApplicationType(WebApplicationType.REACTIVE);
} else {
setWebApplicationType(WebApplicationType.NONE);
}
}
@Override
@@ -134,6 +145,7 @@ public class FunctionalSpringApplication extends org.springframework.boot.Spring
.getSource();
Map<String, Object> map = new HashMap<>(source);
map.put(SPRING_FUNCTIONAL_ENABLED, "true");
map.put(SPRING_WEB_APPLICATION_TYPE, getWebApplicationType());
sources.replace(DEFAULT_PROPERTIES,
new MapPropertySource(DEFAULT_PROPERTIES, map));
}

11
spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/test/FunctionalSpringBootTest.java
View File

@@ -23,6 +23,7 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
import org.springframework.core.annotation.AliasFor;
import org.springframework.test.context.ContextConfiguration;
@@ -37,20 +38,20 @@ import org.springframework.test.context.ContextConfiguration;
@Retention(RetentionPolicy.RUNTIME)
@Documented
@Inherited
@org.springframework.boot.test.context.SpringBootTest(properties = "spring.functional.enabled=true", webEnvironment = WebEnvironment.NONE)
@SpringBootTest(properties = "spring.functional.enabled=true")
@ContextConfiguration(loader = FunctionalTestContextLoader.class)
public @interface FunctionalSpringBootTest {
@AliasFor(annotation=org.springframework.boot.test.context.SpringBootTest.class, attribute="properties")
@AliasFor(annotation=SpringBootTest.class, attribute="properties")
String[] value() default {};
@AliasFor(annotation=org.springframework.boot.test.context.SpringBootTest.class, attribute="value")
@AliasFor(annotation=SpringBootTest.class, attribute="value")
String[] properties() default {};
@AliasFor(annotation=org.springframework.boot.test.context.SpringBootTest.class, attribute="classes")
@AliasFor(annotation=SpringBootTest.class, attribute="classes")
Class<?>[] classes() default {};
@AliasFor(annotation=org.springframework.boot.test.context.SpringBootTest.class, attribute="webEnvironment")
@AliasFor(annotation=SpringBootTest.class, attribute="webEnvironment")
WebEnvironment webEnvironment() default WebEnvironment.MOCK;
}