From cfe534660efefdd9a79e7d3eaff82ee34457b331 Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@pivotal.io>
Date: Tue, 21 Apr 2020 14:48:14 +0200
Subject: [PATCH] Remove hard dependency on Gson from FCF adapter in favor of
 SCF proivided configurable JsonMapper

---
 .../cloud/function/adapter/gcloud/FunctionInvoker.java      | 6 +-----
 .../context/AbstractSpringFunctionAdapterInitializer.java   | 4 ++++
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/main/java/org/springframework/cloud/function/adapter/gcloud/FunctionInvoker.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/main/java/org/springframework/cloud/function/adapter/gcloud/FunctionInvoker.java
index 97d8646ba..2a4b6d0ea 100644
--- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/main/java/org/springframework/cloud/function/adapter/gcloud/FunctionInvoker.java
+++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/main/java/org/springframework/cloud/function/adapter/gcloud/FunctionInvoker.java
@@ -26,7 +26,6 @@ import com.google.cloud.functions.HttpFunction;
 import com.google.cloud.functions.HttpRequest;
 import com.google.cloud.functions.HttpResponse;
 import com.google.cloud.functions.RawBackgroundFunction;
-import com.google.gson.Gson;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -53,8 +52,6 @@ public class FunctionInvoker extends AbstractSpringFunctionAdapterInitializer<Ht
 
 	private String functionName = "";
 
-	private static final Gson gson = new Gson();
-
 	public FunctionInvoker() {
 		super();
 		init();
@@ -124,7 +121,7 @@ public class FunctionInvoker extends AbstractSpringFunctionAdapterInitializer<Ht
 			// If the input type is not PubSubMessage, use the PubSubMessage.data field as
 			// payload, and put the full PubSubMessage and Context into message headers.
 
-			PubSubMessage pubSubMessage = gson.fromJson(json, PubSubMessage.class);
+			PubSubMessage pubSubMessage = this.jsonMapper.fromJson(json, PubSubMessage.class);
 
 			message = getInputType() == Void.class ? null : MessageBuilder.withPayload(pubSubMessage.getData())
 					.setHeader("gcf_context", context).setHeader("gcf_message", pubSubMessage).build();
@@ -139,7 +136,6 @@ public class FunctionInvoker extends AbstractSpringFunctionAdapterInitializer<Ht
 		if (result != null) {
 			log.info("Dropping background function result: " + new String(result.getPayload()));
 		}
-
 	}
 
 }
diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/AbstractSpringFunctionAdapterInitializer.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/AbstractSpringFunctionAdapterInitializer.java
index eb385b905..ef633b8c6 100644
--- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/AbstractSpringFunctionAdapterInitializer.java
+++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/AbstractSpringFunctionAdapterInitializer.java
@@ -38,6 +38,7 @@ import org.springframework.boot.WebApplicationType;
 import org.springframework.cloud.function.context.catalog.FunctionInspector;
 import org.springframework.cloud.function.context.config.FunctionContextUtils;
 import org.springframework.cloud.function.context.config.RoutingFunction;
+import org.springframework.cloud.function.json.JsonMapper;
 import org.springframework.cloud.function.utils.FunctionClassUtils;
 import org.springframework.context.ApplicationContextInitializer;
 import org.springframework.context.ConfigurableApplicationContext;
@@ -80,6 +81,9 @@ public abstract class AbstractSpringFunctionAdapterInitializer<C> implements Clo
 	@Autowired(required = false)
 	protected FunctionCatalog catalog;
 
+	@Autowired(required = false)
+	protected JsonMapper jsonMapper;
+
 	private ConfigurableApplicationContext context;
 
 	public ConfigurableApplicationContext getContext() {