From 8cfb4dc1c00ee7e6805e32d57d57ea92196295c5 Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@vmware.com>
Date: Tue, 6 Apr 2021 12:20:39 +0200
Subject: [PATCH] GH-570 Remove hard dependency on Gson for GCP

Resolves #570

polish test
---
 .../function/adapter/gcp/FunctionInvoker.java |  3 +-
 .../gcp/FunctionInvokerBackgroundTests.java   | 27 ++++++++++++++++--
 .../adapter/gcp/FunctionInvokerHttpTests.java | 28 +++++++++++++++++--
 .../FunctionInvokerIntegrationTests.java      | 25 +++++++++++++++--
 .../FunctionSampleGcpIntegrationTest.java     |  2 +-
 5 files changed, 74 insertions(+), 11 deletions(-)

diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/main/java/org/springframework/cloud/function/adapter/gcp/FunctionInvoker.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/main/java/org/springframework/cloud/function/adapter/gcp/FunctionInvoker.java
index 69ff6cd6f..2b0c424c1 100644
--- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/main/java/org/springframework/cloud/function/adapter/gcp/FunctionInvoker.java
+++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/main/java/org/springframework/cloud/function/adapter/gcp/FunctionInvoker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2020 the original author or authors.
+ * Copyright 2020-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -66,7 +66,6 @@ public class FunctionInvoker extends AbstractSpringFunctionAdapterInitializer<Ht
 		if (System.getenv().containsKey("spring.cloud.function.definition")) {
 			this.functionName = System.getenv("spring.cloud.function.definition");
 		}
-		System.setProperty("spring.http.converters.preferred-json-mapper", "gson");
 		Thread.currentThread() // TODO: remove after upgrading to 1.0.0-alpha-2-rc5
 				.setContextClassLoader(FunctionInvoker.class.getClassLoader());
 		initialize(null);
diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcp/FunctionInvokerBackgroundTests.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcp/FunctionInvokerBackgroundTests.java
index 98d78e688..6bdcce650 100644
--- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcp/FunctionInvokerBackgroundTests.java
+++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcp/FunctionInvokerBackgroundTests.java
@@ -257,24 +257,45 @@ public class FunctionInvokerBackgroundTests {
 
 	}
 
-	private static class IncomingRequest {
+	public static class IncomingRequest {
 
 		String message;
 
-		IncomingRequest(String message) {
+		public IncomingRequest(String message) {
 			this.message = message;
 		}
 
+		public IncomingRequest() {
+		}
+
+		public String getMessage() {
+			return message;
+		}
+
+		public void setMessage(String message) {
+			this.message = message;
+		}
 	}
 
-	private static class OutgoingResponse {
+	public static class OutgoingResponse {
 
 		String message;
 
+		public String getMessage() {
+			return message;
+		}
+
+		public void setMessage(String message) {
+			this.message = message;
+		}
+
 		OutgoingResponse(String message) {
 			this.message = message;
 		}
 
+		public OutgoingResponse() {
+		}
+
 	}
 
 }
diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcp/FunctionInvokerHttpTests.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcp/FunctionInvokerHttpTests.java
index 2936c1dfc..9a83ff353 100644
--- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcp/FunctionInvokerHttpTests.java
+++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcp/FunctionInvokerHttpTests.java
@@ -145,24 +145,46 @@ public class FunctionInvokerHttpTests {
 
 	}
 
-	private static class IncomingRequest {
+	public static class IncomingRequest {
 
 		String message;
 
-		IncomingRequest(String message) {
+		public IncomingRequest(String message) {
 			this.message = message;
 		}
 
+		public IncomingRequest() {
+		}
+
+		public String getMessage() {
+			return message;
+		}
+
+		public void setMessage(String message) {
+			this.message = message;
+		}
 	}
 
-	private static class OutgoingResponse {
+	public static class OutgoingResponse {
 
 		String message;
 
+		public String getMessage() {
+			return message;
+		}
+
+		public void setMessage(String message) {
+			this.message = message;
+		}
+
 		OutgoingResponse(String message) {
 			this.message = message;
 		}
 
+		public OutgoingResponse() {
+		}
+
 	}
 
+
 }
diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcp/integration/FunctionInvokerIntegrationTests.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcp/integration/FunctionInvokerIntegrationTests.java
index 928ac4b11..86cc77f5c 100644
--- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcp/integration/FunctionInvokerIntegrationTests.java
+++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcp/integration/FunctionInvokerIntegrationTests.java
@@ -119,17 +119,28 @@ public class FunctionInvokerIntegrationTests {
 
 	}
 
-	private static class Foo {
+	public static class Foo {
 
 		String value;
 
+		public String getValue() {
+			return value;
+		}
+
+		public void setValue(String value) {
+			this.value = value;
+		}
+
+		public Foo() {
+		}
+
 		Foo(String value) {
 			this.value = value;
 		}
 
 	}
 
-	private static class Bar {
+	public static class Bar {
 
 		String value;
 
@@ -137,6 +148,16 @@ public class FunctionInvokerIntegrationTests {
 			this.value = value;
 		}
 
+		Bar() {
+		}
+
+		public String getValue() {
+			return value;
+		}
+
+		public void setValue(String value) {
+			this.value = value;
+		}
 	}
 
 }
diff --git a/spring-cloud-function-samples/function-sample-gcp-http/src/test/java/com/example/FunctionSampleGcpIntegrationTest.java b/spring-cloud-function-samples/function-sample-gcp-http/src/test/java/com/example/FunctionSampleGcpIntegrationTest.java
index ff7eecee8..db828aacd 100644
--- a/spring-cloud-function-samples/function-sample-gcp-http/src/test/java/com/example/FunctionSampleGcpIntegrationTest.java
+++ b/spring-cloud-function-samples/function-sample-gcp-http/src/test/java/com/example/FunctionSampleGcpIntegrationTest.java
@@ -31,7 +31,7 @@ public class FunctionSampleGcpIntegrationTest {
 	@Test
 	public void testSample() throws IOException, InterruptedException {
 		try (LocalServerTestSupport.ServerProcess process = LocalServerTestSupport.startServer(CloudFunctionMain.class)) {
-			String result = rest.postForObject("http://localhost:8080/", "Hello", String.class);
+			String result = rest.postForObject("http://localhost:8080/", "\"Hello\"", String.class);
 			assertThat(result).isEqualTo("\"HELLO\"");
 		}
 	}