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

Re-org so that default methods are used everywhere

Browse Source
This commit is contained in:
Dave Syer
2018-02-28 10:28:14 +00:00
parent 33b33adb4b
commit 955e99bfe3
3 changed files with 55 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/FunctionInspector.java
View File

@@ -16,6 +16,9 @@
package org.springframework.cloud.function.context.catalog;
import java.util.Collections;
import java.util.Set;
import org.springframework.cloud.function.context.FunctionRegistration;
/**
@@ -57,7 +60,9 @@ public interface FunctionInspector {
default String getName(Object function) {
FunctionRegistration<?> registration = getRegistration(function);
return registration == null ? null : registration.getNames().iterator().next();
Set<String> names = registration == null ? Collections.emptySet()
: registration.getNames();
return names.isEmpty() ? null : names.iterator().next();
}
}

3
spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfiguration.java
View File

@@ -160,7 +160,8 @@ public class ContextFunctionCatalogAutoConfiguration {
@Override
public FunctionRegistration<?> getRegistration(Object function) {
return processor.getRegistration(function);
FunctionRegistration<?> registration = processor.getRegistration(function);
return registration;
}
}