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

GH-234 Ensured Function-Class is treated as function.bean

Browse Source 
. . . yet function.bean will take precedence over Function-Class
This commit is contained in:
Oleg Zhurakousky
2018-11-19 09:38:00 +01:00
parent 221d0f2038
commit 66009830fd
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-cloud-function-deployer/src/main/java/org/springframework/cloud/function/deployer/FunctionCreatorConfiguration.java
View File

@@ -64,8 +64,10 @@ import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.env.Environment;
import org.springframework.util.ClassUtils;
import org.springframework.util.ObjectUtils;
import org.springframework.util.ResourceUtils;
import org.springframework.util.StreamUtils;
import org.springframework.util.StringUtils;
/**
*
@@ -216,6 +218,10 @@ class FunctionCreatorConfiguration {
Manifest manifest = getArchive().getManifest();
String mainClass = null;
if (manifest != null) {
String functionClass = manifest.getMainAttributes().getValue("Function-Class");
if (StringUtils.hasText(functionClass) && ObjectUtils.isEmpty(properties.getBean())) {
properties.setBean(new String[] {functionClass});
}
mainClass = manifest.getMainAttributes().getValue("Start-Class");
if (mainClass == null
// Not surefire or IntelliJ