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

Tighten up contract for SingleEntryFunctionRegistry

Browse Source 
And add some tests. Fixes gh-250.
This commit is contained in:
Dave Syer
2019-01-17 16:27:41 +00:00
parent 9729f26397
commit cca2833f94
4 changed files with 117 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,7 +35,6 @@ import java.util.function.Function;
import java.util.function.Supplier;
import java.util.jar.JarFile;
import java.util.jar.Manifest;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import javax.annotation.PostConstruct;
@@ -218,9 +217,11 @@ 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});
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
@@ -252,7 +253,7 @@ class FunctionCreatorConfiguration {
catch (MalformedURLException e) {
throw new IllegalStateException("Bad URL: " + archive, e);
}
}).collect(Collectors.toList()).toArray(new URL[0]);
}).toArray(URL[]::new);
}
private URL[] extractClasspath(String url) {
@@ -597,10 +598,13 @@ class FunctionCreatorConfiguration {
@Override
public Object postProcessAfterInitialization(Object bean, String beanName)
throws BeansException {
String name = FunctionProperties
.functionName(env.getProperty("function.bean", ""));
if (bean instanceof FunctionRegistry && name.contains("|")) {
bean = new SingleEntryFunctionRegistry((FunctionRegistry) bean, name);
if (bean instanceof FunctionRegistry) {
String name = FunctionProperties
.functionName(env.getProperty("function.bean", ""));
if (name.contains("|")) {
// A single composite function with an empty name
bean = new SingleEntryFunctionRegistry((FunctionRegistry) bean, name);
}
}
return bean;
}

13
spring-cloud-function-deployer/src/main/java/org/springframework/cloud/function/deployer/SingleEntryFunctionRegistry.java
View File

@@ -20,6 +20,7 @@ import java.util.Set;
import org.springframework.cloud.function.context.FunctionRegistration;
import org.springframework.cloud.function.context.FunctionRegistry;
import org.springframework.util.StringUtils;
/**
* @author Dave Syer
@@ -38,14 +39,18 @@ public class SingleEntryFunctionRegistry implements FunctionRegistry {
@Override
public <T> T lookup(Class<?> type, String name) {
return this.name.equals(name) ? this.delegate.lookup(type, name) : null;
if (StringUtils.isEmpty(name)) {
if (delegate.getNames(type).size() == 1) {
return delegate.lookup(type, delegate.getNames(type).iterator().next());
}
name = this.name;
}
return name.equals(this.name) ? delegate.lookup(type, name) : null;
}
@Override
public Set<String> getNames(Class<?> type) {
Set<String> names = this.delegate.getNames(type);
return names.contains(this.name) ? Collections.singleton(this.name)
: Collections.emptySet();
return Collections.singleton(this.name);
}
@Override