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 5283f147d6a8d957554d8076d4535d21dadaa8a1 Merge: ef34c3bed9 b6849441a5 Author: Albumen Kevin <[email protected]> AuthorDate: Thu Nov 10 15:09:37 2022 +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 .github/workflows/build-and-test-pr.yml | 16 +++ .licenserc.yaml | 115 +++++++++++++++++++++ Jenkinsfile.sonar | 49 +++++++++ .../definition/ServiceDefinitionBuilderTest.java | 2 + .../registry/integration/RegistryProtocol.java | 6 +- .../apache/dubbo/rpc/filter/AccessLogFilter.java | 2 +- .../org/apache/dubbo/rpc/support/RpcUtils.java | 16 ++- .../org/apache/dubbo/rpc/support/RpcUtilsTest.java | 115 ++++++++++++++++++++- .../rpc/protocol/dubbo/DecodeableRpcResult.java | 10 +- .../apache/dubbo/common/serialize/ObjectInput.java | 1 - 10 files changed, 316 insertions(+), 16 deletions(-) diff --cc dubbo-common/src/test/java/org/apache/dubbo/metadata/definition/ServiceDefinitionBuilderTest.java index 6d59887d18,69ec26982e..cc9c6f9c8b --- a/dubbo-common/src/test/java/org/apache/dubbo/metadata/definition/ServiceDefinitionBuilderTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/metadata/definition/ServiceDefinitionBuilderTest.java @@@ -21,11 -21,9 +21,12 @@@ import org.apache.dubbo.metadata.defini import org.apache.dubbo.metadata.definition.model.TypeDefinition; import org.apache.dubbo.metadata.definition.service.ComplexObject; import org.apache.dubbo.metadata.definition.service.DemoService; + import org.apache.dubbo.rpc.model.FrameworkModel; +import org.apache.dubbo.rpc.model.FrameworkModel; +import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import java.util.Arrays; @@@ -36,22 -34,9 +37,23 @@@ import java.util.List */ public class ServiceDefinitionBuilderTest { + + private static FrameworkModel frameworkModel; + + @BeforeAll + public static void setup() { + frameworkModel = new FrameworkModel(); + TypeDefinitionBuilder.initBuilders(frameworkModel); + } + + @AfterAll + public static void clear() { + frameworkModel.destroy(); + } + @Test public void testBuilderComplexObject() { + TypeDefinitionBuilder.initBuilders(FrameworkModel.defaultModel()); FullServiceDefinition fullServiceDefinition = ServiceDefinitionBuilder.buildFullDefinition(DemoService.class); checkComplexObjectAsParam(fullServiceDefinition); }
