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 2022/06/28 08:48:58 UTC
[dubbo] branch 3.1 updated (38e4426bd0 -> e1a0477703)
This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a change to branch 3.1
in repository https://gitbox.apache.org/repos/asf/dubbo.git
from 38e4426bd0 Migrate xDS support from dubbo-spi-extensions(#10128)
add be7dc7f397 [3.0] Optimization code (#10034)
add f7957db329 [3.0] fix #10042, ignore overlapping lock exception and print log (#10048)
add fe135983ed Bump gson from 2.8.5 to 2.8.9 in /dubbo-dependencies-bom (#10064)
add c35b2ecd3f use os-maven-plugin as plugin: fixes reproducible build (#10067)
add d42b93dfda fixes #10079, address notification issue with service discovery multi subscription (#10080)
add 25fabf11aa [3.0] Upgrade nacos version (#10024)
add 159b04e6c9 remove author (#10112)
add 4689fefa96 [3.0] Fix INIT rule being changed (#10119)
add 0d98caa0be [3.0] Disable migration file default (#10127)
add 372f6a697a [3.0] Add some logger related command (#10132)
add b4b0aab8a0 Update fastjson to 1.2.83 (#10099)
add db15513071 [3.0] Enhance ls command (#10126)
add 25d9daac52 [3.0] Cherry pick #9978 to 3.0 (#10040)
add e6f169d0d4 fix ScopeBeanExtensionInjector npe (#10140)
add ca811c442d Fixed test order dependencies in class `PojoUtilsTest` (#9987)
add 7591940cf1 Support for ibm J9 (#10033)
add 819375bf44 [3.0] Always get mapping from remote when migrate (#9988)
add d9bdafdf94 fix #10044, sharing proxy instance with references
add d9d87bdab0 fix #10078, Use synchronizedMap to avoid ConcurrentModificationException (#10139)
add 6d188d81df [3.0] fix #9962, recreate RpcInvocation in BroadcastClusterInvoker (#10027)
add 67e36cdd27 [3.0] Improve compressed URL param performance (#10125)
add f7bf43b0c4 improve:speed up application start up time (#10109)
add 162b98f6ba fix #10105, support serialization optimizer (#10147)
add c9b6e85d03 The compiler version is the same as the trunk version (#10144)
add 64a96c5480 fix #10146, use concurrent hashmap to avoid ConcurrentModificationException (#10149)
add 1ea8d2d762 fix #10052, zookeeper service discovery cannot recover from session loss. (#10134)
add 89863e048d [3.0] Add safe foreach in RpcInvocation & Revert synchronizedMap in RpcInvocation (#10160)
add 675cd4bb13 [3.0] Exact json utils (#10156)
add 14d8931339 fix #10031, separate configurators, routers notification from address notification. (#10161)
add 2face28201 register MetadataService as internal service (#10148)
add ab63595800 [optimization]RestProtocol opt, share client pool among services and avoid potential memory leak. (#10023)
add bdda9e56df Remove unused parameters of ServiceAnnotationPostProcessor#processScannedBeanDefinition method (#10152)
add 6de61dfaf1 [ISSUE #10020] add MemorySafeLinkedBlockingQueue (#10021)
add 2d5884bff2 [3.0] Fix InstanceAddressURL unable to get scopeModel when creating invoker (#10177)
add 23f517a904 Improve: enhance scheduled executor for MemoryLimitCalculator (#10178)
add 00895034d0 [3.0] Fix switch logger NPE (#10180)
add 7a33ddf93c fix #10171, Code optimization (#10190)
add b4ba39f728 [Release] update version to 3.0.9
add 135c6f81fe Merge branch '3.0.9-release' into apache-3.0
add 2846766d70 update version to 3.0.10-SNAPSHOT
add a78bdc8998 [3.0] Handle interrupted exception for ExtensionLoader (#10194)
add c85195fc36 fix #10202, use getRemoteAddress (#10203)
add d2d1b99b15 fix qos failure in non-registry scenarios (#10199)
add 06cb5cdd3f Optimization code (#10158)
new e1a0477703 Merge branch 'apache-3.0' into apache-3.1
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/build-and-test-3.yml | 2 +-
compiler/pom.xml | 259 ---------------------
compiler/src/main/resources/Dubbo3Stub.mustache | 16 --
.../cluster/configurator/parser/ConfigParser.java | 30 +--
.../rpc/cluster/router/RouterSnapshotNode.java | 4 +-
.../cluster/router/mesh/route/MeshRuleRouter.java | 2 +-
.../cluster/router/mock/MockInvokersSelector.java | 2 +-
.../cluster/router/state/RouterGroupingState.java | 2 +-
.../cluster/support/BroadcastClusterInvoker.java | 7 +-
.../rpc/cluster/directory/MockDirInvocation.java | 11 +
.../cluster/loadbalance/LoadBalanceBaseTest.java | 4 +-
.../router/mock/MockInvokersSelectorTest.java | 6 +-
.../src/main/java/org/apache/dubbo/common/URL.java | 10 +-
.../common/beans/ScopeBeanExtensionInjector.java | 2 +-
.../org/apache/dubbo/common/bytecode/Mixin.java | 2 +-
.../org/apache/dubbo/common/bytecode/Proxy.java | 2 +-
.../apache/dubbo/common/config/Environment.java | 18 +-
.../config/configcenter/DynamicConfiguration.java | 18 +-
.../configcenter/TreePathDynamicConfiguration.java | 12 -
.../configcenter/nop/NopDynamicConfiguration.java | 12 -
.../wrapper/CompositeDynamicConfiguration.java | 7 -
.../dubbo/common/constants/CommonConstants.java | 9 +
.../extension/DubboInternalLoadingStrategy.java | 5 +
.../common/extension/DubboLoadingStrategy.java | 5 +-
.../dubbo/common/extension/ExtensionLoader.java | 238 ++++++++++++++-----
.../dubbo/common/extension/LoadingStrategy.java | 9 +
.../common/extension/ServicesLoadingStrategy.java | 4 +
.../org/apache/dubbo/common/json/GsonUtils.java | 81 +++++++
.../java/org/apache/dubbo/common/json/JSON.java | 16 +-
.../dubbo/common/json/impl/FastJsonImpl.java | 39 ++--
.../apache/dubbo/common/json/impl/GsonImpl.java | 67 ++++++
.../apache/dubbo/common/logger/LoggerFactory.java | 60 ++++-
.../org/apache/dubbo/common/profiler/Profiler.java | 4 +-
.../common/reference/ReferenceCountedResource.java | 77 ++++++
.../reporter/FrameworkStatusReportService.java | 10 +-
.../common/status/support/LoadStatusChecker.java | 38 ++-
.../common/system/OperatingSystemBeanManager.java | 96 ++++++++
.../common/threadpool/MemoryLimitCalculator.java | 98 ++++++++
.../dubbo/common/threadpool/MemoryLimiter.java | 9 +-
.../threadpool/MemorySafeLinkedBlockingQueue.java | 97 ++++++++
.../manager/DefaultExecutorRepository.java | 23 +-
.../support/cached/CachedThreadPool.java | 3 +-
.../threadpool/support/fixed/FixedThreadPool.java | 3 +-
.../support/limited/LimitedThreadPool.java | 3 +-
.../dubbo/common/url/component/URLParam.java | 211 ++++++-----------
.../dubbo/common/url/component/URLPlainParam.java | 6 +-
.../url/component/param/DynamicParamTable.java | 77 +++---
.../common/url/component/param/DynamicValues.java | 28 ++-
.../url/component/param/FixedParamValue.java | 9 +-
.../common/url/component/param/ParamValue.java | 11 +-
.../common/utils/ClassLoaderResourceLoader.java | 8 +-
.../apache/dubbo/common/utils/CollectionUtils.java | 1 -
.../apache/dubbo/common/utils/ExecutorUtil.java | 23 +-
.../org/apache/dubbo/common/utils/FieldUtils.java | 16 +-
.../org/apache/dubbo/common/utils/IOUtils.java | 24 +-
.../org/apache/dubbo/common/utils/JsonUtils.java | 67 +++++-
.../org/apache/dubbo/common/utils/MethodUtils.java | 31 +++
.../org/apache/dubbo/common/utils/StringUtils.java | 30 +--
.../org/apache/dubbo/config/AbstractConfig.java | 19 +-
.../definition/ServiceDefinitionBuilder.java | 6 +-
.../org/apache/dubbo/rpc/model/ModuleModel.java | 20 ++
.../dubbo/rpc/model/ModuleServiceRepository.java | 2 +-
.../AbstractDynamicConfigurationTest.java | 11 +-
.../file/FileSystemDynamicConfigurationTest.java | 26 +--
.../common/extension/ExtensionLoaderTest.java | 44 +++-
.../org/apache/dubbo/common/extension/SPI1.java | 6 +-
.../SPI1Impl.java} | 7 +-
.../org/apache/dubbo/common/extension/SPI2.java | 6 +-
.../SPI2Impl.java} | 7 +-
.../org/apache/dubbo/common/extension/SPI3.java | 6 +-
.../SPI3Impl.java} | 7 +-
.../org/apache/dubbo/common/extension/SPI4.java | 6 +-
.../SPI4Impl.java} | 7 +-
.../common/extension/wrapper/impl/DemoImpl.java | 6 +
.../dubbo/common/io/UnsafeStringWriterTest.java | 2 +-
.../apache/dubbo/common/json/GsonUtilsTest.java | 93 ++++++++
.../java/org/apache/dubbo/common/model/User.java | 4 +-
.../reporter/FrameworkStatusReportServiceTest.java | 9 +-
...java => MemorySafeLinkedBlockingQueueTest.java} | 19 +-
.../threadpool/manager/ExecutorRepositoryTest.java | 6 +-
.../utils/ClassLoaderResourceLoaderTest.java | 2 +-
.../apache/dubbo/common/utils/JsonUtilsTest.java | 138 +++++++++++
.../common/utils/SerializeClassCheckerTest.java | 6 +
.../dubbo/metadata/definition/MetadataTest.java | 19 +-
.../test/java/org/apache/dubbo/rpc/model/User.java | 4 +-
.../org.apache.dubbo.common.extension.SPI2 | 1 +
.../dubbo/org.apache.dubbo.common.extension.SPI1 | 1 +
.../org.apache.dubbo.common.extension.SPI3 | 1 +
.../org.apache.dubbo.common.extension.SPI4 | 1 +
.../src/test/resources/special_spi.properties | 4 +
.../java/com/alibaba/dubbo/rpc/Invocation.java | 12 +
.../apache/dubbo/generic/GenericServiceTest.java | 12 +-
.../org/apache/dubbo/service/MockInvocation.java | 11 +
dubbo-compiler/pom.xml | 119 ++++++++++
.../org/apache/dubbo/gen/AbstractGenerator.java | 0
.../apache/dubbo/gen/dubbo/Dubbo3Generator.java | 0
.../org/apache/dubbo/gen/dubbo/DubboGenerator.java | 0
.../apache/dubbo/gen/grpc/DubboGrpcGenerator.java | 0
.../grpc/reactive/ReactorDubboGrpcGenerator.java | 0
.../gen/grpc/reactive/RxDubboGrpcGenerator.java | 0
.../dubbo/gen/tri/Dubbo3TripleGenerator.java | 0
.../main/resources/Dubbo3InterfaceStub.mustache | 17 ++
.../src/main/resources/Dubbo3Stub.mustache | 33 +++
.../resources/Dubbo3TripleInterfaceStub.mustache | 17 ++
.../src/main/resources/Dubbo3TripleStub.mustache | 17 ++
.../src/main/resources/DubboGrpcStub.mustache | 17 ++
.../src/main/resources/DubboStub.mustache | 17 ++
.../src/main/resources/DubboStub3Single.mustache | 17 ++
.../main/resources/ReactorDubboGrpcStub.mustache | 17 ++
.../src/main/resources/RxDubboGrpcStub.mustache | 17 ++
.../org/apache/dubbo/config/ConfigInitializer.java | 3 +-
.../ConfigurableMetadataServiceExporter.java | 9 +
.../config/utils/CompositeReferenceCache.java | 25 +-
...dataServiceURLParamsMetadataCustomizerTest.java | 7 +-
.../annotation/ServiceAnnotationPostProcessor.java | 7 +-
.../dubbo/config/spring/EmbeddedZooKeeper.java | 3 -
.../support/apollo/EmbeddedApolloJunit5.java | 16 +-
.../support/nacos/NacosDynamicConfiguration.java | 89 +------
.../nacos/NacosDynamicConfigurationTest.java | 25 +-
.../ZookeeperDynamicConfigurationTest.java | 37 ++-
.../dubbo/demo/consumer/GenericApplication.java | 7 +-
dubbo-demo/dubbo-demo-triple/pom.xml | 18 +-
dubbo-distribution/dubbo-all/pom.xml | 1 +
dubbo-metadata/dubbo-metadata-api/pom.xml | 5 -
.../dubbo/metadata/AbstractCacheManager.java | 2 +-
.../dubbo/metadata/AbstractServiceNameMapping.java | 6 +
.../apache/dubbo/metadata/MappingCacheManager.java | 9 +-
.../org/apache/dubbo/metadata/MetadataInfo.java | 2 +-
.../dubbo/metadata/MetadataServiceDetector.java | 6 +-
.../apache/dubbo/metadata/ServiceNameMapping.java | 6 +-
.../report/support/AbstractMetadataReport.java | 49 ++--
.../rest/ClassPathServiceRestMetadataReader.java | 20 +-
.../dubbo/metadata/rest/RequestMetadata.java | 7 +-
...g.apache.dubbo.rpc.model.BuiltinServiceDetector | 1 +
.../apache/dubbo/metadata/MetadataInfoTest.java | 7 +-
.../support/AbstractMetadataReportFactoryTest.java | 6 +-
.../report/support/AbstractMetadataReportTest.java | 11 +-
.../JAXRSServiceRestMetadataResolverTest.java | 13 +-
.../SpringMvcServiceRestMetadataResolverTest.java | 13 +-
dubbo-metadata/dubbo-metadata-processor/pom.xml | 13 --
.../AbstractServiceAnnotationProcessor.java | 2 +-
...rviceDefinitionMetadataAnnotationProcessor.java | 5 +-
.../rest/ServiceRestMetadataStorage.java | 26 ++-
.../metadata/store/nacos/NacosMetadataReport.java | 2 +-
.../store/redis/RedisMetadataReportTest.java | 27 ++-
.../store/zookeeper/ZookeeperMetadataReport.java | 2 +-
.../zookeeper/ZookeeperMetadataReportTest.java | 11 +-
dubbo-monitor/dubbo-monitor-default/pom.xml | 6 -
.../apache/dubbo/monitor/dubbo/MetricsFilter.java | 22 +-
.../dubbo/monitor/dubbo/MetricsFilterTest.java | 33 +--
.../dubbo/qos/command/impl/ChangeTelnet.java | 2 +-
.../dubbo/qos/command/impl/GetRouterSnapshot.java | 2 +-
.../dubbo/qos/command/impl/InvokeTelnet.java | 8 +-
...{DisableDetailProfiler.java => LoggerInfo.java} | 19 +-
.../java/org/apache/dubbo/qos/command/impl/Ls.java | 6 +-
...rofilerWarnPercent.java => SwitchLogLevel.java} | 45 +++-
...isableDetailProfiler.java => SwitchLogger.java} | 24 +-
.../dubbo/qos/command/util/ServiceCheckUtils.java | 90 ++++---
.../dubbo/qos/protocol/QosProtocolWrapper.java | 15 +-
.../qos/server/handler/QosProcessHandler.java | 13 +-
.../org.apache.dubbo.qos.command.BaseCommand | 3 +
.../dubbo/qos/command/util/CommandHelperTest.java | 6 +
.../qos/command/util/ServiceCheckUtilsTest.java | 107 ++++++---
.../apache/dubbo/registry/RegistryNotifier.java | 5 +
.../registry/client/AbstractServiceDiscovery.java | 1 +
.../registry/client/DefaultServiceInstance.java | 25 +-
.../dubbo/registry/client/InstanceAddressURL.java | 9 +
.../dubbo/registry/client/ServiceDiscovery.java | 2 +
.../listener/ServiceInstancesChangedListener.java | 111 ++++-----
.../registry/client/metadata/MetadataUtils.java | 64 ++++-
.../metadata/ServiceInstanceMetadataUtils.java | 12 +-
.../SpringCloudMetadataServiceURLBuilder.java | 5 +-
.../StandardMetadataServiceURLBuilder.java | 23 +-
.../client/metadata/store/MetaCacheManager.java | 2 +-
.../DefaultMigrationAddressComparator.java | 1 +
.../client/migration/MigrationClusterInvoker.java | 1 +
.../client/migration/MigrationRuleListener.java | 4 +-
.../client/migration/model/MigrationRule.java | 33 ++-
.../dubbo/registry/support/AbstractRegistry.java | 23 +-
.../support/DefaultProviderFirstParams.java | 2 +-
.../AbstractServiceDiscoveryFactoryTest.java | 2 +-
.../registry/client/InstanceAddressURLTest.java | 13 ++
.../ServiceInstancesChangedListenerTest.java | 134 ++++++++++-
.../ProtocolPortsMetadataCustomizerTest.java | 6 +-
.../StandardMetadataServiceURLBuilderTest.java | 38 +--
.../metadata/store/MetaCacheManagerTest.java | 4 +-
.../client/migration/MigrationRuleHandlerTest.java | 5 +-
.../migration/MigrationRuleListenerTest.java | 2 +-
.../client/migration/model/MigrationRuleTest.java | 4 +-
.../registry/multicast/MulticastRegistry.java | 48 ++--
.../dubbo/registry/multiple/MultipleRegistry.java | 4 +-
.../apache/dubbo/registry/nacos/NacosRegistry.java | 2 +-
.../nacos/util/NacosInstanceManageUtil.java | 4 +-
.../dubbo/registry/nacos/NacosRegistryTest.java | 28 +--
.../registry/zookeeper/ZookeeperRegistry.java | 83 ++++---
.../zookeeper/ZookeeperServiceDiscovery.java | 40 +++-
.../ZookeeperServiceDiscoveryChangeWatcher.java | 8 +
.../zookeeper/util/CuratorFrameworkParams.java | 7 +-
.../zookeeper/util/CuratorFrameworkUtils.java | 78 ++++++-
.../zookeeper/util/CuratorFrameworkUtilsTest.java | 4 +-
.../dubbo/remoting/api/ProtocolDetector.java | 1 -
.../dubbo/remoting/transport/CodecSupport.java | 3 +-
.../remoting/http/jetty/JettyLoggerAdapter.java | 2 +-
dubbo-rpc/dubbo-rpc-api/pom.xml | 7 +-
.../main/java/org/apache/dubbo/rpc/Invocation.java | 7 +
.../java/org/apache/dubbo/rpc/RpcInvocation.java | 211 ++++++++++++-----
.../apache/dubbo/rpc/filter/AccessLogFilter.java | 50 ++--
.../org/apache/dubbo/rpc/filter/GenericFilter.java | 109 ++++-----
.../dubbo/rpc/filter/ProfilerServerFilter.java | 6 +-
.../org/apache/dubbo/rpc/filter/TokenFilter.java | 5 +-
.../apache/dubbo/rpc/filter/TokenHeaderFilter.java | 5 +-
.../apache/dubbo/rpc/protocol/AbstractInvoker.java | 2 +-
.../dubbo/rpc/protocol/AbstractProtocol.java | 43 ++++
.../dubbo/rpc/protocol/AbstractProxyProtocol.java | 8 +-
.../org/apache/dubbo/rpc/proxy/InvocationUtil.java | 6 +-
.../apache/dubbo/rpc/support/AccessLogData.java | 31 +--
.../org/apache/dubbo/rpc/support/MockInvoker.java | 22 +-
.../dubbo/rpc/filter/AccessLogFilterTest.java | 4 +-
.../apache/dubbo/rpc/filter/TokenFilterTest.java | 4 +-
.../rpc/protocol/dubbo/CallbackServiceCodec.java | 2 +-
.../rpc/protocol/dubbo/ChannelWrappedInvoker.java | 2 +-
.../apache/dubbo/rpc/protocol/dubbo/Constants.java | 1 -
.../protocol/dubbo/DecodeableRpcInvocation.java | 8 +-
.../dubbo/rpc/protocol/dubbo/DubboProtocol.java | 59 +----
.../rpc/protocol/dubbo/filter/TraceFilter.java | 13 +-
.../dubbo/rpc/protocol/injvm/InjvmInvoker.java | 4 +-
.../rpc/protocol/rest/ReferenceCountedClient.java | 34 ++-
.../dubbo/rpc/protocol/rest/RestProtocol.java | 144 +++++++-----
dubbo-rpc/dubbo-rpc-triple/pom.xml | 18 +-
.../dubbo/rpc/protocol/tri/TripleInvoker.java | 15 +-
.../dubbo/rpc/protocol/tri/TripleProtocol.java | 13 +-
.../tri/call/ReflectionAbstractServerCall.java | 3 +-
.../apache/dubbo/test/check/DubboTestChecker.java | 2 +-
233 files changed, 3465 insertions(+), 1898 deletions(-)
delete mode 100644 compiler/pom.xml
delete mode 100644 compiler/src/main/resources/Dubbo3Stub.mustache
create mode 100644 dubbo-common/src/main/java/org/apache/dubbo/common/json/GsonUtils.java
copy dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/RuleConverter.java => dubbo-common/src/main/java/org/apache/dubbo/common/json/JSON.java (76%)
copy dubbo-compatible/src/test/java/org/apache/dubbo/rpc/cluster/NewRouter.java => dubbo-common/src/main/java/org/apache/dubbo/common/json/impl/FastJsonImpl.java (53%)
create mode 100644 dubbo-common/src/main/java/org/apache/dubbo/common/json/impl/GsonImpl.java
create mode 100755 dubbo-common/src/main/java/org/apache/dubbo/common/reference/ReferenceCountedResource.java
create mode 100644 dubbo-common/src/main/java/org/apache/dubbo/common/system/OperatingSystemBeanManager.java
create mode 100644 dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/MemoryLimitCalculator.java
create mode 100644 dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/MemorySafeLinkedBlockingQueue.java
copy dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/command/impl/TestInterface.java => dubbo-common/src/test/java/org/apache/dubbo/common/extension/SPI1.java (91%)
copy dubbo-common/src/test/java/org/apache/dubbo/common/{compiler/support/HelloServiceImpl0.java => extension/SPI1Impl.java} (86%)
copy dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/command/impl/TestInterface.java => dubbo-common/src/test/java/org/apache/dubbo/common/extension/SPI2.java (91%)
copy dubbo-common/src/test/java/org/apache/dubbo/common/{compiler/support/HelloServiceImpl0.java => extension/SPI2Impl.java} (86%)
copy dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/command/impl/TestInterface.java => dubbo-common/src/test/java/org/apache/dubbo/common/extension/SPI3.java (91%)
copy dubbo-common/src/test/java/org/apache/dubbo/common/{compiler/support/HelloServiceImpl0.java => extension/SPI3Impl.java} (86%)
copy dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/command/impl/TestInterface.java => dubbo-common/src/test/java/org/apache/dubbo/common/extension/SPI4.java (91%)
copy dubbo-common/src/test/java/org/apache/dubbo/common/{compiler/support/HelloServiceImpl0.java => extension/SPI4Impl.java} (86%)
create mode 100644 dubbo-common/src/test/java/org/apache/dubbo/common/json/GsonUtilsTest.java
copy dubbo-common/src/test/java/org/apache/dubbo/common/threadpool/{MemoryLimitedLinkedBlockingQueueTest.java => MemorySafeLinkedBlockingQueueTest.java} (64%)
create mode 100644 dubbo-common/src/test/java/org/apache/dubbo/common/utils/JsonUtilsTest.java
create mode 100644 dubbo-common/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.common.extension.SPI2
create mode 100644 dubbo-common/src/test/resources/META-INF/dubbo/org.apache.dubbo.common.extension.SPI1
create mode 100644 dubbo-common/src/test/resources/META-INF/services/org.apache.dubbo.common.extension.SPI3
create mode 100644 dubbo-common/src/test/resources/META-INF/services/org.apache.dubbo.common.extension.SPI4
create mode 100644 dubbo-common/src/test/resources/special_spi.properties
create mode 100644 dubbo-compiler/pom.xml
rename {compiler => dubbo-compiler}/src/main/java/org/apache/dubbo/gen/AbstractGenerator.java (100%)
rename {compiler => dubbo-compiler}/src/main/java/org/apache/dubbo/gen/dubbo/Dubbo3Generator.java (100%)
rename {compiler => dubbo-compiler}/src/main/java/org/apache/dubbo/gen/dubbo/DubboGenerator.java (100%)
rename {compiler => dubbo-compiler}/src/main/java/org/apache/dubbo/gen/grpc/DubboGrpcGenerator.java (100%)
rename {compiler => dubbo-compiler}/src/main/java/org/apache/dubbo/gen/grpc/reactive/ReactorDubboGrpcGenerator.java (100%)
rename {compiler => dubbo-compiler}/src/main/java/org/apache/dubbo/gen/grpc/reactive/RxDubboGrpcGenerator.java (100%)
rename {compiler => dubbo-compiler}/src/main/java/org/apache/dubbo/gen/tri/Dubbo3TripleGenerator.java (100%)
rename {compiler => dubbo-compiler}/src/main/resources/Dubbo3InterfaceStub.mustache (67%)
create mode 100644 dubbo-compiler/src/main/resources/Dubbo3Stub.mustache
rename {compiler => dubbo-compiler}/src/main/resources/Dubbo3TripleInterfaceStub.mustache (72%)
rename {compiler => dubbo-compiler}/src/main/resources/Dubbo3TripleStub.mustache (92%)
rename {compiler => dubbo-compiler}/src/main/resources/DubboGrpcStub.mustache (93%)
rename {compiler => dubbo-compiler}/src/main/resources/DubboStub.mustache (58%)
rename {compiler => dubbo-compiler}/src/main/resources/DubboStub3Single.mustache (72%)
rename {compiler => dubbo-compiler}/src/main/resources/ReactorDubboGrpcStub.mustache (90%)
rename {compiler => dubbo-compiler}/src/main/resources/RxDubboGrpcStub.mustache (92%)
copy dubbo-common/src/main/java/org/apache/dubbo/rpc/service/EchoServiceDetector.java => dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/MetadataServiceDetector.java (86%)
create mode 100644 dubbo-metadata/dubbo-metadata-api/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.model.BuiltinServiceDetector
copy dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/{DisableDetailProfiler.java => LoggerInfo.java} (67%)
copy dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/{SetProfilerWarnPercent.java => SwitchLogLevel.java} (52%)
copy dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/{DisableDetailProfiler.java => SwitchLogger.java} (64%)
copy dubbo-registry/dubbo-registry-xds/src/main/java/org/apache/dubbo/registry/xds/XdsServiceDiscoveryFactory.java => dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/ReferenceCountedClient.java (58%)
[dubbo] 01/01: Merge branch 'apache-3.0' into apache-3.1
Posted by al...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch 3.1
in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit e1a04777039be9ba6d360a0bf566f316ea47d3f3
Merge: 38e4426bd0 06cb5cdd3f
Author: Albumen Kevin <jh...@gmail.com>
AuthorDate: Tue Jun 28 16:48:29 2022 +0800
Merge branch 'apache-3.0' into apache-3.1
# 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-3.yml | 2 +-
compiler/pom.xml | 259 ---------------------
compiler/src/main/resources/Dubbo3Stub.mustache | 16 --
.../cluster/configurator/parser/ConfigParser.java | 30 +--
.../rpc/cluster/router/RouterSnapshotNode.java | 4 +-
.../cluster/router/mesh/route/MeshRuleRouter.java | 2 +-
.../cluster/router/mock/MockInvokersSelector.java | 2 +-
.../cluster/router/state/RouterGroupingState.java | 2 +-
.../cluster/support/BroadcastClusterInvoker.java | 7 +-
.../rpc/cluster/directory/MockDirInvocation.java | 11 +
.../cluster/loadbalance/LoadBalanceBaseTest.java | 4 +-
.../router/mock/MockInvokersSelectorTest.java | 6 +-
.../src/main/java/org/apache/dubbo/common/URL.java | 10 +-
.../common/beans/ScopeBeanExtensionInjector.java | 2 +-
.../org/apache/dubbo/common/bytecode/Mixin.java | 2 +-
.../org/apache/dubbo/common/bytecode/Proxy.java | 2 +-
.../apache/dubbo/common/config/Environment.java | 18 +-
.../config/configcenter/DynamicConfiguration.java | 18 +-
.../configcenter/TreePathDynamicConfiguration.java | 12 -
.../configcenter/nop/NopDynamicConfiguration.java | 12 -
.../wrapper/CompositeDynamicConfiguration.java | 7 -
.../dubbo/common/constants/CommonConstants.java | 9 +
.../extension/DubboInternalLoadingStrategy.java | 5 +
.../common/extension/DubboLoadingStrategy.java | 5 +-
.../dubbo/common/extension/ExtensionLoader.java | 238 ++++++++++++++-----
.../dubbo/common/extension/LoadingStrategy.java | 9 +
.../common/extension/ServicesLoadingStrategy.java | 4 +
.../org/apache/dubbo/common/json/GsonUtils.java | 81 +++++++
.../{utils/JsonUtils.java => json/JSON.java} | 17 +-
.../impl/FastJsonImpl.java} | 37 +--
.../apache/dubbo/common/json/impl/GsonImpl.java | 67 ++++++
.../apache/dubbo/common/logger/LoggerFactory.java | 60 ++++-
.../org/apache/dubbo/common/profiler/Profiler.java | 4 +-
.../common/reference/ReferenceCountedResource.java | 77 ++++++
.../reporter/FrameworkStatusReportService.java | 10 +-
.../common/status/support/LoadStatusChecker.java | 38 ++-
.../common/system/OperatingSystemBeanManager.java | 96 ++++++++
.../common/threadpool/MemoryLimitCalculator.java | 98 ++++++++
.../dubbo/common/threadpool/MemoryLimiter.java | 9 +-
.../threadpool/MemorySafeLinkedBlockingQueue.java | 97 ++++++++
.../manager/DefaultExecutorRepository.java | 23 +-
.../support/cached/CachedThreadPool.java | 3 +-
.../threadpool/support/fixed/FixedThreadPool.java | 3 +-
.../support/limited/LimitedThreadPool.java | 3 +-
.../dubbo/common/url/component/URLParam.java | 211 ++++++-----------
.../dubbo/common/url/component/URLPlainParam.java | 6 +-
.../url/component/param/DynamicParamTable.java | 77 +++---
.../common/url/component/param/DynamicValues.java | 28 ++-
.../url/component/param/FixedParamValue.java | 9 +-
.../common/url/component/param/ParamValue.java | 11 +-
.../common/utils/ClassLoaderResourceLoader.java | 8 +-
.../apache/dubbo/common/utils/CollectionUtils.java | 1 -
.../apache/dubbo/common/utils/ExecutorUtil.java | 23 +-
.../org/apache/dubbo/common/utils/FieldUtils.java | 16 +-
.../org/apache/dubbo/common/utils/IOUtils.java | 24 +-
.../org/apache/dubbo/common/utils/JsonUtils.java | 67 +++++-
.../org/apache/dubbo/common/utils/MethodUtils.java | 31 +++
.../org/apache/dubbo/common/utils/StringUtils.java | 30 +--
.../org/apache/dubbo/config/AbstractConfig.java | 19 +-
.../definition/ServiceDefinitionBuilder.java | 6 +-
.../org/apache/dubbo/rpc/model/ModuleModel.java | 20 ++
.../dubbo/rpc/model/ModuleServiceRepository.java | 2 +-
.../AbstractDynamicConfigurationTest.java | 11 +-
.../file/FileSystemDynamicConfigurationTest.java | 26 +--
.../common/extension/ExtensionLoaderTest.java | 44 +++-
.../org/apache/dubbo/common/extension/SPI1.java} | 13 +-
.../apache/dubbo/common/extension/SPI1Impl.java} | 14 +-
.../org/apache/dubbo/common/extension/SPI2.java} | 13 +-
.../apache/dubbo/common/extension/SPI2Impl.java} | 14 +-
.../org/apache/dubbo/common/extension/SPI3.java} | 13 +-
.../apache/dubbo/common/extension/SPI3Impl.java} | 14 +-
.../org/apache/dubbo/common/extension/SPI4.java} | 13 +-
.../apache/dubbo/common/extension/SPI4Impl.java} | 14 +-
.../common/extension/wrapper/impl/DemoImpl.java | 6 +
.../dubbo/common/io/UnsafeStringWriterTest.java | 2 +-
.../apache/dubbo/common/json/GsonUtilsTest.java | 93 ++++++++
.../java/org/apache/dubbo/common/model/User.java | 4 +-
.../reporter/FrameworkStatusReportServiceTest.java | 9 +-
.../MemorySafeLinkedBlockingQueueTest.java | 46 ++++
.../threadpool/manager/ExecutorRepositoryTest.java | 6 +-
.../utils/ClassLoaderResourceLoaderTest.java | 2 +-
.../apache/dubbo/common/utils/JsonUtilsTest.java | 138 +++++++++++
.../common/utils/SerializeClassCheckerTest.java | 6 +
.../dubbo/metadata/definition/MetadataTest.java | 19 +-
.../test/java/org/apache/dubbo/rpc/model/User.java | 4 +-
.../org.apache.dubbo.common.extension.SPI2 | 1 +
.../dubbo/org.apache.dubbo.common.extension.SPI1 | 1 +
.../org.apache.dubbo.common.extension.SPI3 | 1 +
.../org.apache.dubbo.common.extension.SPI4 | 1 +
.../src/test/resources/special_spi.properties | 4 +
.../java/com/alibaba/dubbo/rpc/Invocation.java | 12 +
.../apache/dubbo/generic/GenericServiceTest.java | 12 +-
.../org/apache/dubbo/service/MockInvocation.java | 11 +
dubbo-compiler/pom.xml | 119 ++++++++++
.../org/apache/dubbo/gen/AbstractGenerator.java | 0
.../apache/dubbo/gen/dubbo/Dubbo3Generator.java | 0
.../org/apache/dubbo/gen/dubbo/DubboGenerator.java | 0
.../apache/dubbo/gen/grpc/DubboGrpcGenerator.java | 0
.../grpc/reactive/ReactorDubboGrpcGenerator.java | 0
.../gen/grpc/reactive/RxDubboGrpcGenerator.java | 0
.../dubbo/gen/tri/Dubbo3TripleGenerator.java | 0
.../main/resources/Dubbo3InterfaceStub.mustache | 17 ++
.../src/main/resources/Dubbo3Stub.mustache | 33 +++
.../resources/Dubbo3TripleInterfaceStub.mustache | 17 ++
.../src/main/resources/Dubbo3TripleStub.mustache | 17 ++
.../src/main/resources/DubboGrpcStub.mustache | 17 ++
.../src/main/resources/DubboStub.mustache | 17 ++
.../src/main/resources/DubboStub3Single.mustache | 17 ++
.../main/resources/ReactorDubboGrpcStub.mustache | 17 ++
.../src/main/resources/RxDubboGrpcStub.mustache | 17 ++
.../org/apache/dubbo/config/ConfigInitializer.java | 3 +-
.../ConfigurableMetadataServiceExporter.java | 9 +
.../config/utils/CompositeReferenceCache.java | 25 +-
...dataServiceURLParamsMetadataCustomizerTest.java | 7 +-
.../annotation/ServiceAnnotationPostProcessor.java | 7 +-
.../dubbo/config/spring/EmbeddedZooKeeper.java | 3 -
.../support/apollo/EmbeddedApolloJunit5.java | 16 +-
.../support/nacos/NacosDynamicConfiguration.java | 89 +------
.../nacos/NacosDynamicConfigurationTest.java | 25 +-
.../ZookeeperDynamicConfigurationTest.java | 37 ++-
.../dubbo/demo/consumer/GenericApplication.java | 7 +-
dubbo-demo/dubbo-demo-triple/pom.xml | 18 +-
dubbo-distribution/dubbo-all/pom.xml | 1 +
dubbo-metadata/dubbo-metadata-api/pom.xml | 5 -
.../dubbo/metadata/AbstractCacheManager.java | 2 +-
.../dubbo/metadata/AbstractServiceNameMapping.java | 6 +
.../apache/dubbo/metadata/MappingCacheManager.java | 9 +-
.../org/apache/dubbo/metadata/MetadataInfo.java | 2 +-
.../dubbo/metadata/MetadataServiceDetector.java | 12 +-
.../apache/dubbo/metadata/ServiceNameMapping.java | 6 +-
.../report/support/AbstractMetadataReport.java | 49 ++--
.../rest/ClassPathServiceRestMetadataReader.java | 20 +-
.../dubbo/metadata/rest/RequestMetadata.java | 7 +-
...g.apache.dubbo.rpc.model.BuiltinServiceDetector | 1 +
.../apache/dubbo/metadata/MetadataInfoTest.java | 7 +-
.../support/AbstractMetadataReportFactoryTest.java | 6 +-
.../report/support/AbstractMetadataReportTest.java | 11 +-
.../JAXRSServiceRestMetadataResolverTest.java | 13 +-
.../SpringMvcServiceRestMetadataResolverTest.java | 13 +-
dubbo-metadata/dubbo-metadata-processor/pom.xml | 13 --
.../AbstractServiceAnnotationProcessor.java | 2 +-
...rviceDefinitionMetadataAnnotationProcessor.java | 5 +-
.../rest/ServiceRestMetadataStorage.java | 26 ++-
.../metadata/store/nacos/NacosMetadataReport.java | 2 +-
.../store/redis/RedisMetadataReportTest.java | 27 ++-
.../store/zookeeper/ZookeeperMetadataReport.java | 2 +-
.../zookeeper/ZookeeperMetadataReportTest.java | 11 +-
dubbo-monitor/dubbo-monitor-default/pom.xml | 6 -
.../apache/dubbo/monitor/dubbo/MetricsFilter.java | 22 +-
.../dubbo/monitor/dubbo/MetricsFilterTest.java | 33 +--
.../dubbo/qos/command/impl/ChangeTelnet.java | 2 +-
.../dubbo/qos/command/impl/GetRouterSnapshot.java | 2 +-
.../dubbo/qos/command/impl/InvokeTelnet.java | 8 +-
.../apache/dubbo/qos/command/impl/LoggerInfo.java | 37 +++
.../java/org/apache/dubbo/qos/command/impl/Ls.java | 6 +-
.../dubbo/qos/command/impl/SwitchLogLevel.java | 66 ++++++
.../dubbo/qos/command/impl/SwitchLogger.java | 46 ++++
.../dubbo/qos/command/util/ServiceCheckUtils.java | 90 ++++---
.../dubbo/qos/protocol/QosProtocolWrapper.java | 15 +-
.../qos/server/handler/QosProcessHandler.java | 13 +-
.../org.apache.dubbo.qos.command.BaseCommand | 3 +
.../dubbo/qos/command/util/CommandHelperTest.java | 6 +
.../qos/command/util/ServiceCheckUtilsTest.java | 107 ++++++---
.../apache/dubbo/registry/RegistryNotifier.java | 5 +
.../registry/client/AbstractServiceDiscovery.java | 1 +
.../registry/client/DefaultServiceInstance.java | 25 +-
.../dubbo/registry/client/InstanceAddressURL.java | 9 +
.../dubbo/registry/client/ServiceDiscovery.java | 2 +
.../listener/ServiceInstancesChangedListener.java | 111 ++++-----
.../registry/client/metadata/MetadataUtils.java | 64 ++++-
.../metadata/ServiceInstanceMetadataUtils.java | 12 +-
.../SpringCloudMetadataServiceURLBuilder.java | 5 +-
.../StandardMetadataServiceURLBuilder.java | 23 +-
.../client/metadata/store/MetaCacheManager.java | 2 +-
.../DefaultMigrationAddressComparator.java | 1 +
.../client/migration/MigrationClusterInvoker.java | 1 +
.../client/migration/MigrationRuleListener.java | 4 +-
.../client/migration/model/MigrationRule.java | 33 ++-
.../dubbo/registry/support/AbstractRegistry.java | 23 +-
.../support/DefaultProviderFirstParams.java | 2 +-
.../AbstractServiceDiscoveryFactoryTest.java | 2 +-
.../registry/client/InstanceAddressURLTest.java | 13 ++
.../ServiceInstancesChangedListenerTest.java | 134 ++++++++++-
.../ProtocolPortsMetadataCustomizerTest.java | 6 +-
.../StandardMetadataServiceURLBuilderTest.java | 38 +--
.../metadata/store/MetaCacheManagerTest.java | 4 +-
.../client/migration/MigrationRuleHandlerTest.java | 5 +-
.../migration/MigrationRuleListenerTest.java | 2 +-
.../client/migration/model/MigrationRuleTest.java | 4 +-
.../registry/multicast/MulticastRegistry.java | 48 ++--
.../dubbo/registry/multiple/MultipleRegistry.java | 4 +-
.../apache/dubbo/registry/nacos/NacosRegistry.java | 2 +-
.../nacos/util/NacosInstanceManageUtil.java | 4 +-
.../dubbo/registry/nacos/NacosRegistryTest.java | 28 +--
.../registry/zookeeper/ZookeeperRegistry.java | 83 ++++---
.../zookeeper/ZookeeperServiceDiscovery.java | 40 +++-
.../ZookeeperServiceDiscoveryChangeWatcher.java | 8 +
.../zookeeper/util/CuratorFrameworkParams.java | 7 +-
.../zookeeper/util/CuratorFrameworkUtils.java | 78 ++++++-
.../zookeeper/util/CuratorFrameworkUtilsTest.java | 4 +-
.../dubbo/remoting/api/ProtocolDetector.java | 1 -
.../dubbo/remoting/transport/CodecSupport.java | 3 +-
.../remoting/http/jetty/JettyLoggerAdapter.java | 2 +-
dubbo-rpc/dubbo-rpc-api/pom.xml | 7 +-
.../main/java/org/apache/dubbo/rpc/Invocation.java | 7 +
.../java/org/apache/dubbo/rpc/RpcInvocation.java | 211 ++++++++++++-----
.../apache/dubbo/rpc/filter/AccessLogFilter.java | 50 ++--
.../org/apache/dubbo/rpc/filter/GenericFilter.java | 109 ++++-----
.../dubbo/rpc/filter/ProfilerServerFilter.java | 6 +-
.../org/apache/dubbo/rpc/filter/TokenFilter.java | 5 +-
.../apache/dubbo/rpc/filter/TokenHeaderFilter.java | 5 +-
.../apache/dubbo/rpc/protocol/AbstractInvoker.java | 2 +-
.../dubbo/rpc/protocol/AbstractProtocol.java | 43 ++++
.../dubbo/rpc/protocol/AbstractProxyProtocol.java | 8 +-
.../org/apache/dubbo/rpc/proxy/InvocationUtil.java | 6 +-
.../apache/dubbo/rpc/support/AccessLogData.java | 31 +--
.../org/apache/dubbo/rpc/support/MockInvoker.java | 22 +-
.../dubbo/rpc/filter/AccessLogFilterTest.java | 4 +-
.../apache/dubbo/rpc/filter/TokenFilterTest.java | 4 +-
.../rpc/protocol/dubbo/CallbackServiceCodec.java | 2 +-
.../rpc/protocol/dubbo/ChannelWrappedInvoker.java | 2 +-
.../apache/dubbo/rpc/protocol/dubbo/Constants.java | 1 -
.../protocol/dubbo/DecodeableRpcInvocation.java | 8 +-
.../dubbo/rpc/protocol/dubbo/DubboProtocol.java | 59 +----
.../rpc/protocol/dubbo/filter/TraceFilter.java | 13 +-
.../dubbo/rpc/protocol/injvm/InjvmInvoker.java | 4 +-
.../rpc/protocol/rest/ReferenceCountedClient.java | 50 ++++
.../dubbo/rpc/protocol/rest/RestProtocol.java | 144 +++++++-----
dubbo-rpc/dubbo-rpc-triple/pom.xml | 18 +-
.../dubbo/rpc/protocol/tri/TripleInvoker.java | 15 +-
.../dubbo/rpc/protocol/tri/TripleProtocol.java | 13 +-
.../tri/call/ReflectionAbstractServerCall.java | 3 +-
.../apache/dubbo/test/check/DubboTestChecker.java | 2 +-
233 files changed, 3636 insertions(+), 1892 deletions(-)