From 42da405a1893a3f98eef28df75d3aea436e347ce Mon Sep 17 00:00:00 2001 From: onobc Date: Tue, 1 Mar 2022 13:54:31 -0600 Subject: [PATCH] Simplify if/else in Azure function invoker --- .../spring-cloud-function-adapter-azure/pom.xml | 3 +-- .../cloud/function/adapter/azure/FunctionInvoker.java | 6 +++--- 2 files changed, 4 insertions(+), 5 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 149e0fdc6..a493f620c 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,8 +20,7 @@ UTF-8 UTF-8 1.8 - 1.2.2 - + 1.2.2 diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/src/main/java/org/springframework/cloud/function/adapter/azure/FunctionInvoker.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/src/main/java/org/springframework/cloud/function/adapter/azure/FunctionInvoker.java index 7b89e1df7..db5da503d 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/src/main/java/org/springframework/cloud/function/adapter/azure/FunctionInvoker.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/src/main/java/org/springframework/cloud/function/adapter/azure/FunctionInvoker.java @@ -129,10 +129,10 @@ public class FunctionInvoker { Object functionResult = function.apply(enhancedInput); - if (!(functionResult instanceof Publisher)) { - return postProcessImperativeFunctionResult(input, enhancedInput, functionResult, function, executionContext); + if (functionResult instanceof Publisher) { + return postProcessReactiveFunctionResult(input, enhancedInput, (Publisher) functionResult, function, executionContext); } - return postProcessReactiveFunctionResult(input, enhancedInput, (Publisher) functionResult, function, executionContext); + return postProcessImperativeFunctionResult(input, enhancedInput, functionResult, function, executionContext); } /**