init method parameters list when build ServiceDefinition,add typeBuil…

…derName in TypeDefinition.
apache · Jun 24, 2019 · 216ee79 · 216ee79
1 parent 041a6ad
commit 216ee79
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 3 deletions.
diff --git a/...finition/src/main/java/org/apache/dubbo/metadata/definition/ServiceDefinitionBuilder.java b/...finition/src/main/java/org/apache/dubbo/metadata/definition/ServiceDefinitionBuilder.java
@@ -26,6 +26,7 @@
 
 import java.lang.reflect.Method;
 import java.lang.reflect.Type;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -73,11 +74,14 @@ public static <T extends ServiceDefinition> void build(T sd, final Class<?> inte
             Type[] genericParamTypes = method.getGenericParameterTypes();
 
             String[] parameterTypes = new String[paramTypes.length];
+            List<TypeDefinition> parameters = new ArrayList<>();
             for (int i = 0; i < paramTypes.length; i++) {
                 TypeDefinition td = builder.build(genericParamTypes[i], paramTypes[i]);
                 parameterTypes[i] = td.getType();
+                parameters.add(td);
             }
             md.setParameterTypes(parameterTypes);
+            md.setParameters(parameters);
 
             // Process return type.
             TypeDefinition td = builder.build(method.getGenericReturnType(), method.getReturnType());

diff --git a/...-definition/src/main/java/org/apache/dubbo/metadata/definition/TypeDefinitionBuilder.java b/...-definition/src/main/java/org/apache/dubbo/metadata/definition/TypeDefinitionBuilder.java
@@ -33,10 +33,10 @@
 public class TypeDefinitionBuilder {
     private static final List<TypeBuilder> BUILDERS;
 
-    static{
+    static {
         List<TypeBuilder> builders = new ArrayList<>();
         ExtensionLoader<TypeBuilder> extensionLoader = ExtensionLoader.getExtensionLoader(TypeBuilder.class);
-        for(String extensionName : extensionLoader.getSupportedExtensions()){
+        for (String extensionName : extensionLoader.getSupportedExtensions()) {
             builders.add(extensionLoader.getExtension(extensionName));
         }
         BUILDERS = builders;
@@ -47,8 +47,10 @@ public static TypeDefinition build(Type type, Class<?> clazz, Map<Class<?>, Type
         TypeDefinition td;
         if (builder != null) {
             td = builder.build(type, clazz, typeCache);
+            td.setTypeBuilderName(builder.getClass().getName());
         } else {
             td = DefaultTypeBuilder.build(clazz, typeCache);
+            td.setTypeBuilderName(DefaultTypeBuilder.class.getName());
         }
         return td;
     }

diff --git a/...a-definition/src/main/java/org/apache/dubbo/metadata/definition/model/TypeDefinition.java b/...a-definition/src/main/java/org/apache/dubbo/metadata/definition/model/TypeDefinition.java
@@ -37,6 +37,7 @@ public class TypeDefinition {
     private List<String> enums;
     private String $ref;
     private Map<String, TypeDefinition> properties;
+    private String typeBuilderName;
 
     public TypeDefinition(String type) {
         this.type = type;
@@ -75,6 +76,10 @@ public String getType() {
         return type;
     }
 
+    public String getTypeBuilderName() {
+        return typeBuilderName;
+    }
+
     public void set$ref(String $ref) {
         this.$ref = $ref;
     }
@@ -99,6 +104,10 @@ public void setType(String type) {
         this.type = type;
     }
 
+    public void setTypeBuilderName(String typeBuilderName) {
+        this.typeBuilderName = typeBuilderName;
+    }
+
     @Override
     public String toString() {
         return "TypeDefinition [id=" + id + ", type=" + type + ", properties=" + properties + ", $ref=" + $ref + "]";

diff --git a/...-metadata-definition/src/test/java/org/apache/dubbo/metadata/definition/MetadataTest.java b/...-metadata-definition/src/test/java/org/apache/dubbo/metadata/definition/MetadataTest.java
@@ -16,6 +16,10 @@
  */
 package org.apache.dubbo.metadata.definition;
 
+import org.apache.dubbo.metadata.definition.builder.CollectionTypeBuilder;
+import org.apache.dubbo.metadata.definition.builder.DefaultTypeBuilder;
+import org.apache.dubbo.metadata.definition.builder.EnumTypeBuilder;
+import org.apache.dubbo.metadata.definition.builder.MapTypeBuilder;
 import org.apache.dubbo.metadata.definition.common.ClassExtendsMap;
 import org.apache.dubbo.metadata.definition.common.ColorEnum;
 import org.apache.dubbo.metadata.definition.common.OuterClass;
@@ -46,7 +50,7 @@ public void testInnerClassType() {
         Assertions.assertEquals("org.apache.dubbo.metadata.definition.common.OuterClass$InnerClass", td.getType());
         Assertions.assertEquals(1, td.getProperties().size());
         Assertions.assertNotNull(td.getProperties().get("name"));
-
+        Assertions.assertEquals(DefaultTypeBuilder.class.getName(), td.getTypeBuilderName());
         ServiceDefinition sd = MetadataUtils.generateMetadata(TestService.class);
         System.out.println(">> testInnerClassType: " + new Gson().toJson(sd));
 
@@ -73,7 +77,9 @@ public void testRawMap() {
         Assertions.assertEquals("org.apache.dubbo.metadata.definition.common.ResultWithRawCollections", td.getType());
         Assertions.assertEquals(2, td.getProperties().size());
         Assertions.assertEquals("java.util.Map", td.getProperties().get("map").getType());
+        Assertions.assertEquals(MapTypeBuilder.class.getName(), td.getProperties().get("map").getTypeBuilderName());
         Assertions.assertEquals("java.util.List", td.getProperties().get("list").getType());
+        Assertions.assertEquals(CollectionTypeBuilder.class.getName(), td.getProperties().get("list").getTypeBuilderName());
 
         ServiceDefinition sd = MetadataUtils.generateMetadata(TestService.class);
         System.out.println(">> testRawMap: " + new Gson().toJson(sd));
@@ -97,6 +103,7 @@ public void testEnum() {
         System.out.println(">> testEnum: " + new Gson().toJson(td));
 
         Assertions.assertEquals("org.apache.dubbo.metadata.definition.common.ColorEnum", td.getType());
+        Assertions.assertEquals(EnumTypeBuilder.class.getName(), td.getTypeBuilderName());
         Assertions.assertEquals(3, td.getEnums().size());
         Assertions.assertTrue(td.getEnums().contains("RED"));
         Assertions.assertTrue(td.getEnums().contains("YELLOW"));
@@ -124,6 +131,7 @@ public void testExtendsMap() {
         System.out.println(">> testExtendsMap: " + new Gson().toJson(td));
 
         Assertions.assertEquals("org.apache.dubbo.metadata.definition.common.ClassExtendsMap", td.getType());
+        Assertions.assertEquals(MapTypeBuilder.class.getName(), td.getTypeBuilderName());
         Assertions.assertEquals(0, td.getProperties().size());
 
         ServiceDefinition sd = MetadataUtils.generateMetadata(TestService.class);

diff --git a/...ion/src/test/java/org/apache/dubbo/metadata/definition/ServiceDefinitionBuildderTest.java b/...ion/src/test/java/org/apache/dubbo/metadata/definition/ServiceDefinitionBuildderTest.java
@@ -37,6 +37,26 @@ public class ServiceDefinitionBuildderTest {
     public void testBuilderComplextObject() {
         FullServiceDefinition fullServiceDefinition = ServiceDefinitionBuilder.buildFullDefinition(DemoService.class);
         checkComplextObjectAsParam(fullServiceDefinition);
+        checkMethodParameterTypeDefinition(fullServiceDefinition);
+    }
+
+    private void checkMethodParameterTypeDefinition(FullServiceDefinition fullServiceDefinition) {
+        List<MethodDefinition> methodDefinitions = fullServiceDefinition.getMethods();
+        MethodDefinition complexComputeMethod = methodDefinitions.stream().filter(
+                a-> a.getName().equals("complexCompute")).findFirst().get();
+        Assertions.assertEquals(2, complexComputeMethod.getParameters().size());
+        Assertions.assertEquals(String.class.getName(), complexComputeMethod.getParameters().get(0).getType());
+        Assertions.assertEquals(ComplexObject.class.getName(), complexComputeMethod.getParameters().get(1).getType());
+
+        MethodDefinition findComplexObjectMethodDefintion = methodDefinitions.stream().filter(
+                a-> a.getName().equals("findComplexObject")).findFirst().get();
+        Assertions.assertEquals(6, findComplexObjectMethodDefintion.getParameters().size());
+        Assertions.assertEquals(String.class.getName(), findComplexObjectMethodDefintion.getParameters().get(0).getType());
+        Assertions.assertEquals("int", findComplexObjectMethodDefintion.getParameters().get(1).getType());
+        Assertions.assertEquals("long", findComplexObjectMethodDefintion.getParameters().get(2).getType());
+        Assertions.assertEquals("java.lang.String[]", findComplexObjectMethodDefintion.getParameters().get(3).getType());
+        Assertions.assertEquals("java.util.List<java.lang.Integer>", findComplexObjectMethodDefintion.getParameters().get(4).getType());
+        Assertions.assertEquals("org.apache.dubbo.metadata.definition.service.ComplexObject.TestEnum", findComplexObjectMethodDefintion.getParameters().get(5).getType());
     }