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

Extend search for main class to include custom manifest entries

Browse Source
This commit is contained in:
Dave Syer
2018-11-16 16:16:12 +00:00
parent b23a647aa4
commit 0287a5d8f3
1 changed files with 32 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,6 +34,7 @@ import java.util.function.Consumer;
import java.util.function.Function; import java.util.function.Function;
import java.util.function.Supplier; import java.util.function.Supplier;
import java.util.jar.JarFile; import java.util.jar.JarFile;
import java.util.jar.Manifest;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
@@ -63,6 +64,7 @@ import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.core.env.Environment; import org.springframework.core.env.Environment;
import org.springframework.util.ClassUtils; import org.springframework.util.ClassUtils;
import org.springframework.util.ResourceUtils;
import org.springframework.util.StreamUtils; import org.springframework.util.StreamUtils;
/** /**
@@ -110,11 +112,13 @@ class FunctionCreatorConfiguration {
public void init() { public void init() {
URL[] urls = Arrays.stream(properties.getLocation()) URL[] urls = Arrays.stream(properties.getLocation())
.flatMap(toResourceURL(delegatingResourceLoader)).toArray(URL[]::new); .flatMap(toResourceURL(delegatingResourceLoader)).toArray(URL[]::new);
URL[] roots = Arrays.stream(properties.getLocation()).map(this::toUrl)
.toArray(URL[]::new);
try { try {
logger.info( logger.info(
"Locating function from " + Arrays.asList(properties.getLocation())); "Locating function from " + Arrays.asList(properties.getLocation()));
this.creator = new BeanCreator(urls); this.creator = new BeanCreator(roots, urls);
this.creator.run(properties.getMain()); this.creator.run(properties.getMain());
Arrays.stream(functionNames()).map(this.creator::create).sequential() Arrays.stream(functionNames()).map(this.creator::create).sequential()
.forEach(this.creator::register); .forEach(this.creator::register);
@@ -131,6 +135,18 @@ class FunctionCreatorConfiguration {
} }
} }
private URL toUrl(String url) {
if (url.equals("app:classpath")) {
return urls()[0];
}
try {
return new URL(url);
}
catch (MalformedURLException e) {
throw new UncheckedIOException(e);
}
}
private String[] functionNames() { private String[] functionNames() {
if (properties.getBean() != null && properties.getBean().length > 0) { if (properties.getBean() != null && properties.getBean().length > 0) {
return properties.getBean(); return properties.getBean();
@@ -197,12 +213,19 @@ class FunctionCreatorConfiguration {
@Override @Override
public String getMainClass() throws Exception { public String getMainClass() throws Exception {
try { Manifest manifest = getArchive().getManifest();
return super.getMainClass(); String mainClass = null;
} if (manifest != null) {
catch (Exception e) { mainClass = manifest.getMainAttributes().getValue("Function-Class");
return null; if (mainClass == null) {
mainClass = manifest.getMainAttributes().getValue("Start-Class");
}
if (mainClass == null) {
// Not a Spring Boot jar but it might have a "main" class
mainClass = manifest.getMainAttributes().getValue("Main-Class");
}
} }
return mainClass;
} }
public URL[] getClassLoaderUrls() throws Exception { public URL[] getClassLoaderUrls() throws Exception {
@@ -273,9 +296,9 @@ class FunctionCreatorConfiguration {
private String defaultMain; private String defaultMain;
public BeanCreator(URL[] urls) { public BeanCreator(URL[] roots, URL[] urls) {
functionClassLoader = new BeanCreatorClassLoader(expand(urls), getParent()); functionClassLoader = new BeanCreatorClassLoader(expand(urls), getParent());
this.defaultMain = findMain(urls); this.defaultMain = findMain(roots);
} }
private ClassLoader getParent() { private ClassLoader getParent() {
@@ -296,7 +319,7 @@ class FunctionCreatorConfiguration {
private String findMain(URL[] urls) { private String findMain(URL[] urls) {
for (URL url : urls) { for (URL url : urls) {
try { try {
File file = new File(url.toURI()); File file = ResourceUtils.getFile(url);
if (file.exists()) { if (file.exists()) {
Archive archive = file.getName().endsWith(".jar") Archive archive = file.getName().endsWith(".jar")
? new JarFileArchive(file) ? new JarFileArchive(file)