Skip to content

Commit 478e375

Browse files
authored
[#1453] upgrade dubbo-serialization-hessian2 version to 3.3.4 (#1454) (#1467)
1 parent eb7a0e1 commit 478e375

File tree

5 files changed

+23
-5
lines changed

5 files changed

+23
-5
lines changed

integration-tests/discovery-nacos-tests/common/src/main/java/com/huaweicloud/sample/hessian/NonSerializableModel.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,11 @@
1616
*/
1717
package com.huaweicloud.sample.hessian;
1818

19-
public class NonSerializableModel {
19+
import java.io.Serializable;
20+
21+
public class NonSerializableModel implements Serializable {
22+
private static final long serialVersionUID = -1L;
23+
2024
private String age;
2125

2226
public String getAge() {

integration-tests/discovery-servicecomb-tests/common/src/main/java/com/huaweicloud/sample/hessian/NonSerializableModel.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,11 @@
1616
*/
1717
package com.huaweicloud.sample.hessian;
1818

19-
public class NonSerializableModel {
19+
import java.io.Serializable;
20+
21+
public class NonSerializableModel implements Serializable {
22+
private static final long serialVersionUID = -1L;
23+
2024
private String age;
2125

2226
public String getAge() {

spring-cloud-huawei-dependencies/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@
4545
<resilience4j.version>1.7.0</resilience4j.version>
4646
<jasypt.version>3.0.5</jasypt.version>
4747
<annotations.version>3.0.1</annotations.version>
48-
<dubbo.hessian.version>2.7.23</dubbo.hessian.version>
4948
<springdoc.version>1.6.8</springdoc.version>
49+
<dubbo.hessian.version>3.3.4</dubbo.hessian.version>
5050
<nacos.client.version>2.3.0</nacos.client.version>
5151
<alibaba.context.support.version>1.0.11</alibaba.context.support.version>
5252
<spring-framework.version>5.3.39</spring-framework.version>

spring-cloud-starter-huawei/spring-cloud-starter-huawei-hessian/src/main/java/com/huaweicloud/hessian/Hessian2ObjectInput.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@
3939
import org.apache.dubbo.common.serialize.Cleanable;
4040
import org.apache.dubbo.common.serialize.ObjectInput;
4141
import org.apache.dubbo.common.serialize.hessian2.Hessian2SerializerFactory;
42+
import org.apache.dubbo.common.utils.DefaultSerializeClassChecker;
43+
import org.apache.dubbo.common.utils.SerializeCheckStatus;
4244

4345
import com.alibaba.com.caucho.hessian.io.Hessian2Input;
4446

@@ -50,7 +52,10 @@ public class Hessian2ObjectInput implements ObjectInput, Cleanable {
5052

5153
private static ThreadLocal<Hessian2Input> INPUT_TL = ThreadLocal.withInitial(() -> {
5254
Hessian2Input h2i = new Hessian2Input(null);
53-
Hessian2SerializerFactory factory = new Hessian2SerializerFactory();
55+
ClassLoader loader = Hessian2ObjectInput.class.getClassLoader();
56+
DefaultSerializeClassChecker classChecker = DefaultSerializeClassChecker.getInstance();
57+
classChecker.notifyCheckStatus(SerializeCheckStatus.WARN);
58+
Hessian2SerializerFactory factory = new Hessian2SerializerFactory(loader, classChecker);
5459
factory.setAllowNonSerializable(true);
5560
h2i.setSerializerFactory(factory);
5661
h2i.setCloseStreamOnClose(true);

spring-cloud-starter-huawei/spring-cloud-starter-huawei-hessian/src/main/java/com/huaweicloud/hessian/Hessian2ObjectOutput.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@
3838
import org.apache.dubbo.common.serialize.Cleanable;
3939
import org.apache.dubbo.common.serialize.ObjectOutput;
4040
import org.apache.dubbo.common.serialize.hessian2.Hessian2SerializerFactory;
41+
import org.apache.dubbo.common.utils.DefaultSerializeClassChecker;
42+
import org.apache.dubbo.common.utils.SerializeCheckStatus;
4143

4244
import com.alibaba.com.caucho.hessian.io.Hessian2Output;
4345

@@ -49,7 +51,10 @@ public class Hessian2ObjectOutput implements ObjectOutput, Cleanable {
4951

5052
private static ThreadLocal<Hessian2Output> OUTPUT_TL = ThreadLocal.withInitial(() -> {
5153
Hessian2Output h2o = new Hessian2Output(null);
52-
Hessian2SerializerFactory factory = new Hessian2SerializerFactory();
54+
ClassLoader loader = Hessian2ObjectOutput.class.getClassLoader();
55+
DefaultSerializeClassChecker classChecker = DefaultSerializeClassChecker.getInstance();
56+
classChecker.notifyCheckStatus(SerializeCheckStatus.WARN);
57+
Hessian2SerializerFactory factory = new Hessian2SerializerFactory(loader, classChecker);
5358
factory.setAllowNonSerializable(true);
5459
h2o.setSerializerFactory(factory);
5560
h2o.setCloseStreamOnClose(true);

0 commit comments

Comments
 (0)