This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch 3.3.0-beta.2-release in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit 9c1175bc281e8e743667b9dc3db62bd4743ed878 Merge: 04594755a2 9b3a32f8d6 Author: Albumen Kevin <[email protected]> AuthorDate: Thu Mar 14 15:54:01 2024 +0800 Merge branch 'apache-3.3' into 3.3.0-beta.2-release # Conflicts: # dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml # dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml .artifacts | 26 +- .asf.yaml | 2 + .editorconfig | 49 +- .github/DISCUSSION_TEMPLATE/general.yml | 88 + .github/DISCUSSION_TEMPLATE/question.yml | 88 + .github/ISSUE_TEMPLATE/1-bug.yml | 142 ++ .github/ISSUE_TEMPLATE/2-feature.yml | 106 + .github/ISSUE_TEMPLATE/bug_report.md | 39 - .github/ISSUE_TEMPLATE/config.yml | 28 +- .github/ISSUE_TEMPLATE/discussion.md | 11 - .github/ISSUE_TEMPLATE/feature_request.md | 16 - .github/ISSUE_TEMPLATE/proposal.md | 15 - .github/ISSUE_TEMPLATE/question.md | 13 - .../PULL_REQUEST_TEMPLATE.md | 0 .github/workflows/build-and-test-pr.yml | 195 +- .github/workflows/build-and-test-scheduled-3.1.yml | 162 +- .github/workflows/build-and-test-scheduled-3.2.yml | 138 +- .github/workflows/build-and-test-scheduled-3.3.yml | 502 +++++ .github/workflows/release-test.yml | 131 +- .licenserc.yaml | 1 - NOTICE | 2 +- README.md | 110 +- SECURITY.md | 12 +- codecov.yml | 1 - dubbo-cluster/pom.xml | 4 +- .../MergeableClusterScopeModelInitializer.java | 0 .../rpc/cluster/directory/AbstractDirectory.java | 167 +- .../support/CallbackConsumerContextFilter.java | 0 .../filter/support/ConsumerClassLoaderFilter.java | 0 .../filter/support/ConsumerContextFilter.java | 152 ++ .../cluster/loadbalance/AdaptiveLoadBalance.java | 0 .../loadbalance/ConsistentHashLoadBalance.java | 8 +- .../dubbo/rpc/cluster/merger/ArrayMerger.java | 0 .../rpc/cluster/merger/BooleanArrayMerger.java | 0 .../dubbo/rpc/cluster/merger/ByteArrayMerger.java | 0 .../dubbo/rpc/cluster/merger/CharArrayMerger.java | 0 .../rpc/cluster/merger/DoubleArrayMerger.java | 0 .../dubbo/rpc/cluster/merger/FloatArrayMerger.java | 0 .../dubbo/rpc/cluster/merger/IntArrayMerger.java | 0 .../dubbo/rpc/cluster/merger/ListMerger.java | 0 .../dubbo/rpc/cluster/merger/LongArrayMerger.java | 0 .../apache/dubbo/rpc/cluster/merger/MapMerger.java | 0 .../dubbo/rpc/cluster/merger/MergerFactory.java | 0 .../apache/dubbo/rpc/cluster/merger/SetMerger.java | 0 .../dubbo/rpc/cluster/merger/ShortArrayMerger.java | 0 .../router/condition/ConditionStateRouter.java | 331 +++ .../condition/ConditionStateRouterFactory.java | 0 .../router/condition/config/AppStateRouter.java | 0 .../condition/config/AppStateRouterFactory.java | 0 .../condition/config/ListenableStateRouter.java | 0 .../condition/config/ProviderAppStateRouter.java | 0 .../config/ProviderAppStateRouterFactory.java | 0 .../condition/config/ServiceStateRouter.java | 0 .../config/ServiceStateRouterFactory.java | 0 .../config/model/ConditionRouterRule.java | 0 .../config/model/ConditionRuleParser.java | 0 .../matcher/AbstractConditionMatcher.java | 0 .../router/condition/matcher/ConditionMatcher.java | 0 .../condition/matcher/ConditionMatcherFactory.java | 0 .../matcher/argument/ArgumentConditionMatcher.java | 0 .../argument/ArgumentConditionMatcherFactory.java | 0 .../attachment/AttachmentConditionMatcher.java | 0 .../AttachmentConditionMatcherFactory.java | 0 .../matcher/param/UrlParamConditionMatcher.java | 0 .../param/UrlParamConditionMatcherFactory.java | 0 .../condition/matcher/pattern/ValuePattern.java | 0 .../matcher/pattern/range/RangeValuePattern.java | 0 .../pattern/wildcard/WildcardValuePattern.java | 0 .../router/file/FileStateRouterFactory.java | 0 .../router/mesh/MeshScopeModelInitializer.java | 0 .../router/mesh/route/MeshAppRuleListener.java | 0 .../cluster/router/mesh/route/MeshEnvListener.java | 0 .../router/mesh/route/MeshEnvListenerFactory.java | 0 .../cluster/router/mesh/route/MeshRuleCache.java | 0 .../router/mesh/route/MeshRuleConstants.java | 0 .../cluster/router/mesh/route/MeshRuleManager.java | 0 .../cluster/router/mesh/route/MeshRuleRouter.java | 0 .../router/mesh/route/StandardMeshRuleRouter.java | 0 .../mesh/route/StandardMeshRuleRouterFactory.java | 0 .../rpc/cluster/router/mesh/rule/BaseRule.java | 0 .../router/mesh/rule/VsDestinationGroup.java | 0 .../rule/destination/ConnectionPoolSettings.java | 0 .../mesh/rule/destination/DestinationRule.java | 0 .../mesh/rule/destination/DestinationRuleSpec.java | 0 .../router/mesh/rule/destination/Subset.java | 0 .../router/mesh/rule/destination/TCPSettings.java | 0 .../router/mesh/rule/destination/TcpKeepalive.java | 0 .../mesh/rule/destination/TrafficPolicy.java | 0 .../destination/loadbalance/ConsistentHashLB.java | 0 .../loadbalance/LoadBalancerSettings.java | 0 .../rule/destination/loadbalance/SimpleLB.java | 0 .../rule/virtualservice/DubboMatchRequest.java | 0 .../mesh/rule/virtualservice/DubboRoute.java | 0 .../mesh/rule/virtualservice/DubboRouteDetail.java | 0 .../rule/virtualservice/VirtualServiceRule.java | 0 .../rule/virtualservice/VirtualServiceSpec.java | 0 .../destination/DubboDestination.java | 0 .../destination/DubboRouteDestination.java | 0 .../virtualservice/match/DubboAttachmentMatch.java | 0 .../router/mesh/util/MeshRuleDispatcher.java | 0 .../cluster/router/mesh/util/MeshRuleListener.java | 0 .../router/mesh/util/TracingContextProvider.java | 0 .../cluster/router/mock/MockInvokersSelector.java | 0 .../router/mock/MockStateRouterFactory.java | 0 .../cluster/router/script/ScriptStateRouter.java | 0 .../router/script/ScriptStateRouterFactory.java | 0 .../script/config/AppScriptRouterFactory.java | 0 .../router/script/config/AppScriptStateRouter.java | 0 .../router/script/config/model/ScriptRule.java | 0 .../rpc/cluster/router/tag/TagStateRouter.java | 0 .../cluster/router/tag/TagStateRouterFactory.java | 0 .../rpc/cluster/router/tag/model/ParamMatch.java | 0 .../dubbo/rpc/cluster/router/tag/model/Tag.java | 0 .../cluster/router/tag/model/TagRouterRule.java | 0 .../cluster/router/tag/model/TagRuleParser.java | 0 .../rpc/cluster/support/MergeableCluster.java | 0 .../cluster/support/MergeableClusterInvoker.java | 223 ++ .../support/wrapper/MockClusterInvoker.java | 234 ++ .../support/wrapper/MockClusterWrapper.java | 0 .../dubbo/internal/org.apache.dubbo.rpc.Filter | 1 + .../internal/org.apache.dubbo.rpc.cluster.Cluster | 2 + .../org.apache.dubbo.rpc.cluster.LoadBalance | 1 + .../internal/org.apache.dubbo.rpc.cluster.Merger | 0 ...g.apache.dubbo.rpc.cluster.filter.ClusterFilter | 2 + ...outer.condition.matcher.ConditionMatcherFactory | 3 + ...r.router.condition.matcher.pattern.ValuePattern | 0 ...bbo.rpc.cluster.router.state.StateRouterFactory | 8 + ...rg.apache.dubbo.rpc.model.ScopeModelInitializer | 2 + .../rpc/cluster/directory/MockDirInvocation.java | 0 .../rpc/cluster/directory/StaticDirectoryTest.java | 0 .../loadbalance/AdaptiveLoadBalanceTest.java | 0 .../loadbalance/ConsistentHashLoadBalanceTest.java | 33 + .../dubbo/rpc/cluster/merger/DoubleSumMerger.java | 0 .../dubbo/rpc/cluster/merger/FloatSumMerger.java | 0 .../dubbo/rpc/cluster/merger/IntFindAnyMerger.java | 0 .../rpc/cluster/merger/IntFindFirstMerger.java | 0 .../dubbo/rpc/cluster/merger/IntSumMerger.java | 0 .../dubbo/rpc/cluster/merger/LongSumMerger.java | 0 .../dubbo/rpc/cluster/merger/ResultMergerTest.java | 0 .../cluster/router/ConfigConditionRouterTest.java | 0 .../router/condition/ConditionStateRouterTest.java | 0 .../ProviderAppConditionStateRouterTest.java | 0 .../cluster/router/file/FileRouterEngineTest.java | 0 .../router/mesh/route/MeshAppRuleListenerTest.java | 0 .../router/mesh/route/MeshRuleCacheTest.java | 0 .../router/mesh/route/MeshRuleManagerTest.java | 0 .../router/mesh/route/MeshRuleRouterTest.java | 0 .../route/StandardMeshRuleRouterFactoryTest.java | 0 .../router/mesh/rule/DestinationRuleTest.java | 0 .../router/mesh/rule/VirtualServiceRuleTest.java | 0 .../rule/virtualservice/DubboMatchRequestTest.java | 0 .../match/DubboAttachmentMatchTest.java | 0 .../router/mesh/util/MeshRuleDispatcherTest.java | 0 .../router/mock/MockInvokersSelectorTest.java | 0 .../router/script/ScriptStateRouterTest.java | 0 .../script/config/AppScriptStateRouterTest.java | 0 .../rpc/cluster/router/tag/TagStateRouterTest.java | 0 .../dubbo/rpc/cluster/support/DemoServiceA.java | 21 + .../rpc/cluster/support/DemoServiceAMock.java | 29 + .../dubbo/rpc/cluster/support/DemoServiceB.java | 21 + .../rpc/cluster/support/DemoServiceBMock.java | 29 + .../support/FailbackClusterInvokerTest.java | 2 +- .../apache/dubbo/rpc/cluster/support/Greeting.java | 24 + .../dubbo/rpc/cluster/support/GreetingMock1.java | 19 + .../dubbo/rpc/cluster/support/GreetingMock2.java | 26 + .../org/apache/dubbo/rpc/cluster/support/Menu.java | 0 .../dubbo/rpc/cluster/support/MenuService.java | 0 .../support/MergeableClusterInvokerTest.java | 0 .../support/MockAbstractClusterInvokerTest.java | 190 ++ .../dubbo/rpc/cluster/support/MockInvokerTest.java | 166 ++ .../support/wrapper/MockClusterInvokerTest.java | 0 .../wrapper/MockProviderRpcExceptionTest.java | 245 ++ .../cluster/support/wrapper/MyMockException.java | 0 .../src/test/resources/DestinationRuleTest.yaml | 0 .../src/test/resources/DestinationRuleTest2.yaml | 0 .../internal/org.apache.dubbo.rpc.cluster.Merger | 0 ...bbo.rpc.cluster.router.state.StateRouterFactory | 0 .../src/test/resources/VirtualServiceTest.yaml | 0 dubbo-cluster/src/test/resources/log4j.xml | 38 - dubbo-cluster/src/test/resources/log4j2-test.xml | 33 + .../cluster/router/file/availablerule.javascript | 0 .../rpc/cluster/router/file/methodrule.javascript | 0 .../router/file/notAvailablerule.javascript | 0 dubbo-common/pom.xml | 9 +- .../src/main/java/org/apache/dubbo/common/URL.java | 16 +- .../java/org/apache/dubbo/common/URLBuilder.java | 7 +- .../apache/dubbo/common/aot/NativeDetector.java | 7 +- .../common/beans/factory/ScopeBeanFactory.java | 6 +- .../dubbo/common/cache/FileCacheStoreFactory.java | 4 +- .../dubbo/common/compact/Dubbo2CompactUtils.java | 8 +- .../apache/dubbo/common/config/Environment.java | 9 +- .../dubbo/common/config/ModuleEnvironment.java | 18 +- .../configcenter/TreePathDynamicConfiguration.java | 1 - .../dubbo/common/constants/CommonConstants.java | 200 +- .../dubbo/common/constants/ProviderConstants.java | 28 - .../dubbo/common/deploy/AbstractDeployer.java | 26 +- .../apache/dubbo/common/deploy/DeployListener.java | 22 + .../dubbo/common/deploy/DeployListenerAdapter.java | 3 + .../apache/dubbo/common/deploy/DeployState.java | 5 + .../org/apache/dubbo/common/deploy/Deployer.java | 2 + .../dubbo/common/extension/ExtensionAccessor.java | 22 +- .../org/apache/dubbo/common/io/StreamUtils.java | 52 + .../org/apache/dubbo/common/json/JsonUtil.java | 4 + .../dubbo/common/json/impl/FastJson2Impl.java | 10 + .../dubbo/common/json/impl/FastJsonImpl.java | 11 + .../apache/dubbo/common/json/impl/GsonImpl.java | 12 + .../apache/dubbo/common/json/impl/JacksonImpl.java | 11 + .../apache/dubbo/common/logger/LoggerFactory.java | 5 +- .../dubbo/common/logger/log4j/Log4jLogger.java | 5 - .../dubbo/common/logger/log4j2/Log4j2Logger.java | 5 + .../serialization/PreferSerializationProvider.java | 21 + .../threadpool/support/AbortPolicyWithReport.java | 32 +- .../dubbo/common/timer/HashedWheelTimer.java | 5 +- .../common/url/component/ServiceConfigURL.java | 4 +- .../org/apache/dubbo/common/utils/ArrayUtils.java | 4 + .../java/org/apache/dubbo/common/utils/Assert.java | 6 + .../org/apache/dubbo/common/utils/ClassUtils.java | 4 + .../apache/dubbo/common/utils/CollectionUtils.java | 87 +- .../org/apache/dubbo/common/utils/ConfigUtils.java | 4 +- .../org/apache/dubbo/common/utils/DateUtils.java | 259 +++ .../common/utils/DefaultSerializeClassChecker.java | 6 +- .../apache/dubbo/common/utils/DubboAppender.java | 116 +- .../java/org/apache/dubbo/common/utils/JRE.java | 4 +- .../org/apache/dubbo/common/utils/JVMUtil.java | 3 +- .../org/apache/dubbo/common/utils/JsonUtils.java | 12 +- .../org/apache/dubbo/common/utils/LRU2Cache.java | 17 +- .../org/apache/dubbo/common/utils/LRUCache.java | 17 +- .../org/apache/dubbo/common/utils/LockUtils.java | 54 + .../java/org/apache/dubbo/common/utils/Log.java | 4 +- .../org/apache/dubbo/common/utils/LogUtil.java | 3 +- .../org/apache/dubbo/common/utils/NetUtils.java | 15 +- .../java/org/apache/dubbo/common/utils/Pair.java | 138 ++ .../apache/dubbo/common/utils/ProtobufUtils.java | 46 + .../apache/dubbo/common/utils/ReflectUtils.java | 4 - .../utils/SerializeSecurityConfigurator.java | 19 +- .../org/apache/dubbo/common/utils/StringUtils.java | 102 +- .../common/utils/SystemPropertyConfigUtils.java | 120 + .../dubbo/config/AbstractInterfaceConfig.java | 34 +- .../apache/dubbo/config/AbstractServiceConfig.java | 19 +- .../org/apache/dubbo/config/ApplicationConfig.java | 3 + .../java/org/apache/dubbo/config/Constants.java | 2 - .../org/apache/dubbo/config/ConsumerConfig.java | 15 +- .../java/org/apache/dubbo/config/MethodConfig.java | 3 +- .../org/apache/dubbo/config/MetricsConfig.java | 14 - .../java/org/apache/dubbo/config/ModuleConfig.java | 2 +- .../org/apache/dubbo/config/ProtocolConfig.java | 9 +- .../apache/dubbo/config/ReferenceConfigBase.java | 8 +- .../java/org/apache/dubbo/config/RestConfig.java | 118 + .../java/org/apache/dubbo/config/TripleConfig.java | 13 + .../dubbo/config/annotation/DubboService.java | 29 +- .../definition/builder/DefaultTypeBuilder.java | 11 +- .../dubbo/rpc/model/StubMethodDescriptor.java | 4 - .../log4j/core/config/plugins/Log4j2Plugins.dat | Bin 0 -> 78 bytes .../main/resources/security/serialize.blockedlist | 1 - .../org/apache/dubbo/common/URLStrParserTest.java | 24 +- .../test/java/org/apache/dubbo/common/URLTest.java | 5 +- .../common/cache/FileCacheStoreFactoryTest.java | 4 +- .../dubbo/common/cache/FileCacheStoreTest.java | 4 +- .../config/OrderedPropertiesConfigurationTest.java | 16 + .../support/AbortPolicyWithReportTest.java | 13 +- .../apache/dubbo/common/utils/ConfigUtilsTest.java | 8 +- .../utils/DefaultSerializeClassCheckerTest.java | 28 +- .../dubbo/common/utils/DubboAppenderTest.java | 18 +- .../org/apache/dubbo/common/utils/JRETest.java | 4 +- .../apache/dubbo/common/utils/JsonUtilsTest.java | 83 +- .../apache/dubbo/common/utils/LockUtilsTest.java | 144 ++ .../org/apache/dubbo/common/utils/LogTest.java | 3 +- .../org/apache/dubbo/common/utils/LogUtilTest.java | 3 +- ...sInterfaceDisplayNameHasMetaCharactersTest.java | 12 +- .../apache/dubbo/common/utils/NetUtilsTest.java | 12 +- .../dubbo/common/utils/ProtobufUtilsTest.java | 38 + .../utils/SerializeSecurityConfiguratorTest.java | 35 +- .../utils/SystemPropertyConfigUtilsTest.java | 62 + .../dubbo/config/AbstractInterfaceConfigTest.java | 10 +- .../dubbo/config/context/ConfigManagerTest.java | 10 + .../definition/DefaultTypeBuilderTest.java | 44 + .../org/apache/dubbo/rpc/model/HelloReply.java | 47 + .../org/apache/dubbo/rpc/model/HelloRequest.java | 47 + dubbo-common/src/test/resources/log4j.xml | 41 - dubbo-common/src/test/resources/log4j2-test.xml | 29 + dubbo-compatible/pom.xml | 15 +- .../java/com/alibaba/dubbo/common/DelegateURL.java | 4 +- .../com/alibaba/dubbo/container/Container.java | 20 - .../container/page/pages/SystemPageHandler.java | 19 +- .../apache/dubbo/config/ApplicationConfigTest.java | 4 +- .../apache/dubbo/config/ConsumerConfigTest.java | 9 +- .../apache/dubbo/config/ProviderConfigTest.java | 43 +- .../context/annotation/EnableDubboConfigTest.java | 1 - .../apache/dubbo/generic/GenericServiceTest.java | 6 +- .../src/test/resources/META-INF/config.properties | 1 - .../src/test/resources/log4j2-test.xml | 29 + dubbo-config/dubbo-config-api/pom.xml | 32 +- .../org/apache/dubbo/config/ReferenceConfig.java | 3 +- .../org/apache/dubbo/config/ServiceConfig.java | 9 +- .../dubbo/config/bootstrap/DubboBootstrap.java | 16 +- .../config/bootstrap/builders/ArgumentBuilder.java | 4 + .../bootstrap/builders/ConfigCenterBuilder.java | 5 + .../config/bootstrap/builders/ConsumerBuilder.java | 4 + .../builders/InternalServiceConfigBuilder.java | 22 +- .../config/bootstrap/builders/MethodBuilder.java | 5 + .../config/bootstrap/builders/MetricsBuilder.java | 220 ++ .../config/bootstrap/builders/ModuleBuilder.java | 5 + .../config/bootstrap/builders/MonitorBuilder.java | 5 + .../config/bootstrap/builders/ProtocolBuilder.java | 20 + .../config/bootstrap/builders/ProviderBuilder.java | 26 + .../bootstrap/builders/ReferenceBuilder.java | 1 + .../config/bootstrap/builders/RegistryBuilder.java | 1 + .../config/bootstrap/builders/ServiceBuilder.java | 1 + .../config/deploy/DefaultApplicationDeployer.java | 122 +- .../dubbo/config/deploy/DefaultModuleDeployer.java | 22 +- .../config/metadata/ExporterDeployListener.java | 3 + .../dubbo/config/utils/ConfigValidationUtils.java | 16 +- .../apache/dubbo/config/AbstractConfigTest.java | 25 + .../apache/dubbo/config/ApplicationConfigTest.java | 4 +- .../apache/dubbo/config/ConsumerConfigTest.java | 6 +- .../apache/dubbo/config/ProtocolConfigTest.java | 6 +- .../apache/dubbo/config/ProviderConfigTest.java | 74 +- .../apache/dubbo/config/ReferenceConfigTest.java | 2 +- .../ConsulDubboServiceConsumerBootstrap.java | 55 - .../ConsulDubboServiceProviderBootstrap.java | 46 - .../dubbo/config/bootstrap/DubboBootstrapTest.java | 53 +- .../bootstrap/DubboServiceConsumerBootstrap.java | 13 - .../bootstrap/DubboServiceProviderBootstrap.java | 10 - .../DubboServiceProviderMinimumBootstrap.java | 1 - .../EtcdDubboServiceConsumerBootstrap.java | 56 - .../EtcdDubboServiceProviderBootstrap.java | 90 - .../dubbo/config/bootstrap/MultiInstanceTest.java | 41 +- .../bootstrap/builders/ApplicationBuilderTest.java | 8 +- .../bootstrap/builders/ArgumentBuilderTest.java | 8 +- .../builders/ConfigCenterBuilderTest.java | 30 +- .../bootstrap/builders/ConsumerBuilderTest.java | 16 +- .../bootstrap/builders/MethodBuilderTest.java | 38 +- .../bootstrap/builders/MetricsBuilderTest.java | 303 +++ .../bootstrap/builders/ModuleBuilderTest.java | 18 +- .../bootstrap/builders/MonitorBuilderTest.java | 22 +- .../bootstrap/builders/ProviderBuilderTest.java | 48 +- .../DubboInterfaceConsumerBootstrap.java | 3 - ...RegistryCenterDubboProtocolIntegrationTest.java | 23 +- .../utils/TestPreferSerializationProvider.java | 26 + .../dubbo-config-api/src/test/resources/log4j.xml | 28 - dubbo-config/dubbo-config-spring/pom.xml | 50 +- .../apache/dubbo/config/spring/ReferenceBean.java | 20 +- .../config/spring/aot/AotWithSpringDetector.java | 6 + .../ReferenceAnnotationBeanPostProcessor.java | 5 + .../annotation/ServiceAnnotationPostProcessor.java | 12 +- .../context/DubboDeployApplicationListener.java | 10 + .../spring/reference/ReferenceBeanSupport.java | 8 +- .../config/spring/util/DubboAnnotationUtils.java | 4 +- .../src/main/resources/META-INF/dubbo.xsd | 6 - .../org/apache/dubbo/config/spring/ConfigTest.java | 8 +- .../dubbo/config/spring/EmbeddedZooKeeper.java | 5 +- .../context/KeepRunningOnSpringClosedTest.java | 18 +- .../context/annotation/EnableDubboConfigTest.java | 1 - .../src/test/resources/log4j.xml | 35 - dubbo-config/dubbo-config-spring6/pom.xml | 4 +- .../dubbo/config/spring6/utils/AotUtils.java | 25 +- .../dubbo/config/spring6/utils/AotUtilsTest.java | 30 + .../utils/CircularDependencyDemoService.java | 21 + .../apache/dubbo/config/spring6/utils/DemoA.java | 23 + .../apache/dubbo/config/spring6/utils/DemoB.java | 23 + .../dubbo/config/spring6/utils/DemoService.java | 2 + .../apache/dubbo/config/spring6/utils/Person.java | 13 +- .../apache/dubbo/config/spring6/utils/SexEnum.java | 32 + .../dubbo-configcenter-apollo/pom.xml | 2 +- .../support/apollo/ApolloDynamicConfiguration.java | 27 +- .../src/test/resources/log4j2-test.xml | 29 + .../file/FileSystemDynamicConfiguration.java | 5 +- .../src/test/resources/log4j2-test.xml | 29 + .../dubbo-configcenter-nacos/pom.xml | 5 + .../support/nacos/MockConfigService.java | 4 + .../src/test/resources/log4j2-test.xml | 29 + dubbo-container/dubbo-container-api/pom.xml | 56 - .../java/org/apache/dubbo/container/Container.java | 36 - .../main/java/org/apache/dubbo/container/Main.java | 115 - .../main/resources/META-INF/assembly/bin/dump.sh | 108 - .../resources/META-INF/assembly/bin/restart.sh | 20 - .../main/resources/META-INF/assembly/bin/server.sh | 40 - .../main/resources/META-INF/assembly/bin/start.bat | 44 - .../main/resources/META-INF/assembly/bin/start.sh | 132 -- .../main/resources/META-INF/assembly/bin/stop.sh | 60 - dubbo-container/dubbo-container-spring/pom.xml | 49 - .../dubbo/container/spring/SpringContainer.java | 67 - .../internal/org.apache.dubbo.container.Container | 1 - .../container/spring/SpringContainerTest.java | 39 - .../src/test/resources/META-INF/spring/test.xml | 24 - .../src/test/resources/log4j.xml | 29 - dubbo-container/pom.xml | 37 - .../dubbo-demo-annotation-consumer/pom.xml | 4 + .../src/main/resources/log4j.properties | 7 - .../src/main/resources/log4j2.xml | 29 + .../dubbo-demo-annotation-provider/pom.xml | 4 + .../src/main/resources/log4j.properties | 7 - .../src/main/resources/log4j2.xml | 29 + dubbo-demo/dubbo-demo-annotation/pom.xml | 2 +- .../dubbo-demo-api/dubbo-demo-api-consumer/pom.xml | 4 + .../src/main/resources/log4j.properties | 7 - .../src/main/resources/log4j2.xml | 29 + .../dubbo-demo-api/dubbo-demo-api-provider/pom.xml | 4 + .../src/main/resources/log4j.properties | 7 - .../src/main/resources/log4j2.xml | 29 + dubbo-demo/dubbo-demo-api/pom.xml | 2 +- dubbo-demo/dubbo-demo-generic-call/pom.xml | 5 +- .../src/main/resources/log4j.properties | 7 - .../src/main/resources/log4j2.xml | 29 + dubbo-demo/dubbo-demo-interface/pom.xml | 5 + .../org/apache/dubbo/demo/RestDemoService.java | 2 +- .../dubbo-demo-native-consumer/pom.xml | 20 +- .../dubbo/demo/graalvm/consumer/Application.java | 6 +- .../src/main/resources/Log4j.properties | 24 - .../src/main/resources/log4j2.xml | 29 + .../dubbo-demo-native-provider/pom.xml | 23 +- .../dubbo/demo/graalvm/provider/Application.java | 6 +- .../src/main/resources/Log4j.properties | 27 - .../src/main/resources/log4j2.xml | 29 + .../dubbo-demo-spring-boot-consumer/pom.xml | 34 +- .../src/main/resources/application.yml | 3 - .../src/main/resources/log4j.properties | 7 - .../src/main/resources/log4j2.xml | 29 + .../dubbo-demo-spring-boot-provider/pom.xml | 17 + .../src/main/resources/application.yml | 4 - .../src/main/resources/log4j.properties | 7 - .../src/main/resources/log4j2.xml | 29 + dubbo-demo/dubbo-demo-spring-boot/pom.xml | 22 +- dubbo-demo/dubbo-demo-triple/pom.xml | 7 + .../src/main/resources/log4j.properties | 26 - .../src/main/resources/log4j2.xml | 29 + .../dubbo-demo-jaxrs-rest-consumer/pom.xml | 4 + .../src/main/resources/log4j2.xml | 29 + .../dubbo-demo-jaxrs-rest-provider/pom.xml | 4 + .../src/main/resources/log4j2.xml | 29 + .../dubbo-demo-spring-mvc-rest-consumer/pom.xml | 4 + .../src/main/resources/log4j2.xml | 29 + .../dubbo-demo-spring-mvc-rest-provider/pom.xml | 4 + .../src/main/resources/log4j2.xml | 29 + .../dubbo-demo-xml/dubbo-demo-xml-consumer/pom.xml | 4 + .../src/main/resources/log4j.properties | 7 - .../src/main/resources/log4j2.xml | 29 + .../dubbo-demo-xml/dubbo-demo-xml-provider/pom.xml | 4 + .../src/main/resources/log4j.properties | 7 - .../src/main/resources/log4j2.xml | 29 + dubbo-demo/dubbo-demo-xml/pom.xml | 2 +- dubbo-demo/pom.xml | 7 - dubbo-dependencies-bom/pom.xml | 274 +-- .../dubbo-dependencies-zookeeper-curator5/pom.xml | 20 +- .../dubbo-dependencies-zookeeper/pom.xml | 6 +- dubbo-dependencies/pom.xml | 2 +- dubbo-distribution/dubbo-all-shaded/pom.xml | 2375 ++++++++------------ dubbo-distribution/dubbo-all/pom.xml | 229 +- dubbo-distribution/dubbo-apache-release/pom.xml | 162 +- dubbo-distribution/dubbo-bom/pom.xml | 134 +- dubbo-distribution/dubbo-core-spi/pom.xml | 1252 ++++------- dubbo-distribution/pom.xml | 2 +- dubbo-kubernetes/pom.xml | 78 - .../kubernetes/KubernetesMeshEnvListener.java | 207 -- .../KubernetesMeshEnvListenerFactory.java | 42 - .../registry/kubernetes/KubernetesRegistry.java | 50 - .../kubernetes/KubernetesRegistryFactory.java | 34 - .../kubernetes/KubernetesServiceDiscovery.java | 451 ---- .../KubernetesServiceDiscoveryFactory.java | 28 - .../dubbo/registry/kubernetes/MeshConstant.java | 45 - .../kubernetes/NopKubernetesMeshEnvListener.java | 34 - .../kubernetes/util/KubernetesClientConst.java | 78 - .../kubernetes/util/KubernetesConfigUtils.java | 104 - .../org.apache.dubbo.registry.RegistryFactory | 1 - ...e.dubbo.registry.client.ServiceDiscoveryFactory | 1 - ...luster.router.mesh.route.MeshEnvListenerFactory | 1 - .../kubernetes/KubernetesServiceDiscoveryTest.java | 289 --- .../org.mockito.plugins.MockMaker | 1 - dubbo-maven-plugin/pom.xml | 10 +- .../maven/plugin/aot/DubboProcessAotMojo.java | 2 +- .../dubbo/maven/plugin/aot/JavaExecutable.java | 66 +- .../plugin/protoc/DubboProtocCompilerMojo.java | 10 +- .../plugin/protoc/enums/DubboGenerateTypeEnum.java | 4 - dubbo-metadata/dubbo-metadata-api/pom.xml | 5 + .../apache/dubbo/metadata/MappingCacheManager.java | 14 +- .../apache/dubbo/metadata/MetadataConstants.java | 2 + .../metadata/report/MetadataReportInstance.java | 18 +- .../report/support/AbstractMetadataReport.java | 6 +- .../support/AbstractMetadataReportFactory.java | 6 +- .../dubbo/metadata/report/support/Constants.java | 2 - .../src/test/resources/log4j2-test.xml | 29 + .../src/test/resources/log4j2-test.xml | 29 + dubbo-metadata/dubbo-metadata-processor/pom.xml | 4 - .../builder/PrimitiveTypeDefinitionBuilder.java | 2 +- .../src/test/resources/log4j2-test.xml | 29 + .../store/nacos/NacosMetadataReportFactory.java | 14 + .../metadata/store/nacos/MockConfigService.java | 4 + .../src/test/resources/log4j2-test.xml | 29 + dubbo-metadata/dubbo-metadata-report-redis/pom.xml | 5 + .../src/test/resources/log4j2-test.xml | 29 + dubbo-metadata/dubbo-metadata-rest/pom.xml | 33 + .../rest/AbstractServiceRestMetadataResolver.java | 33 +- .../src/test/resources/log4j2-test.xml | 29 + dubbo-metrics/dubbo-metrics-api/pom.xml | 5 + .../dubbo/metrics/data/MethodStatComposite.java | 5 +- .../apache/dubbo/metrics/data/RtStatComposite.java | 8 +- .../metrics/model/sample/GaugeMetricSample.java | 24 +- .../metrics/report/AbstractMetricsExport.java | 18 + .../java/org/apache/dubbo/monitor/Constants.java | 60 + .../java/org/apache/dubbo/monitor/Monitor.java | 27 + .../org/apache/dubbo/monitor/MonitorFactory.java | 39 + .../org/apache/dubbo/monitor/MonitorService.java | 52 + .../src/test/resources/log4j2-test.xml | 29 + dubbo-metrics/dubbo-metrics-config-center/pom.xml | 5 + .../src/test/resources/log4j2-test.xml | 29 + dubbo-metrics/dubbo-metrics-default/pom.xml | 5 + .../monitor/support/MonitorClusterFilter.java | 26 + .../dubbo/monitor/support/MonitorFilter.java | 262 +++ .../dubbo/internal/org.apache.dubbo.rpc.Filter | 1 + ...g.apache.dubbo.rpc.cluster.filter.ClusterFilter | 2 +- .../dubbo/monitor/support/MonitorFilterTest.java | 0 .../src/test/resources/log4j2-test.xml | 29 + dubbo-metrics/dubbo-metrics-metadata/pom.xml | 5 + .../src/test/resources/log4j2-test.xml | 29 + dubbo-metrics/dubbo-metrics-prometheus/pom.xml | 5 + .../src/test/resources/log4j2-test.xml | 29 + dubbo-metrics/dubbo-metrics-registry/pom.xml | 5 + .../src/test/resources/log4j2-test.xml | 29 + dubbo-metrics/dubbo-tracing/pom.xml | 5 + .../dubbo/tracing/DubboObservationRegistry.java | 8 +- .../dubbo/tracing/context/DubboClientContext.java | 3 +- .../dubbo/tracing/context/DubboServerContext.java | 3 +- .../tracing/filter/ObservationReceiverFilter.java | 4 +- .../tracing/filter/ObservationSenderFilter.java | 4 +- .../DubboClientTracingObservationHandler.java | 40 + .../DubboServerTracingObservationHandler.java | 51 + .../tracing/tracer/otel/OpenTelemetryProvider.java | 24 +- .../src/test/resources/log4j2-test.xml | 29 + dubbo-monitor/dubbo-monitor-api/pom.xml | 40 - .../java/org/apache/dubbo/monitor/Constants.java | 59 - .../org/apache/dubbo/monitor/MetricsService.java | 26 - .../java/org/apache/dubbo/monitor/Monitor.java | 26 - .../org/apache/dubbo/monitor/MonitorFactory.java | 38 - .../org/apache/dubbo/monitor/MonitorService.java | 51 - dubbo-monitor/dubbo-monitor-common/pom.xml | 45 - .../monitor/support/AbstractMonitorFactory.java | 120 - .../monitor/support/MetricsServiceDetector.java | 33 - .../monitor/support/MonitorClusterFilter.java | 25 - .../dubbo/monitor/support/MonitorFilter.java | 261 --- .../monitor/support/MonitorServiceDetector.java | 28 - .../dubbo/internal/org.apache.dubbo.rpc.Filter | 1 - ...g.apache.dubbo.rpc.cluster.filter.ClusterFilter | 1 - ...g.apache.dubbo.rpc.model.BuiltinServiceDetector | 2 - .../support/AbstractMonitorFactoryTest.java | 99 - dubbo-monitor/dubbo-monitor-default/pom.xml | 86 - .../apache/dubbo/monitor/dubbo/DubboMonitor.java | 238 -- .../dubbo/monitor/dubbo/DubboMonitorFactory.java | 69 - .../apache/dubbo/monitor/dubbo/MetricsFilter.java | 296 --- .../org/apache/dubbo/monitor/dubbo/Statistics.java | 216 -- .../apache/dubbo/monitor/dubbo/StatisticsItem.java | 140 -- .../org.apache.dubbo.monitor.MonitorFactory | 1 - .../dubbo/internal/org.apache.dubbo.rpc.Filter | 1 - .../dubbo/monitor/dubbo/AppResponseBuilder.java | 55 - .../monitor/dubbo/DubboMonitorFactoryTest.java | 70 - .../dubbo/monitor/dubbo/DubboMonitorTest.java | 275 --- .../dubbo/monitor/dubbo/MetricsFilterTest.java | 421 ---- .../dubbo/monitor/dubbo/MockMonitorService.java | 43 - .../apache/dubbo/monitor/dubbo/StatisticsTest.java | 109 - .../dubbo/monitor/dubbo/service/DemoService.java | 28 - .../src/test/resources/dubbo.properties | 2 - .../src/test/resources/log4j.properties | 7 - dubbo-monitor/pom.xml | 48 - .../dubbo-auth/src/test/resources/log4j2-test.xml | 29 + .../org/apache/dubbo/gen/dubbo/DubboGenerator.java | 37 - .../apache/dubbo/gen/grpc/DubboGrpcGenerator.java | 36 - .../grpc/reactive/ReactorDubboGrpcGenerator.java | 37 - .../gen/grpc/reactive/RxDubboGrpcGenerator.java | 36 - .../main/resources/Dubbo3InterfaceStub.mustache | 19 +- .../resources/Dubbo3TripleInterfaceStub.mustache | 35 +- .../src/main/resources/Dubbo3TripleStub.mustache | 75 +- .../src/main/resources/DubboGrpcStub.mustache | 323 --- .../src/main/resources/DubboStub.mustache | 67 - .../ReactorDubbo3TripleInterfaceStub.mustache | 7 +- .../resources/ReactorDubbo3TripleStub.mustache | 27 +- .../main/resources/ReactorDubboGrpcStub.mustache | 223 -- .../src/main/resources/RxDubboGrpcStub.mustache | 257 --- .../src/test/resources/log4j2-test.xml | 29 + .../src/test/resources/log4j2-test.xml | 29 + .../apache/dubbo/aot/api/ExecutableDescriber.java | 74 + .../org/apache/dubbo/aot/api/ExecutableMode.java | 13 +- .../org/apache/dubbo/aot/api/MemberCategory.java | 13 +- .../org/apache/dubbo/aot/api/TypeDescriber.java | 2 - .../apache/dubbo/aot/generate/AotProcessor.java | 12 + .../dubbo/aot/generate/ExecutableDescriber.java | 77 - .../generate/ReflectConfigMetadataRepository.java | 18 + .../dubbo/aot/generate/ReflectionConfigWriter.java | 1 + .../src/test/resources/log4j2-test.xml | 29 + dubbo-plugin/dubbo-plugin-access-log/pom.xml | 42 - .../apache/dubbo/rpc/filter/AccessLogFilter.java | 296 --- .../dubbo/internal/org.apache.dubbo.rpc.Filter | 1 - .../dubbo/rpc/filter/AccessLogFilterTest.java | 146 -- .../org/apache/dubbo/rpc/support/DemoService.java | 21 - .../apache/dubbo/rpc/support/MockInvocation.java | 165 -- .../org/apache/dubbo/rpc/support/MyInvoker.java | 89 - .../src/test/resources/log4j.xml | 46 - .../dubbo-plugin-classloader-filter/pom.xml | 42 - .../dubbo/internal/org.apache.dubbo.rpc.Filter | 2 - ...g.apache.dubbo.rpc.cluster.filter.ClusterFilter | 1 - .../org/apache/dubbo/rpc/support/DemoService.java | 21 - .../org/apache/dubbo/rpc/support/MyInvoker.java | 89 - .../dubbo-plugin-cluster-mergeable/pom.xml | 37 - .../cluster/support/MergeableClusterInvoker.java | 207 -- .../internal/org.apache.dubbo.rpc.cluster.Cluster | 1 - ...rg.apache.dubbo.rpc.model.ScopeModelInitializer | 1 - dubbo-plugin/dubbo-plugin-context/pom.xml | 42 - .../filter/support/ConsumerContextFilter.java | 156 -- .../dubbo/internal/org.apache.dubbo.rpc.Filter | 2 - ...g.apache.dubbo.rpc.cluster.filter.ClusterFilter | 1 - .../org/apache/dubbo/rpc/support/DemoService.java | 21 - .../apache/dubbo/rpc/support/MockInvocation.java | 165 -- .../org/apache/dubbo/rpc/support/MyInvoker.java | 89 - dubbo-plugin/dubbo-plugin-generic-invoke/pom.xml | 42 - .../dubbo/internal/org.apache.dubbo.rpc.Filter | 2 - .../org/apache/dubbo/rpc/support/DemoService.java | 22 - .../java/org/apache/dubbo/rpc/support/Person.java | 52 - .../dubbo-plugin-loadbalance-adaptive/pom.xml | 42 - .../rpc/filter/AdaptiveLoadBalanceFilter.java | 154 -- .../dubbo/internal/org.apache.dubbo.rpc.Filter | 1 - .../org.apache.dubbo.rpc.cluster.LoadBalance | 1 - ...rg.apache.dubbo.rpc.model.ScopeModelInitializer | 1 - .../cluster/loadbalance/LoadBalanceBaseTest.java | 319 --- dubbo-plugin/dubbo-plugin-mock/pom.xml | 42 - .../support/wrapper/MockClusterInvoker.java | 233 -- .../dubbo/rpc/support/MockConfigPostProcessor.java | 81 - .../org.apache.dubbo.config.ConfigPostProcessor | 1 - .../dubbo/internal/org.apache.dubbo.rpc.Protocol | 1 - .../internal/org.apache.dubbo.rpc.cluster.Cluster | 1 - ...bbo.rpc.cluster.router.state.StateRouterFactory | 1 - .../wrapper/MockProviderRpcExceptionTest.java | 245 -- .../org/apache/dubbo/rpc/support/DemoServiceA.java | 21 - .../apache/dubbo/rpc/support/DemoServiceAMock.java | 29 - .../org/apache/dubbo/rpc/support/DemoServiceB.java | 21 - .../apache/dubbo/rpc/support/DemoServiceBMock.java | 29 - .../org/apache/dubbo/rpc/support/Greeting.java | 24 - .../apache/dubbo/rpc/support/GreetingMock1.java | 19 - .../apache/dubbo/rpc/support/GreetingMock2.java | 26 - .../support/MockAbstractClusterInvokerTest.java | 191 -- .../rpc/support/MockConfigPostProcessorTest.java | 54 - .../apache/dubbo/rpc/support/MockInvokerTest.java | 164 -- dubbo-plugin/dubbo-plugin-proxy-bytebuddy/pom.xml | 41 - .../rpc/proxy/bytebuddy/ByteBuddyInterceptor.java | 40 - .../dubbo/rpc/proxy/bytebuddy/ByteBuddyProxy.java | 130 -- .../rpc/proxy/bytebuddy/ByteBuddyProxyFactory.java | 40 - .../rpc/proxy/bytebuddy/ByteBuddyProxyInvoker.java | 56 - .../internal/org.apache.dubbo.rpc.ProxyFactory | 1 - .../apache/dubbo/rpc/proxy/AbstractProxyTest.java | 87 - .../org/apache/dubbo/rpc/proxy/RemoteService.java | 26 - .../proxy/bytebuddy/ByteBuddyInterceptorTest.java | 45 - .../proxy/bytebuddy/ByteBuddyProxyFactoryTest.java | 26 - .../proxy/bytebuddy/ByteBuddyProxyInvokerTest.java | 41 - .../rpc/proxy/bytebuddy/ByteBuddyProxyTest.java | 44 - .../org/apache/dubbo/rpc/support/DemoService.java | 21 - .../apache/dubbo/rpc/support/DemoServiceImpl.java | 26 - .../org/apache/dubbo/rpc/support/MyInvoker.java | 89 - dubbo-plugin/dubbo-plugin-qos-trace/pom.xml | 47 - .../dubbo/qos/legacy/service/DemoService.java | 24 - .../rpc/protocol/dubbo/filter/TraceFilterTest.java | 140 -- dubbo-plugin/dubbo-plugin-router-condition/pom.xml | 37 - .../router/condition/ConditionStateRouter.java | 331 --- ...outer.condition.matcher.ConditionMatcherFactory | 4 - ...bbo.rpc.cluster.router.state.StateRouterFactory | 4 - .../dubbo/rpc/cluster/router/MockInvoker.java | 67 - dubbo-plugin/dubbo-plugin-router-mesh/pom.xml | 37 - ...bbo.rpc.cluster.router.state.StateRouterFactory | 1 - ...rg.apache.dubbo.rpc.model.ScopeModelInitializer | 1 - dubbo-plugin/dubbo-plugin-router-script/pom.xml | 37 - ...bbo.rpc.cluster.router.state.StateRouterFactory | 1 - .../dubbo/rpc/cluster/router/MockInvoker.java | 67 - ...bbo.rpc.cluster.router.state.StateRouterFactory | 2 - dubbo-plugin/dubbo-plugin-router-tag/pom.xml | 37 - ...bbo.rpc.cluster.router.state.StateRouterFactory | 1 - .../dubbo/rpc/cluster/router/MockInvoker.java | 67 - dubbo-plugin/dubbo-plugin-token/pom.xml | 42 - .../dubbo/internal/org.apache.dubbo.rpc.Filter | 1 - dubbo-plugin/dubbo-plugin-tps/pom.xml | 42 - .../dubbo/internal/org.apache.dubbo.rpc.Filter | 3 - .../apache/dubbo/rpc/support/BlockMyInvoker.java | 63 - .../org/apache/dubbo/rpc/support/DemoService.java | 21 - .../apache/dubbo/rpc/support/MockInvocation.java | 165 -- .../org/apache/dubbo/rpc/support/MyInvoker.java | 89 - .../dubbo/rpc/support/RuntimeExceptionInvoker.java | 34 - .../dubbo/qos/command/impl/ChangeTelnet.java | 3 +- .../apache/dubbo/qos/command/impl/CountTelnet.java | 3 +- .../dubbo/qos/legacy/ChangeTelnetHandler.java | 0 .../dubbo/qos/legacy/TraceTelnetHandler.java | 0 .../qos/probe/impl/DeployerReadinessProbe.java | 2 +- .../org.apache.dubbo.remoting.telnet.TelnetHandler | 0 .../dubbo/qos/command/impl/ChangeTelnetTest.java | 11 +- .../dubbo/qos/command/impl/CountTelnetTest.java | 26 +- .../apache/dubbo/qos/command/impl/ReadyTest.java | 4 +- .../dubbo/qos/legacy/ChangeTelnetHandlerTest.java | 0 .../org/apache/dubbo/qos/legacy/ProtocolUtils.java | 0 .../dubbo/qos/legacy/TraceTelnetHandlerTest.java | 0 .../dubbo/qos/legacy/channel/MockChannel.java | 0 .../dubbo-qos/src/test/resources/log4j2-test.xml | 29 + .../dubbo/reactive/CreateObserverAdapter.java | 8 +- .../src/test/resources/log4j2-test.xml | 29 + dubbo-plugin/dubbo-rest-jaxrs/pom.xml | 102 + .../jaxrs/AbstractJaxrsArgumentResolver.java | 32 + .../tri/rest/support/jaxrs/Annotations.java | 65 + .../tri/rest/support/jaxrs/BeanArgumentBinder.java | 280 +++ .../support/jaxrs/BeanParamArgumentResolver.java | 44 + .../rest/support/jaxrs/BodyArgumentResolver.java | 56 + .../support/jaxrs/CookieParamArgumentResolver.java | 74 + .../support/jaxrs/FallbackArgumentResolver.java | 89 + .../rest/support/jaxrs/FormArgumentResolver.java | 43 + .../support/jaxrs/FormParamArgumentResolver.java | 52 + .../support/jaxrs/HeaderParamArgumentResolver.java | 48 + .../protocol/tri/rest/support/jaxrs/Helper.java | 85 + .../support/jaxrs/JaxrsHttpRequestAdaptee.java | 163 ++ .../support/jaxrs/JaxrsHttpResponseAdaptee.java | 101 + .../support/jaxrs/JaxrsMiscArgumentResolver.java | 83 + .../support/jaxrs/JaxrsRequestMappingResolver.java | 93 + .../support/jaxrs/JaxrsResponseRestFilter.java | 42 + .../tri/rest/support/jaxrs/JaxrsRestToolKit.java | 58 + .../support/jaxrs/MatrixParamArgumentResolver.java | 53 + .../rest/support/jaxrs/MultivaluedMapWrapper.java | 29 + .../support/jaxrs/PathParamArgumentResolver.java | 69 + .../support/jaxrs/QueryParamArgumentResolver.java | 49 + .../jaxrs/filter/ContainerRequestContextImpl.java | 214 ++ .../filter/ContainerRequestFilterAdapter.java | 57 + .../jaxrs/filter/ContainerResponseContextImpl.java | 228 ++ .../filter/ContainerResponseFilterAdapter.java | 56 + .../jaxrs/filter/ExceptionMapperAdapter.java | 76 + .../jaxrs/filter/InterceptorContextImpl.java | 84 + .../jaxrs/filter/ReadInterceptorAdapter.java | 52 + .../jaxrs/filter/ReaderInterceptorContextImpl.java | 88 + .../jaxrs/filter/WriterInterceptorAdapter.java | 54 + .../jaxrs/filter/WriterInterceptorContextImpl.java | 88 + ...rpc.protocol.tri.rest.argument.ArgumentResolver | 11 + ...ubbo.rpc.protocol.tri.rest.filter.RestExtension | 1 + ...c.protocol.tri.rest.filter.RestExtensionAdapter | 5 + ...rotocol.tri.rest.mapping.RequestMappingResolver | 1 + .../rest/support/jaxrs/compatible/DemoService.java | 156 ++ .../support/jaxrs/compatible/DemoServiceImpl.java | 187 ++ .../jaxrs/compatible/JaxrsRestProtocolTest.java | 563 +++++ .../jaxrs/compatible/ResteasyExceptionMapper.java | 27 + .../tri/rest/support/jaxrs/compatible/User.java | 88 + .../filter/TestContainerRequestFilter.java | 34 + .../jaxrs/compatible/filter/TraceFilter.java | 44 + .../filter/TraceRequestAndResponseFilter.java | 45 + .../intercept/DynamicTraceInterceptor.java | 49 + .../compatible/rest/AnotherUserRestService.java | 65 + .../rest/AnotherUserRestServiceImpl.java | 58 + .../jaxrs/compatible/rest/HttpMethodService.java | 67 + .../compatible/rest/HttpMethodServiceImpl.java | 55 + .../jaxrs/compatible/rest/RegistrationResult.java | 62 + .../compatible/rest/RestDemoForTestException.java | 44 + .../jaxrs/compatible/rest/RestDemoService.java | 65 + .../jaxrs/compatible/rest/RestDemoServiceImpl.java | 80 + .../src/test/resources/log4j2-test.xml | 30 + dubbo-plugin/dubbo-rest-servlet/pom.xml | 46 + .../rest/support/servlet/DummyFilterConfig.java | 67 + .../rest/support/servlet/DummyServletContext.java | 318 +++ .../tri/rest/support/servlet/FilterAdapter.java | 109 + .../protocol/tri/rest/support/servlet/Helper.java | 145 ++ .../rest/support/servlet/HttpSessionFactory.java | 27 + .../support/servlet/ServletArgumentResolver.java | 95 + .../servlet/ServletHttpMessageAdapterFactory.java | 66 + .../support/servlet/ServletHttpRequestAdaptee.java | 491 ++++ .../servlet/ServletHttpResponseAdaptee.java | 221 ++ ...moting.http12.message.HttpMessageAdapterFactory | 1 + ...rpc.protocol.tri.rest.argument.ArgumentResolver | 1 + ...c.protocol.tri.rest.filter.RestExtensionAdapter | 1 + .../src/test/resources/log4j2-test.xml | 30 + dubbo-plugin/dubbo-rest-spring/pom.xml | 115 + .../spring/AbstractSpringArgumentResolver.java | 32 + .../tri/rest/support/spring/Annotations.java | 62 + .../rest/support/spring/BeanArgumentBinder.java | 158 ++ .../rest/support/spring/ConfigurationWrapper.java | 43 + .../spring/CookieValueArgumentResolver.java | 74 + .../support/spring/FallbackArgumentResolver.java | 66 + .../support/spring/HandlerInterceptorAdapter.java | 110 + .../protocol/tri/rest/support/spring/Helper.java | 44 + .../spring/MatrixVariableArgumentResolver.java | 125 ++ .../spring/ModelAttributeArgumentResolver.java | 59 + .../spring/PathVariableArgumentResolver.java | 66 + .../spring/RequestAttributeArgumentResolver.java | 43 + .../spring/RequestBodyArgumentResolver.java | 79 + .../spring/RequestHeaderArgumentResolver.java | 48 + .../spring/RequestParamArgumentResolver.java | 49 + .../spring/RequestPartArgumentResolver.java | 68 + .../support/spring/SpringMiscArgumentResolver.java | 68 + .../spring/SpringMvcRequestMappingResolver.java | 107 + .../support/spring/SpringResponseRestFilter.java | 195 ++ .../tri/rest/support/spring/SpringRestToolKit.java | 127 ++ ...rpc.protocol.tri.rest.argument.ArgumentResolver | 12 + ...ubbo.rpc.protocol.tri.rest.filter.RestExtension | 1 + ...c.protocol.tri.rest.filter.RestExtensionAdapter | 1 + ...rotocol.tri.rest.mapping.RequestMappingResolver | 1 + .../spring/compatible/SpringDemoServiceImpl.java | 107 + .../compatible/SpringMvcRestProtocolTest.java | 312 +++ .../spring/compatible/SpringRestDemoService.java | 72 + .../tri/rest/support/spring/compatible/User.java | 88 + .../src/test/resources/log4j2-test.xml | 30 + .../dubbo/security/cert/CertDeployerListener.java | 3 + .../src/test/resources/log4j2-test.xml | 29 + .../src/test/resources/log4j2-test.xml | 29 + dubbo-plugin/pom.xml | 24 +- dubbo-registry/dubbo-registry-api/pom.xml | 26 +- .../client/metadata/store/MetaCacheManager.java | 14 +- .../integration/DefaultServiceURLCustomizer.java | 120 + .../registry/integration/DynamicDirectory.java | 2 +- .../registry/integration/RegistryProtocol.java | 121 +- .../registry/integration/ServiceURLCustomizer.java | 39 + .../dubbo/registry/support/AbstractRegistry.java | 7 +- .../support/CacheableFailbackRegistry.java | 16 - .../dubbo/registry/support/FailbackRegistry.java | 15 + ...dubbo.registry.integration.ServiceURLCustomizer | 1 + .../apache/dubbo/registry/PerformanceUtils.java | 15 +- .../metadata/store/MetaCacheManagerTest.java | 15 +- .../registry/integration/RegistryProtocolTest.java | 11 +- .../src/test/resources/log4j.xml | 29 - .../src/test/resources/log4j2-test.xml | 29 + dubbo-registry/dubbo-registry-multicast/pom.xml | 5 + .../src/test/resources/log4j2-test.xml | 29 + .../dubbo/registry/multiple/MultipleRegistry.java | 5 +- dubbo-registry/dubbo-registry-nacos/pom.xml | 4 +- .../registry/nacos/NacosAggregateListener.java | 2 +- .../apache/dubbo/registry/nacos/NacosRegistry.java | 6 +- .../src/test/resources/log4j2-test.xml | 29 + dubbo-registry/dubbo-registry-zookeeper/pom.xml | 5 + .../src/test/resources/log4j2-test.xml | 29 + dubbo-remoting/dubbo-remoting-api/pom.xml | 4 +- .../java/org/apache/dubbo/remoting/Constants.java | 7 - .../api/pu/AbstractPortUnificationServer.java | 21 +- .../apache/dubbo/remoting/exchange/Request.java | 5 +- .../org/apache/dubbo/remoting/utils/UrlUtils.java | 10 +- .../apache/dubbo/remoting/PerformanceUtils.java | 14 +- .../dubbo/remoting/codec/ExchangeCodecTest.java | 2 +- .../apache/dubbo/remoting/utils/UrlUtilsTest.java | 12 +- .../src/test/resources/log4j.xml | 35 - .../src/test/resources/log4j2-test.xml | 29 + dubbo-remoting/dubbo-remoting-http/pom.xml | 4 +- .../remoting/http/tomcat/TomcatHttpServer.java | 4 +- .../dubbo/remoting/http/rest/RestClientTest.java | 47 + .../src/test/resources/log4j.xml | 41 - .../src/test/resources/log4j2-test.xml | 29 + dubbo-remoting/dubbo-remoting-http12/pom.xml | 23 + .../http12/AbstractServerHttpChannelObserver.java | 58 +- .../dubbo/remoting/http12/ErrorResponse.java | 9 + .../apache/dubbo/remoting/http12/HttpChannel.java | 2 + .../apache/dubbo/remoting/http12/HttpCookie.java | 123 + .../dubbo/remoting/http12/HttpHeaderNames.java | 4 +- .../apache/dubbo/remoting/http12/HttpHeaders.java | 8 + .../apache/dubbo/remoting/http12/HttpMethods.java | 64 + .../apache/dubbo/remoting/http12/HttpRequest.java | 161 ++ .../apache/dubbo/remoting/http12/HttpResponse.java | 98 + .../apache/dubbo/remoting/http12/HttpResult.java | 79 + .../apache/dubbo/remoting/http12/HttpStatus.java | 10 + .../apache/dubbo/remoting/http12/HttpUtils.java | 255 +++ .../remoting/http12/exception/DecodeException.java | 4 + .../exception/HttpResultPayloadException.java | 51 + .../http12/exception/HttpStatusException.java | 5 + .../http12/exception/IllegalPathException.java | 30 - .../remoting/http12/h2/Http2ChannelDelegate.java | 5 + .../remoting/http12/message/CodecMediaType.java | 26 + .../message/DefaultHttpMessageAdapterFactory.java | 37 + .../http12/message/DefaultHttpRequest.java | 679 ++++++ .../http12/message/DefaultHttpResponse.java | 368 +++ .../remoting/http12/message/DefaultHttpResult.java | 147 ++ .../http12/message/DefaultListeningDecoder.java | 8 +- .../http12/message/HttpMessageAdapterFactory.java | 35 + .../remoting/http12/message/HttpMessageCodec.java | 35 +- .../http12/message/HttpMessageCodecFactory.java | 38 - .../http12/message/HttpMessageDecoder.java | 42 + .../http12/message/HttpMessageDecoderFactory.java | 28 + .../http12/message/HttpMessageEncoder.java | 46 + .../http12/message/HttpMessageEncoderFactory.java | 28 + .../dubbo/remoting/http12/message/JsonCodec.java | 124 - .../remoting/http12/message/JsonCodecFactory.java | 37 - .../dubbo/remoting/http12/message/JsonPbCodec.java | 122 - .../http12/message/JsonPbCodecFactory.java | 49 - .../message/LengthFieldStreamingDecoder.java | 2 +- .../dubbo/remoting/http12/message/MediaType.java | 55 +- .../remoting/http12/message/codec/BinaryCodec.java | 61 + .../http12/message/codec/BinaryCodecFactory.java | 41 + .../remoting/http12/message/codec/CodecUtils.java | 90 + .../remoting/http12/message/codec/HtmlCodec.java | 61 + .../http12/message/codec/HtmlCodecFactory.java | 46 + .../remoting/http12/message/codec/JsonCodec.java | 92 + .../http12/message/codec/JsonCodecFactory.java | 44 + .../remoting/http12/message/codec/JsonPbCodec.java | 91 + .../http12/message/codec/JsonPbCodecFactory.java | 46 + .../http12/message/codec/MultipartDecoder.java | 270 +++ .../message/codec/MultipartDecoderFactory.java | 44 + .../http12/message/codec/PlainTextCodec.java | 64 + .../message/codec/PlainTextCodecFactory.java | 46 + .../http12/message/codec/UrlEncodeFormCodec.java | 134 ++ .../message/codec/UrlEncodeFormCodecFactory.java | 46 + .../remoting/http12/message/codec/XmlCodec.java | 86 + .../http12/message/codec/XmlCodecFactory.java | 46 + .../remoting/http12/message/codec/YamlCodec.java | 118 + .../http12/message/codec/YamlCodecFactory.java | 46 + .../http12/netty4/h1/NettyHttp1Channel.java | 5 + .../netty4/h1/NettyHttp1ConnectionHandler.java | 85 +- .../http12/netty4/h2/NettyH2StreamChannel.java | 5 + .../h2/NettyHttp2ProtocolSelectorHandler.java | 16 +- ...moting.http12.message.HttpMessageAdapterFactory | 1 + ....dubbo.remoting.http12.message.HttpMessageCodec | 1 - ...remoting.http12.message.HttpMessageCodecFactory | 2 - ...moting.http12.message.HttpMessageDecoderFactory | 8 + ...moting.http12.message.HttpMessageEncoderFactory | 7 + .../http12/message/codec/CodeUtilsTest.java | 72 + .../remoting/http12/message/codec/CodecTest.java | 390 ++++ .../dubbo/remoting/http12/message/codec/User.java | 57 + .../http12/message/codec/XmlSafetyTest.java | 115 + .../src/test/resources/log4j2-test.xml | 29 + dubbo-remoting/dubbo-remoting-netty/pom.xml | 4 +- .../netty/NettyPortUnificationServer.java | 2 +- .../src/test/resources/log4j.xml | 38 - .../src/test/resources/log4j2-test.xml | 29 + dubbo-remoting/dubbo-remoting-netty4/pom.xml | 4 +- .../transport/netty4/NettyConnectionClient.java | 3 +- .../transport/netty4/NettyEventLoopFactory.java | 9 +- .../netty4/NettyPortUnificationServer.java | 2 +- .../netty4/NettyPortUnificationServerHandler.java | 17 +- .../transport/netty4/ssl/SslServerTlsHandler.java | 7 +- .../netty4/NettyEventLoopFactoryTest.java | 12 +- .../transport/netty4/api/EmptyWireProtocol.java | 2 + .../src/test/resources/log4j.properties | 7 - .../src/test/resources/log4j2-test.xml | 29 + .../dubbo-remoting-zookeeper-curator5/pom.xml | 5 + .../src/test/resources/log4j2-test.xml | 29 + dubbo-rpc/dubbo-rpc-api/pom.xml | 4 +- .../java/org/apache/dubbo/rpc/AdaptiveMetrics.java | 0 .../dubbo/rpc/AdaptiveScopeModelInitializer.java | 0 .../java/org/apache/dubbo/rpc/AsyncRpcResult.java | 5 +- .../main/java/org/apache/dubbo/rpc/Constants.java | 12 +- .../java/org/apache/dubbo/rpc/FutureContext.java | 8 +- .../apache/dubbo/rpc/filter/AccessLogFilter.java | 296 +++ .../apache/dubbo/rpc/filter/ActiveLimitFilter.java | 0 .../rpc/filter/AdaptiveLoadBalanceFilter.java | 154 ++ .../rpc/filter/ClassLoaderCallbackFilter.java | 0 .../apache/dubbo/rpc/filter/ClassLoaderFilter.java | 0 .../org/apache/dubbo/rpc/filter/ContextFilter.java | 0 .../apache/dubbo/rpc/filter/ExceptionFilter.java | 4 +- .../dubbo/rpc/filter/ExecuteLimitFilter.java | 0 .../org/apache/dubbo/rpc/filter/GenericFilter.java | 0 .../apache/dubbo/rpc/filter/GenericImplFilter.java | 0 .../org/apache/dubbo/rpc/filter/TokenFilter.java | 0 .../apache/dubbo/rpc/filter/TokenHeaderFilter.java | 0 .../apache/dubbo/rpc/filter/TpsLimitFilter.java | 0 .../dubbo/rpc/filter/tps/DefaultTPSLimiter.java | 0 .../org/apache/dubbo/rpc/filter/tps/StatItem.java | 0 .../apache/dubbo/rpc/filter/tps/TPSLimiter.java | 0 .../apache/dubbo/rpc/protocol/AbstractInvoker.java | 5 +- .../apache/dubbo/rpc/support/AccessLogData.java | 0 .../org/apache/dubbo/rpc/support/MockInvoker.java | 0 .../org/apache/dubbo/rpc/support/MockProtocol.java | 0 .../dubbo/internal/org.apache.dubbo.rpc.Filter | 10 + .../internal/org.apache.dubbo.rpc.HeaderFilter | 0 .../dubbo/internal/org.apache.dubbo.rpc.Protocol | 1 + ...rg.apache.dubbo.rpc.model.ScopeModelInitializer | 1 + .../dubbo/rpc/filter/AccessLogFilterTest.java | 118 + .../dubbo/rpc/filter/ActiveLimitFilterTest.java | 0 .../dubbo/rpc/filter/ClassLoaderFilterTest.java | 0 .../apache/dubbo/rpc/filter/ContextFilterTest.java | 0 .../dubbo/rpc/filter/ExceptionFilterTest.java | 2 +- .../dubbo/rpc/filter/ExecuteLimitFilterTest.java | 0 .../apache/dubbo/rpc/filter/GenericFilterTest.java | 0 .../dubbo/rpc/filter/GenericImplFilterTest.java | 0 .../apache/dubbo/rpc/filter/TokenFilterTest.java | 0 .../rpc/filter/tps/DefaultTPSLimiterTest.java | 0 .../apache/dubbo/rpc/filter/tps/StatItemTest.java | 0 .../dubbo/rpc/filter/tps/TpsLimitFilterTest.java | 0 .../dubbo-rpc-api/src/test/resources/log4j.xml | 46 - .../src/test/resources/log4j2-test.xml | 33 + dubbo-rpc/dubbo-rpc-dubbo/pom.xml | 4 +- .../protocol/dubbo/DecodeableRpcInvocation.java | 5 +- .../rpc/protocol/dubbo/DecodeableRpcResult.java | 2 +- .../dubbo/rpc/protocol/dubbo/DubboCodec.java | 5 +- .../dubbo/rpc/protocol/dubbo/DubboInvoker.java | 7 +- .../rpc/protocol/dubbo/filter/TraceFilter.java | 0 .../dubbo/internal/org.apache.dubbo.rpc.Filter | 0 .../rpc/protocol/dubbo/filter/MockChannel.java | 0 .../rpc/protocol/dubbo/filter/TraceFilterTest.java | 140 ++ .../dubbo-rpc-dubbo/src/test/resources/log4j.xml | 46 - .../src/test/resources/log4j2-test.xml | 33 + dubbo-rpc/dubbo-rpc-injvm/pom.xml | 5 + .../protocol/injvm/DefaultParamDeepCopyUtil.java | 5 + .../dubbo/rpc/protocol/injvm/InjvmInvoker.java | 5 +- .../src/test/resources/log4j2-test.xml | 29 + dubbo-rpc/dubbo-rpc-rest/pom.xml | 13 + .../rpc/protocol/rest/constans/RestConstant.java | 3 + .../rest/extension/resteasy/ResteasyContext.java | 7 +- .../resteasy/filter/ResteasyNettyHttpResponse.java | 9 +- .../ResteasyRequestContainerFilterAdapter.java | 2 + .../intercept/ResteasyStatusCodeInterceptor.java | 49 + .../rpc/protocol/rest/message/codec/JsonCodec.java | 3 +- .../protocol/rest/message/codec/StringCodec.java | 2 +- .../rpc/protocol/rest/netty/NettyHttpResponse.java | 4 + .../rest/netty/ssl/SslServerTlsHandler.java | 7 +- .../rpc/protocol/rest/request/RequestFacade.java | 23 + .../rpc/protocol/rest/util/DataParseUtils.java | 37 + ...pc.protocol.rest.filter.RestResponseInterceptor | 1 + .../rpc/protocol/rest/DataParseUtilsTest.java | 11 + .../rpc/protocol/rest/NettyRequestFacadeTest.java | 35 + .../rest/NoAnnotationRestProtocolTest.java | 6 +- .../rpc/protocol/rest/ResteasyResponseTest.java | 16 + .../protocol/rest/SpringMvcRestProtocolTest.java | 32 + .../rpc/protocol/rest/rest/RestDemoService.java | 14 +- .../protocol/rest/rest/RestDemoServiceImpl.java | 5 + .../src/test/resources/log4j2-test.xml | 29 + dubbo-rpc/dubbo-rpc-triple/pom.xml | 4 +- .../java/org/apache/dubbo/rpc/TriRpcStatus.java | 4 +- .../dubbo/rpc/protocol/tri/DescriptorUtils.java | 155 ++ .../dubbo/rpc/protocol/tri/HttpContextFilter.java | 82 + .../rpc/protocol/tri/ReflectionPackableMethod.java | 41 +- .../dubbo/rpc/protocol/tri/RequestMetadata.java | 5 +- .../dubbo/rpc/protocol/tri/RestProtocol.java | 26 + .../protocol/tri/RpcInvocationBuildContext.java | 51 + .../dubbo/rpc/protocol/tri/TripleConstant.java | 14 +- .../dubbo/rpc/protocol/tri/TripleHeaderEnum.java | 96 +- .../rpc/protocol/tri/TripleHttp2Protocol.java | 12 - .../dubbo/rpc/protocol/tri/TripleInvoker.java | 34 +- .../rpc/protocol/tri/TriplePingPongHandler.java | 4 +- .../dubbo/rpc/protocol/tri/TripleProtocol.java | 50 +- .../TripleReflectionTypeDescriberRegistrar.java | 2 - .../rpc/protocol/tri/call/AbstractServerCall.java | 438 ---- .../tri/call/AbstractServerCallListener.java | 102 - .../tri/call/BiStreamServerCallListener.java | 61 - .../tri/call/ReflectionAbstractServerCall.java | 214 -- .../dubbo/rpc/protocol/tri/call/ServerCall.java | 75 - .../tri/call/ServerStreamServerCallListener.java | 51 - .../protocol/tri/call/StubAbstractServerCall.java | 66 - .../protocol/tri/call/UnaryServerCallListener.java | 84 - .../tri/h12/AbstractServerCallListener.java | 4 +- .../tri/h12/AbstractServerTransportListener.java | 423 +--- .../rpc/protocol/tri/h12/CompressibleCodec.java | 71 - .../rpc/protocol/tri/h12/CompressibleEncoder.java | 53 + .../tri/h12/HttpMessageDecoderWrapper.java | 65 + .../tri/h12/HttpMessageEncoderWrapper.java | 82 + .../tri/h12/HttpRequestHandlerMapping.java | 121 + .../protocol/tri/h12/TripleProtocolDetector.java | 34 +- .../protocol/tri/h12/grpc/GrpcCompositeCodec.java | 34 +- .../tri/h12/grpc/GrpcCompositeCodecFactory.java | 20 +- .../rpc/protocol/tri/h12/grpc/GrpcHeaderNames.java | 3 +- .../h12/grpc/GrpcHttp2ServerTransportListener.java | 152 +- .../GrpcHttp2ServerTransportListenerFactory.java | 5 +- .../tri/h12/grpc/GrpcRequestHandlerMapping.java | 54 + .../tri/h12/grpc/ProtobufHttpMessageCodec.java | 9 +- .../tri/h12/grpc/WrapperHttpMessageCodec.java | 13 +- .../DefaultHttp11ServerTransportListener.java | 83 +- .../http2/GenericHttp2ServerTransportListener.java | 168 +- .../http2/Http2ServerCallToObserverAdapter.java | 5 +- .../tri/h12/http2/Http2ServerStreamObserver.java | 19 +- .../tri/observer/ServerCallToObserverAdapter.java | 136 -- .../dubbo/rpc/protocol/tri/rest/Messages.java | 64 + .../rpc/protocol/tri/rest/PathParserException.java | 30 + .../protocol/tri/rest/RestBadRequestException.java | 49 + .../dubbo/rpc/protocol/tri/rest/RestConstants.java | 61 + .../dubbo/rpc/protocol/tri/rest/RestException.java | 89 + .../protocol/tri/rest/RestHttpMessageCodec.java | 128 ++ .../protocol/tri/rest/RestInitializeException.java | 30 + .../protocol/tri/rest/RestParameterException.java | 49 + .../AbstractAnnotationBaseArgumentResolver.java | 42 + .../rest/argument/AbstractArgumentResolver.java | 34 + .../argument/AnnotationBaseArgumentResolver.java | 40 + .../tri/rest/argument/ArgumentConverter.java | 27 + .../tri/rest/argument/ArgumentResolver.java | 31 + .../rest/argument/CompositeArgumentConverter.java | 85 + .../rest/argument/CompositeArgumentResolver.java | 77 + .../tri/rest/argument/GeneralTypeConverter.java | 1261 +++++++++++ .../tri/rest/argument/MiscArgumentResolver.java | 73 + .../NamedValueArgumentResolverSupport.java | 95 + .../protocol/tri/rest/argument/TypeConverter.java | 30 + .../tri/rest/filter/AbstractRestFilter.java | 55 + .../tri/rest/filter/DefaultFilterChain.java | 136 ++ .../protocol/tri/rest/filter/RestExtension.java | 29 + .../tri/rest/filter/RestExtensionAdapter.java | 28 + .../rest/filter/RestExtensionExecutionFilter.java | 198 ++ .../rpc/protocol/tri/rest/filter/RestFilter.java | 44 + .../tri/rest/filter/RestFilterAdapter.java | 67 + .../tri/rest/filter/RestHeaderFilterAdapter.java | 42 + .../tri/rest/mapping/ContentNegotiator.java | 154 ++ .../mapping/DefaultRequestMappingRegistry.java | 236 ++ .../rpc/protocol/tri/rest/mapping/RadixTree.java | 316 +++ .../protocol/tri/rest/mapping/RequestMapping.java | 385 ++++ .../tri/rest/mapping/RequestMappingRegistry.java | 35 + .../tri/rest/mapping/RequestMappingResolver.java | 37 + .../rest/mapping/RestRequestHandlerMapping.java | 110 + .../tri/rest/mapping/condition/Condition.java | 28 + .../rest/mapping/condition/ConditionWrapper.java | 70 + .../rest/mapping/condition/ConsumesCondition.java | 136 ++ .../rest/mapping/condition/HeadersCondition.java | 95 + .../mapping/condition/MediaTypeExpression.java | 251 +++ .../rest/mapping/condition/MethodsCondition.java | 95 + .../mapping/condition/NameValueExpression.java | 115 + .../rest/mapping/condition/ParamsCondition.java | 78 + .../tri/rest/mapping/condition/PathCondition.java | 159 ++ .../tri/rest/mapping/condition/PathExpression.java | 126 ++ .../tri/rest/mapping/condition/PathParser.java | 462 ++++ .../tri/rest/mapping/condition/PathSegment.java | 242 ++ .../rest/mapping/condition/ProducesCondition.java | 218 ++ .../mapping/condition/ServiceVersionCondition.java | 87 + .../tri/rest/mapping/meta/AnnotationEnum.java | 43 + .../tri/rest/mapping/meta/AnnotationMeta.java | 233 ++ .../tri/rest/mapping/meta/AnnotationSupport.java | 216 ++ .../tri/rest/mapping/meta/HandlerMeta.java | 72 + .../protocol/tri/rest/mapping/meta/MethodMeta.java | 122 + .../tri/rest/mapping/meta/MethodParameterMeta.java | 106 + .../tri/rest/mapping/meta/NamedValueMeta.java | 109 + .../tri/rest/mapping/meta/ParameterMeta.java | 116 + .../tri/rest/mapping/meta/ResponseMeta.java | 63 + .../tri/rest/mapping/meta/ServiceMeta.java | 104 + .../protocol/tri/rest/util/DefaultRestToolKit.java | 87 + .../rpc/protocol/tri/rest/util/MethodWalker.java | 108 + .../rpc/protocol/tri/rest/util/PathUtils.java | 260 +++ .../rpc/protocol/tri/rest/util/RequestUtils.java | 179 ++ .../rpc/protocol/tri/rest/util/RestToolKit.java | 44 + .../rpc/protocol/tri/rest/util/RestUtils.java | 67 + .../rpc/protocol/tri/rest/util/TypeUtils.java | 218 ++ .../protocol/tri/route/DefaultRequestRouter.java | 62 + .../rpc/protocol/tri/route/RequestHandler.java | 128 ++ .../protocol/tri/route/RequestHandlerMapping.java | 31 + .../rpc/protocol/tri/route/RequestRouter.java | 27 + .../protocol/tri/service/TriBuiltinService.java | 4 +- .../rpc/protocol/tri/stream/ServerStream.java | 64 - .../dubbo/rpc/protocol/tri/stream/StreamUtils.java | 249 +- .../protocol/tri/stream/TripleServerStream.java | 505 ----- .../tri/transport/AbstractH2TransportListener.java | 2 +- .../transport/TripleHttp2FrameServerHandler.java | 115 - ....dubbo.remoting.http12.message.HttpMessageCodec | 2 - ...remoting.http12.message.HttpMessageCodecFactory | 1 - ...moting.http12.message.HttpMessageDecoderFactory | 1 + ...moting.http12.message.HttpMessageEncoderFactory | 1 + .../dubbo/internal/org.apache.dubbo.rpc.Filter | 2 + .../dubbo/internal/org.apache.dubbo.rpc.Protocol | 3 +- ...rpc.protocol.tri.rest.argument.ArgumentResolver | 1 + ...bo.rpc.protocol.tri.route.RequestHandlerMapping | 3 + .../org/apache/dubbo/rpc/TriRpcStatusTest.java | 9 + .../apache/dubbo/rpc/protocol/tri/DataWrapper.java | 21 + .../dubbo/rpc/protocol/tri/DescriptorService.java | 11 + .../protocol/tri/ReflectionPackableMethodTest.java | 32 + .../tri/call/ReflectionServerCallTest.java | 92 - .../rpc/protocol/tri/call/StubServerCallTest.java | 68 - .../tri/rest/GeneralTypeConverterTest.java | 50 + .../protocol/tri/rest/mapping/PathUtilsTest.java | 43 + .../protocol/tri/rest/mapping/RadixTreeTest.java | 56 + .../tri/rest/mapping/condition/PathParserTest.java | 49 + .../rpc/protocol/tri/stream/StreamUtilsTest.java | 6 +- .../dubbo-rpc-triple/src/test/resources/log4j.xml | 38 - .../src/test/resources/log4j2-test.xml | 30 + .../SerializationScopeModelInitializer.java | 36 + .../support/DefaultSerializationSelector.java | 11 +- .../support/PreferSerializationProviderImpl.java | 42 + ...rg.apache.dubbo.rpc.model.ScopeModelInitializer | 1 + .../dubbo-serialization-fastjson2/pom.xml | 5 + .../fastjson2/FastJson2Serialization.java | 15 + .../fastjson2/Fastjson2ScopeModelInitializer.java | 14 +- .../src/test/resources/log4j2-test.xml | 29 + .../dubbo-serialization-hessian2/pom.xml | 5 + .../serialize/hessian2/Hessian2FactoryManager.java | 28 +- .../hessian2/Hessian2ScopeModelInitializer.java | 14 +- .../serialize/hessian2/Hessian2Serialization.java | 16 + .../hessian2/Hessian2SerializationTest.java | 7 +- .../src/test/resources/log4j2-test.xml | 29 + .../src/test/resources/log4j2-test.xml | 29 + .../dubbo-spring-boot-autoconfigure/pom.xml | 2 +- .../DubboRelaxedBinding2AutoConfiguration.java | 2 +- .../src/test/resources/log4j2-test.xml | 29 + .../dubbo-spring-boot-compatible/actuator/pom.xml | 6 +- .../endpoint/metadata/AbstractDubboMetadata.java | 2 +- .../actuator/src/test/resources/log4j2-test.xml | 29 + .../autoconfigure/pom.xml | 2 +- .../boot/autoconfigure/DubboAutoConfiguration.java | 2 +- .../DubboConfigurationProperties.java | 15 + .../apache/dubbo/spring/boot/util/DubboUtils.java | 5 +- .../src/test/resources/log4j2-test.xml | 29 + .../pom.xml | 12 - .../DubboMicrometerTracingAutoConfiguration.java | 25 +- .../autoconfigure/ObservationHandlerGrouping.java | 7 +- .../brave/BraveAutoConfiguration.java | 8 +- .../otel/OpenTelemetryAutoConfiguration.java | 33 +- .../src/test/resources/log4j2-test.xml | 29 + .../observability/pom.xml | 8 +- dubbo-spring-boot/pom.xml | 19 +- dubbo-test/dubbo-dependencies-all/pom.xml | 121 +- dubbo-test/dubbo-test-check/pom.xml | 6 +- ...bstractRegistryCenterTestExecutionListener.java | 12 +- .../registrycenter/ZookeeperRegistryCenter.java | 12 +- dubbo-test/dubbo-test-common/pom.xml | 4 + .../src/main/resources/log4j2-test.xml | 29 + .../src/test/resources/log4j2-test.xml | 29 + dubbo-test/dubbo-test-spring/pom.xml | 7 +- .../src/main/resources/log4j.properties | 7 - dubbo-xds/pom.xml | 131 -- .../dubbo/registry/xds/XdsCertificateSigner.java | 58 - .../java/org/apache/dubbo/registry/xds/XdsEnv.java | 22 - .../registry/xds/XdsInitializationException.java | 28 - .../org/apache/dubbo/registry/xds/XdsRegistry.java | 50 - .../dubbo/registry/xds/XdsRegistryFactory.java | 34 - .../dubbo/registry/xds/XdsServiceDiscovery.java | 117 - .../registry/xds/XdsServiceDiscoveryFactory.java | 48 - .../xds/istio/IstioCitadelCertificateSigner.java | 294 --- .../dubbo/registry/xds/istio/IstioConstant.java | 109 - .../apache/dubbo/registry/xds/istio/IstioEnv.java | 195 -- .../dubbo/registry/xds/util/AdsObserver.java | 140 -- .../dubbo/registry/xds/util/NodeBuilder.java | 43 - .../dubbo/registry/xds/util/PilotExchanger.java | 250 --- .../apache/dubbo/registry/xds/util/XdsChannel.java | 142 -- .../dubbo/registry/xds/util/XdsListener.java | 23 - .../xds/util/bootstrap/BootstrapInfoImpl.java | 131 -- .../registry/xds/util/bootstrap/Bootstrapper.java | 75 - .../xds/util/bootstrap/BootstrapperImpl.java | 179 -- .../bootstrap/CertificateProviderInfoImpl.java | 45 - .../xds/util/bootstrap/ServerInfoImpl.java | 71 - .../xds/util/protocol/AbstractProtocol.java | 269 --- .../registry/xds/util/protocol/DeltaResource.java | 32 - .../registry/xds/util/protocol/XdsProtocol.java | 41 - .../xds/util/protocol/delta/DeltaEndpoint.java | 48 - .../xds/util/protocol/delta/DeltaListener.java | 47 - .../xds/util/protocol/delta/DeltaRoute.java | 47 - .../xds/util/protocol/impl/EdsProtocol.java | 97 - .../xds/util/protocol/impl/LdsProtocol.java | 106 - .../xds/util/protocol/impl/RdsProtocol.java | 92 - .../xds/util/protocol/message/Endpoint.java | 96 - .../xds/util/protocol/message/EndpointResult.java | 60 - .../xds/util/protocol/message/ListenerResult.java | 68 - .../xds/util/protocol/message/RouteResult.java | 94 - .../cluster/router/xds/EdsEndpointListener.java | 26 - .../rpc/cluster/router/xds/EdsEndpointManager.java | 127 -- .../cluster/router/xds/RdsRouteRuleManager.java | 162 -- .../cluster/router/xds/RdsVirtualHostListener.java | 184 -- .../cluster/router/xds/XdsRouteRuleListener.java | 28 - .../dubbo/rpc/cluster/router/xds/XdsRouter.java | 391 ---- .../rpc/cluster/router/xds/XdsRouterFactory.java | 31 - .../router/xds/XdsScopeModelInitializer.java | 39 - .../rpc/cluster/router/xds/rule/ClusterWeight.java | 37 - .../cluster/router/xds/rule/DestinationSubset.java | 57 - .../router/xds/rule/HTTPRouteDestination.java | 42 - .../rpc/cluster/router/xds/rule/HeaderMatcher.java | 121 - .../cluster/router/xds/rule/HttpRequestMatch.java | 39 - .../cluster/router/xds/rule/LongRangeMatch.java | 47 - .../rpc/cluster/router/xds/rule/PathMatcher.java | 71 - .../rpc/cluster/router/xds/rule/XdsRouteRule.java | 37 - dubbo-xds/src/main/proto/ca.proto | 62 - .../org.apache.dubbo.registry.RegistryFactory | 1 - ...e.dubbo.registry.client.ServiceDiscoveryFactory | 1 - ....apache.dubbo.registry.xds.XdsCertificateSigner | 1 - ...bbo.rpc.cluster.router.state.StateRouterFactory | 1 - ...rg.apache.dubbo.rpc.model.ScopeModelInitializer | 1 - .../xds/util/bootstrap/BootstrapperTest.java | 148 -- .../xds/util/protocol/impl/EdsProtocolMock.java | 51 - .../xds/util/protocol/impl/LdsProtocolMock.java | 68 - .../xds/util/protocol/impl/RdsProtocolMock.java | 54 - .../cluster/router/xds/EdsEndpointManagerTest.java | 108 - .../router/xds/RdsRouteRuleManagerTest.java | 126 -- .../router/xds/RdsVirtualHostListenerTest.java | 258 --- .../dubbo/rpc/cluster/router/xds/XdsRouteTest.java | 375 ---- .../cluster/router/xds/rule/HeaderMatcherTest.java | 89 - .../cluster/router/xds/rule/PathMatcherTest.java | 57 - pom.xml | 47 +- 1254 files changed, 37041 insertions(+), 27118 deletions(-) diff --cc dubbo-dependencies-bom/pom.xml index 4c3294d189,63cc1f9e50..780b026b90 --- a/dubbo-dependencies-bom/pom.xml +++ b/dubbo-dependencies-bom/pom.xml @@@ -206,8 -184,10 +184,10 @@@ <spotless.action>check</spotless.action> <dubbo-shared-resources.version>1.0.0</dubbo-shared-resources.version> <palantirJavaFormat.version>2.38.0</palantirJavaFormat.version> - <revision>3.3.0-beta.2-SNAPSHOT</revision> + <revision>3.3.0-beta.2</revision> <open_feign_version>3.1.5</open_feign_version> + <jakarta.xml.bind-api.version>4.0.1</jakarta.xml.bind-api.version> + <jaxb-runtime.version>2.3.3-b02</jaxb-runtime.version> </properties> <dependencyManagement> diff --cc dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml index 45747e69de,fab9f50a09..7ea31bf2e2 --- a/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml +++ b/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml @@@ -31,12 -31,12 +31,12 @@@ <packaging>pom</packaging> <properties> - <revision>3.3.0-beta.2-SNAPSHOT</revision> + <revision>3.3.0-beta.2</revision> - <maven_flatten_version>1.5.0</maven_flatten_version> + <maven_flatten_version>1.6.0</maven_flatten_version> <slf4j_version>1.7.36</slf4j_version> <curator5_version>5.1.0</curator5_version> - <zookeeper_version>3.8.1</zookeeper_version> - <spotless-maven-plugin.version>2.40.0</spotless-maven-plugin.version> + <zookeeper_version>3.8.3</zookeeper_version> + <spotless-maven-plugin.version>2.43.0</spotless-maven-plugin.version> <spotless.action>check</spotless.action> <dubbo-shared-resources.version>1.0.0</dubbo-shared-resources.version> <palantirJavaFormat.version>2.38.0</palantirJavaFormat.version> diff --cc dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml index 26bfcf3f6c,0bab7fa215..8940707b94 --- a/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml +++ b/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml @@@ -31,8 -31,8 +31,8 @@@ <packaging>pom</packaging> <properties> - <revision>3.3.0-beta.2-SNAPSHOT</revision> + <revision>3.3.0-beta.2</revision> - <maven_flatten_version>1.5.0</maven_flatten_version> + <maven_flatten_version>1.6.0</maven_flatten_version> <slf4j_version>1.7.36</slf4j_version> <curator_version>4.3.0</curator_version> <zookeeper_version>3.4.14</zookeeper_version>
