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

SpringApplication->FunctionalSpringApplication (less confusing)

Browse Source
This commit is contained in:
Dave Syer
2018-10-18 09:38:27 +01:00
parent c4ee7ab065
commit 4315cb1d61
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/SpringFunctionInitializer.java
View File

@@ -110,7 +110,7 @@ public class SpringFunctionInitializer implements Closeable {
private SpringApplication springApplication() {
Class<?> sourceClass = configurationClass;
SpringApplication application = new org.springframework.cloud.function.context.SpringApplication(
SpringApplication application = new org.springframework.cloud.function.context.FunctionalSpringApplication(
sourceClass);
application.setWebApplicationType(WebApplicationType.NONE);
return application;

2
spring-cloud-function-adapters/spring-cloud-function-adapter-azure/src/main/java/org/springframework/cloud/function/adapter/azure/AzureSpringFunctionInitializer.java
View File

@@ -133,7 +133,7 @@ public class AzureSpringFunctionInitializer implements Closeable {
private SpringApplication springApplication() {
Class<?> sourceClass = configurationClass;
SpringApplication application = new org.springframework.cloud.function.context.SpringApplication(
SpringApplication application = new org.springframework.cloud.function.context.FunctionalSpringApplication(
sourceClass);
application.setWebApplicationType(WebApplicationType.NONE);
return application;

6
spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/SpringApplication.java → spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/FunctionalSpringApplication.java
View File

@@ -35,7 +35,7 @@ import org.springframework.core.env.MutablePropertySources;
* @author Dave Syer
*
*/
public class SpringApplication extends org.springframework.boot.SpringApplication {
public class FunctionalSpringApplication extends org.springframework.boot.SpringApplication {
/**
* Name of default property source.
@@ -54,10 +54,10 @@ public class SpringApplication extends org.springframework.boot.SpringApplicatio
public static ConfigurableApplicationContext run(Class<?>[] primarySources,
String[] args) {
return new SpringApplication(primarySources).run(args);
return new FunctionalSpringApplication(primarySources).run(args);
}
public SpringApplication(Class<?>... primarySources) {
public FunctionalSpringApplication(Class<?>... primarySources) {
super(primarySources);
// Prefer non-web applications, even if a server is on the classpath
setWebApplicationType(WebApplicationType.NONE);

4
spring-cloud-function-samples/function-sample-aws/src/main/java/example/Config.java
View File

@@ -22,7 +22,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.cloud.function.context.FunctionRegistration;
import org.springframework.cloud.function.context.FunctionType;
import org.springframework.cloud.function.context.SpringApplication;
import org.springframework.cloud.function.context.FunctionalSpringApplication;
import org.springframework.context.ApplicationContextInitializer;
import org.springframework.context.annotation.Bean;
import org.springframework.context.support.GenericApplicationContext;
@@ -47,7 +47,7 @@ public class Config implements ApplicationContextInitializer<GenericApplicationC
}
public static void main(String[] args) throws Exception {
SpringApplication.run(Config.class, args);
FunctionalSpringApplication.run(Config.class, args);
}
@Override