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

Clean up in JsonMessageConverter

Browse Source 
This is also to ensure that we can completely remove ApplicationJsonMessageMarshallingConverter from s-c-stream
This commit is contained in:
Oleg Zhurakousky
2022-10-17 16:06:34 +02:00
parent 4210b9333b
commit 2301eac68b
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/JsonMessageConverter.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2020-2020 the original author or authors. * Copyright 2020-2022 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -16,11 +16,14 @@
package org.springframework.cloud.function.context.config; package org.springframework.cloud.function.context.config;
import java.io.ByteArrayOutputStream;
import java.io.DataOutputStream;
import java.lang.reflect.Type; import java.lang.reflect.Type;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import org.springframework.cloud.function.cloudevent.CloudEventMessageUtils; import org.springframework.cloud.function.cloudevent.CloudEventMessageUtils;
import org.springframework.cloud.function.json.JsonMapper; import org.springframework.cloud.function.json.JsonMapper;
import org.springframework.core.ParameterizedTypeReference;
import org.springframework.lang.Nullable; import org.springframework.lang.Nullable;
import org.springframework.messaging.Message; import org.springframework.messaging.Message;
import org.springframework.messaging.MessageHeaders; import org.springframework.messaging.MessageHeaders;
@@ -75,7 +78,13 @@ public class JsonMessageConverter extends AbstractMessageConverter {
@Override @Override
protected Object convertFromInternal(Message<?> message, Class<?> targetClass, @Nullable Object conversionHint) { protected Object convertFromInternal(Message<?> message, Class<?> targetClass, @Nullable Object conversionHint) {
if (conversionHint instanceof ParameterizedTypeReference<?>) {
conversionHint = ((ParameterizedTypeReference<?>) conversionHint).getType();
}
Type convertToType = conversionHint == null ? targetClass : (Type) conversionHint; Type convertToType = conversionHint == null ? targetClass : (Type) conversionHint;
if (convertToType == Object.class) {
return message.getPayload();
}
if (targetClass == byte[].class && message.getPayload() instanceof String) { if (targetClass == byte[].class && message.getPayload() instanceof String) {
return ((String) message.getPayload()).getBytes(StandardCharsets.UTF_8); return ((String) message.getPayload()).getBytes(StandardCharsets.UTF_8);
} }
@@ -84,7 +93,7 @@ public class JsonMessageConverter extends AbstractMessageConverter {
return this.jsonMapper.fromJson(message.getPayload(), convertToType); return this.jsonMapper.fromJson(message.getPayload(), convertToType);
} }
catch (Exception e) { catch (Exception e) {
if (message.getPayload() instanceof byte[] && targetClass.isAssignableFrom(String.class)) { if (message.getPayload() instanceof byte[] && String.class.isAssignableFrom(targetClass)) {
return new String((byte[]) message.getPayload(), StandardCharsets.UTF_8); return new String((byte[]) message.getPayload(), StandardCharsets.UTF_8);
} }
else if (logger.isDebugEnabled()) { else if (logger.isDebugEnabled()) {