Merge branch '3.2.0' into doc_offical_master

songxiaosheng · Dec 22, 2023 · e421f8f · e421f8f
2 parents 2a9e61a + c828581
commit e421f8f
Show file tree

Hide file tree

Showing 63 changed files with 135 additions and 518 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -42,7 +42,7 @@ jobs:
           ./mvnw --batch-mode -U -e --no-transfer-progress clean test verify -Pjacoco -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -Dmaven.wagon.http.retryHandler.count=5 -DskipTests=false -DskipIntegrationTests=false -Dcheckstyle.skip=false -Dcheckstyle_unix.skip=false -Drat.skip=false -Dmaven.javadoc.skip=true
       - name: "Test with Maven"
         timeout-minutes: 50
-        if: ${{ startsWith( matrix.os) }}
+        if: ${{ startsWith( matrix.os, 'windows') }}
         run: |
           cd ./dubbo-spi-extensions
           ./mvnw --batch-mode -U -e --no-transfer-progress clean test verify -Pjacoco -D"http.keepAlive=false" -D"maven.wagon.http.pool=false" -D"maven.wagon.httpconnectionManager.ttlSeconds=120" -D"maven.wagon.http.retryHandler.count=5" -DskipTests=false -DskipIntegrationTests=true -D"checkstyle.skip=false" -D"checkstyle_unix.skip=true" -D"rat.skip=false" -D"maven.javadoc.skip=true"

diff --git a/dubbo-serialization-extensions/dubbo-serialization-avro/pom.xml b/dubbo-serialization-extensions/dubbo-serialization-avro/pom.xml
@@ -26,7 +26,7 @@
     <artifactId>dubbo-serialization-avro</artifactId>
     <packaging>jar</packaging>
     <name>${project.artifactId}</name>
-    <version>1.0.2-SNAPSHOT</version>
+    <version>3.2.0-SNAPSHOT</version>
     <description>The avro serialization module of dubbo project</description>
     <properties>
         <skip_maven_deploy>false</skip_maven_deploy>
@@ -46,6 +46,12 @@
             <version>${dubbo.version}</version>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>org.apache.dubbo.extensions</groupId>
+            <artifactId>dubbo-serialization-test</artifactId>
+            <version>3.2.0-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.avro</groupId>
             <artifactId>avro</artifactId>

diff --git a/...ialization-avro/src/main/java/org/apache/dubbo/common/serialize/avro/AvroObjectInput.java b/...ialization-avro/src/main/java/org/apache/dubbo/common/serialize/avro/AvroObjectInput.java
@@ -31,8 +31,8 @@
 import java.util.Map;
 
 public class AvroObjectInput implements ObjectInput {
-    private static DecoderFactory decoderFactory = DecoderFactory.get();
-    private BinaryDecoder decoder;
+    private static final DecoderFactory decoderFactory = DecoderFactory.get();
+    private final BinaryDecoder decoder;
 
     public AvroObjectInput(InputStream in) {
         decoder = decoderFactory.binaryDecoder(in, null);

diff --git a/...alization-avro/src/main/java/org/apache/dubbo/common/serialize/avro/AvroObjectOutput.java b/...alization-avro/src/main/java/org/apache/dubbo/common/serialize/avro/AvroObjectOutput.java
@@ -29,8 +29,8 @@
 import java.util.Arrays;
 
 public class AvroObjectOutput implements ObjectOutput {
-    private static EncoderFactory encoderFactory = EncoderFactory.get();
-    private BinaryEncoder encoder;
+    private static final EncoderFactory encoderFactory = EncoderFactory.get();
+    private final BinaryEncoder encoder;
 
     public AvroObjectOutput(OutputStream out) {
         encoder = encoderFactory.binaryEncoder(out, null);

diff --git a/...alize/avro/AvroObjectInputOutputTest.java → ...alize/avro/AvroObjectInputOutputTest.java b/...alize/avro/AvroObjectInputOutputTest.java → ...alize/avro/AvroObjectInputOutputTest.java
@@ -18,7 +18,6 @@
 
 
 import org.apache.dubbo.common.serialize.model.Person;
-
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;

diff --git a/...serialize/avro/AvroSerializationTest.java → ...serialize/avro/AvroSerializationTest.java b/...serialize/avro/AvroSerializationTest.java → ...serialize/avro/AvroSerializationTest.java
@@ -18,7 +18,6 @@
 
 import org.apache.dubbo.common.serialize.ObjectInput;
 import org.apache.dubbo.common.serialize.ObjectOutput;
-
 import org.hamcrest.Matchers;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;

diff --git a/dubbo-serialization-extensions/dubbo-serialization-common/pom.xml b/dubbo-serialization-extensions/dubbo-serialization-common/pom.xml
@@ -38,11 +38,13 @@ limitations under the License.
             <groupId>org.apache.dubbo</groupId>
             <artifactId>dubbo-serialization-api</artifactId>
             <version>3.2.7</version>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.dubbo</groupId>
             <artifactId>dubbo-common</artifactId>
             <version>3.2.7</version>
+            <optional>true</optional>
         </dependency>
     </dependencies>
 </project>
diff --git a/dubbo-serialization-extensions/dubbo-serialization-fastjson/pom.xml b/dubbo-serialization-extensions/dubbo-serialization-fastjson/pom.xml
@@ -43,11 +43,13 @@ limitations under the License.
             <groupId>org.apache.dubbo</groupId>
             <artifactId>dubbo-serialization-api</artifactId>
             <version>${dubbo.version}</version>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.dubbo</groupId>
             <artifactId>dubbo-common</artifactId>
             <version>${dubbo.version}</version>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>com.alibaba</groupId>

diff --git a/dubbo-serialization-extensions/dubbo-serialization-fst/pom.xml b/dubbo-serialization-extensions/dubbo-serialization-fst/pom.xml
@@ -26,17 +26,30 @@
     <artifactId>dubbo-serialization-fst</artifactId>
     <packaging>jar</packaging>
     <name>${project.artifactId}</name>
-    <version>1.0.2-SNAPSHOT</version>
+    <version>3.2.0-SNAPSHOT</version>
     <description>The fst serialization module of dubbo project</description>
     <properties>
         <skip_maven_deploy>false</skip_maven_deploy>
+        <dubbo.version>3.2.7</dubbo.version>
     </properties>
     <dependencies>
         <dependency>
             <groupId>org.apache.dubbo</groupId>
             <artifactId>dubbo-serialization-api</artifactId>
+            <version>${dubbo.version}</version>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>org.apache.dubbo</groupId>
+            <artifactId>dubbo-common</artifactId>
+            <version>3.2.7</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.dubbo.extensions</groupId>
+            <artifactId>dubbo-serialization-test</artifactId>
+            <version>3.2.0-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>de.ruedigermoeller</groupId>
             <artifactId>fst</artifactId>

diff --git a/...serialization-fst/src/main/java/org/apache/dubbo/common/serialize/fst/FstObjectInput.java b/...serialization-fst/src/main/java/org/apache/dubbo/common/serialize/fst/FstObjectInput.java
@@ -29,7 +29,7 @@
  */
 public class FstObjectInput implements ObjectInput {
 
-    private FSTObjectInput input;
+    private final FSTObjectInput input;
 
     public FstObjectInput(InputStream inputStream) {
         input = FstFactory.getDefaultFactory().getObjectInput(inputStream);

diff --git a/...erialization-fst/src/main/java/org/apache/dubbo/common/serialize/fst/FstObjectOutput.java b/...erialization-fst/src/main/java/org/apache/dubbo/common/serialize/fst/FstObjectOutput.java
@@ -28,7 +28,7 @@
  */
 public class FstObjectOutput implements ObjectOutput {
 
-    private FSTObjectOutput output;
+    private final FSTObjectOutput output;
 
     public FstObjectOutput(OutputStream outputStream) {
         output = FstFactory.getDefaultFactory().getObjectOutput(outputStream);

diff --git a/.../common/serialize/fst/FstFactoryTest.java → .../common/serialize/fst/FstFactoryTest.java b/.../common/serialize/fst/FstFactoryTest.java → .../common/serialize/fst/FstFactoryTest.java
diff --git a/...mon/serialize/fst/FstObjectInputTest.java → ...mon/serialize/fst/FstObjectInputTest.java b/...mon/serialize/fst/FstObjectInputTest.java → ...mon/serialize/fst/FstObjectInputTest.java
@@ -17,7 +17,6 @@
 package org.apache.dubbo.common.serialize.fst;
 
 import org.apache.dubbo.common.serialize.model.person.FullAddress;
-
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 

diff --git a/...on/serialize/fst/FstObjectOutputTest.java → ...on/serialize/fst/FstObjectOutputTest.java b/...on/serialize/fst/FstObjectOutputTest.java → ...on/serialize/fst/FstObjectOutputTest.java
@@ -18,7 +18,6 @@
 
 import org.apache.dubbo.common.serialize.model.AnimalEnum;
 import org.apache.dubbo.common.serialize.model.person.FullAddress;
-
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;

diff --git a/...n/serialize/fst/FstSerializationTest.java → ...n/serialize/fst/FstSerializationTest.java b/...n/serialize/fst/FstSerializationTest.java → ...n/serialize/fst/FstSerializationTest.java
@@ -18,7 +18,6 @@
 
 import org.apache.dubbo.common.serialize.ObjectInput;
 import org.apache.dubbo.common.serialize.ObjectOutput;
-
 import org.hamcrest.Matchers;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;

diff --git a/dubbo-serialization-extensions/dubbo-serialization-fury/pom.xml b/dubbo-serialization-extensions/dubbo-serialization-fury/pom.xml
@@ -27,6 +27,9 @@ limitations under the License.
     </parent>
 
     <artifactId>dubbo-serialization-fury</artifactId>
+    <packaging>jar</packaging>
+    <name>${project.artifactId}</name>
+    <version>3.2.0-SNAPSHOT</version>
 
     <properties>
         <maven.compiler.source>17</maven.compiler.source>

diff --git a/dubbo-serialization-extensions/dubbo-serialization-gson/pom.xml b/dubbo-serialization-extensions/dubbo-serialization-gson/pom.xml
@@ -32,20 +32,17 @@ Licensed to the Apache Software Foundation (ASF) under one or more
         <skip_maven_deploy>false</skip_maven_deploy>
     </properties>
     <dependencies>
-        <dependency>
-            <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo-serialization-api</artifactId>
-            <optional>true</optional>
-        </dependency>
         <dependency>
             <groupId>org.apache.dubbo</groupId>
             <artifactId>dubbo-serialization-api</artifactId>
             <version>3.2.7</version>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.dubbo</groupId>
             <artifactId>dubbo-common</artifactId>
             <version>3.2.7</version>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.dubbo.extensions</groupId>

diff --git a/dubbo-serialization-extensions/dubbo-serialization-jackson/pom.xml b/dubbo-serialization-extensions/dubbo-serialization-jackson/pom.xml
@@ -27,6 +27,7 @@
 
     <artifactId>dubbo-serialization-jackson</artifactId>
     <description>The jackson serialization module of dubbo project</description>
+    <version>3.2.0-SNAPSHOT</version>
 
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>
@@ -49,6 +50,7 @@
         <dependency>
             <groupId>org.apache.dubbo</groupId>
             <artifactId>dubbo-common</artifactId>
+            <optional>true</optional>
             <version>3.2.7</version>
         </dependency>
         <dependency>

diff --git a/dubbo-serialization-extensions/dubbo-serialization-kryo/pom.xml b/dubbo-serialization-extensions/dubbo-serialization-kryo/pom.xml
@@ -27,18 +27,32 @@ limitations under the License.
     <artifactId>dubbo-serialization-kryo</artifactId>
     <packaging>jar</packaging>
     <name>${project.artifactId}</name>
-    <version>1.0.2-SNAPSHOT</version>
+    <version>3.2.0-SNAPSHOT</version>
     <description>The kryo serialization module of dubbo project</description>
     <properties>
         <skip_maven_deploy>false</skip_maven_deploy>
+        <dubbo.version>3.2.7</dubbo.version>
         <dubbo-common-extensions-version>1.0.1</dubbo-common-extensions-version>
     </properties>
     <dependencies>
         <dependency>
             <groupId>org.apache.dubbo</groupId>
             <artifactId>dubbo-serialization-api</artifactId>
+            <version>${dubbo.version}</version>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>org.apache.dubbo</groupId>
+            <artifactId>dubbo-common</artifactId>
+            <version>${dubbo.version}</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.dubbo.extensions</groupId>
+            <artifactId>dubbo-serialization-test</artifactId>
+            <version>3.2.0-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>com.esotericsoftware</groupId>
             <artifactId>kryo</artifactId>

diff --git a/...ialization-kryo/src/main/java/org/apache/dubbo/common/serialize/kryo/KryoObjectInput.java b/...ialization-kryo/src/main/java/org/apache/dubbo/common/serialize/kryo/KryoObjectInput.java
@@ -34,7 +34,7 @@
 public class KryoObjectInput implements ObjectInput, Cleanable {
 
     private Kryo kryo;
-    private Input input;
+    private final Input input;
 
     public KryoObjectInput(InputStream inputStream) {
         input = new Input(inputStream);

diff --git a/...kryo/src/main/java/org/apache/dubbo/common/serialize/kryo/optimized/KryoObjectInput2.java b/...kryo/src/main/java/org/apache/dubbo/common/serialize/kryo/optimized/KryoObjectInput2.java
@@ -36,7 +36,7 @@
 public class KryoObjectInput2 implements ObjectInput, Cleanable {
 
     private Kryo kryo;
-    private Input input;
+    private final Input input;
 
     public KryoObjectInput2(InputStream inputStream) {
         input = new Input(inputStream);

diff --git a/...ryo/src/main/java/org/apache/dubbo/common/serialize/kryo/optimized/KryoObjectOutput2.java b/...ryo/src/main/java/org/apache/dubbo/common/serialize/kryo/optimized/KryoObjectOutput2.java
@@ -31,7 +31,7 @@
  */
 public class KryoObjectOutput2 implements ObjectOutput, Cleanable {
 
-    private Output output;
+    private final Output output;
     private Kryo kryo;
 
     public KryoObjectOutput2(OutputStream outputStream) {
@@ -105,7 +105,7 @@ public void writeObject(Object v) throws IOException {
     }
 
     @Override
-    public void writeThrowable(Object v) throws IOException {
+    public void writeThrowable(Throwable v) throws IOException {
         kryo.writeClassAndObject(output, v);
     }
 

diff --git a/...mmon/serialize/kryo/KryoPersonOkTest.java → ...mmon/serialize/kryo/KryoPersonOkTest.java b/...mmon/serialize/kryo/KryoPersonOkTest.java → ...mmon/serialize/kryo/KryoPersonOkTest.java
@@ -26,4 +26,4 @@ public class KryoPersonOkTest extends AbstractSerializationPersonOkTest {
     {
         serialization = new KryoSerialization();
     }
-}
+}
diff --git a/...erialize/kryo/KryoSerialization2Test.java → ...erialize/kryo/KryoSerialization2Test.java b/...erialize/kryo/KryoSerialization2Test.java → ...erialize/kryo/KryoSerialization2Test.java
@@ -88,7 +88,7 @@ public void testObject() throws IOException, ClassNotFoundException {
         objectOutput.flushBuffer();
 
         ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(
-            byteArrayOutputStream.toByteArray());
+                byteArrayOutputStream.toByteArray());
         ObjectInput deserialize = serialization.deserialize(url, byteArrayInputStream);
 
         assertEquals(bigPerson, BigPerson.class.cast(deserialize.readObject(BigPerson.class)));
@@ -112,7 +112,7 @@ public void testObjectWithAttachments() throws IOException, ClassNotFoundExcepti
         objectOutput.flushBuffer();
 
         ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(
-            byteArrayOutputStream.toByteArray());
+                byteArrayOutputStream.toByteArray());
         ObjectInput deserialize = serialization.deserialize(url, byteArrayInputStream);
 
         assertEquals(bigPerson, BigPerson.class.cast(deserialize.readObject(BigPerson.class)));

diff --git a/...serialize/kryo/KyroSerializationTest.java → ...serialize/kryo/KyroSerializationTest.java b/...serialize/kryo/KyroSerializationTest.java → ...serialize/kryo/KyroSerializationTest.java
diff --git a/dubbo-serialization-extensions/dubbo-serialization-msgpack/pom.xml b/dubbo-serialization-extensions/dubbo-serialization-msgpack/pom.xml
@@ -25,19 +25,28 @@ Licensed to the Apache Software Foundation (ASF) under one or more
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>dubbo-serialization-msgpack</artifactId>
-    <version>1.0.2-SNAPSHOT</version>
+    <version>3.2.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>${project.artifactId}</name>
     <description>The Msgpack serialization implement for dubbo</description>
     <properties>
         <skip_maven_deploy>false</skip_maven_deploy>
+        <dubbo.version>3.2.7</dubbo.version>
     </properties>
 
     <dependencies>
 
         <dependency>
             <groupId>org.apache.dubbo</groupId>
             <artifactId>dubbo-serialization-api</artifactId>
+            <version>${dubbo.version}</version>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.dubbo</groupId>
+            <artifactId>dubbo-common</artifactId>
+            <version>${dubbo.version}</version>
             <optional>true</optional>
         </dependency>
 

diff --git a/...n-msgpack/src/main/java/org/apache/dubbo/common/serialize/msgpack/MsgpackObjectInput.java b/...n-msgpack/src/main/java/org/apache/dubbo/common/serialize/msgpack/MsgpackObjectInput.java
@@ -32,7 +32,7 @@ public class MsgpackObjectInput implements ObjectInput {
 
     private final InputStream in;
 
-    private ObjectMapper om;
+    private final ObjectMapper om;
 
     public MsgpackObjectInput(InputStream in) {
         this.in = in;

diff --git a/...-msgpack/src/main/java/org/apache/dubbo/common/serialize/msgpack/MsgpackObjectOutput.java b/...-msgpack/src/main/java/org/apache/dubbo/common/serialize/msgpack/MsgpackObjectOutput.java
@@ -97,7 +97,7 @@ public void writeObject(Object obj) throws IOException {
     }
 
     @Override
-    public void writeThrowable(Object obj) throws IOException {
+    public void writeThrowable(Throwable obj) throws IOException {
         writeObject(obj.getClass());
         writeObject(obj);
     }

diff --git a/dubbo-serialization-extensions/dubbo-serialization-native-hession/pom.xml b/dubbo-serialization-extensions/dubbo-serialization-native-hession/pom.xml
@@ -25,7 +25,7 @@ limitations under the License.
     </parent>
 
     <artifactId>dubbo-serialization-native-hession</artifactId>
-    <version>1.0.2-SNAPSHOT</version>
+    <version>3.2.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>${project.artifactId}</name>
     <description>The native-hession serialization module of dubbo project</description>