From 863bbdc3ebc17ccf59e2554aab5b46d9586c6f35 Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@vmware.com>
Date: Wed, 10 Mar 2021 16:31:17 +0100
Subject: [PATCH] Polish JsonMapper and upgrade function dependency in azure
 adapter

---
 .../org/springframework/cloud/function/json/JsonMapper.java  | 5 +----
 spring-cloud-function-samples/function-sample-azure/pom.xml  | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/json/JsonMapper.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/json/JsonMapper.java
index 21bd84be2..f364f4d00 100644
--- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/json/JsonMapper.java
+++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/json/JsonMapper.java
@@ -87,12 +87,9 @@ public abstract class JsonMapper {
 					return (T) json;
 				}
 			}
-			if (json instanceof String && !isJsonString(json) && (String.class == type || byte[].class == type)) {
+			if (json instanceof String && (String.class == type || byte[].class == type)) {
 				return String.class == type ? (T) json : (T) ((String) json).getBytes(StandardCharsets.UTF_8);
 			}
-//			if (String.class == type && json instanceof String && !isJsonString(json)) {
-//				return (T) json;
-//			}
 			else {
 				return this.doFromJson(json, type);
 			}
diff --git a/spring-cloud-function-samples/function-sample-azure/pom.xml b/spring-cloud-function-samples/function-sample-azure/pom.xml
index d32fbe29b..86e962a50 100644
--- a/spring-cloud-function-samples/function-sample-azure/pom.xml
+++ b/spring-cloud-function-samples/function-sample-azure/pom.xml
@@ -54,7 +54,7 @@
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-function-dependencies</artifactId>
-				<version>3.1.0.BUILD-SNAPSHOT</version>
+				<version>3.1.2-SNAPSHOT</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>