You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by al...@apache.org on 2023/02/06 09:44:41 UTC
[dubbo] 01/01: Merge branch 'apache-3.1' into apache-3.2
This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch 3.2
in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit 90ae7524c06935a810a4a26d1cbad43075f44d97
Merge: 203970e550 2da1e1ffd5
Author: Albumen Kevin <jh...@gmail.com>
AuthorDate: Mon Feb 6 17:44:17 2023 +0800
Merge branch 'apache-3.1' into apache-3.2
# Conflicts:
# dubbo-dependencies-bom/pom.xml
# dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml
# dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml
# pom.xml
.../common/utils/DefaultSerializeClassChecker.java | 21 ++++++---
.../utils/SerializeSecurityConfigurator.java | 10 ++--
.../common/utils/SerializeSecurityManager.java | 8 +++-
.../utils/DefaultSerializeClassCheckerTest.java | 10 ++++
.../src/main/resources/Dubbo3TripleStub.mustache | 33 +++++++++++++
.../src/main/resources/META-INF/dubbo.xsd | 20 ++++++++
.../META-INF/native-image/reflect-config.json | 14 ++++--
.../qos/command/impl/SerializeWarnedClasses.java | 51 ++++++++++++++++++++
.../qos/command/util/SerializeCheckUtils.java | 15 ++++--
.../org.apache.dubbo.qos.command.BaseCommand | 1 +
.../command/impl/SerializeWarnedClassesTest.java | 55 ++++++++++++++++++++++
.../dubbo/qos/command/util/CommandHelperTest.java | 2 +
.../apache/dubbo/rpc/filter/GenericImplFilter.java | 22 ++++++---
.../rpc/protocol/ProtocolSecurityWrapper.java | 4 ++
.../dubbo/rpc/filter/GenericImplFilterTest.java | 13 ++---
.../rpc/protocol/tri/ReflectionPackableMethod.java | 20 ++++----
.../rpc/protocol/tri/call/AbstractServerCall.java | 4 ++
.../apache/dubbo/rpc/stub/StubInvocationUtil.java | 2 +
.../dubbo/rpc/protocol/tri/DescriptorService.java | 5 ++
.../protocol/tri/ReflectionPackableMethodTest.java | 11 +++++
.../tri/call/ReflectionServerCallTest.java | 20 +++-----
.../fastjson2/Fastjson2SecurityManager.java | 23 +++++----
22 files changed, 299 insertions(+), 65 deletions(-)
diff --cc dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/ReflectionPackableMethod.java
index 80580b59fb,790d807605..b274f779f5
--- a/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/ReflectionPackableMethod.java
+++ b/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/ReflectionPackableMethod.java
@@@ -37,8 -29,17 +29,16 @@@ import org.apache.dubbo.rpc.model.Packa
import com.google.protobuf.Message;
+ import java.io.ByteArrayInputStream;
+ import java.io.ByteArrayOutputStream;
+ import java.io.IOException;
+ import java.lang.reflect.ParameterizedType;
+ import java.util.Iterator;
+ import java.util.Map;
+ import java.util.concurrent.ConcurrentHashMap;
+
import static org.apache.dubbo.common.constants.CommonConstants.$ECHO;
import static org.apache.dubbo.common.constants.CommonConstants.PROTOBUF_MESSAGE_CLASS_NAME;
-import static org.apache.dubbo.remoting.Constants.SERIALIZATION_KEY;
import static org.apache.dubbo.rpc.protocol.tri.TripleProtocol.METHOD_ATTR_PACK;
public class ReflectionPackableMethod implements PackableMethod {