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

GH-253 Updated AZUR library

Browse Source
This commit is contained in:
Oleg Zhurakousky
2019-02-06 07:59:51 +01:00
parent 79cdf3c9b5
commit 194858bf60
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml
View File

@@ -20,7 +20,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version> <java.version>1.8</java.version>
<azure.functions.java.core.version>1.0.0-beta-5 <azure.functions.java.core.version>1.2.2
</azure.functions.java.core.version> </azure.functions.java.core.version>
</properties> </properties>

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

@@ -141,8 +141,7 @@ public class ContextFunctionCatalogAutoConfiguration {
@Override @Override
public int size() { public int size() {
return this.processor.suppliers.size() return this.processor.suppliers.size() + this.processor.functions.size()
+ this.processor.functions.size()
+ this.processor.consumers.size(); + this.processor.consumers.size();
} }
@@ -263,9 +262,11 @@ public class ContextFunctionCatalogAutoConfiguration {
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
private Object lookup(String name, @SuppressWarnings("rawtypes") Map lookup, Class<?> typeOfFunction) { private Object lookup(String name, @SuppressWarnings("rawtypes") Map lookup,
Class<?> typeOfFunction) {
Object function = compose(name, lookup); Object function = compose(name, lookup);
if (function != null && typeOfFunction.isAssignableFrom(function.getClass())) { if (function != null
&& typeOfFunction.isAssignableFrom(function.getClass())) {
return function; return function;
} }
else { else {
@@ -305,8 +306,7 @@ public class ContextFunctionCatalogAutoConfiguration {
} }
else { else {
String[] stages = StringUtils.delimitedListToStringArray(name, "|"); String[] stages = StringUtils.delimitedListToStringArray(name, "|");
if (Stream.of(stages) if (Stream.of(stages).allMatch(funcName -> contains(funcName))) {
.allMatch(funcName -> contains(funcName))) {
List<Object> composableFunctions = Stream.of(stages) List<Object> composableFunctions = Stream.of(stages)
.map(funcName -> find(funcName)) .map(funcName -> find(funcName))
.collect(Collectors.toList()); .collect(Collectors.toList());
@@ -330,7 +330,8 @@ public class ContextFunctionCatalogAutoConfiguration {
} }
private boolean contains(String name) { private boolean contains(String name) {
return suppliers.containsKey(name) || functions.containsKey(name) || consumers.containsKey(name); return suppliers.containsKey(name) || functions.containsKey(name)
|| consumers.containsKey(name);
} }
private Object find(String name) { private Object find(String name) {
@@ -644,5 +645,4 @@ public class ContextFunctionCatalogAutoConfiguration {
} }
} }