support openapi, for issue alibaba#1256 alibaba#1309

KuroTL · Apr 2, 2023 · c048b13 · c048b13
1 parent fd3c375
commit c048b13
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 7 deletions.
diff --git a/...ava/com/alibaba/fastjson2/support/spring/http/converter/FastJsonHttpMessageConverter.java b/...ava/com/alibaba/fastjson2/support/spring/http/converter/FastJsonHttpMessageConverter.java
@@ -123,6 +123,10 @@ protected void writeInternal(Object object, HttpOutputMessage outputMessage) thr
                 byte[] strBytes = ((String) object).getBytes(config.getCharset());
                 contentLength = strBytes.length;
                 outputMessage.getBody().write(strBytes, 0, strBytes.length);
+            } else if (object instanceof byte[] && JSON.isValid((byte[]) object)) {
+                byte[] strBytes = (byte[]) object;
+                contentLength = strBytes.length;
+                outputMessage.getBody().write(strBytes, 0, strBytes.length);
             } else {
                 contentLength = JSON.writeTo(
                         outputMessage.getBody(),

diff --git a/...va/com/alibaba/fastjson2/support/spring6/http/converter/FastJsonHttpMessageConverter.java b/...va/com/alibaba/fastjson2/support/spring6/http/converter/FastJsonHttpMessageConverter.java
@@ -123,6 +123,9 @@ protected void writeInternal(Object object, HttpOutputMessage outputMessage) thr
                 byte[] strBytes = ((String) object).getBytes(config.getCharset());
                 contentLength = strBytes.length;
                 outputMessage.getBody().write(strBytes, 0, strBytes.length);
+            } else if (object instanceof byte[] && JSON.isValid((byte[]) object)) {
+                byte[] strBytes = (byte[]) object;
+                contentLength = strBytes.length;
             } else {
                 contentLength = JSON.writeTo(
                         outputMessage.getBody(),

diff --git a/fastjson1-compatible/src/main/java/com/alibaba/fastjson/support/config/FastJsonConfig.java b/fastjson1-compatible/src/main/java/com/alibaba/fastjson/support/config/FastJsonConfig.java
@@ -8,7 +8,6 @@
 import com.alibaba.fastjson.serializer.SerializeFilter;
 import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.alibaba.fastjson.util.IOUtils;
-import com.alibaba.fastjson2.JSONWriter;
 
 import java.nio.charset.Charset;
 import java.util.Map;

diff --git a/...tible/src/main/java/com/alibaba/fastjson/support/spring/FastJsonHttpMessageConverter.java b/...tible/src/main/java/com/alibaba/fastjson/support/spring/FastJsonHttpMessageConverter.java
@@ -136,14 +136,25 @@ protected void writeInternal(
         try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
             HttpHeaders headers = outputMessage.getHeaders();
 
-            int len = JSON.writeJSONString(
-                    baos, object,
-                    fastJsonConfig.getSerializeFilters(),
-                    fastJsonConfig.getSerializerFeatures()
-            );
+            int contentLength;
+            if (object instanceof String && com.alibaba.fastjson2.JSON.isValidObject((String) object)) {
+                byte[] strBytes = ((String) object).getBytes(fastJsonConfig.getCharset());
+                contentLength = strBytes.length;
+                outputMessage.getBody().write(strBytes, 0, strBytes.length);
+            } else if (object instanceof byte[] && com.alibaba.fastjson2.JSON.isValid((byte[]) object)) {
+                byte[] strBytes = (byte[]) object;
+                contentLength = strBytes.length;
+                outputMessage.getBody().write(strBytes, 0, strBytes.length);
+            } else {
+                contentLength = JSON.writeJSONString(
+                        baos, object,
+                        fastJsonConfig.getSerializeFilters(),
+                        fastJsonConfig.getSerializerFeatures()
+                );
+            }
 
             if (headers.getContentLength() < 0 && fastJsonConfig.isWriteContentLength()) {
-                headers.setContentLength(len);
+                headers.setContentLength(contentLength);
             }
 
             baos.writeTo(outputMessage.getBody());