From a88a8be223af773e136caf80b0d2acd67a7c7021 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Wed, 24 Mar 2021 16:31:41 +0100 Subject: [PATCH] Simplify FunctionInvocationHelper and its CE implementation --- .../CloudEventsFunctionInvocationHelper.java | 6 ------ .../function/core/FunctionInvocationHelper.java | 14 +++++++++----- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/cloudevent/CloudEventsFunctionInvocationHelper.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/cloudevent/CloudEventsFunctionInvocationHelper.java index 31be851e8..32643c70e 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/cloudevent/CloudEventsFunctionInvocationHelper.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/cloudevent/CloudEventsFunctionInvocationHelper.java @@ -94,12 +94,6 @@ public class CloudEventsFunctionInvocationHelper implements FunctionInvocationHe return this.doPostProcessResult(convertedResult, targetPrefix); } - @Override - public Message postProcessResult(Object result, String targetProtocol) { - String targetPrefix = CloudEventMessageUtils.determinePrefixToUse(targetProtocol); - return this.doPostProcessResult(result, targetPrefix); - } - @Override public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { this.applicationContext = (ConfigurableApplicationContext) applicationContext; diff --git a/spring-cloud-function-core/src/main/java/org/springframework/cloud/function/core/FunctionInvocationHelper.java b/spring-cloud-function-core/src/main/java/org/springframework/cloud/function/core/FunctionInvocationHelper.java index 37a2444ee..ccd11c6e2 100644 --- a/spring-cloud-function-core/src/main/java/org/springframework/cloud/function/core/FunctionInvocationHelper.java +++ b/spring-cloud-function-core/src/main/java/org/springframework/cloud/function/core/FunctionInvocationHelper.java @@ -26,11 +26,15 @@ package org.springframework.cloud.function.core; */ public interface FunctionInvocationHelper { - boolean isRetainOuputAsMessage(I input); + default boolean isRetainOuputAsMessage(I input) { + return true; + }; - I preProcessInput(I input, Object inputConverter); + default I preProcessInput(I input, Object inputConverter) { + return input; + } - I postProcessResult(Object result, String hint); - - I postProcessResult(Object result, I input); + default Object postProcessResult(Object result, I input) { + return result; + } }