SpringCloud/spring-cloud-function
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish JsonMapper and upgrade function dependency in azure adapter

Browse Source
This commit is contained in:
Oleg Zhurakousky
2021-03-10 16:31:17 +01:00
parent 778672e6ea
commit 863bbdc3eb
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-cloud-function-context/src/main/java/org/springframework/cloud/function/json/JsonMapper.java
View File

@@ -87,12 +87,9 @@ public abstract class JsonMapper {
return (T) json; 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); 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 { else {
return this.doFromJson(json, type); return this.doFromJson(json, type);
} }

2
spring-cloud-function-samples/function-sample-azure/pom.xml
View File

@@ -54,7 +54,7 @@
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-dependencies</artifactId> <artifactId>spring-cloud-function-dependencies</artifactId>
<version>3.1.0.BUILD-SNAPSHOT</version> <version>3.1.2-SNAPSHOT</version>
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
</dependency> </dependency>