add generic reflect type for collection,map,array json (#12732)

apache · Jul 17, 2023 · 2932f09 · 2932f09
1 parent 630e14a
commit 2932f09
Show file tree

Hide file tree

Showing 19 changed files with 173 additions and 40 deletions.
diff --git a/...i/src/main/java/org/apache/dubbo/metadata/rest/AbstractNoAnnotatedParameterProcessor.java b/...i/src/main/java/org/apache/dubbo/metadata/rest/AbstractNoAnnotatedParameterProcessor.java
@@ -16,6 +16,7 @@
  */
 package org.apache.dubbo.metadata.rest;
 
+import org.apache.dubbo.metadata.rest.jaxrs.JAXRSServiceRestMetadataResolver;
 import org.apache.dubbo.metadata.rest.media.MediaType;
 
 import java.lang.reflect.Parameter;
@@ -39,8 +40,16 @@ public boolean process(Parameter parameter, int parameterIndex, RestMethodMetada
     private boolean contentTypeSupport(RestMethodMetadata restMethodMetadata, MediaType mediaType, Class paramType) {
 
         // @RequestParam String,number param
-        if (mediaType.equals(MediaType.ALL_VALUE) && (String.class == paramType || paramType.isPrimitive() || Number.class.isAssignableFrom(paramType))) {
-            return true;
+        if (mediaType.equals(MediaType.ALL_VALUE)) {
+             // jaxrs no annotation param is from http body
+            if (JAXRSServiceRestMetadataResolver.class.equals(restMethodMetadata.getCodeStyle())) {
+                return true;
+            }
+
+            // spring mvc no annotation param only is used by text data(string,number)
+            if (String.class == paramType || paramType.isPrimitive() || Number.class.isAssignableFrom(paramType)) {
+                return true;
+            }
         }
 
         Set<String> consumes = restMethodMetadata.getRequest().getConsumes();

diff --git a/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/rest/ArgInfo.java b/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/rest/ArgInfo.java
@@ -18,9 +18,10 @@
 
 
 import java.lang.reflect.Parameter;
+import java.lang.reflect.Type;
 
 /**
- *  description of service method args info
+ * description of service method args info
  */
 public class ArgInfo {
     /**
@@ -42,6 +43,11 @@ public class ArgInfo {
      */
     private Class paramType;
 
+    /**
+     *  param actual Type(collection,map,array)
+     */
+    private Type actualType;
+
     /**
      * param name
      */
@@ -64,6 +70,7 @@ public ArgInfo(int index, String name, Class paramType) {
 
     public ArgInfo(int index, Parameter parameter) {
         this(index, parameter.getName(), parameter.getType());
+        this.actualType = parameter.getParameterizedType();
     }
 
     public ArgInfo() {
@@ -152,6 +159,10 @@ public ArgInfo setFormContentType(boolean isFormContentType) {
         return this;
     }
 
+    public Type actualReflectType() {
+        return actualType;
+    }
+
     @Override
     public String toString() {
         return "ArgInfo{" +

diff --git a/dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/RestInvoker.java b/dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/RestInvoker.java
@@ -40,6 +40,7 @@
 import org.apache.dubbo.rpc.protocol.rest.util.HttpHeaderUtil;
 import org.apache.dubbo.rpc.protocol.rest.util.MediaTypeUtil;
 
+import java.lang.reflect.Method;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
@@ -100,9 +101,10 @@ protected Result doInvoke(Invocation invocation) {
                         } else if (responseCode >= 500) {
                             responseFuture.completeExceptionally(new RemoteServerInternalException(r.getMessage()));
                         } else if (responseCode < 400) {
-                            mediaType = MediaTypeUtil.convertMediaType(restMethodMetadata.getReflectMethod().getReturnType(), r.getContentType());
+                            Method reflectMethod = restMethodMetadata.getReflectMethod();
+                            mediaType = MediaTypeUtil.convertMediaType(reflectMethod.getReturnType(), r.getContentType());
                             Object value = HttpMessageCodecManager.httpMessageDecode(r.getBody(),
-                                restMethodMetadata.getReflectMethod().getReturnType(), mediaType);
+                                reflectMethod.getReturnType(), reflectMethod.getGenericReturnType(), mediaType);
                             appResponse.setValue(value);
                             // resolve response attribute & attachment
                             HttpHeaderUtil.parseResponseHeader(appResponse, r);

diff --git a/...ache/dubbo/rpc/protocol/rest/annotation/param/parse/provider/BodyProviderParamParser.java b/...ache/dubbo/rpc/protocol/rest/annotation/param/parse/provider/BodyProviderParamParser.java
@@ -28,7 +28,6 @@
 import org.apache.dubbo.rpc.protocol.rest.util.MediaTypeUtil;
 
 
-
 /**
  * body param parse
  */
@@ -43,7 +42,7 @@ protected void doParse(ProviderParseContext parseContext, ArgInfo argInfo) {
         try {
             String contentType = parseContext.getRequestFacade().getHeader(RestHeaderEnum.CONTENT_TYPE.getHeader());
             MediaType mediaType = MediaTypeUtil.convertMediaType(argInfo.getParamType(), contentType);
-            Object param = HttpMessageCodecManager.httpMessageDecode(request.getInputStream(), argInfo.getParamType(), mediaType);
+            Object param = HttpMessageCodecManager.httpMessageDecode(request.getInputStream(), argInfo.getParamType(), argInfo.actualReflectType(), mediaType);
             parseContext.setValueByIndex(argInfo.getIndex(), param);
         } catch (Throwable e) {
             throw new ParamParseException("dubbo rest protocol provider body param parser  error: " + e.getMessage());

diff --git a/...est/src/main/java/org/apache/dubbo/rpc/protocol/rest/message/HttpMessageCodecManager.java b/...est/src/main/java/org/apache/dubbo/rpc/protocol/rest/message/HttpMessageCodecManager.java
@@ -23,21 +23,22 @@
 import org.apache.dubbo.rpc.protocol.rest.pair.MessageCodecResultPair;
 
 import java.io.OutputStream;
+import java.lang.reflect.Type;
 import java.util.Set;
 
 public class HttpMessageCodecManager {
     private static final Set<HttpMessageCodec> httpMessageCodecs =
         FrameworkModel.defaultModel().getExtensionLoader(HttpMessageCodec.class).getSupportedExtensionInstances();
 
 
-    public static Object httpMessageDecode(byte[] body, Class<?> type, MediaType mediaType) throws Exception {
+    public static Object httpMessageDecode(byte[] body, Class<?> type, Type actualType, MediaType mediaType) throws Exception {
         if (body == null || body.length == 0) {
             return null;
         }
 
         for (HttpMessageCodec httpMessageCodec : httpMessageCodecs) {
             if (httpMessageCodec.contentTypeSupport(mediaType, type) || typeJudge(mediaType, type, httpMessageCodec)) {
-                return httpMessageCodec.decode(body, type);
+                return httpMessageCodec.decode(body, type,actualType);
             }
         }
         throw new UnSupportContentTypeException("UnSupport content-type :" + mediaType.value);

diff --git a/...-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/message/HttpMessageDecode.java b/...-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/message/HttpMessageDecode.java
@@ -17,8 +17,11 @@
 package org.apache.dubbo.rpc.protocol.rest.message;
 
 
-public interface HttpMessageDecode<InputStream>{
+import java.lang.reflect.Type;
+
+public interface HttpMessageDecode<InputStream> {
+
+    Object decode(InputStream body, Class<?> targetType,Type actualTYpe) throws Exception;
 
-    Object decode(InputStream body, Class<?> targetType) throws Exception;
 
 }
diff --git a/...c-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/message/codec/ByteArrayCodec.java b/...c-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/message/codec/ByteArrayCodec.java
@@ -22,6 +22,7 @@
 import org.apache.dubbo.rpc.protocol.rest.message.HttpMessageCodec;
 
 import java.io.OutputStream;
+import java.lang.reflect.Type;
 
 /**
  *  body type is byte array
@@ -31,7 +32,7 @@ public class ByteArrayCodec implements HttpMessageCodec<byte[], OutputStream> {
 
 
     @Override
-    public Object decode(byte[] body, Class<?> targetType) throws Exception {
+    public Object decode(byte[] body, Class<?> targetType, Type type) throws Exception {
         return body;
     }
 

diff --git a/...bo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/message/codec/JsonCodec.java b/...bo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/message/codec/JsonCodec.java
@@ -23,14 +23,15 @@
 import org.apache.dubbo.rpc.protocol.rest.message.HttpMessageCodec;
 import org.apache.dubbo.rpc.protocol.rest.message.MediaTypeMatcher;
 import org.apache.dubbo.rpc.protocol.rest.util.DataParseUtils;
-import javax.ws.rs.core.Response;
+
 import java.io.OutputStream;
+import java.lang.reflect.Type;
 import java.nio.charset.StandardCharsets;
 import java.util.HashSet;
 import java.util.Set;
 
 /**
- *  body is json
+ * body is json
  */
 @Activate("json")
 public class JsonCodec implements HttpMessageCodec<byte[], OutputStream> {
@@ -39,12 +40,15 @@ public class JsonCodec implements HttpMessageCodec<byte[], OutputStream> {
     static {
         unSupportClasses.add(byte[].class);
         unSupportClasses.add(String.class);
-        unSupportClasses.add(Response.class);
+    }
+
+    public static void addUnSupportClass(Class<?> unSupportClass) {
+        unSupportClasses.add(unSupportClass);
     }
 
     @Override
-    public Object decode(byte[] body, Class<?> targetType) throws Exception {
-        return DataParseUtils.jsonConvert(targetType, body);
+    public Object decode(byte[] body, Class<?> targetType, Type actualType) throws Exception {
+        return DataParseUtils.jsonConvert(actualType, body);
     }
 
     @Override

diff --git a/...-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/message/codec/MultiValueCodec.java b/...-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/message/codec/MultiValueCodec.java
@@ -26,6 +26,7 @@
 
 import java.io.OutputStream;
 import java.lang.reflect.Field;
+import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -39,8 +40,7 @@ public class MultiValueCodec implements HttpMessageCodec<byte[], OutputStream> {
 
 
     @Override
-    public Object decode(byte[] body, Class<?> targetType) throws Exception {
-        // TODO java bean  get set convert
+    public Object decode(byte[] body, Class<?> targetType, Type type) throws Exception {
         Object map = DataParseUtils.multipartFormConvert(body,targetType);
         Map valuesMap = (Map) map;
         if (Map.class.isAssignableFrom(targetType)) {

diff --git a/...src/main/java/org/apache/dubbo/rpc/protocol/rest/message/codec/ResteasyResponseCodec.java b/...src/main/java/org/apache/dubbo/rpc/protocol/rest/message/codec/ResteasyResponseCodec.java
@@ -26,15 +26,18 @@
 
 import java.io.OutputStream;
 import java.lang.reflect.Method;
+import java.lang.reflect.Type;
 import java.nio.charset.StandardCharsets;
 
-@Activate(onClass="javax.ws.rs.core.Response")
+@Activate(onClass = "javax.ws.rs.core.Response")
 public class ResteasyResponseCodec implements HttpMessageCodec<byte[], OutputStream> {
 
     private Class<?> responseClass;
-    public ResteasyResponseCodec(){
+
+    public ResteasyResponseCodec() {
         try {
             responseClass = ClassUtils.forName("javax.ws.rs.core.Response");
+            JsonCodec.addUnSupportClass(responseClass);
         } catch (Exception exception) {
             responseClass = null;
         }
@@ -56,7 +59,7 @@ public MediaType contentType() {
     }
 
     @Override
-    public Object decode(byte[] body, Class<?> targetType) throws Exception {
+    public Object decode(byte[] body, Class<?> targetType, Type type) throws Exception {
         if (null == body || body.length == 0) {
             return null;
         }

diff --git a/...-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/message/codec/StringCodec.java b/...-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/message/codec/StringCodec.java
@@ -22,6 +22,7 @@
 import org.apache.dubbo.rpc.protocol.rest.message.HttpMessageCodec;
 
 import java.io.OutputStream;
+import java.lang.reflect.Type;
 import java.nio.charset.StandardCharsets;
 
 /**
@@ -32,7 +33,7 @@ public class StringCodec implements HttpMessageCodec<byte[], OutputStream> {
 
 
     @Override
-    public Object decode(byte[] body, Class<?> targetType) throws Exception {
+    public Object decode(byte[] body, Class<?> targetType, Type type) throws Exception {
         if (body == null || body.length == 0) {
             return null;
         }

diff --git a/...bo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/message/codec/TextCodec.java b/...bo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/message/codec/TextCodec.java
@@ -24,6 +24,7 @@
 import org.apache.dubbo.rpc.protocol.rest.util.DataParseUtils;
 
 import java.io.OutputStream;
+import java.lang.reflect.Type;
 import java.nio.charset.StandardCharsets;
 
 /**
@@ -33,7 +34,7 @@
 public class TextCodec implements HttpMessageCodec<byte[], OutputStream> {
 
     @Override
-    public Object decode(byte[] body, Class<?> targetType) throws Exception {
+    public Object decode(byte[] body, Class<?> targetType, Type type) throws Exception {
         return DataParseUtils.stringTypeConvert(targetType, new String(body, StandardCharsets.UTF_8));
     }
 

diff --git a/...bbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/message/codec/XMLCodec.java b/...bbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/message/codec/XMLCodec.java
@@ -32,6 +32,7 @@
 import javax.xml.transform.sax.SAXSource;
 import java.io.OutputStream;
 import java.io.StringReader;
+import java.lang.reflect.Type;
 
 /**
  *  body content-type is xml
@@ -41,7 +42,7 @@ public class XMLCodec implements HttpMessageCodec<byte[], OutputStream> {
 
 
     @Override
-    public Object decode(byte[] body, Class<?> targetType) throws Exception {
+    public Object decode(byte[] body, Class<?> targetType, Type type) throws Exception {
 
 
         SAXParserFactory spf = SAXParserFactory.newInstance();

diff --git a/.../dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/util/DataParseUtils.java b/.../dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/util/DataParseUtils.java
@@ -22,6 +22,7 @@
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
+import java.lang.reflect.Type;
 import java.net.URLDecoder;
 import java.net.URLEncoder;
 import java.nio.charset.Charset;
@@ -151,7 +152,7 @@ public static byte[] objectTextConvertToByteArray(Object object) {
 
     }
 
-    public static Object jsonConvert(Class targetType, byte[] body) throws Exception {
+    public static Object jsonConvert(Type targetType, byte[] body) throws Exception {
         return JsonUtils.toJavaObject(new String(body, StandardCharsets.UTF_8), targetType);
     }
 

diff --git a/dubbo-rpc/dubbo-rpc-rest/src/test/java/org/apache/dubbo/rpc/protocol/rest/DemoService.java b/dubbo-rpc/dubbo-rpc-rest/src/test/java/org/apache/dubbo/rpc/protocol/rest/DemoService.java
@@ -31,6 +31,7 @@
 import javax.ws.rs.core.MultivaluedMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 @Path("/demoService")
 public interface DemoService {
@@ -128,4 +129,24 @@ public interface DemoService {
     @Consumes({MediaType.APPLICATION_JSON})
     User noBodyArg(User user);
 
+    @POST
+    @Path("/list")
+    List<User> list(List<User> users);
+
+    @POST
+    @Path("/set")
+    Set<User> set(Set<User> users);
+
+    @POST
+    @Path("/array")
+    User[] array(User[] users);
+
+    @POST
+    @Path("/stringMap")
+    Map<String, User> stringMap(Map<String,User> userMap);
+
+    @POST
+    @Path("/map")
+    Map<User, User> userMap(Map<User,User> userMap);
+
 }