add gson, native-hessian, pb, protostuff

apache · Mar 15, 2024 · a31e8d4 · a31e8d4
1 parent 95e5012
commit a31e8d4
Show file tree

Hide file tree

Showing 15 changed files with 75 additions and 30 deletions.
diff --git a/client-base/src/main/resources/logback.xml b/client-base/src/main/resources/logback.xml
@@ -19,7 +19,7 @@
         </encoder>
     </appender>
 
-    <root level="INFO">
+    <root level="ERROR">
          <appender-ref ref="CONSOLE" />
         <appender-ref ref="FILE"/>
     </root>

diff --git a/dubbo-gson-client/pom.xml b/dubbo-gson-client/pom.xml
@@ -17,6 +17,11 @@
             <artifactId>client-base</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.dubbo.extensions</groupId>
+            <artifactId>dubbo-serialization-gson</artifactId>
+            <version>${dubbo-serialization-extension.version}</version>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

diff --git a/dubbo-gson-server/pom.xml b/dubbo-gson-server/pom.xml
@@ -16,6 +16,11 @@
             <artifactId>server-base</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.dubbo.extensions</groupId>
+            <artifactId>dubbo-serialization-gson</artifactId>
+            <version>${dubbo-serialization-extension.version}</version>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/dubbo-native-hessian-client/pom.xml b/dubbo-native-hessian-client/pom.xml
@@ -21,10 +21,11 @@
             <groupId>com.caucho</groupId>
             <artifactId>hessian</artifactId>
         </dependency>
-<!--        <dependency>-->
-<!--            <groupId>org.apache.dubbo</groupId>-->
-<!--            <artifactId>dubbo-serialization-native-hession</artifactId>-->
-<!--        </dependency>-->
+        <dependency>
+            <groupId>org.apache.dubbo.extensions</groupId>
+            <artifactId>dubbo-serialization-native-hession</artifactId>
+            <version>${dubbo-serialization-extension.version}</version>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/dubbo-native-hessian-server/pom.xml b/dubbo-native-hessian-server/pom.xml
@@ -23,10 +23,11 @@
             <groupId>com.caucho</groupId>
             <artifactId>hessian</artifactId>
         </dependency>
-<!--        <dependency>-->
-<!--            <groupId>org.apache.dubbo</groupId>-->
-<!--            <artifactId>dubbo-serialization-native-hession</artifactId>-->
-<!--        </dependency>-->
+        <dependency>
+            <groupId>org.apache.dubbo.extensions</groupId>
+            <artifactId>dubbo-serialization-native-hession</artifactId>
+            <version>${dubbo-serialization-extension.version}</version>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/dubbo-pb-client/pom.xml b/dubbo-pb-client/pom.xml
@@ -12,21 +12,16 @@
     <artifactId>dubbo-pb-client</artifactId>
 
     <dependencies>
-        <dependency>
-            <groupId>com.google.protobuf</groupId>
-            <artifactId>protobuf-java</artifactId>
-            <version>3.16.3</version>
-        </dependency>
-        <dependency>
-            <groupId>com.google.protobuf</groupId>
-            <artifactId>protobuf-java-util</artifactId>
-            <version>3.7.1</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.dubbo</groupId>
             <artifactId>client-base</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.dubbo.extensions</groupId>
+            <artifactId>dubbo-serialization-protobuf</artifactId>
+            <version>${dubbo-serialization-extension.version}</version>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/dubbo-pb-client/src/main/java/org/apache/dubbo/benchmark/DubboPbClientInitializer.java b/dubbo-pb-client/src/main/java/org/apache/dubbo/benchmark/DubboPbClientInitializer.java
@@ -0,0 +1,14 @@
+package org.apache.dubbo.benchmark;
+
+import org.apache.dubbo.benchmark.bean.PagePB;
+import org.apache.dubbo.common.serialize.protobuf.support.ProtobufUtils;
+
+import javax.annotation.PostConstruct;
+
+public class DubboPbClientInitializer {
+
+    @PostConstruct
+    public void initProtobuf() {
+        ProtobufUtils.marshaller(PagePB.Response.getDefaultInstance());
+    }
+}
diff --git a/dubbo-pb-client/src/main/resources/consumer.xml b/dubbo-pb-client/src/main/resources/consumer.xml
@@ -7,6 +7,9 @@
     <dubbo:application name="dubbo-pb-client"/>
     <dubbo:reference id="userService" check="false"
                      interface="org.apache.dubbo.benchmark.bean.UserServiceDubbo$IUserService"
-                     url="dubbo://${server.host}:${server.port}"/>
+                     url="dubbo://${server.host}:${server.port}">
+        <dubbo:parameter key="prefer.serialization" value="protobuf"/>
+    </dubbo:reference>
     <dubbo:consumer client="netty4" filter="-default"/>
+    <bean id="dubboPbClientInitializer" class="org.apache.dubbo.benchmark.DubboPbClientInitializer"/>
 </beans>
diff --git a/dubbo-pb-server/pom.xml b/dubbo-pb-server/pom.xml
@@ -18,14 +18,9 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.google.protobuf</groupId>
-            <artifactId>protobuf-java</artifactId>
-            <version>3.7.1</version>
-        </dependency>
-        <dependency>
-            <groupId>com.google.protobuf</groupId>
-            <artifactId>protobuf-java-util</artifactId>
-            <version>3.7.1</version>
+            <groupId>org.apache.dubbo.extensions</groupId>
+            <artifactId>dubbo-serialization-protobuf</artifactId>
+            <version>${dubbo-serialization-extension.version}</version>
         </dependency>
     </dependencies>
 

diff --git a/dubbo-pb-server/src/main/java/org/apache/dubbo/benchmark/DubboPbServerInitializer.java b/dubbo-pb-server/src/main/java/org/apache/dubbo/benchmark/DubboPbServerInitializer.java
@@ -0,0 +1,14 @@
+package org.apache.dubbo.benchmark;
+
+import org.apache.dubbo.benchmark.bean.PagePB;
+import org.apache.dubbo.common.serialize.protobuf.support.ProtobufUtils;
+
+import javax.annotation.PostConstruct;
+
+public class DubboPbServerInitializer {
+
+    @PostConstruct
+    public void initProtobuf() {
+        ProtobufUtils.marshaller(PagePB.Request.getDefaultInstance());
+    }
+}
diff --git a/dubbo-pb-server/src/main/resources/provider.xml b/dubbo-pb-server/src/main/resources/provider.xml
@@ -9,4 +9,5 @@
     <dubbo:registry address="N/A"/>
     <dubbo:service interface="org.apache.dubbo.benchmark.bean.UserServiceDubbo$IUserService" ref="userService" filter="-default" serialization="protobuf"/>
     <bean id="userService" class="org.apache.dubbo.benchmark.service.PBUserServiceImpl"/>
+    <bean id="dubboPbClientInitializer" class="org.apache.dubbo.benchmark.DubboPbServerInitializer"/>
 </beans>
diff --git a/dubbo-protostuff-client/pom.xml b/dubbo-protostuff-client/pom.xml
@@ -32,6 +32,11 @@
             <artifactId>objenesis</artifactId>
             <version>2.5</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.dubbo.extensions</groupId>
+            <artifactId>dubbo-serialization-protostuff</artifactId>
+            <version>${dubbo-serialization-extension.version}</version>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

diff --git a/dubbo-protostuff-server/pom.xml b/dubbo-protostuff-server/pom.xml
@@ -32,6 +32,11 @@
             <artifactId>objenesis</artifactId>
             <version>2.5</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.dubbo.extensions</groupId>
+            <artifactId>dubbo-serialization-protostuff</artifactId>
+            <version>${dubbo-serialization-extension.version}</version>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
@@ -46,7 +51,7 @@
                 <configuration>
                     <archive>
                         <manifest>
-                            <mainClass>org.apache.dubbo.benchmark.ClientSimple</mainClass>
+                            <mainClass>org.apache.dubbo.benchmark.Server</mainClass>
                         </manifest>
                     </archive>
                 </configuration>

diff --git a/pom.xml b/pom.xml
@@ -13,6 +13,7 @@
         <java.source>1.8</java.source>
         <java.target>1.8</java.target>
         <dubbo.version>3.2.11</dubbo.version>
+        <dubbo-serialization-extension.version>1.0.1</dubbo-serialization-extension.version>
         <netty.version>4.1.107.Final</netty.version>
         <kryo.version>4.0.2</kryo.version>
         <avro.version>1.11.3</avro.version>

diff --git a/server-base/src/main/resources/logback.xml b/server-base/src/main/resources/logback.xml
@@ -19,7 +19,7 @@
         </encoder>
     </appender>
 
-    <root level="INFO">
+    <root level="ERROR">
         <appender-ref ref="CONSOLE"/>
         <appender-ref ref="FILE"/>
     </root>