[DUBBO-4010] TypeDefinitonBuilder support google protobuf entity buil…

…d # (apache#4011) * add protobuf typeDefinitionBuilder * fix pull request comment add test case to test NestPbType
zonghaishang · May 22, 2019 · a7f56a3 · a7f56a3
1 parent 52cbfc9
commit a7f56a3
Show file tree

Hide file tree

Showing 11 changed files with 426 additions and 24 deletions.
diff --git a/dubbo-metadata-report/dubbo-metadata-definition/pom.xml b/dubbo-metadata-report/dubbo-metadata-definition/pom.xml
@@ -21,7 +21,6 @@
         <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-
     <artifactId>dubbo-metadata-definition</artifactId>
 
 

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
@@ -16,17 +16,13 @@
  */
 package org.apache.dubbo.metadata.definition;
 
-import org.apache.dubbo.metadata.definition.builder.ArrayTypeBuilder;
-import org.apache.dubbo.metadata.definition.builder.CollectionTypeBuilder;
+import org.apache.dubbo.common.extension.ExtensionLoader;
 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.builder.TypeBuilder;
 import org.apache.dubbo.metadata.definition.model.TypeDefinition;
 
 import java.lang.reflect.Type;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -35,13 +31,16 @@
  * 2015/1/27.
  */
 public class TypeDefinitionBuilder {
+    private static final List<TypeBuilder> BUILDERS;
 
-    private static final TypeBuilder ARRAY_BUILDER = new ArrayTypeBuilder();
-    private static final TypeBuilder COLLECTION_BUILDER = new CollectionTypeBuilder();
-    private static final TypeBuilder MAP_BUILDER = new MapTypeBuilder();
-    private static final TypeBuilder ENUM_BUILDER = new EnumTypeBuilder();
-
-    private static final List<TypeBuilder> BUILDERS = Arrays.asList(ARRAY_BUILDER, COLLECTION_BUILDER, MAP_BUILDER, ENUM_BUILDER);
+    static{
+        List<TypeBuilder> builders = new ArrayList<>();
+        ExtensionLoader<TypeBuilder> extensionLoader = ExtensionLoader.getExtensionLoader(TypeBuilder.class);
+        for(String extensionName : extensionLoader.getSupportedExtensions()){
+            builders.add(extensionLoader.getExtension(extensionName));
+        }
+        BUILDERS = builders;
+    }
 
     public static TypeDefinition build(Type type, Class<?> clazz, Map<Class<?>, TypeDefinition> typeCache) {
         TypeBuilder builder = getGenericTypeBuilder(type, clazz);

diff --git a/...ion/src/main/java/org/apache/dubbo/metadata/definition/builder/CollectionTypeBuilder.java b/...ion/src/main/java/org/apache/dubbo/metadata/definition/builder/CollectionTypeBuilder.java
@@ -49,7 +49,8 @@ public TypeDefinition build(Type type, Class<?> clazz, Map<Class<?>, TypeDefinit
         Type[] actualTypeArgs = parameterizedType.getActualTypeArguments();
         if (actualTypeArgs == null || actualTypeArgs.length != 1) {
             throw new IllegalArgumentException(MessageFormat.format(
-                    "[ServiceDefinitionBuilder] Collection type [{0}] with unexpected amount of arguments [{1}]." + Arrays.toString(actualTypeArgs),
+                    "[ServiceDefinitionBuilder] Collection type [{0}] with unexpected amount of arguments [{1}]."
+                            + Arrays.toString(actualTypeArgs),
                     type, actualTypeArgs));
         }
 
@@ -60,11 +61,7 @@ public TypeDefinition build(Type type, Class<?> clazz, Map<Class<?>, TypeDefinit
             TypeDefinitionBuilder.build(actualType, rawType, typeCache);
         } else if (actualType instanceof Class<?>) {
             Class<?> actualClass = (Class<?>) actualType;
-            if (actualClass.isArray() || actualClass.isEnum()) {
-                TypeDefinitionBuilder.build(null, actualClass, typeCache);
-            } else {
-                DefaultTypeBuilder.build(actualClass, typeCache);
-            }
+            TypeDefinitionBuilder.build(null, actualClass, typeCache);
         }
 
         return new TypeDefinition(type.toString());

diff --git a/...definition/src/main/java/org/apache/dubbo/metadata/definition/builder/MapTypeBuilder.java b/...definition/src/main/java/org/apache/dubbo/metadata/definition/builder/MapTypeBuilder.java
@@ -48,7 +48,8 @@ public TypeDefinition build(Type type, Class<?> clazz, Map<Class<?>, TypeDefinit
         Type[] actualTypeArgs = parameterizedType.getActualTypeArguments();
         if (actualTypeArgs == null || actualTypeArgs.length != 2) {
             throw new IllegalArgumentException(MessageFormat.format(
-                    "[ServiceDefinitionBuilder] Map type [{0}] with unexpected amount of arguments [{1}]." + Arrays.toString(actualTypeArgs), type, actualTypeArgs));
+                    "[ServiceDefinitionBuilder] Map type [{0}] with unexpected amount of arguments [{1}]."
+                            + Arrays.toString(actualTypeArgs), type, actualTypeArgs));
         }
 
         for (Type actualType : actualTypeArgs) {
@@ -58,11 +59,7 @@ public TypeDefinition build(Type type, Class<?> clazz, Map<Class<?>, TypeDefinit
                 TypeDefinitionBuilder.build(actualType, rawType, typeCache);
             } else if (actualType instanceof Class<?>) {
                 Class<?> actualClass = (Class<?>) actualType;
-                if (actualClass.isArray() || actualClass.isEnum()) {
-                    TypeDefinitionBuilder.build(null, actualClass, typeCache);
-                } else {
-                    DefaultTypeBuilder.build(actualClass, typeCache);
-                }
+                TypeDefinitionBuilder.build(null, actualClass, typeCache);
             }
         }
 

diff --git a/...ta-definition/src/main/java/org/apache/dubbo/metadata/definition/builder/TypeBuilder.java b/...ta-definition/src/main/java/org/apache/dubbo/metadata/definition/builder/TypeBuilder.java
@@ -16,6 +16,7 @@
  */
 package org.apache.dubbo.metadata.definition.builder;
 
+import org.apache.dubbo.common.extension.SPI;
 import org.apache.dubbo.metadata.definition.model.TypeDefinition;
 
 import java.lang.reflect.Type;
@@ -24,6 +25,7 @@
 /**
  * 2015/1/27.
  */
+@SPI
 public interface TypeBuilder {
 
     /**

diff --git a/...esources/META-INF/dubbo/internal/org.apache.dubbo.metadata.definition.builder.TypeBuilder b/...esources/META-INF/dubbo/internal/org.apache.dubbo.metadata.definition.builder.TypeBuilder
@@ -0,0 +1,4 @@
+array=org.apache.dubbo.metadata.definition.builder.ArrayTypeBuilder
+collection=org.apache.dubbo.metadata.definition.builder.CollectionTypeBuilder
+map=org.apache.dubbo.metadata.definition.builder.MapTypeBuilder
+enum=org.apache.dubbo.metadata.definition.builder.EnumTypeBuilder
diff --git a/dubbo-serialization/dubbo-serialization-protobuf-json/pom.xml b/dubbo-serialization/dubbo-serialization-protobuf-json/pom.xml
@@ -42,5 +42,10 @@ limitations under the License.
             <groupId>com.google.protobuf</groupId>
             <artifactId>protobuf-java-util</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.dubbo</groupId>
+            <artifactId>dubbo-metadata-definition</artifactId>
+            <version>${project.parent.version}</version>
+        </dependency>
     </dependencies>
 </project>