From 194858bf60982fdb809dc8ed8e944b9481e3a258 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Wed, 6 Feb 2019 07:59:51 +0100 Subject: [PATCH] GH-253 Updated AZUR library --- .../spring-cloud-function-adapter-azure/pom.xml | 2 +- .../ContextFunctionCatalogAutoConfiguration.java | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml index 0e507e8ad..94e399056 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml @@ -20,7 +20,7 @@ UTF-8 UTF-8 1.8 - 1.0.0-beta-5 + 1.2.2 diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfiguration.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfiguration.java index 464595dbb..b0865e097 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfiguration.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfiguration.java @@ -141,8 +141,7 @@ public class ContextFunctionCatalogAutoConfiguration { @Override public int size() { - return this.processor.suppliers.size() - + this.processor.functions.size() + return this.processor.suppliers.size() + this.processor.functions.size() + this.processor.consumers.size(); } @@ -263,9 +262,11 @@ public class ContextFunctionCatalogAutoConfiguration { } @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); - if (function != null && typeOfFunction.isAssignableFrom(function.getClass())) { + if (function != null + && typeOfFunction.isAssignableFrom(function.getClass())) { return function; } else { @@ -305,8 +306,7 @@ public class ContextFunctionCatalogAutoConfiguration { } else { String[] stages = StringUtils.delimitedListToStringArray(name, "|"); - if (Stream.of(stages) - .allMatch(funcName -> contains(funcName))) { + if (Stream.of(stages).allMatch(funcName -> contains(funcName))) { List composableFunctions = Stream.of(stages) .map(funcName -> find(funcName)) .collect(Collectors.toList()); @@ -330,7 +330,8 @@ public class ContextFunctionCatalogAutoConfiguration { } 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) { @@ -644,5 +645,4 @@ public class ContextFunctionCatalogAutoConfiguration { } - }