Change FunctionCatalog to key off Class<?>

Makes it possible to support other "function" types in the future.
The user is always taking a risk with the lookup that the object
returned has the generic type desired (but that hasn't changed
with this commit). FunctionCatalog is a lot simpler as a result
and also a lot more flexible.
This commit is contained in:
Dave Syer
2018-02-27 10:22:44 +00:00
parent c11a4454ff
commit 33b33adb4b
21 changed files with 498 additions and 407 deletions

View File

@@ -64,11 +64,11 @@ public class OpenWhiskFunctionInitializer {
String name = this.properties.getName();
String type = this.properties.getType();
if ("function".equals(type)) {
this.function = this.catalog.lookupFunction(name);
this.function = this.catalog.lookup(Function.class, name);
} else if ("consumer".equals(type)) {
this.consumer = this.catalog.lookupConsumer(name);
this.consumer = this.catalog.lookup(Consumer.class, name);
} else if ("supplier".equals(type)) {
this.supplier = this.catalog.lookupSupplier(name);
this.supplier = this.catalog.lookup(Supplier.class, name);
}
}