You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by cr...@apache.org on 2023/11/07 07:41:52 UTC
(dubbo) branch 3.3 updated: [3.3]Use spotless to format the code (#13322)
This is an automated email from the ASF dual-hosted git repository.
crazyhzm pushed a commit to branch 3.3
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/3.3 by this push:
new d979b211ce [3.3]Use spotless to format the code (#13322)
d979b211ce is described below
commit d979b211ce6a160ce4787ebf2ac073a0ee95852a
Author: huazhongming <cr...@gmail.com>
AuthorDate: Tue Nov 7 15:41:45 2023 +0800
[3.3]Use spotless to format the code (#13322)
* Use spotless to format the code
Signed-off-by: crazyhzm <cr...@gmail.com>
* Use spotless to format the code
Signed-off-by: crazyhzm <cr...@gmail.com>
* Use spotless to format the code
Signed-off-by: crazyhzm <cr...@gmail.com>
* degrade dubbo version
Signed-off-by: crazyhzm <cr...@gmail.com>
* degrade dubbo version
Signed-off-by: crazyhzm <cr...@gmail.com>
* revert degrade dubbo version
Signed-off-by: crazyhzm <cr...@gmail.com>
* Fix ut
Signed-off-by: crazyhzm <cr...@gmail.com>
---------
Signed-off-by: crazyhzm <cr...@gmail.com>
---
dubbo-cluster/pom.xml | 202 +-
.../org/apache/dubbo/registry/AddressListener.java | 5 +-
.../java/org/apache/dubbo/rpc/cluster/Cluster.java | 4 +-
.../rpc/cluster/ClusterScopeModelInitializer.java | 3 +-
.../org/apache/dubbo/rpc/cluster/Configurator.java | 8 +-
.../dubbo/rpc/cluster/ConfiguratorFactory.java | 1 -
.../org/apache/dubbo/rpc/cluster/Constants.java | 1 -
.../org/apache/dubbo/rpc/cluster/LoadBalance.java | 1 -
.../java/org/apache/dubbo/rpc/cluster/Merger.java | 1 -
.../rpc/cluster/ProviderURLMergeProcessor.java | 4 +-
.../java/org/apache/dubbo/rpc/cluster/Router.java | 10 +-
.../org/apache/dubbo/rpc/cluster/RouterChain.java | 71 +-
.../apache/dubbo/rpc/cluster/RuleConverter.java | 2 -
.../dubbo/rpc/cluster/SingleRouterChain.java | 70 +-
.../cluster/configurator/AbstractConfigurator.java | 45 +-
.../configurator/absent/AbsentConfigurator.java | 1 -
.../absent/AbsentConfiguratorFactory.java | 1 -
.../override/OverrideConfigurator.java | 1 -
.../override/OverrideConfiguratorFactory.java | 1 -
.../cluster/configurator/parser/ConfigParser.java | 19 +-
.../configurator/parser/model/ConditionMatch.java | 13 +-
.../configurator/parser/model/ConfigItem.java | 28 +-
.../parser/model/ConfiguratorConfig.java | 4 +-
.../configurator/parser/model/ParamMatch.java | 5 +-
.../rpc/cluster/directory/AbstractDirectory.java | 239 +-
.../rpc/cluster/directory/StaticDirectory.java | 23 +-
.../cluster/filter/DefaultFilterChainBuilder.java | 20 +-
.../rpc/cluster/filter/FilterChainBuilder.java | 53 +-
.../rpc/cluster/filter/ProtocolFilterWrapper.java | 4 +-
.../filter/support/MetricsConsumerFilter.java | 7 +-
.../DefaultGovernanceRuleRepositoryImpl.java | 1 -
.../governance/GovernanceRuleRepository.java | 1 -
.../cluster/loadbalance/AbstractLoadBalance.java | 5 +-
.../loadbalance/ConsistentHashLoadBalance.java | 10 +-
.../loadbalance/LeastActiveLoadBalance.java | 7 +-
.../rpc/cluster/loadbalance/RandomLoadBalance.java | 5 +-
.../cluster/loadbalance/RoundRobinLoadBalance.java | 9 +-
.../loadbalance/ShortestResponseLoadBalance.java | 25 +-
.../dubbo/rpc/cluster/router/AbstractRouter.java | 10 +-
.../rpc/cluster/router/RouterSnapshotFilter.java | 2 +-
.../rpc/cluster/router/RouterSnapshotNode.java | 78 +-
.../rpc/cluster/router/RouterSnapshotSwitcher.java | 2 +-
.../rule/virtualservice/match/AddressMatch.java | 9 +-
.../mesh/rule/virtualservice/match/BoolMatch.java | 6 +-
.../rule/virtualservice/match/DoubleMatch.java | 3 -
.../virtualservice/match/DoubleRangeMatch.java | 3 -
.../rule/virtualservice/match/DubboMethodArg.java | 15 +-
.../virtualservice/match/DubboMethodMatch.java | 22 +-
.../rule/virtualservice/match/ListBoolMatch.java | 3 -
.../rule/virtualservice/match/ListDoubleMatch.java | 2 -
.../rule/virtualservice/match/ListStringMatch.java | 3 -
.../rule/virtualservice/match/StringMatch.java | 16 +-
.../cluster/router/state/AbstractStateRouter.java | 37 +-
.../dubbo/rpc/cluster/router/state/BitList.java | 12 +-
.../router/state/CacheableStateRouterFactory.java | 3 +-
.../cluster/router/state/RouterGroupingState.java | 43 +-
.../rpc/cluster/router/state/StateRouter.java | 11 +-
.../rpc/cluster/router/state/TailStateRouter.java | 20 +-
.../cluster/support/AbstractClusterInvoker.java | 128 +-
.../cluster/support/AvailableClusterInvoker.java | 4 +-
.../rpc/cluster/support/BroadcastCluster.java | 1 -
.../cluster/support/BroadcastClusterInvoker.java | 57 +-
.../dubbo/rpc/cluster/support/ClusterUtils.java | 19 +-
.../dubbo/rpc/cluster/support/FailbackCluster.java | 3 +-
.../cluster/support/FailbackClusterInvoker.java | 76 +-
.../dubbo/rpc/cluster/support/FailfastCluster.java | 3 +-
.../cluster/support/FailfastClusterInvoker.java | 20 +-
.../dubbo/rpc/cluster/support/FailoverCluster.java | 3 +-
.../cluster/support/FailoverClusterInvoker.java | 55 +-
.../dubbo/rpc/cluster/support/FailsafeCluster.java | 3 +-
.../cluster/support/FailsafeClusterInvoker.java | 13 +-
.../dubbo/rpc/cluster/support/ForkingCluster.java | 3 +-
.../rpc/cluster/support/ForkingClusterInvoker.java | 64 +-
.../merger/DefaultProviderURLMergeProcessor.java | 14 +-
.../cluster/support/registry/ZoneAwareCluster.java | 3 +-
.../support/registry/ZoneAwareClusterInvoker.java | 34 +-
.../cluster/support/wrapper/AbstractCluster.java | 54 +-
.../support/wrapper/ScopeClusterInvoker.java | 71 +-
.../support/wrapper/ScopeClusterWrapper.java | 4 +-
.../apache/dubbo/rpc/cluster/ConfiguratorTest.java | 15 +-
.../apache/dubbo/rpc/cluster/RouterChainTest.java | 253 -
.../org/apache/dubbo/rpc/cluster/StickyTest.java | 24 +-
.../absent/AbsentConfiguratorTest.java | 23 +-
.../cluster/configurator/consts/UrlConstant.java | 19 +-
.../override/OverrideConfiguratorTest.java | 32 +-
.../configurator/parser/ConfigParserTest.java | 29 +-
.../filter/DefaultFilterChainBuilderTest.java | 82 +-
.../dubbo/rpc/cluster/filter/DemoService.java | 1 -
.../dubbo/rpc/cluster/filter/DemoServiceImpl.java | 3 +-
.../dubbo/rpc/cluster/filter/DemoServiceLocal.java | 12 +-
.../dubbo/rpc/cluster/filter/DemoServiceStub.java | 4 +-
.../apache/dubbo/rpc/cluster/filter/LogFilter.java | 9 +-
.../loadbalance/AbstractLoadBalanceTest.java | 12 +-
.../loadbalance/ConsistentHashLoadBalanceTest.java | 35 +-
.../loadbalance/LeastActiveBalanceTest.java | 12 +-
.../cluster/loadbalance/LoadBalanceBaseTest.java | 32 +-
.../cluster/loadbalance/RandomLoadBalanceTest.java | 11 +-
.../loadbalance/RoundRobinLoadBalanceTest.java | 39 +-
.../ShortestResponseLoadBalanceTest.java | 30 +-
.../dubbo/rpc/cluster/router/MockInvoker.java | 6 +-
.../cluster/router/RouterSnapshotFilterTest.java | 3 +-
.../rule/virtualservice/match/BoolMatchTest.java | 6 +-
.../rule/virtualservice/match/DoubleMatchTest.java | 6 -
.../virtualservice/match/DubboMethodMatchTest.java | 53 +-
.../virtualservice/match/ListBoolMatchTest.java | 6 +-
.../virtualservice/match/ListDoubleMatchTest.java | 7 +-
.../virtualservice/match/ListStringMatchTest.java | 8 +-
.../rule/virtualservice/match/StringMatchTest.java | 5 -
.../rpc/cluster/router/state/BitListTest.java | 15 +-
.../support/AbstractClusterInvokerTest.java | 101 +-
.../support/AvailableClusterInvokerTest.java | 7 +-
.../support/BroadCastClusterInvokerTest.java | 13 +-
.../rpc/cluster/support/ClusterUtilsTest.java | 105 +-
.../support/ConnectivityValidationTest.java | 52 +-
.../support/FailSafeClusterInvokerTest.java | 14 +-
.../support/FailbackClusterInvokerTest.java | 83 +-
.../support/FailfastClusterInvokerTest.java | 8 +-
.../support/FailoverClusterInvokerTest.java | 26 +-
.../cluster/support/ForkingClusterInvokerTest.java | 14 +-
.../support/TagProviderURLMergeProcessor.java | 1 -
.../DefaultProviderURLMergeProcessorTest.java | 73 +-
.../registry/ZoneAwareClusterInvokerTest.java | 118 +-
.../support/wrapper/AbstractClusterTest.java | 29 +-
.../cluster/support/wrapper/DemoClusterFilter.java | 5 +-
.../support/wrapper/ScopeClusterInvokerTest.java | 117 +-
dubbo-common/pom.xml | 191 +-
.../apache/dubbo/common/BatchExecutorQueue.java | 10 +-
.../java/org/apache/dubbo/common/Experimental.java | 13 +-
.../java/org/apache/dubbo/common/Extension.java | 2 -
.../main/java/org/apache/dubbo/common/Node.java | 1 -
.../java/org/apache/dubbo/common/Parameters.java | 4 +-
.../apache/dubbo/common/ProtocolServiceKey.java | 2 +-
.../java/org/apache/dubbo/common/Resetable.java | 1 -
.../java/org/apache/dubbo/common/ServiceKey.java | 9 +-
.../src/main/java/org/apache/dubbo/common/URL.java | 100 +-
.../java/org/apache/dubbo/common/URLBuilder.java | 42 +-
.../java/org/apache/dubbo/common/URLStrParser.java | 29 +-
.../main/java/org/apache/dubbo/common/Version.java | 58 +-
.../apache/dubbo/common/aot/NativeDetector.java | 2 -
.../common/beans/ScopeBeanExtensionInjector.java | 2 +-
.../common/beans/factory/ScopeBeanFactory.java | 36 +-
.../beans/support/InstantiationStrategy.java | 7 +-
.../dubbo/common/beanutil/JavaBeanAccessor.java | 1 -
.../dubbo/common/beanutil/JavaBeanDescriptor.java | 2 +-
.../common/beanutil/JavaBeanSerializeUtil.java | 58 +-
.../dubbo/common/bytecode/ClassGenerator.java | 65 +-
.../common/bytecode/DubboLoaderClassPath.java | 9 +-
.../org/apache/dubbo/common/bytecode/Mixin.java | 33 +-
.../common/bytecode/NoSuchMethodException.java | 1 -
.../common/bytecode/NoSuchPropertyException.java | 1 -
.../org/apache/dubbo/common/bytecode/Proxy.java | 25 +-
.../org/apache/dubbo/common/bytecode/Wrapper.java | 154 +-
.../apache/dubbo/common/cache/FileCacheStore.java | 41 +-
.../dubbo/common/cache/FileCacheStoreFactory.java | 59 +-
.../dubbo/common/compact/Dubbo2CompactUtils.java | 1 +
.../compact/Dubbo2GenericExceptionUtils.java | 36 +-
.../org/apache/dubbo/common/compiler/Compiler.java | 1 -
.../common/compiler/support/AbstractCompiler.java | 7 +-
.../common/compiler/support/AdaptiveCompiler.java | 1 -
.../dubbo/common/compiler/support/ClassUtils.java | 31 +-
.../common/compiler/support/CtClassBuilder.java | 14 +-
.../common/compiler/support/JavassistCompiler.java | 8 +-
.../dubbo/common/compiler/support/JdkCompiler.java | 45 +-
.../dubbo/common/concurrent/AbortPolicy.java | 2 -
.../common/concurrent/CallableSafeInitializer.java | 5 +-
.../dubbo/common/concurrent/DiscardPolicy.java | 5 +-
.../dubbo/common/concurrent/RejectException.java | 3 +-
.../common/config/CompositeConfiguration.java | 20 +-
.../apache/dubbo/common/config/Configuration.java | 13 +-
.../dubbo/common/config/ConfigurationUtils.java | 79 +-
.../apache/dubbo/common/config/Environment.java | 19 +-
.../dubbo/common/config/InmemoryConfiguration.java | 4 +-
.../dubbo/common/config/ModuleEnvironment.java | 6 +-
.../config/OrderedPropertiesConfiguration.java | 9 +-
.../common/config/OrderedPropertiesProvider.java | 5 +-
.../dubbo/common/config/PrefixedConfiguration.java | 1 -
.../dubbo/common/config/SystemConfiguration.java | 1 -
.../configcenter/AbstractDynamicConfiguration.java | 49 +-
.../config/configcenter/ConfigChangedEvent.java | 20 +-
.../common/config/configcenter/ConfigItem.java | 5 +-
.../config/configcenter/DynamicConfiguration.java | 5 +-
.../configcenter/DynamicConfigurationFactory.java | 1 -
.../configcenter/TreePathDynamicConfiguration.java | 13 +-
.../wrapper/CompositeDynamicConfiguration.java | 12 +-
.../dubbo/common/constants/ClusterRules.java | 3 -
.../dubbo/common/constants/CommonConstants.java | 10 +-
.../dubbo/common/constants/FilterConstants.java | 1 -
.../dubbo/common/constants/LoadbalanceRules.java | 1 -
.../common/constants/LoggerCodeConstants.java | 1 -
.../dubbo/common/constants/QosConstants.java | 1 -
.../dubbo/common/constants/RegistryConstants.java | 2 -
.../dubbo/common/constants/RemotingConstants.java | 1 -
.../dubbo/common/context/ApplicationExt.java | 4 +-
.../dubbo/common/context/LifecycleAdapter.java | 12 +-
.../org/apache/dubbo/common/context/ModuleExt.java | 4 +-
.../apache/dubbo/common/convert/ConverterUtil.java | 17 +-
.../dubbo/common/convert/StringConverter.java | 3 +-
.../common/convert/StringToCharArrayConverter.java | 2 -
.../common/convert/StringToDoubleConverter.java | 1 -
.../common/convert/StringToDurationConverter.java | 7 +-
.../common/convert/StringToLongConverter.java | 1 -
.../common/convert/StringToOptionalConverter.java | 1 -
.../common/convert/StringToShortConverter.java | 1 -
.../convert/multiple/StringToArrayConverter.java | 1 -
.../multiple/StringToIterableConverter.java | 38 +-
.../multiple/StringToMultiValueConverter.java | 2 +-
.../dubbo/common/deploy/AbstractDeployer.java | 35 +-
.../common/deploy/ApplicationDeployListener.java | 4 +-
.../apache/dubbo/common/deploy/DeployListener.java | 1 -
.../dubbo/common/deploy/DeployListenerAdapter.java | 21 +-
.../dubbo/common/deploy/ModuleDeployListener.java | 4 +-
.../apache/dubbo/common/extension/Activate.java | 2 +-
.../apache/dubbo/common/extension/Adaptive.java | 1 -
.../extension/AdaptiveClassCodeGenerator.java | 60 +-
.../dubbo/common/extension/DisableInject.java | 3 +-
.../dubbo/common/extension/ExtensionAccessor.java | 1 -
.../common/extension/ExtensionAccessorAware.java | 1 -
.../dubbo/common/extension/ExtensionDirector.java | 7 +-
.../dubbo/common/extension/ExtensionInjector.java | 3 +-
.../dubbo/common/extension/ExtensionLoader.java | 383 +-
.../common/extension/ExtensionPostProcessor.java | 1 -
.../dubbo/common/extension/LoadingStrategy.java | 2 +-
.../org/apache/dubbo/common/extension/SPI.java | 1 -
.../inject/AdaptiveExtensionInjector.java | 21 +-
.../extension/inject/SpiExtensionInjector.java | 2 +-
.../extension/support/ActivateComparator.java | 8 +-
.../extension/support/WrapperComparator.java | 8 +-
.../apache/dubbo/common/function/Predicates.java | 1 -
.../org/apache/dubbo/common/function/Streams.java | 2 -
.../apache/dubbo/common/infra/InfraAdapter.java | 2 -
.../java/org/apache/dubbo/common/io/Bytes.java | 70 +-
.../org/apache/dubbo/common/io/StreamUtils.java | 3 +-
.../common/io/UnsafeByteArrayInputStream.java | 3 +-
.../common/io/UnsafeByteArrayOutputStream.java | 3 +-
.../apache/dubbo/common/io/UnsafeStringReader.java | 3 +-
.../apache/dubbo/common/io/UnsafeStringWriter.java | 9 +-
.../org/apache/dubbo/common/json/GsonUtils.java | 12 +-
.../common/json/impl/AbstractJsonUtilImpl.java | 28 +-
.../dubbo/common/json/impl/FastJson2Impl.java | 5 +-
.../dubbo/common/json/impl/FastJsonImpl.java | 5 +-
.../apache/dubbo/common/json/impl/GsonImpl.java | 9 +-
.../apache/dubbo/common/json/impl/JacksonImpl.java | 18 +-
.../org/apache/dubbo/common/lang/Nullable.java | 5 +-
.../org/apache/dubbo/common/lang/Prioritized.java | 6 +-
.../dubbo/common/lang/ShutdownHookCallbacks.java | 3 +-
.../dubbo/common/logger/ErrorTypeAwareLogger.java | 1 -
.../java/org/apache/dubbo/common/logger/Level.java | 1 -
.../dubbo/common/logger/ListenableLogger.java | 4 +-
.../apache/dubbo/common/logger/LogListener.java | 2 -
.../org/apache/dubbo/common/logger/Logger.java | 1 -
.../apache/dubbo/common/logger/LoggerFactory.java | 55 +-
.../apache/dubbo/common/logger/jcl/JclLogger.java | 1 -
.../dubbo/common/logger/jcl/JclLoggerAdapter.java | 5 +-
.../apache/dubbo/common/logger/jdk/JdkLogger.java | 6 +-
.../dubbo/common/logger/jdk/JdkLoggerAdapter.java | 9 +-
.../common/logger/log4j/Log4jLoggerAdapter.java | 6 +-
.../common/logger/log4j2/Log4j2LoggerAdapter.java | 4 +-
.../dubbo/common/logger/slf4j/Slf4jLogger.java | 10 +-
.../common/logger/slf4j/Slf4jLoggerAdapter.java | 8 +-
.../support/FailsafeErrorTypeAwareLogger.java | 34 +-
.../common/logger/support/FailsafeLogger.java | 4 +-
.../org/apache/dubbo/common/profiler/Profiler.java | 25 +-
.../dubbo/common/profiler/ProfilerSwitch.java | 6 +-
.../common/reference/ReferenceCountedResource.java | 9 +-
.../apache/dubbo/common/resource/Disposable.java | 1 -
.../common/resource/GlobalResourceInitializer.java | 1 -
.../common/resource/GlobalResourcesRepository.java | 19 +-
.../org/apache/dubbo/common/ssl/CertManager.java | 3 +-
.../org/apache/dubbo/common/ssl/ProviderCert.java | 3 +-
.../common/ssl/impl/SSLConfigCertProvider.java | 89 +-
.../org/apache/dubbo/common/status/Status.java | 1 -
.../apache/dubbo/common/status/StatusChecker.java | 1 -
.../reporter/FrameworkStatusReportService.java | 7 +-
.../status/reporter/FrameworkStatusReporter.java | 2 -
.../common/status/support/LoadStatusChecker.java | 1 -
.../common/status/support/MemoryStatusChecker.java | 8 +-
.../dubbo/common/status/support/StatusUtils.java | 1 -
.../org/apache/dubbo/common/store/DataStore.java | 2 -
.../common/store/support/SimpleDataStore.java | 8 +-
.../apache/dubbo/common/stream/StreamObserver.java | 2 -
.../common/system/OperatingSystemBeanManager.java | 18 +-
.../dubbo/common/threadlocal/InternalRunnable.java | 16 +-
.../dubbo/common/threadlocal/InternalThread.java | 4 +-
.../threadlocal/NamedInternalThreadFactory.java | 1 -
.../common/threadpool/MemoryLimitCalculator.java | 7 +-
.../MemoryLimitedLinkedBlockingQueue.java | 1 -
.../dubbo/common/threadpool/MemoryLimiter.java | 1 -
.../threadpool/MemorySafeLinkedBlockingQueue.java | 8 +-
.../apache/dubbo/common/threadpool/ThreadPool.java | 3 +-
.../common/threadpool/ThreadlessExecutor.java | 1 -
.../concurrent/ScheduledCompletableFuture.java | 32 +-
.../manager/DefaultExecutorRepository.java | 70 +-
.../threadpool/manager/ExecutorRepository.java | 13 +-
.../manager/FrameworkExecutorRepository.java | 82 +-
.../threadpool/support/AbortPolicyWithReport.java | 59 +-
.../support/cached/CachedThreadPool.java | 13 +-
.../threadpool/support/eager/EagerThreadPool.java | 7 +-
.../support/eager/EagerThreadPoolExecutor.java | 15 +-
.../common/threadpool/support/eager/TaskQueue.java | 1 -
.../threadpool/support/fixed/FixedThreadPool.java | 14 +-
.../support/limited/LimitedThreadPool.java | 15 +-
.../url/component/DubboServiceAddressURL.java | 9 +-
.../dubbo/common/url/component/PathURLAddress.java | 34 +-
.../common/url/component/ServiceAddressURL.java | 10 +-
.../common/url/component/ServiceConfigURL.java | 68 +-
.../dubbo/common/url/component/URLAddress.java | 12 +-
.../dubbo/common/url/component/URLParam.java | 103 +-
.../dubbo/common/url/component/URLPlainParam.java | 11 +-
.../url/component/param/DynamicParamTable.java | 7 +-
.../url/component/param/FixedParamValue.java | 4 +-
.../common/url/component/param/IgnoredParam.java | 1 -
.../common/url/component/param/ParamValue.java | 1 -
.../apache/dubbo/common/utils/AnnotationUtils.java | 62 +-
.../org/apache/dubbo/common/utils/ArrayUtils.java | 4 +-
.../java/org/apache/dubbo/common/utils/Assert.java | 5 +-
.../dubbo/common/utils/AtomicPositiveInteger.java | 3 +-
.../dubbo/common/utils/CacheableSupplier.java | 1 -
.../dubbo/common/utils/CharSequenceComparator.java | 5 +-
.../org/apache/dubbo/common/utils/ClassHelper.java | 10 +-
.../common/utils/ClassLoaderResourceLoader.java | 18 +-
.../org/apache/dubbo/common/utils/ClassUtils.java | 114 +-
.../apache/dubbo/common/utils/CollectionUtils.java | 10 +-
.../dubbo/common/utils/CompatibleTypeUtils.java | 26 +-
.../dubbo/common/utils/ConcurrentHashMapUtils.java | 7 +-
.../dubbo/common/utils/ConcurrentHashSet.java | 1 -
.../org/apache/dubbo/common/utils/ConfigUtils.java | 79 +-
.../common/utils/DefaultSerializeClassChecker.java | 48 +-
.../apache/dubbo/common/utils/DubboAppender.java | 7 +-
.../apache/dubbo/common/utils/ExecutorUtil.java | 11 +-
.../org/apache/dubbo/common/utils/FieldUtils.java | 1 -
.../java/org/apache/dubbo/common/utils/Holder.java | 1 -
.../org/apache/dubbo/common/utils/IOUtils.java | 14 +-
.../java/org/apache/dubbo/common/utils/JRE.java | 9 +-
.../org/apache/dubbo/common/utils/JVMUtil.java | 17 +-
.../dubbo/common/utils/JsonCompatibilityUtil.java | 23 +-
.../org/apache/dubbo/common/utils/JsonUtils.java | 23 +-
.../org/apache/dubbo/common/utils/LFUCache.java | 15 +-
.../org/apache/dubbo/common/utils/LRU2Cache.java | 1 -
.../org/apache/dubbo/common/utils/LRUCache.java | 1 -
.../java/org/apache/dubbo/common/utils/Log.java | 5 +-
.../org/apache/dubbo/common/utils/LogHelper.java | 4 +-
.../org/apache/dubbo/common/utils/LogUtil.java | 6 +-
.../org/apache/dubbo/common/utils/MD5Utils.java | 2 -
.../org/apache/dubbo/common/utils/MemberUtils.java | 1 -
.../dubbo/common/utils/MethodComparator.java | 5 +-
.../org/apache/dubbo/common/utils/MethodUtils.java | 26 +-
.../org/apache/dubbo/common/utils/NetUtils.java | 86 +-
.../org/apache/dubbo/common/utils/PathUtils.java | 5 +-
.../org/apache/dubbo/common/utils/PojoUtils.java | 153 +-
.../apache/dubbo/common/utils/ReflectUtils.java | 72 +-
.../apache/dubbo/common/utils/ReflectionUtils.java | 8 +-
.../apache/dubbo/common/utils/RegexProperties.java | 8 +-
.../utils/SerializeSecurityConfigurator.java | 62 +-
.../common/utils/SerializeSecurityManager.java | 3 +-
.../common/utils/ServiceAnnotationResolver.java | 7 +-
.../java/org/apache/dubbo/common/utils/Stack.java | 4 +-
.../utils/StringConstantFieldValuePredicate.java | 10 +-
.../org/apache/dubbo/common/utils/StringUtils.java | 30 +-
.../org/apache/dubbo/common/utils/TimeUtils.java | 4 +-
.../apache/dubbo/common/utils/ToStringUtils.java | 3 +-
.../org/apache/dubbo/common/utils/TypeUtils.java | 21 +-
.../org/apache/dubbo/common/utils/UrlUtils.java | 70 +-
.../org/apache/dubbo/config/AbstractConfig.java | 135 +-
.../dubbo/config/AbstractInterfaceConfig.java | 80 +-
.../apache/dubbo/config/AbstractMethodConfig.java | 7 +-
.../dubbo/config/AbstractReferenceConfig.java | 9 +-
.../apache/dubbo/config/AbstractServiceConfig.java | 3 +-
.../org/apache/dubbo/config/ApplicationConfig.java | 18 +-
.../org/apache/dubbo/config/ArgumentConfig.java | 4 +-
.../dubbo/config/CommonConfigPostProcessor.java | 9 +-
.../apache/dubbo/config/ConfigCenterConfig.java | 4 +-
.../java/org/apache/dubbo/config/ConfigKeys.java | 1 -
.../java/org/apache/dubbo/config/Constants.java | 22 +-
.../org/apache/dubbo/config/ConsumerConfig.java | 7 +-
.../apache/dubbo/config/MetadataReportConfig.java | 15 +-
.../java/org/apache/dubbo/config/MethodConfig.java | 40 +-
.../org/apache/dubbo/config/MetricsConfig.java | 3 +-
.../java/org/apache/dubbo/config/ModuleConfig.java | 3 +-
.../org/apache/dubbo/config/MonitorConfig.java | 4 +-
.../org/apache/dubbo/config/ProtocolConfig.java | 25 +-
.../org/apache/dubbo/config/ProviderConfig.java | 4 +-
.../apache/dubbo/config/ReferenceConfigBase.java | 36 +-
.../org/apache/dubbo/config/RegistryConfig.java | 3 +-
.../org/apache/dubbo/config/ServiceConfigBase.java | 24 +-
.../java/org/apache/dubbo/config/SslConfig.java | 15 +-
.../org/apache/dubbo/config/TracingConfig.java | 4 +-
.../java/org/apache/dubbo/config/TripleConfig.java | 1 -
.../apache/dubbo/config/annotation/Argument.java | 6 +-
.../org/apache/dubbo/config/annotation/Method.java | 1 -
.../config/context/AbstractConfigManager.java | 116 +-
.../apache/dubbo/config/context/ConfigManager.java | 35 +-
.../dubbo/config/context/ConfigValidator.java | 1 -
.../dubbo/config/context/ModuleConfigManager.java | 26 +-
.../apache/dubbo/config/nested/BaggageConfig.java | 7 +-
.../apache/dubbo/config/nested/ExporterConfig.java | 7 +-
.../dubbo/config/nested/HistogramConfig.java | 1 -
.../dubbo/config/nested/PropagationConfig.java | 4 +-
.../apache/dubbo/config/nested/SamplingConfig.java | 3 +-
.../org/apache/dubbo/config/support/Nested.java | 3 +-
.../org/apache/dubbo/config/support/Parameter.java | 1 -
.../definition/MethodDefinitionBuilder.java | 1 -
.../definition/ServiceDefinitionBuilder.java | 5 +-
.../metadata/definition/TypeDefinitionBuilder.java | 4 +-
.../definition/builder/ArrayTypeBuilder.java | 1 -
.../definition/builder/CollectionTypeBuilder.java | 4 +-
.../definition/builder/DefaultTypeBuilder.java | 3 +-
.../definition/builder/EnumTypeBuilder.java | 4 +-
.../metadata/definition/builder/TypeBuilder.java | 1 -
.../definition/model/FullServiceDefinition.java | 5 +-
.../definition/model/MethodDefinition.java | 6 +-
.../definition/model/ServiceDefinition.java | 8 +-
.../metadata/definition/model/TypeDefinition.java | 13 +-
.../dubbo/metadata/definition/util/ClassUtils.java | 10 +-
.../definition/util/JaketConfigurationUtils.java | 1 -
.../executor/AbstractIsolationExecutorSupport.java | 3 +-
.../dubbo/rpc/executor/DefaultExecutorSupport.java | 1 -
.../executor/IsolationExecutorSupportFactory.java | 4 +-
.../apache/dubbo/rpc/model/ApplicationModel.java | 29 +-
.../dubbo/rpc/model/BuiltinServiceDetector.java | 1 -
.../dubbo/rpc/model/ConsumerMethodModel.java | 15 +-
.../org/apache/dubbo/rpc/model/ConsumerModel.java | 56 +-
.../java/org/apache/dubbo/rpc/model/DubboStub.java | 4 +-
.../org/apache/dubbo/rpc/model/FrameworkModel.java | 36 +-
.../rpc/model/FrameworkServiceRepository.java | 11 +-
.../apache/dubbo/rpc/model/MethodDescriptor.java | 6 +-
.../org/apache/dubbo/rpc/model/ModuleModel.java | 21 +-
.../dubbo/rpc/model/ModuleServiceRepository.java | 61 +-
.../main/java/org/apache/dubbo/rpc/model/Pack.java | 2 -
.../org/apache/dubbo/rpc/model/PackableMethod.java | 3 -
.../dubbo/rpc/model/PackableMethodFactory.java | 2 -
.../org/apache/dubbo/rpc/model/ProviderModel.java | 38 +-
.../rpc/model/ReflectionMethodDescriptor.java | 43 +-
.../rpc/model/ReflectionServiceDescriptor.java | 30 +-
.../org/apache/dubbo/rpc/model/ScopeModel.java | 3 +-
.../apache/dubbo/rpc/model/ScopeModelAccessor.java | 1 -
.../apache/dubbo/rpc/model/ScopeModelAware.java | 13 +-
.../apache/dubbo/rpc/model/ServiceDescriptor.java | 1 -
.../apache/dubbo/rpc/model/ServiceMetadata.java | 3 +-
.../org/apache/dubbo/rpc/model/ServiceModel.java | 35 +-
.../apache/dubbo/rpc/model/ServiceRepository.java | 8 +-
.../dubbo/rpc/model/StubMethodDescriptor.java | 28 +-
.../dubbo/rpc/model/StubServiceDescriptor.java | 20 +-
.../java/org/apache/dubbo/rpc/model/UnPack.java | 2 -
.../org/apache/dubbo/rpc/model/WrapperUnPack.java | 2 -
.../org/apache/dubbo/rpc/service/Destroyable.java | 1 -
.../org/apache/dubbo/rpc/service/EchoService.java | 1 -
.../dubbo/rpc/service/EchoServiceDetector.java | 1 -
.../apache/dubbo/rpc/service/GenericException.java | 4 +-
.../apache/dubbo/rpc/service/GenericService.java | 4 +-
.../dubbo/rpc/service/GenericServiceDetector.java | 1 -
.../service/ServiceDescriptorInternalCache.java | 3 +-
.../dubbo/rpc/support/GroupServiceKeyCache.java | 2 +-
.../apache/dubbo/rpc/support/ProtocolUtils.java | 33 +-
dubbo-common/src/test/java/com/pojo/Demo2.java | 3 +-
dubbo-common/src/test/java/com/pojo/Demo3.java | 3 +-
dubbo-common/src/test/java/com/pojo/Demo4.java | 3 +-
dubbo-common/src/test/java/com/pojo/Demo5.java | 3 +-
dubbo-common/src/test/java/com/pojo/Demo6.java | 3 +-
dubbo-common/src/test/java/com/pojo/Demo7.java | 3 +-
dubbo-common/src/test/java/com/pojo/Demo8.java | 3 +-
.../src/test/java/com/pojo/DemoException1.java | 3 +-
.../src/test/java/com/pojo/DemoException2.java | 3 +-
.../src/test/java/com/pojo/DemoException3.java | 3 +-
dubbo-common/src/test/java/com/pojo/Simple.java | 3 +-
.../src/test/java/com/service/DemoService1.java | 14 +-
.../src/test/java/com/service/DemoService2.java | 3 +-
.../src/test/java/com/service/DemoService4.java | 4 +-
.../src/test/java/com/service/DemoService5.java | 3 +-
dubbo-common/src/test/java/com/service/Params.java | 1 -
.../src/test/java/com/service/Service.java | 27 +-
dubbo-common/src/test/java/com/service/User.java | 1 -
.../src/test/java/com/service/UserService.java | 31 +-
.../service/deep1/deep2/deep3/DemoService3.java | 3 +-
.../dubbo/common/BaseServiceMetadataTest.java | 39 +-
.../dubbo/common/InterfaceAddressURLTest.java | 41 +-
.../common/PojoUtilsForNonPublicStaticTest.java | 2 +-
.../common/ProtocolServiceKeyMatcherTest.java | 87 +-
.../dubbo/common/ProtocolServiceKeyTest.java | 42 +-
.../apache/dubbo/common/ServiceKeyMatcherTest.java | 213 +-
.../org/apache/dubbo/common/ServiceKeyTest.java | 2 +-
.../org/apache/dubbo/common/URLBuilderTest.java | 55 +-
.../org/apache/dubbo/common/URLStrParserTest.java | 19 +-
.../test/java/org/apache/dubbo/common/URLTest.java | 182 +-
.../common/beans/InstantiationStrategyTest.java | 16 +-
.../dubbo/common/beans/ScopeBeanFactoryTest.java | 19 +-
.../org/apache/dubbo/common/beanutil/Bean.java | 8 +-
.../common/beanutil/JavaBeanAccessorTest.java | 6 +-
.../common/beanutil/JavaBeanSerializeUtilTest.java | 87 +-
.../dubbo/common/bytecode/ClassGeneratorTest.java | 98 +-
.../apache/dubbo/common/bytecode/MixinTest.java | 4 +-
.../apache/dubbo/common/bytecode/ProxyTest.java | 2 +-
.../apache/dubbo/common/bytecode/WrapperTest.java | 77 +-
.../common/cache/FileCacheStoreFactoryTest.java | 12 +-
.../dubbo/common/cache/FileCacheStoreTest.java | 7 +-
.../compiler/support/AdaptiveCompilerTest.java | 4 +-
.../common/compiler/support/ClassUtilsTest.java | 50 +-
.../common/compiler/support/HelloService.java | 1 -
.../common/compiler/support/JavaCodeTest.java | 16 +-
.../compiler/support/JavassistCompilerTest.java | 24 +-
.../common/compiler/support/JdkCompilerTest.java | 16 +-
.../support/internal/HelloServiceInternalImpl.java | 3 +-
.../concurrent/CompletableFutureTaskTest.java | 60 +-
.../common/config/CompositeConfigurationTest.java | 4 +-
.../common/config/ConfigurationCacheTest.java | 2 +-
.../common/config/ConfigurationUtilsTest.java | 14 +-
.../config/EnvironmentConfigurationTest.java | 6 +-
.../dubbo/common/config/EnvironmentTest.java | 7 +-
.../common/config/InmemoryConfigurationTest.java | 16 +-
.../config/OrderedPropertiesConfigurationTest.java | 7 +-
.../common/config/PrefixedConfigurationTest.java | 14 +-
.../common/config/PropertiesConfigurationTest.java | 6 +-
.../common/config/SystemConfigurationTest.java | 4 +-
.../AbstractDynamicConfigurationFactoryTest.java | 2 +-
.../AbstractDynamicConfigurationTest.java | 27 +-
.../config/configcenter/ConfigChangeTypeTest.java | 4 +-
.../configcenter/ConfigChangedEventTest.java | 14 +-
.../DynamicConfigurationFactoryTest.java | 9 +-
.../common/constants/CommonConstantsTest.java | 2 +-
.../apache/dubbo/common/convert/ConverterTest.java | 8 +-
.../convert/StringToBooleanConverterTest.java | 5 +-
.../convert/StringToCharArrayConverterTest.java | 7 +-
.../convert/StringToCharacterConverterTest.java | 5 +-
.../convert/StringToDoubleConverterTest.java | 5 +-
.../convert/StringToDurationConverterTest.java | 9 +-
.../common/convert/StringToFloatConverterTest.java | 2 +-
.../convert/StringToIntegerConverterTest.java | 5 +-
.../convert/StringToOptionalConverterTest.java | 9 +-
.../common/convert/StringToShortConverterTest.java | 2 +-
.../convert/StringToStringConverterTest.java | 5 +-
.../convert/multiple/MultiValueConverterTest.java | 6 +-
.../multiple/StringToArrayConverterTest.java | 6 +-
.../StringToBlockingDequeConverterTest.java | 13 +-
.../StringToBlockingQueueConverterTest.java | 12 +-
.../multiple/StringToCollectionConverterTest.java | 9 +-
.../multiple/StringToDequeConverterTest.java | 9 +-
.../multiple/StringToListConverterTest.java | 9 +-
.../StringToNavigableSetConverterTest.java | 9 +-
.../multiple/StringToQueueConverterTest.java | 8 +-
.../convert/multiple/StringToSetConverterTest.java | 8 +-
.../multiple/StringToSortedSetConverterTest.java | 9 +-
.../StringToTransferQueueConverterTest.java | 8 +-
.../extension/AdaptiveClassCodeGeneratorTest.java | 8 +-
.../common/extension/ExtensionDirectorTest.java | 137 +-
.../common/extension/ExtensionLoaderTest.java | 191 +-
.../extension/ExtensionLoader_Activate_Test.java | 5 +-
.../extension/ExtensionLoader_Adaptive_Test.java | 45 +-
...tensionLoader_Adaptive_UseJdkCompiler_Test.java | 2 +-
.../extension/ExtensionLoader_Compatible_Test.java | 8 +-
.../apache/dubbo/common/extension/SPI1Impl.java | 2 +-
.../apache/dubbo/common/extension/SPI2Impl.java | 2 +-
.../apache/dubbo/common/extension/SPI3Impl.java | 2 +-
.../apache/dubbo/common/extension/SPI4Impl.java | 2 +-
.../common/extension/activate/ActivateExt1.java | 1 -
.../extension/activate/ActivateWrapperExt1.java | 1 -
.../extension/activate/impl/ActivateExt1Impl1.java | 5 +-
.../activate/impl/ActivateOnClassExt1Impl.java | 6 +-
.../activate/impl/ActivateWrapperExt1Impl1.java | 5 +-
.../activate/impl/ActivateWrapperExt1Impl2.java | 5 +-
.../activate/impl/ActivateWrapperExt1Wrapper.java | 2 -
.../activate/impl/GroupActivateExtImpl.java | 1 -
.../activate/impl/OrderActivateExtImpl1.java | 5 +-
.../activate/impl/OrderActivateExtImpl2.java | 5 +-
.../activate/impl/ValueActivateExtImpl.java | 5 +-
.../common/extension/adaptive/HasAdaptiveExt.java | 1 -
.../impl/HasAdaptiveExt_ManualAdaptive.java | 3 +-
.../compatible/impl/CompatibleExtImpl2.java | 1 -
.../extension/convert/String2BooleanConverter.java | 3 +-
.../extension/convert/String2DoubleConverter.java | 3 +-
.../extension/convert/String2IntegerConverter.java | 3 +-
.../common/extension/director/FooAppProvider.java | 1 -
.../extension/director/FooFrameworkProvider.java | 1 -
.../extension/director/FooModuleProvider.java | 1 -
.../extension/director/FooModuleService.java | 1 -
.../extension/director/impl/TestAppProvider.java | 4 +-
.../extension/director/impl/TestAppService.java | 4 +-
.../director/impl/TestFrameworkProvider.java | 4 +-
.../director/impl/TestFrameworkService.java | 4 +-
.../director/impl/TestModuleProvider.java | 5 +-
.../extension/director/impl/TestModuleService.java | 4 +-
.../common/extension/ext1/impl/SimpleExtImpl2.java | 1 -
.../common/extension/ext1/impl/SimpleExtImpl3.java | 1 -
.../ext10_multi_names/Ext10MultiNames.java | 3 +-
.../impl/Ext10MultiNamesImpl.java | 3 +-
.../common/extension/ext2/impl/Ext2Impl2.java | 1 -
.../common/extension/ext2/impl/Ext2Impl3.java | 1 -
.../common/extension/ext4/impl/Ext4Impl2.java | 1 -
.../dubbo/common/extension/ext6_inject/Dao.java | 1 -
.../common/extension/ext6_inject/impl/DaoImpl.java | 5 +-
.../extension/ext6_inject/impl/Ext6Impl1.java | 2 -
.../extension/ext6_inject/impl/Ext6Impl2.java | 1 -
.../extension/ext6_wrap/impl/Ext6Wrapper3.java | 4 +-
.../extension/ext6_wrap/impl/Ext6Wrapper4.java | 4 +-
.../dubbo/common/extension/ext7/impl/Ext7Impl.java | 1 -
.../extension/ext7/impl/Ext7InitErrorImpl.java | 1 -
.../extension/ext9_empty/impl/Ext9EmptyImpl.java | 4 +-
.../inject/AdaptiveExtensionInjectorTest.java | 10 +-
.../extension/support/ActivateComparatorTest.java | 13 +-
.../dubbo/common/extension/support/Filter0.java | 3 +-
.../dubbo/common/extension/support/Filter1.java | 3 +-
.../dubbo/common/extension/support/Filter2.java | 3 +-
.../dubbo/common/extension/support/Filter3.java | 3 +-
.../dubbo/common/extension/support/Filter4.java | 3 +-
.../common/extension/support/Order0Filter0.java | 4 +-
.../common/extension/support/Order0Filter1.java | 4 +-
.../common/extension/support/Order0Filter2.java | 4 +-
.../common/extension/wrapper/WrapperTest.java | 2 +-
.../common/extension/wrapper/impl/DemoImpl.java | 6 +-
.../common/extension/wrapper/impl/DemoWrapper.java | 4 +-
.../extension/wrapper/impl/DemoWrapper2.java | 4 +-
.../dubbo/common/function/PredicatesTest.java | 2 +-
.../apache/dubbo/common/function/StreamsTest.java | 6 +-
.../dubbo/common/function/ThrowableActionTest.java | 11 +-
.../common/function/ThrowableConsumerTest.java | 11 +-
.../common/function/ThrowableFunctionTest.java | 11 +-
.../java/org/apache/dubbo/common/io/BytesTest.java | 21 +-
.../apache/dubbo/common/io/StreamUtilsTest.java | 8 +-
.../common/io/UnsafeByteArrayInputStreamTest.java | 6 +-
.../common/io/UnsafeByteArrayOutputStreamTest.java | 10 +-
.../dubbo/common/io/UnsafeStringReaderTest.java | 6 +-
.../dubbo/common/io/UnsafeStringWriterTest.java | 6 +-
.../apache/dubbo/common/json/GsonUtilsTest.java | 12 +-
.../dubbo/common/json/impl/FastJson2ImplTest.java | 20 +-
.../dubbo/common/json/impl/FastJsonImplTest.java | 11 +-
.../dubbo/common/json/impl/GsonImplTest.java | 39 +-
.../apache/dubbo/common/lang/PrioritizedTest.java | 10 +-
.../common/lang/ShutdownHookCallbacksTest.java | 5 +-
.../dubbo/common/logger/LoggerAdapterTest.java | 22 +-
.../dubbo/common/logger/LoggerFactoryTest.java | 12 +-
.../org/apache/dubbo/common/logger/LoggerTest.java | 15 +-
.../dubbo/common/logger/slf4j/Slf4jLoggerTest.java | 17 +-
.../support/FailsafeErrorTypeAwareLoggerTest.java | 32 +-
.../common/logger/support/FailsafeLoggerTest.java | 2 +-
.../java/org/apache/dubbo/common/model/Person.java | 21 +-
.../dubbo/common/model/SerializablePerson.java | 24 +-
.../java/org/apache/dubbo/common/model/User.java | 1 -
.../org/apache/dubbo/common/model/media/Image.java | 9 +-
.../org/apache/dubbo/common/model/media/Media.java | 30 +-
.../dubbo/common/model/person/BigPerson.java | 47 +-
.../apache/dubbo/common/model/person/Dgeneric.java | 2 +-
.../dubbo/common/model/person/FullAddress.java | 68 +-
.../dubbo/common/model/person/PersonInfo.java | 64 +-
.../dubbo/common/model/person/PersonMap.java | 1 -
.../apache/dubbo/common/model/person/Phone.java | 37 +-
.../apache/dubbo/common/profiler/ProfilerTest.java | 2 +-
.../resource/GlobalResourcesRepositoryTest.java | 10 +-
.../apache/dubbo/common/ssl/CertManagerTest.java | 1 +
.../apache/dubbo/common/ssl/FirstCertProvider.java | 1 +
.../common/ssl/SSLConfigCertProviderTest.java | 52 +-
.../dubbo/common/ssl/SecondCertProvider.java | 1 +
.../org/apache/dubbo/common/status/StatusTest.java | 5 +-
.../reporter/FrameworkStatusReportServiceTest.java | 39 +-
.../status/support/LoadStatusCheckerTest.java | 3 +-
.../status/support/MemoryStatusCheckerTest.java | 3 +-
.../common/status/support/StatusUtilsTest.java | 9 +-
.../common/store/support/SimpleDataStoreTest.java | 6 +-
.../threadlocal/InternalThreadLocalTest.java | 30 +-
.../NamedInternalThreadFactoryTest.java | 3 +-
.../MemoryLimitedLinkedBlockingQueueTest.java | 9 +-
.../MemorySafeLinkedBlockingQueueTest.java | 32 +-
.../common/threadpool/ThreadlessExecutorTest.java | 12 +-
.../ThreadPoolExhaustedEventListenerTest.java | 6 +-
.../event/ThreadPoolExhaustedEventTest.java | 5 +-
.../threadpool/manager/ExecutorRepositoryTest.java | 22 +-
.../manager/FrameworkExecutorRepositoryTest.java | 22 +-
.../threadpool/serial/SerializingExecutorTest.java | 9 +-
.../support/AbortPolicyWithReportTest.java | 31 +-
.../support/cached/CachedThreadPoolTest.java | 24 +-
.../support/eager/EagerThreadPoolExecutorTest.java | 88 +-
.../support/eager/EagerThreadPoolTest.java | 25 +-
.../threadpool/support/eager/TaskQueueTest.java | 13 +-
.../support/fixed/FixedThreadPoolTest.java | 24 +-
.../support/limited/LimitedThreadPoolTest.java | 22 +-
.../dubbo/common/timer/HashedWheelTimerTest.java | 59 +-
.../org/apache/dubbo/common/url/URLParamTest.java | 50 +-
.../dubbo/common/utils/AnnotationUtilsTest.java | 73 +-
.../apache/dubbo/common/utils/ArrayUtilsTest.java | 6 +-
.../org/apache/dubbo/common/utils/AssertTest.java | 11 +-
.../common/utils/AtomicPositiveIntegerTest.java | 7 +-
.../apache/dubbo/common/utils/CIDRUtilsTest.java | 8 +-
.../utils/ClassLoaderResourceLoaderTest.java | 11 +-
.../apache/dubbo/common/utils/ClassUtilsTest.java | 13 +-
.../dubbo/common/utils/CollectionUtilsTest.java | 20 +-
.../common/utils/CompatibleTypeUtilsTest.java | 21 +-
.../common/utils/ConcurrentHashMapUtilsTest.java | 20 +-
.../apache/dubbo/common/utils/ConfigUtilsTest.java | 69 +-
.../apache/dubbo/common/utils/DefaultPageTest.java | 6 +-
.../utils/DefaultSerializeClassCheckerTest.java | 105 +-
.../dubbo/common/utils/DubboAppenderTest.java | 3 +-
.../dubbo/common/utils/ExecutorUtilTest.java | 9 +-
.../apache/dubbo/common/utils/FieldUtilsTest.java | 4 +-
.../org/apache/dubbo/common/utils/HolderTest.java | 5 +-
.../org/apache/dubbo/common/utils/IOUtilsTest.java | 22 +-
.../org/apache/dubbo/common/utils/JRETest.java | 13 +-
.../org/apache/dubbo/common/utils/JVMUtilTest.java | 6 +-
.../common/utils/JsonCompatibilityUtilTest.java | 9 +-
.../apache/dubbo/common/utils/JsonUtilsTest.java | 43 +-
.../apache/dubbo/common/utils/LFUCacheTest.java | 4 +-
.../apache/dubbo/common/utils/LRU2CacheTest.java | 3 +-
.../apache/dubbo/common/utils/LogHelperTest.java | 3 +-
.../org/apache/dubbo/common/utils/LogTest.java | 4 +-
.../org/apache/dubbo/common/utils/LogUtilTest.java | 4 +-
.../apache/dubbo/common/utils/MD5UtilsTest.java | 21 +-
.../apache/dubbo/common/utils/MemberUtilsTest.java | 16 +-
.../apache/dubbo/common/utils/MethodUtilsTest.java | 25 +-
.../java/org/apache/dubbo/common/utils/MyEnum.java | 5 +-
.../dubbo/common/utils/NamedThreadFactoryTest.java | 7 +-
...sInterfaceDisplayNameHasMetaCharactersTest.java | 35 +-
.../apache/dubbo/common/utils/NetUtilsTest.java | 33 +-
.../apache/dubbo/common/utils/PojoUtilsTest.java | 228 +-
.../dubbo/common/utils/ReflectUtilsTest.java | 75 +-
.../dubbo/common/utils/RegexPropertiesTest.java | 16 +-
.../utils/SerializeSecurityConfiguratorTest.java | 75 +-
.../org/apache/dubbo/common/utils/StackTest.java | 9 +-
.../StringConstantFieldValuePredicateTest.java | 6 +-
.../apache/dubbo/common/utils/StringUtilsTest.java | 19 +-
.../common/utils/TestAllowClassNotifyListener.java | 10 +-
.../apache/dubbo/common/utils/TimeUtilsTest.java | 1 -
.../apache/dubbo/common/utils/UrlUtilsTest.java | 22 +-
.../org/apache/dubbo/common/utils/json/Color.java | 8 +-
.../org/apache/dubbo/common/utils/json/Range.java | 7 +-
.../apache/dubbo/common/utils/json/Service.java | 1 -
.../apache/dubbo/common/utils/json/Student.java | 5 +-
.../apache/dubbo/common/utils/json/Teacher.java | 5 +-
.../apache/dubbo/common/utils/json/TestEnum.java | 4 +-
.../dubbo/common/utils/json/TestObjectA.java | 3 +-
.../dubbo/common/utils/json/TestObjectB.java | 1 -
.../apache/dubbo/common/version/VersionTest.java | 27 +-
.../java/org/apache/dubbo/common/vo/UserVo.java | 9 +-
.../dubbo/config/AbstractInterfaceConfigTest.java | 18 +-
.../java/org/apache/dubbo/config/Greeting.java | 2 +-
.../org/apache/dubbo/config/GreetingLocal1.java | 6 +-
.../org/apache/dubbo/config/GreetingLocal2.java | 2 +-
.../org/apache/dubbo/config/GreetingLocal3.java | 2 +-
.../context/ConfigConfigurationAdapterTest.java | 2 +-
.../dubbo/config/context/ConfigManagerTest.java | 40 +-
.../dubbo/metadata/definition/MetadataTest.java | 12 +-
.../definition/ServiceDefinitionBuilderTest.java | 98 +-
.../metadata/definition/Test3TypeBuilder.java | 4 +-
.../dubbo/metadata/definition/TestTypeBuilder.java | 2 +-
.../definition/common/ClassExtendsMap.java | 3 +-
.../metadata/definition/common/ColorEnum.java | 5 +-
.../common/ResultWithRawCollections.java | 3 +-
.../metadata/definition/service/ComplexObject.java | 71 +-
.../metadata/definition/service/DemoService.java | 3 +-
.../IsolationExecutorSupportFactoryTest.java | 24 +-
.../dubbo/rpc/model/ApplicationModelTest.java | 8 +-
.../apache/dubbo/rpc/model/FrameworkModelTest.java | 1 -
.../rpc/model/FrameworkServiceRepositoryTest.java | 35 +-
.../apache/dubbo/rpc/model/ModuleModelTest.java | 1 -
.../rpc/model/ModuleServiceRepositoryTest.java | 41 +-
.../java/org/apache/dubbo/rpc/model/Person.java | 21 +-
.../rpc/model/ReflectionMethodDescriptorTest.java | 26 +-
.../rpc/model/ReflectionServiceDescriptorTest.java | 26 +-
.../ScopeModelAwareExtensionProcessorTest.java | 3 +-
.../org/apache/dubbo/rpc/model/ScopeModelTest.java | 16 +-
.../apache/dubbo/rpc/model/ScopeModelUtilTest.java | 60 +-
.../apache/dubbo/rpc/model/SerializablePerson.java | 21 +-
.../dubbo/rpc/model/ServiceRepositoryTest.java | 42 +-
.../test/java/org/apache/dubbo/rpc/model/User.java | 1 -
.../org/apache/dubbo/rpc/model/media/Image.java | 9 +-
.../org/apache/dubbo/rpc/model/media/Media.java | 30 +-
.../apache/dubbo/rpc/model/person/BigPerson.java | 47 +-
.../apache/dubbo/rpc/model/person/FullAddress.java | 68 +-
.../apache/dubbo/rpc/model/person/PersonInfo.java | 64 +-
.../org/apache/dubbo/rpc/model/person/Phone.java | 37 +-
.../dubbo/rpc/service/GenericExceptionTest.java | 5 +-
.../ServiceDescriptorInternalCacheTest.java | 12 +-
.../apache/dubbo/rpc/support/DemoService1Impl.java | 2 +-
.../dubbo/rpc/support/ProtocolUtilsTest.java | 6 +-
dubbo-compatible/pom.xml | 226 +-
.../main/java/com/alibaba/dubbo/cache/Cache.java | 4 +-
.../java/com/alibaba/dubbo/cache/CacheFactory.java | 4 +-
.../dubbo/cache/support/AbstractCacheFactory.java | 10 +-
.../java/com/alibaba/dubbo/common/Constants.java | 48 +-
.../java/com/alibaba/dubbo/common/DelegateURL.java | 3 +-
.../main/java/com/alibaba/dubbo/common/URL.java | 91 +-
.../alibaba/dubbo/common/compiler/Compiler.java | 4 +-
.../alibaba/dubbo/common/extension/Activate.java | 1 -
.../dubbo/common/extension/ExtensionFactory.java | 3 +-
.../alibaba/dubbo/common/logger/LoggerAdapter.java | 4 +-
.../dubbo/common/serialize/ObjectInput.java | 4 +-
.../dubbo/common/serialize/ObjectOutput.java | 4 +-
.../dubbo/common/serialize/Serialization.java | 13 +-
.../com/alibaba/dubbo/common/status/Status.java | 1 -
.../alibaba/dubbo/common/status/StatusChecker.java | 1 -
.../com/alibaba/dubbo/common/store/DataStore.java | 4 +-
.../dubbo/common/threadpool/ThreadPool.java | 1 -
.../com/alibaba/dubbo/common/utils/UrlUtils.java | 22 +-
.../alibaba/dubbo/config/ApplicationConfig.java | 1 -
.../com/alibaba/dubbo/config/ArgumentConfig.java | 4 +-
.../com/alibaba/dubbo/config/ConsumerConfig.java | 1 -
.../com/alibaba/dubbo/config/MethodConfig.java | 1 -
.../com/alibaba/dubbo/config/ModuleConfig.java | 4 +-
.../com/alibaba/dubbo/config/MonitorConfig.java | 4 +-
.../com/alibaba/dubbo/config/ProtocolConfig.java | 6 +-
.../com/alibaba/dubbo/config/ProviderConfig.java | 1 -
.../com/alibaba/dubbo/config/ReferenceConfig.java | 4 +-
.../com/alibaba/dubbo/config/RegistryConfig.java | 4 +-
.../com/alibaba/dubbo/config/ServiceConfig.java | 8 +-
.../alibaba/dubbo/config/annotation/Reference.java | 3 -
.../alibaba/dubbo/config/annotation/Service.java | 2 -
.../spring/context/annotation/EnableDubbo.java | 7 +-
.../com/alibaba/dubbo/container/Container.java | 4 +-
.../com/alibaba/dubbo/container/page/Menu.java | 1 -
.../dubbo/container/page/MenuComparator.java | 9 +-
.../com/alibaba/dubbo/container/page/Page.java | 16 +-
.../alibaba/dubbo/container/page/PageHandler.java | 2 -
.../alibaba/dubbo/container/page/PageServlet.java | 38 +-
.../dubbo/container/page/ResourceFilter.java | 13 +-
.../container/page/pages/HomePageHandler.java | 9 +-
.../dubbo/container/page/pages/LogPageHandler.java | 35 +-
.../container/page/pages/StatusPageHandler.java | 25 +-
.../container/page/pages/SystemPageHandler.java | 20 +-
.../java/com/alibaba/dubbo/monitor/Monitor.java | 5 +-
.../com/alibaba/dubbo/monitor/MonitorFactory.java | 1 -
.../com/alibaba/dubbo/qos/command/BaseCommand.java | 1 -
.../alibaba/dubbo/qos/command/CommandContext.java | 1 -
.../com/alibaba/dubbo/registry/NotifyListener.java | 7 +-
.../java/com/alibaba/dubbo/registry/Registry.java | 12 +-
.../alibaba/dubbo/registry/RegistryFactory.java | 1 -
.../dubbo/registry/support/AbstractRegistry.java | 66 +-
.../registry/support/AbstractRegistryFactory.java | 5 +-
.../dubbo/registry/support/FailbackRegistry.java | 61 +-
.../java/com/alibaba/dubbo/remoting/Channel.java | 1 -
.../com/alibaba/dubbo/remoting/ChannelHandler.java | 30 +-
.../java/com/alibaba/dubbo/remoting/Codec.java | 4 +-
.../java/com/alibaba/dubbo/remoting/Codec2.java | 4 +-
.../com/alibaba/dubbo/remoting/Dispatcher.java | 5 +-
.../alibaba/dubbo/remoting/RemotingException.java | 6 +-
.../java/com/alibaba/dubbo/remoting/Server.java | 3 +-
.../com/alibaba/dubbo/remoting/Transporter.java | 1 -
.../alibaba/dubbo/remoting/exchange/Exchanger.java | 4 +-
.../dubbo/remoting/exchange/ResponseCallback.java | 2 -
.../dubbo/remoting/exchange/ResponseFuture.java | 2 -
.../alibaba/dubbo/remoting/http/HttpBinder.java | 4 +-
.../dubbo/remoting/telnet/TelnetHandler.java | 4 +-
.../remoting/zookeeper/ZookeeperTransporter.java | 4 +-
.../main/java/com/alibaba/dubbo/rpc/Exporter.java | 1 -
.../main/java/com/alibaba/dubbo/rpc/Filter.java | 11 +-
.../java/com/alibaba/dubbo/rpc/Invocation.java | 13 +-
.../main/java/com/alibaba/dubbo/rpc/Invoker.java | 11 +-
.../com/alibaba/dubbo/rpc/InvokerListener.java | 1 -
.../main/java/com/alibaba/dubbo/rpc/Protocol.java | 10 +-
.../java/com/alibaba/dubbo/rpc/ProxyFactory.java | 4 +-
.../main/java/com/alibaba/dubbo/rpc/Result.java | 24 +-
.../java/com/alibaba/dubbo/rpc/RpcContext.java | 24 +-
.../java/com/alibaba/dubbo/rpc/RpcException.java | 1 -
.../java/com/alibaba/dubbo/rpc/RpcInvocation.java | 36 +-
.../main/java/com/alibaba/dubbo/rpc/RpcResult.java | 4 +-
.../com/alibaba/dubbo/rpc/cluster/Cluster.java | 4 +-
.../com/alibaba/dubbo/rpc/cluster/Directory.java | 11 +-
.../com/alibaba/dubbo/rpc/cluster/LoadBalance.java | 23 +-
.../java/com/alibaba/dubbo/rpc/cluster/Merger.java | 4 +-
.../java/com/alibaba/dubbo/rpc/cluster/Router.java | 29 +-
.../alibaba/dubbo/rpc/cluster/RouterFactory.java | 1 -
.../alibaba/dubbo/rpc/cluster/RuleConverter.java | 6 +-
.../cluster/loadbalance/AbstractLoadBalance.java | 16 +-
.../dubbo/rpc/protocol/dubbo/FutureAdapter.java | 17 +-
.../rpc/protocol/rest/support/ContentType.java | 4 +-
.../com/alibaba/dubbo/rpc/service/EchoService.java | 4 +-
.../dubbo/rpc/service/GenericException.java | 5 +-
.../alibaba/dubbo/rpc/service/GenericService.java | 4 +-
.../com/alibaba/dubbo/rpc/support/RpcUtils.java | 7 +-
.../com/alibaba/dubbo/validation/Validation.java | 4 +-
.../com/alibaba/dubbo/validation/Validator.java | 4 +-
.../java/org/apache/dubbo/cache/CacheTest.java | 16 +-
.../test/java/org/apache/dubbo/cache/MyCache.java | 10 +-
.../org/apache/dubbo/cache/MyCacheFactory.java | 1 -
.../dubbo/common/extension/ExtensionTest.java | 21 +-
.../dubbo/common/extension/MockDispatcher.java | 3 +-
.../dubbo/common/extension/MyExtensionFactory.java | 2 +-
.../common/extension/activate/ActivateExt1.java | 1 -
.../extension/activate/impl/ActivateExt1Impl1.java | 5 +-
.../extension/support/ActivateComparatorTest.java | 13 +-
.../dubbo/common/extension/support/Filter0.java | 3 +-
.../dubbo/common/extension/support/Filter1.java | 3 +-
.../dubbo/common/extension/support/Filter2.java | 3 +-
.../dubbo/common/extension/support/Filter3.java | 3 +-
.../dubbo/common/extension/support/Filter4.java | 3 +-
.../dubbo/common/extension/support/OldFilter0.java | 3 +-
.../dubbo/common/extension/support/OldFilter5.java | 4 +-
.../common/extension/support/Order0Filter0.java | 4 +-
.../common/extension/support/Order0Filter1.java | 4 +-
.../common/extension/support/Order0Filter2.java | 4 +-
.../dubbo/common/utils/AnnotationUtilsTest.java | 78 +-
.../apache/dubbo/config/ApplicationConfigTest.java | 9 +-
.../apache/dubbo/config/ArgumentConfigTest.java | 7 +-
.../java/org/apache/dubbo/config/ConfigTest.java | 7 +-
.../apache/dubbo/config/ConsumerConfigTest.java | 1 -
.../org/apache/dubbo/config/MethodConfigTest.java | 15 +-
.../org/apache/dubbo/config/ModuleConfigTest.java | 9 +-
.../apache/dubbo/config/ProtocolConfigTest.java | 7 +-
.../apache/dubbo/config/ProviderConfigTest.java | 8 +-
.../apache/dubbo/config/ReferenceConfigTest.java | 1 -
.../apache/dubbo/config/RegistryConfigTest.java | 7 +-
.../org/apache/dubbo/config/SignatureTest.java | 45 +-
.../org/apache/dubbo/config/spring/api/Box.java | 1 -
.../dubbo/config/spring/api/DemoService.java | 1 -
.../dubbo/config/spring/api/HelloService.java | 1 -
.../ServiceAnnotationTestConfiguration.java | 12 +-
.../DubboComponentScanRegistrarTest.java | 8 +-
.../annotation/DubboConfigConfigurationTest.java | 8 +-
.../context/annotation/EnableDubboConfigTest.java | 25 +-
.../spring/context/annotation/EnableDubboTest.java | 12 +-
.../annotation/consumer/ConsumerConfiguration.java | 12 +-
.../consumer/test/TestConsumerConfiguration.java | 17 +-
.../annotation/provider/DefaultHelloService.java | 1 -
.../annotation/provider/DemoServiceImpl.java | 4 +-
.../annotation/provider/ProviderConfiguration.java | 6 +-
.../apache/dubbo/config/spring/filter/MockDao.java | 4 +-
.../dubbo/config/spring/filter/MockDaoImpl.java | 4 +-
.../dubbo/config/spring/filter/MockFilter.java | 1 -
.../org/apache/dubbo/echo/EchoServiceTest.java | 7 +-
.../java/org/apache/dubbo/filter/FilterTest.java | 7 +-
.../org/apache/dubbo/filter/LegacyInvocation.java | 8 +-
.../org/apache/dubbo/filter/LegacyInvoker.java | 5 +-
.../java/org/apache/dubbo/filter/MyFilter.java | 2 -
.../apache/dubbo/generic/GenericServiceTest.java | 134 +-
.../AbstractAnnotationProcessingTest.java | 9 +-
.../AnnotationProcessingTestProcessor.java | 17 +-
.../processing/CompilerInvocationInterceptor.java | 19 +-
.../builder/ArrayTypeDefinitionBuilderTest.java | 43 +-
.../CollectionTypeDefinitionBuilderTest.java | 52 +-
.../builder/EnumTypeDefinitionBuilderTest.java | 8 +-
.../builder/GeneralTypeDefinitionBuilderTest.java | 14 +-
.../builder/MapTypeDefinitionBuilderTest.java | 44 +-
.../PrimitiveTypeDefinitionBuilderTest.java | 28 +-
.../builder/ServiceDefinitionBuilderTest.java | 11 +-
.../builder/SimpleTypeDefinitionBuilderTest.java | 6 +-
.../processing/model/ArrayTypeModel.java | 9 +-
.../processing/model/CollectionTypeModel.java | 7 +-
.../annotation/processing/model/Color.java | 5 +-
.../annotation/processing/model/MapTypeModel.java | 6 +-
.../processing/util/AnnotationUtilsTest.java | 80 +-
.../annotation/processing/util/FieldUtilsTest.java | 9 +-
.../processing/util/MemberUtilsTest.java | 8 +-
.../processing/util/MethodUtilsTest.java | 13 +-
.../util/ServiceAnnotationUtilsTest.java | 41 +-
.../annotation/processing/util/TypeUtilsTest.java | 102 +-
.../apache/dubbo/metadata/rest/RestService.java | 1 -
.../dubbo/metadata/rest/SpringRestService.java | 23 +-
.../dubbo/metadata/rest/StandardRestService.java | 18 +-
.../org/apache/dubbo/metadata/tools/Compiler.java | 11 +-
.../apache/dubbo/metadata/tools/CompilerTest.java | 10 +-
.../metadata/tools/DefaultRestServiceTest.java | 7 +-
.../dubbo/metadata/tools/DefaultTestService.java | 7 +-
.../dubbo/metadata/tools/GenericTestService.java | 8 +-
.../dubbo/metadata/tools/RestServiceTest.java | 8 +-
.../metadata/tools/SpringRestServiceTest.java | 4 +-
.../metadata/tools/StandardRestServiceTest.java | 4 +-
.../apache/dubbo/metadata/tools/TestProcessor.java | 3 +-
.../apache/dubbo/metadata/tools/TestService.java | 1 +
.../dubbo/metadata/tools/TestServiceImpl.java | 10 +-
.../java/org/apache/dubbo/rpc/RpcContextTest.java | 7 +-
.../apache/dubbo/rpc/cluster/CompatibleRouter.java | 4 +-
.../dubbo/rpc/cluster/CompatibleRouter2.java | 4 +-
.../org/apache/dubbo/rpc/cluster/RouterTest.java | 12 +-
.../dubbo/rpc/filter/GenericImplFilterTest.java | 23 +-
.../org/apache/dubbo/rpc/support/DemoService.java | 5 +-
.../java/org/apache/dubbo/rpc/support/Type.java | 4 +-
.../apache/dubbo/serialization/MyObjectInput.java | 5 +-
.../apache/dubbo/serialization/MyObjectOutput.java | 45 +-
.../dubbo/serialization/MySerialization.java | 9 +-
.../dubbo/serialization/SerializationTest.java | 11 +-
.../org/apache/dubbo/service/ComplexObject.java | 74 +-
.../org/apache/dubbo/service/CustomArgument.java | 4 +-
.../java/org/apache/dubbo/service/DemoService.java | 6 +-
.../org/apache/dubbo/service/DemoServiceImpl.java | 16 +-
.../org/apache/dubbo/service/MockInvocation.java | 22 +-
.../test/java/org/apache/dubbo/service/Type.java | 4 +-
dubbo-config/dubbo-config-api/pom.xml | 446 +-
.../org/apache/dubbo/config/ConfigInitializer.java | 10 +-
.../apache/dubbo/config/ConfigPostProcessor.java | 8 +-
.../dubbo/config/ConfigScopeModelInitializer.java | 1 -
.../org/apache/dubbo/config/DubboShutdownHook.java | 34 +-
.../org/apache/dubbo/config/ReferenceConfig.java | 189 +-
.../org/apache/dubbo/config/ServiceConfig.java | 292 +-
.../config/bootstrap/BootstrapTakeoverMode.java | 5 +-
.../dubbo/config/bootstrap/DubboBootstrap.java | 18 +-
.../bootstrap/DubboBootstrapStartStopListener.java | 1 -
.../config/bootstrap/builders/AbstractBuilder.java | 3 +-
.../builders/AbstractInterfaceBuilder.java | 4 +-
.../bootstrap/builders/AbstractMethodBuilder.java | 2 +-
.../builders/AbstractReferenceBuilder.java | 3 +-
.../bootstrap/builders/AbstractServiceBuilder.java | 3 +-
.../builders/InternalServiceConfigBuilder.java | 137 +-
.../config/bootstrap/builders/MethodBuilder.java | 1 +
.../config/bootstrap/builders/ProtocolBuilder.java | 2 +-
.../config/bootstrap/builders/ServiceBuilder.java | 18 +-
.../config/deploy/DefaultApplicationDeployer.java | 351 +-
.../deploy/DefaultMetricsServiceExporter.java | 57 +-
.../dubbo/config/deploy/DefaultModuleDeployer.java | 152 +-
.../dubbo/config/deploy/FrameworkModelCleaner.java | 4 +-
.../ConfigurableMetadataServiceExporter.java | 30 +-
.../config/metadata/ExporterDeployListener.java | 37 +-
...MetadataServiceURLParamsMetadataCustomizer.java | 6 +-
.../config/utils/CompositeReferenceCache.java | 14 +-
.../dubbo/config/utils/ConfigValidationUtils.java | 143 +-
.../dubbo/config/utils/DefaultConfigValidator.java | 1 -
.../dubbo/config/utils/SimpleReferenceCache.java | 22 +-
.../java/demo/MultiClassLoaderServiceImpl.java | 4 +-
.../java/demo/MultiClassLoaderServiceRequest.java | 3 +-
.../java/demo/MultiClassLoaderServiceResult.java | 3 +-
.../apache/dubbo/config/AbstractConfigTest.java | 109 +-
.../dubbo/config/AbstractMethodConfigTest.java | 10 +-
.../dubbo/config/AbstractReferenceConfigTest.java | 34 +-
.../dubbo/config/AbstractServiceConfigTest.java | 13 +-
.../apache/dubbo/config/ApplicationConfigTest.java | 35 +-
.../apache/dubbo/config/ArgumentConfigTest.java | 7 +-
.../dubbo/config/ConfigCenterConfigTest.java | 91 +-
.../config/ConfigScopeModelInitializerTest.java | 2 +-
.../apache/dubbo/config/ConsumerConfigTest.java | 63 +-
.../apache/dubbo/config/DubboShutdownHookTest.java | 12 +-
.../dubbo/config/MetadataReportConfigTest.java | 7 +-
.../org/apache/dubbo/config/MethodConfigTest.java | 143 +-
.../org/apache/dubbo/config/MetricsConfigTest.java | 5 +-
.../org/apache/dubbo/config/ModuleConfigTest.java | 15 +-
.../org/apache/dubbo/config/MonitorConfigTest.java | 13 +-
.../apache/dubbo/config/ProtocolConfigTest.java | 33 +-
.../apache/dubbo/config/ProviderConfigTest.java | 13 +-
.../apache/dubbo/config/ReferenceConfigTest.java | 479 +-
.../apache/dubbo/config/RegistryConfigTest.java | 29 +-
.../org/apache/dubbo/config/ServiceConfigTest.java | 178 +-
.../java/org/apache/dubbo/config/SysProps.java | 1 -
.../test/java/org/apache/dubbo/config/api/Box.java | 1 -
.../org/apache/dubbo/config/api/DemoException.java | 1 -
.../org/apache/dubbo/config/api/DemoService.java | 4 +-
.../java/org/apache/dubbo/config/api/Greeting.java | 2 +-
.../java/org/apache/dubbo/config/api/User.java | 4 +-
.../ConsulDubboServiceConsumerBootstrap.java | 9 +-
.../ConsulDubboServiceProviderBootstrap.java | 8 +-
.../dubbo/config/bootstrap/DubboBootstrapTest.java | 119 +-
.../bootstrap/DubboServiceConsumerBootstrap.java | 21 +-
.../bootstrap/DubboServiceProviderBootstrap.java | 28 +-
.../DubboServiceProviderMinimumBootstrap.java | 11 +-
.../EtcdDubboServiceConsumerBootstrap.java | 15 +-
.../EtcdDubboServiceProviderBootstrap.java | 30 +-
.../dubbo/config/bootstrap/MultiInstanceTest.java | 288 +-
.../NacosDubboServiceConsumerBootstrap.java | 8 +-
.../NacosDubboServiceProviderBootstrap.java | 12 +-
.../ZookeeperDubboServiceConsumerBootstrap.java | 7 +-
.../ZookeeperDubboServiceProviderBootstrap.java | 11 +-
.../bootstrap/builders/AbstractBuilderTest.java | 11 +-
.../builders/AbstractInterfaceBuilderTest.java | 34 +-
.../builders/AbstractMethodBuilderTest.java | 25 +-
.../builders/AbstractReferenceBuilderTest.java | 17 +-
.../builders/AbstractServiceBuilderTest.java | 32 +-
.../bootstrap/builders/ApplicationBuilderTest.java | 37 +-
.../bootstrap/builders/ArgumentBuilderTest.java | 2 +-
.../builders/ConfigCenterBuilderTest.java | 26 +-
.../bootstrap/builders/ConsumerBuilderTest.java | 12 +-
.../builders/MetadataReportBuilderTest.java | 22 +-
.../bootstrap/builders/MethodBuilderTest.java | 27 +-
.../bootstrap/builders/ModuleBuilderTest.java | 15 +-
.../bootstrap/builders/MonitorBuilderTest.java | 21 +-
.../bootstrap/builders/ProtocolBuilderTest.java | 49 +-
.../bootstrap/builders/ProviderBuilderTest.java | 32 +-
.../bootstrap/builders/ReferenceBuilderTest.java | 9 +-
.../bootstrap/builders/RegistryBuilderTest.java | 37 +-
.../bootstrap/builders/ServiceBuilderTest.java | 43 +-
.../DubboInterfaceConsumerBootstrap.java | 10 +-
.../apache/dubbo/config/bootstrap/rest/User.java | 39 +-
.../dubbo/config/bootstrap/rest/UserService.java | 35 +-
.../config/bootstrap/rest/UserServiceImpl.java | 27 +-
.../apache/dubbo/config/cache/CacheService.java | 1 -
.../dubbo/config/cache/CacheServiceImpl.java | 1 -
.../org/apache/dubbo/config/cache/CacheTest.java | 29 +-
.../deploy/DefaultApplicationDeployerTest.java | 1 -
.../AbstractRegistryCenterExporterListener.java | 12 +-
.../AbstractRegistryCenterServiceListener.java | 4 +-
.../dubbo/config/integration/IntegrationTest.java | 2 +-
.../integration/multiple/AbstractStorage.java | 1 -
.../dubbo/config/integration/multiple/Storage.java | 2 +-
...egistryCenterExportMetadataIntegrationTest.java | 30 +-
...MultipleRegistryCenterExportProviderFilter.java | 2 +-
...egistryCenterExportProviderIntegrationTest.java | 56 +-
...nterExportProviderRegistryProtocolListener.java | 13 +-
.../injvm/MultipleRegistryCenterInjvmFilter.java | 2 +-
...MultipleRegistryCenterInjvmIntegrationTest.java | 31 +-
...terServiceDiscoveryRegistryIntegrationTest.java | 54 +-
...ceDiscoveryRegistryRegistryServiceListener.java | 15 +-
...yCenterServiceDiscoveryRegistryServiceImpl.java | 3 +-
.../ServiceDiscoveryRegistryStorage.java | 4 +-
...RegistryCenterDubboProtocolIntegrationTest.java | 101 +-
...egistryCenterExportMetadataIntegrationTest.java | 25 +-
.../SingleRegistryCenterExportProviderFilter.java | 2 +-
...egistryCenterExportProviderIntegrationTest.java | 55 +-
...nterExportProviderRegistryProtocolListener.java | 13 +-
.../injvm/SingleRegistryCenterInjvmFilter.java | 2 +-
.../SingleRegistryCenterInjvmIntegrationTest.java | 24 +-
.../DelegateProviderMetaDataInvokerTest.java | 4 +-
...dataServiceURLParamsMetadataCustomizerTest.java | 24 +-
.../apache/dubbo/config/mock/GreetingLocal1.java | 6 +-
.../apache/dubbo/config/mock/GreetingLocal2.java | 2 +-
.../apache/dubbo/config/mock/GreetingLocal3.java | 2 +-
.../org/apache/dubbo/config/mock/MockCluster.java | 2 +-
.../org/apache/dubbo/config/mock/MockCodec.java | 7 +-
.../apache/dubbo/config/mock/MockDispatcher.java | 3 +-
.../apache/dubbo/config/mock/MockExchanger.java | 3 +-
.../dubbo/config/mock/MockExporterListener.java | 11 +-
.../org/apache/dubbo/config/mock/MockFilter.java | 2 +-
.../dubbo/config/mock/MockInvokerListener.java | 10 +-
.../apache/dubbo/config/mock/MockLoadBalance.java | 2 +-
.../org/apache/dubbo/config/mock/MockProtocol.java | 9 +-
.../apache/dubbo/config/mock/MockProtocol2.java | 3 +-
.../apache/dubbo/config/mock/MockProxyFactory.java | 2 +-
.../org/apache/dubbo/config/mock/MockRegistry.java | 21 +-
.../dubbo/config/mock/MockRegistryFactory.java | 1 -
.../dubbo/config/mock/MockRegistryFactory2.java | 3 +-
.../dubbo/config/mock/MockServiceDiscovery.java | 19 +-
.../dubbo/config/mock/MockServiceListener.java | 3 +-
.../dubbo/config/mock/MockStatusChecker.java | 3 +-
.../dubbo/config/mock/MockTelnetHandler.java | 3 +-
.../apache/dubbo/config/mock/MockThreadPool.java | 3 +-
.../apache/dubbo/config/mock/MockTransporter.java | 3 +-
.../apache/dubbo/config/mock/TestProxyFactory.java | 3 +-
.../dubbo/config/nested/AggregationConfigTest.java | 2 +-
.../config/provider/impl/DemoServiceImpl.java | 1 -
.../config/url/ExporterSideConfigUrlTest.java | 25 +-
.../dubbo/config/url/InvokerSideConfigUrlTest.java | 140 +-
.../dubbo/config/url/RpcConfigGetSetProxy.java | 8 +-
.../org/apache/dubbo/config/url/UrlTestBase.java | 44 +-
.../config/utils/ConfigValidationUtilsTest.java | 44 +-
.../dubbo/config/utils/ReferenceCacheTest.java | 36 +-
.../dubbo/config/utils/service/FooService.java | 3 +-
.../dubbo/config/utils/service/FooServiceImpl.java | 3 +-
.../dubbo/config/utils/service/XxxService.java | 3 +-
.../dubbo/config/utils/service/XxxServiceImpl.java | 3 +-
.../metadata/MetadataServiceExporterTest.java | 256 -
dubbo-config/dubbo-config-spring/pom.xml | 551 +-
.../dubbo/config/spring/ConfigCenterBean.java | 26 +-
.../org/apache/dubbo/config/spring/Constants.java | 1 -
.../apache/dubbo/config/spring/ReferenceBean.java | 110 +-
.../apache/dubbo/config/spring/ServiceBean.java | 11 +-
.../config/spring/SpringScopeModelInitializer.java | 12 +-
.../config/spring/aot/AotWithSpringDetector.java | 2 +-
.../AbstractAnnotationBeanPostProcessor.java | 126 +-
.../AnnotationPropertyValuesAdapter.java | 26 +-
.../annotation/DubboConfigAliasPostProcessor.java | 8 +-
.../ReferenceAnnotationBeanPostProcessor.java | 181 +-
.../annotation/ServiceAnnotationPostProcessor.java | 210 +-
.../factory/annotation/ServiceBeanNameBuilder.java | 10 +-
.../factory/annotation/ServicePackagesHolder.java | 2 -
...onfigDefaultPropertyValueBeanPostProcessor.java | 17 +-
.../context/DubboBootstrapApplicationListener.java | 26 +-
.../context/DubboConfigApplicationListener.java | 21 +-
.../spring/context/DubboConfigBeanInitializer.java | 13 +-
.../spring/context/DubboContextPostProcessor.java | 11 +-
.../context/DubboDeployApplicationListener.java | 35 +-
.../DubboInfraBeanRegisterPostProcessor.java | 12 +-
.../spring/context/DubboSpringInitContext.java | 6 +-
.../spring/context/DubboSpringInitCustomizer.java | 1 -
.../context/DubboSpringInitCustomizerHolder.java | 4 +-
.../spring/context/DubboSpringInitializer.java | 54 +-
.../DubboClassPathBeanDefinitionScanner.java | 25 +-
.../context/annotation/DubboComponentScan.java | 5 +-
.../annotation/DubboComponentScanRegistrar.java | 31 +-
.../annotation/DubboConfigConfiguration.java | 60 +-
.../spring/context/annotation/EnableDubbo.java | 6 +-
.../context/annotation/EnableDubboConfig.java | 7 +-
...pertyDefaultValueDubboConfigBeanCustomizer.java | 7 +-
.../spring/context/event/DubboConfigInitEvent.java | 1 -
.../properties/AbstractDubboConfigBinder.java | 1 -
.../properties/DefaultDubboConfigBinder.java | 21 +-
.../spring/extension/SpringExtensionInjector.java | 21 +-
.../spring/reference/ReferenceAttributes.java | 10 +-
.../spring/reference/ReferenceBeanBuilder.java | 84 +-
.../spring/reference/ReferenceBeanManager.java | 49 +-
.../spring/reference/ReferenceBeanSupport.java | 84 +-
.../config/spring/reference/ReferenceCreator.java | 50 +-
.../schema/AnnotationBeanDefinitionParser.java | 5 +-
.../spring/schema/DubboBeanDefinitionParser.java | 205 +-
.../spring/status/DataSourceStatusChecker.java | 12 +-
.../config/spring/status/SpringStatusChecker.java | 9 +-
.../dubbo/config/spring/util/AnnotationUtils.java | 230 +-
.../config/spring/util/DubboAnnotationUtils.java | 84 +-
.../dubbo/config/spring/util/DubboBeanUtils.java | 81 +-
.../dubbo/config/spring/util/EnvironmentUtils.java | 29 +-
.../util/GenericBeanPostProcessorAdapter.java | 15 +-
.../spring/util/LazyTargetInvocationHandler.java | 4 +-
.../apache/dubbo/config/spring/util/LockUtils.java | 7 +-
.../config/spring/util/PropertySourcesUtils.java | 19 +-
.../config/spring/util/SpringCompatUtils.java | 27 +-
.../config/spring/AbstractRegistryService.java | 21 +-
.../org/apache/dubbo/config/spring/ConfigTest.java | 218 +-
.../config/spring/ControllerServiceConfigTest.java | 5 +-
.../dubbo/config/spring/DubboStateListener.java | 4 +-
.../dubbo/config/spring/JavaConfigBeanTest.java | 19 +-
.../dubbo/config/spring/ServiceBeanTest.java | 4 +-
.../config/spring/SimpleRegistryExporter.java | 13 +-
.../dubbo/config/spring/SimpleRegistryService.java | 46 +-
.../org/apache/dubbo/config/spring/SysProps.java | 1 -
.../spring/action/DemoActionByAnnotation.java | 1 -
.../config/spring/action/DemoActionBySetter.java | 1 -
.../config/spring/action/DemoInterceptor.java | 1 -
.../annotation/consumer/AnnotationAction.java | 5 +-
.../spring/annotation/merged/MergedReference.java | 5 +-
.../spring/annotation/merged/MergedService.java | 5 +-
.../annotation/provider/AnnotationServiceImpl.java | 1 -
.../org/apache/dubbo/config/spring/api/Box.java | 1 -
.../dubbo/config/spring/api/DemoService.java | 1 -
.../dubbo/config/spring/api/HelloService.java | 1 -
.../DubboConfigAliasPostProcessorTest.java | 1 -
.../factory/annotation/MergedAnnotationTest.java | 13 +-
.../annotation/MethodConfigCallbackTest.java | 63 +-
.../factory/annotation/ParameterConvertTest.java | 25 +-
.../ReferenceAnnotationBeanPostProcessorTest.java | 93 +-
.../factory/annotation/ReferenceCreatorTest.java | 107 +-
.../ServiceAnnotationPostProcessorTest.java | 29 +-
.../ServiceAnnotationTestConfiguration.java | 12 +-
.../annotation/ServiceBeanNameBuilderTest.java | 31 +-
...gDefaultPropertyValueBeanPostProcessorTest.java | 5 +-
.../MultipleServicesWithMethodConfigsTest.java | 5 +-
.../factory/config/YamlPropertySourceFactory.java | 87 +-
.../config/YamlPropertySourceFactoryTest.java | 7 +-
.../XmlReferenceBeanConditionalTest.java | 31 +-
...nfigAnnotationReferenceBeanConditionalTest.java | 32 +-
.../JavaConfigRawReferenceBeanConditionalTest.java | 32 +-
.../JavaConfigReferenceBeanConditionalTest4.java | 32 +-
.../configprops/SpringBootConfigPropsTest.java | 62 +-
.../SpringBootMultipleConfigPropsTest.java | 76 +-
.../importxml/SpringBootImportDubboXmlTest.java | 17 +-
.../spring/boot/importxml2/HelloServiceImpl.java | 1 -
.../importxml2/SpringBootImportAndScanTest.java | 28 +-
.../context/KeepRunningOnSpringClosedTest.java | 15 +-
.../DubboComponentScanRegistrarTest.java | 10 +-
.../annotation/DubboConfigConfigurationTest.java | 8 +-
.../context/annotation/EnableDubboConfigTest.java | 25 +-
.../spring/context/annotation/EnableDubboTest.java | 26 +-
.../annotation/consumer/ConsumerConfiguration.java | 12 +-
.../consumer/test/TestConsumerConfiguration.java | 8 +-
.../annotation/provider/DefaultHelloService.java | 1 -
.../annotation/provider/DemoServiceImpl.java | 4 +-
.../annotation/provider/HelloServiceImpl.java | 1 -
.../annotation/provider/ProviderConfiguration.java | 6 +-
.../customize/DubboSpringInitCustomizerTest.java | 11 +-
.../properties/DefaultDubboConfigBinderTest.java | 4 +-
.../extension/SpringExtensionInjectorTest.java | 18 +-
.../apache/dubbo/config/spring/filter/MockDao.java | 4 +-
.../dubbo/config/spring/filter/MockDaoImpl.java | 4 +-
.../dubbo/config/spring/filter/MockFilter.java | 1 -
.../dubbo/config/spring/impl/DemoServiceImpl.java | 1 -
.../config/spring/impl/DemoServiceSonImpl.java | 1 -
.../config/spring/impl/MethodCallbackImpl.java | 8 +-
.../impl/UnserializableBoxDemoServiceImpl.java | 1 -
.../spring/isolation/api/ApiIsolationTest.java | 49 +-
.../config/spring/isolation/spring/BaseTest.java | 8 +-
.../spring/annotation/AnnotationIsolationTest.java | 23 +-
.../annotation/consumer/dubbo/DemoServiceV1.java | 1 +
.../annotation/consumer/dubbo/HelloServiceV2.java | 1 +
.../annotation/consumer/dubbo/HelloServiceV3.java | 1 +
.../annotation/consumer/tri/DemoServiceV1.java | 3 +-
.../annotation/consumer/tri/HelloServiceV2.java | 1 +
.../annotation/consumer/tri/HelloServiceV3.java | 1 +
.../annotation/provider/HelloServiceImplV2.java | 1 +
.../annotation/provider/HelloServiceImplV3.java | 2 +-
.../spring/support/DemoServiceExecutor.java | 3 +-
.../spring/support/HelloServiceExecutor.java | 10 +-
.../isolation/spring/xml/XmlIsolationTest.java | 12 +-
.../spring/issues/issue6000/Issue6000Test.java | 3 +-
.../spring/issues/issue6252/Issue6252Test.java | 1 -
.../spring/issues/issue7003/Issue7003Test.java | 14 +-
.../issue9172/MultipleConsumerAndProviderTest.java | 16 +-
.../issues/issue9207/ConfigCenterBeanTest.java | 41 +-
.../metrics/SpringBootConfigMetricsTest.java | 50 +-
.../consumer/PropertyConfigurerTest.java | 20 +-
.../consumer2/PropertySourcesConfigurerTest.java | 19 +-
.../consumer3/PropertySourcesInJavaConfigTest.java | 32 +-
.../provider/HelloServiceImpl.java | 7 +-
.../reference/DubboConfigBeanInitializerTest.java | 35 +-
.../config/spring/reference/ReferenceKeyTest.java | 274 +-
.../javaconfig/JavaConfigReferenceBeanTest.java | 110 +-
.../spring/reference/localcall/LocalCallTest.java | 19 +-
.../spring/reference/localcall/LocalCallTest2.java | 11 +-
.../reference/localcall/LocalHelloServiceImpl.java | 5 +-
.../LocalCallReferenceAnnotationTest.java | 16 +-
.../LocalCallMultipleReferenceAnnotationsTest.java | 36 +-
.../localcallmix/LocalCallReferenceMixTest.java | 15 +-
.../registryNA/consumer/DubboXmlConsumerTest.java | 13 +-
.../registryNA/provider/DubboXmlProviderTest.java | 17 +-
.../dubbo/config/spring/registry/MockRegistry.java | 4 +-
.../spring/registry/MockServiceDiscovery.java | 26 +-
.../consumer/DemoServiceConsumerBootstrap.java | 7 +-
.../consumer/DemoServiceConsumerXmlBootstrap.java | 4 +-
.../provider/DemoServiceProviderBootstrap.java | 4 +-
.../provider/DemoServiceProviderXmlBootstrap.java | 4 +-
.../nacos/demo/service/DefaultService.java | 4 +-
.../registry/nacos/demo/service/DemoService.java | 1 -
.../registry/nacos/nacos/NacosServiceNameTest.java | 3 +-
.../spring/schema/DubboNamespaceHandlerTest.java | 92 +-
.../config/spring/schema/GenericServiceTest.java | 10 +-
.../schema/GenericServiceWithoutInterfaceTest.java | 11 +-
.../spring/status/DataSourceStatusCheckerTest.java | 22 +-
.../spring/status/SpringStatusCheckerTest.java | 13 +-
.../config/spring/util/EnvironmentUtilsTest.java | 12 +-
dubbo-config/dubbo-config-spring6/pom.xml | 143 +-
...eferenceAnnotationWithAotBeanPostProcessor.java | 123 +-
.../ServiceAnnotationWithAotPostProcessor.java | 16 +-
.../factory/aot/AutowiredElementResolver.java | 22 +-
.../factory/aot/ReferencedFieldValueResolver.java | 36 +-
.../aot/ReferencedMethodArgumentsResolver.java | 67 +-
.../DubboInfraBeanRegisterPostProcessor.java | 8 +-
.../dubbo/config/spring6/utils/AotUtils.java | 32 +-
.../dubbo/config/spring6/utils/AotUtilsTest.java | 4 +-
.../dubbo/config/spring6/utils/DemoService.java | 2 -
.../dubbo/config/spring6/utils/HelloRequest.java | 1 -
.../config/spring6/utils/HelloRequestSuper.java | 3 +-
.../dubbo/config/spring6/utils/HelloResponse.java | 1 -
dubbo-config/pom.xml | 122 +-
.../dubbo-configcenter-apollo/pom.xml | 103 +-
.../support/apollo/ApolloDynamicConfiguration.java | 85 +-
.../apollo/ApolloDynamicConfigurationFactory.java | 4 +-
.../apollo/ApolloDynamicConfigurationTest.java | 58 +-
.../support/apollo/EmbeddedApolloJunit5.java | 25 +-
dubbo-configcenter/dubbo-configcenter-file/pom.xml | 81 +-
.../file/FileSystemDynamicConfiguration.java | 185 +-
.../FileSystemDynamicConfigurationFactoryTest.java | 7 +-
.../file/FileSystemDynamicConfigurationTest.java | 54 +-
.../dubbo-configcenter-nacos/pom.xml | 87 +-
.../support/nacos/NacosDynamicConfiguration.java | 58 +-
.../nacos/NacosDynamicConfigurationFactory.java | 5 +-
.../support/nacos/MockConfigService.java | 18 +-
.../nacos/NacosDynamicConfigurationTest.java | 65 +-
.../configcenter/support/nacos/RetryTest.java | 49 +-
.../dubbo-configcenter-zookeeper/pom.xml | 155 +-
.../support/zookeeper/CacheListener.java | 17 +-
.../support/zookeeper/ZookeeperDataListener.java | 10 +-
.../zookeeper/ZookeeperDynamicConfiguration.java | 35 +-
.../ZookeeperDynamicConfigurationTest.java | 86 +-
dubbo-configcenter/pom.xml | 57 +-
dubbo-container/dubbo-container-api/pom.xml | 75 +-
.../java/org/apache/dubbo/container/Container.java | 1 -
.../main/java/org/apache/dubbo/container/Main.java | 13 +-
dubbo-container/dubbo-container-spring/pom.xml | 61 +-
.../dubbo/container/spring/SpringContainer.java | 1 -
.../container/spring/SpringContainerTest.java | 9 +-
dubbo-container/pom.xml | 37 +-
.../dubbo-demo-annotation-consumer/pom.xml | 165 +-
.../apache/dubbo/demo/consumer/Application.java | 7 +-
.../demo/consumer/comp/DemoServiceComponent.java | 4 +-
.../dubbo-demo-annotation-provider/pom.xml | 165 +-
.../apache/dubbo/demo/provider/Application.java | 3 +-
.../dubbo/demo/provider/DemoServiceImpl.java | 11 +-
dubbo-demo/dubbo-demo-annotation/pom.xml | 65 +-
.../dubbo-demo-api/dubbo-demo-api-consumer/pom.xml | 167 +-
.../apache/dubbo/demo/consumer/Application.java | 25 +-
.../dubbo-demo-api/dubbo-demo-api-provider/pom.xml | 160 +-
.../apache/dubbo/demo/provider/Application.java | 14 +-
.../dubbo/demo/provider/DemoServiceImpl.java | 11 +-
dubbo-demo/dubbo-demo-api/pom.xml | 70 +-
dubbo-demo/dubbo-demo-generic-call/pom.xml | 155 +-
.../dubbo/demo/consumer/GenericApplication.java | 17 +-
dubbo-demo/dubbo-demo-interface/pom.xml | 63 +-
.../java/org/apache/dubbo/demo/DemoService.java | 1 -
.../org/apache/dubbo/demo/RestDemoService.java | 14 +-
.../apache/dubbo/demo/rest/api/CurlService.java | 8 +-
.../rest/api/DubboServiceAnnotationService.java | 4 -
.../demo/rest/api/ExceptionMapperService.java | 3 -
.../dubbo/demo/rest/api/HttpMethodService.java | 7 +-
.../HttpRequestAndResponseRPCContextService.java | 5 +-
.../dubbo/demo/rest/api/JaxRsRestDemoService.java | 15 +-
.../dubbo/demo/rest/api/SpringRestDemoService.java | 26 +-
.../src/main/java/po/TestPO.java | 9 +-
.../src/main/java/po/User.java | 10 +-
.../dubbo-demo-native-consumer/pom.xml | 361 +-
.../dubbo/demo/graalvm/consumer/Application.java | 18 +-
.../dubbo-demo-native-interface/pom.xml | 27 +-
.../org/apache/dubbo/graalvm/demo/DemoService.java | 1 -
.../dubbo-demo-native-provider/pom.xml | 363 +-
.../dubbo/demo/graalvm/provider/Application.java | 22 +-
.../demo/graalvm/provider/DemoServiceImpl.java | 11 +-
dubbo-demo/dubbo-demo-native/pom.xml | 39 +-
.../dubbo-demo-spring-boot-consumer/pom.xml | 213 +-
.../demo/consumer/ConsumerApplication.java | 2 +-
.../dubbo-demo-spring-boot-interface/pom.xml | 27 +-
.../apache/dubbo/springboot/demo/DemoService.java | 1 -
.../dubbo-demo-spring-boot-provider/pom.xml | 201 +-
.../springboot/demo/provider/DemoServiceImpl.java | 9 +-
.../demo/provider/ProviderApplication.java | 7 +-
dubbo-demo/dubbo-demo-spring-boot/pom.xml | 117 +-
dubbo-demo/dubbo-demo-triple/pom.xml | 298 +-
.../java/org/apache/dubbo/demo/GreeterService.java | 2 -
.../org/apache/dubbo/demo/GreeterServiceImpl.java | 4 +-
.../apache/dubbo/demo/consumer/ApiConsumer.java | 18 +-
.../dubbo/demo/consumer/ApiWrapperConsumer.java | 11 +-
.../apache/dubbo/demo/provider/ApiProvider.java | 13 +-
.../dubbo/demo/provider/ApiWrapperProvider.java | 13 +-
.../dubbo-demo-jaxrs-rest-consumer/pom.xml | 252 +-
.../apache/dubbo/demo/rest/api/RestConsumer.java | 25 +-
.../DubboServiceAnnotationServiceConsumer.java | 1 +
.../dubbo/demo/rest/api/config/DubboConfig.java | 3 +-
.../dubbo-demo-jaxrs-rest-provider/pom.xml | 252 +-
.../apache/dubbo/demo/rest/api/RestProvider.java | 19 +-
.../dubbo/demo/rest/api/config/DubboConfig.java | 3 +-
.../rest/api/extension/ExceptionMapperForTest.java | 2 -
.../dubbo/demo/rest/api/impl/CurlServiceImpl.java | 4 +-
.../rest/api/impl/ExceptionMapperServiceImpl.java | 3 +-
.../demo/rest/api/impl/HttpMethodServiceImpl.java | 2 +-
...ttpRequestAndResponseRPCContextServiceImpl.java | 6 +-
.../rest/api/impl/JaxRsRestDemoServiceImpl.java | 14 +-
.../dubbo-demo-spring-mvc-rest-consumer/pom.xml | 253 +-
.../dubbo/demo/rest/api/SpringMvcRestConsumer.java | 12 +-
.../dubbo/demo/rest/api/config/DubboConfig.java | 5 +-
.../consumer/SpringRestDemoServiceConsumer.java | 5 +-
.../dubbo-demo-spring-mvc-rest-provider/pom.xml | 252 +-
.../dubbo/demo/rest/api/SpringMvcRestProvider.java | 7 +-
.../dubbo/demo/rest/api/config/DubboConfig.java | 3 +-
.../rest/api/impl/SpringRestDemoServiceImpl.java | 14 +-
.../dubbo-demo-xml/dubbo-demo-xml-consumer/pom.xml | 191 +-
.../apache/dubbo/demo/consumer/Application.java | 85 +-
.../dubbo-demo-xml/dubbo-demo-xml-provider/pom.xml | 214 +-
.../dubbo/demo/provider/DemoServiceImpl.java | 20 +-
.../dubbo/demo/provider/RestDemoServiceImpl.java | 8 +-
.../dubbo/demo/provider/TripleServiceImpl.java | 1 -
dubbo-demo/dubbo-demo-xml/pom.xml | 75 +-
dubbo-demo/pom.xml | 61 +-
dubbo-dependencies-bom/pom.xml | 2240 +++---
.../dubbo-dependencies-zookeeper-curator5/pom.xml | 382 +-
.../dubbo-dependencies-zookeeper/pom.xml | 370 +-
dubbo-dependencies/pom.xml | 205 +-
dubbo-distribution/dubbo-all/pom.xml | 2751 +++----
dubbo-distribution/dubbo-bom/pom.xml | 1622 ++---
dubbo-distribution/pom.xml | 151 +-
dubbo-kubernetes/pom.xml | 116 +-
.../kubernetes/KubernetesMeshEnvListener.java | 27 +-
.../registry/kubernetes/KubernetesRegistry.java | 16 +-
.../kubernetes/KubernetesServiceDiscovery.java | 227 +-
.../dubbo/registry/kubernetes/MeshConstant.java | 26 +-
.../kubernetes/NopKubernetesMeshEnvListener.java | 8 +-
.../kubernetes/util/KubernetesClientConst.java | 54 +-
.../kubernetes/util/KubernetesConfigUtils.java | 24 +-
.../kubernetes/KubernetesServiceDiscoveryTest.java | 137 +-
dubbo-maven-plugin/pom.xml | 160 +-
.../maven/plugin/aot/DubboProcessAotMojo.java | 22 +-
.../maven/plugin/protoc/DubboProtocPlugin.java | 24 +-
.../plugin/protoc/DubboProtocPluginWrapper.java | 4 +-
.../protoc/DubboProtocPluginWrapperFactory.java | 8 +-
.../protoc/LinuxDubboProtocPluginWrapper.java | 13 +-
.../dubbo/maven/plugin/protoc/ProtocMetaData.java | 15 +-
.../plugin/protoc/WinDubboProtocPluginWrapper.java | 37 +-
.../plugin/protoc/enums/DubboGenerateTypeEnum.java | 15 +-
dubbo-metadata/dubbo-metadata-api/pom.xml | 99 +-
.../dubbo/metadata/AbstractCacheManager.java | 34 +-
.../dubbo/metadata/AbstractServiceNameMapping.java | 59 +-
.../metadata/DefaultMetadataParamsFilter.java | 20 +-
.../apache/dubbo/metadata/MappingCacheManager.java | 2 +-
.../apache/dubbo/metadata/MappingChangedEvent.java | 3 +-
.../apache/dubbo/metadata/MetadataConstants.java | 1 -
.../org/apache/dubbo/metadata/MetadataInfo.java | 165 +-
.../dubbo/metadata/MetadataParamsFilter.java | 16 +-
.../dubbo/metadata/MetadataServiceDetector.java | 1 -
.../dubbo/metadata/ParameterTypesComparator.java | 4 -
.../apache/dubbo/metadata/RevisionResolver.java | 2 -
.../apache/dubbo/metadata/ServiceNameMapping.java | 6 +-
.../MetadataReflectionTypeDescriberRegistrar.java | 7 +-
.../dubbo/metadata/report/MetadataReport.java | 15 +-
.../metadata/report/MetadataReportFactory.java | 3 +-
.../metadata/report/MetadataReportInstance.java | 27 +-
.../report/MetadataScopeModelInitializer.java | 8 +-
.../BaseApplicationMetadataIdentifier.java | 3 +-
.../report/identifier/BaseMetadataIdentifier.java | 1 -
.../metadata/report/identifier/KeyTypeEnum.java | 2 -
.../report/identifier/MetadataIdentifier.java | 17 +-
.../identifier/ServiceMetadataIdentifier.java | 23 +-
.../identifier/SubscriberMetadataIdentifier.java | 6 +-
.../report/support/AbstractMetadataReport.java | 190 +-
.../support/AbstractMetadataReportFactory.java | 6 +-
.../dubbo/metadata/report/support/Constants.java | 1 -
.../metadata/report/support/NopMetadataReport.java | 29 +-
.../metadata/AbstractServiceNameMappingTest.java | 46 +-
.../org/apache/dubbo/metadata/DemoService.java | 37 -
.../apache/dubbo/metadata/MetadataInfoTest.java | 60 +-
.../dubbo/metadata/ServiceNameMappingTest.java | 125 -
.../metadata/filter/CustomizedParamsFilter.java | 2 +-
.../metadata/filter/ExcludedParamsFilter.java | 2 +-
.../metadata/filter/ExcludedParamsFilter2.java | 2 +-
.../report/MetadataReportInstanceTest.java | 15 +-
.../BaseApplicationMetadataIdentifierTest.java | 2 +-
.../BaseServiceMetadataIdentifierTest.java | 2 +-
.../report/identifier/MetadataIdentifierTest.java | 26 +-
.../support/AbstractMetadataReportFactoryTest.java | 56 +-
.../report/support/AbstractMetadataReportTest.java | 185 +-
.../metadata/test/JTestMetadataReport4Test.java | 11 +-
.../test/JTestMetadataReportFactory4Test.java | 1 -
.../dubbo-metadata-definition-protobuf/pom.xml | 47 +-
.../definition/protobuf/ProtobufTypeBuilder.java | 28 +-
.../protobuf/ProtobufTypeBuilderTest.java | 22 +-
.../definition/protobuf/model/GooglePB.java | 7497 ++++++++++----------
dubbo-metadata/dubbo-metadata-processor/pom.xml | 196 +-
.../AbstractServiceAnnotationProcessor.java | 5 +-
.../processing/ClassPathMetadataStorage.java | 22 +-
...rviceDefinitionMetadataAnnotationProcessor.java | 4 +-
.../builder/ArrayTypeDefinitionBuilder.java | 7 +-
.../builder/CollectionTypeDefinitionBuilder.java | 12 +-
.../builder/EnumTypeDefinitionBuilder.java | 7 +-
.../builder/GeneralTypeDefinitionBuilder.java | 7 +-
.../builder/MapTypeDefinitionBuilder.java | 12 +-
.../builder/MethodDefinitionBuilder.java | 7 +-
.../builder/PrimitiveTypeDefinitionBuilder.java | 4 +-
.../builder/ServiceDefinitionBuilder.java | 4 +-
.../builder/SimpleTypeDefinitionBuilder.java | 5 +-
.../annotation/processing/builder/TypeBuilder.java | 1 +
.../processing/builder/TypeDefinitionBuilder.java | 31 +-
.../AbstractAnnotatedMethodParameterProcessor.java | 17 +-
.../rest/AbstractServiceRestMetadataResolver.java | 124 +-
.../rest/AnnotatedMethodParameterProcessor.java | 9 +-
.../rest/DefaultServiceRestMetadataResolver.java | 55 +-
.../ServiceRestMetadataAnnotationProcessor.java | 16 +-
.../rest/ServiceRestMetadataResolver.java | 8 +-
.../rest/ServiceRestMetadataStorage.java | 27 +-
.../rest/jaxrs/DefaultValueParameterProcessor.java | 12 +-
.../rest/jaxrs/HeaderParamParameterProcessor.java | 11 +-
.../jaxrs/JAXRSServiceRestMetadataResolver.java | 33 +-
.../jaxrs/ParamAnnotationParameterProcessor.java | 10 +-
...bstractRequestAnnotationParameterProcessor.java | 13 +-
.../springmvc/RequestHeaderParameterProcessor.java | 10 +-
.../springmvc/RequestParamParameterProcessor.java | 11 +-
.../SpringMvcServiceRestMetadataResolver.java | 56 +-
.../processing/util/AnnotationUtils.java | 89 +-
.../util/ExecutableElementComparator.java | 9 +-
.../annotation/processing/util/FieldUtils.java | 12 +-
.../annotation/processing/util/LoggerUtils.java | 1 -
.../annotation/processing/util/MemberUtils.java | 4 +-
.../annotation/processing/util/MethodUtils.java | 41 +-
.../processing/util/ServiceAnnotationUtils.java | 7 +-
.../annotation/processing/util/TypeUtils.java | 57 +-
.../AbstractAnnotationProcessingTest.java | 10 +-
.../AnnotationProcessingTestProcessor.java | 17 +-
.../processing/CompilerInvocationInterceptor.java | 19 +-
.../builder/ArrayTypeDefinitionBuilderTest.java | 43 +-
.../CollectionTypeDefinitionBuilderTest.java | 52 +-
.../builder/EnumTypeDefinitionBuilderTest.java | 8 +-
.../builder/GeneralTypeDefinitionBuilderTest.java | 14 +-
.../builder/MapTypeDefinitionBuilderTest.java | 44 +-
.../PrimitiveTypeDefinitionBuilderTest.java | 28 +-
.../builder/ServiceDefinitionBuilderTest.java | 11 +-
.../builder/SimpleTypeDefinitionBuilderTest.java | 6 +-
.../processing/model/ArrayTypeModel.java | 9 +-
.../processing/model/CollectionTypeModel.java | 7 +-
.../annotation/processing/model/Color.java | 5 +-
.../annotation/processing/model/MapTypeModel.java | 6 +-
.../processing/util/AnnotationUtilsTest.java | 86 +-
.../annotation/processing/util/FieldUtilsTest.java | 9 +-
.../processing/util/MemberUtilsTest.java | 8 +-
.../processing/util/MethodUtilsTest.java | 13 +-
.../util/ServiceAnnotationUtilsTest.java | 42 +-
.../annotation/processing/util/TypeUtilsTest.java | 102 +-
.../apache/dubbo/metadata/rest/RestService.java | 1 -
.../dubbo/metadata/rest/SpringRestService.java | 23 +-
.../dubbo/metadata/rest/StandardRestService.java | 18 +-
.../org/apache/dubbo/metadata/tools/Compiler.java | 11 +-
.../apache/dubbo/metadata/tools/CompilerTest.java | 10 +-
.../metadata/tools/DefaultRestServiceTest.java | 7 +-
.../dubbo/metadata/tools/DefaultTestService.java | 7 +-
.../dubbo/metadata/tools/GenericTestService.java | 6 +-
.../dubbo/metadata/tools/RestServiceTest.java | 8 +-
.../metadata/tools/SpringRestServiceTest.java | 4 +-
.../metadata/tools/StandardRestServiceTest.java | 4 +-
.../apache/dubbo/metadata/tools/TestProcessor.java | 3 +-
.../apache/dubbo/metadata/tools/TestService.java | 1 +
.../dubbo/metadata/tools/TestServiceImpl.java | 7 +-
dubbo-metadata/dubbo-metadata-report-nacos/pom.xml | 44 +-
.../store/nacos/NacosConfigServiceWrapper.java | 1 -
.../metadata/store/nacos/NacosMetadataReport.java | 93 +-
.../store/nacos/NacosMetadataReportFactory.java | 1 -
.../metadata/store/nacos/MockConfigService.java | 12 +-
.../dubbo/metadata/store/nacos/RetryTest.java | 40 +-
dubbo-metadata/dubbo-metadata-report-redis/pom.xml | 65 +-
.../metadata/store/redis/RedisMetadataReport.java | 28 +-
.../store/redis/RedisMetadataReportFactory.java | 2 -
.../store/redis/RedisMetadata4TstService.java | 1 -
.../store/redis/RedisMetadataReportTest.java | 82 +-
.../dubbo-metadata-report-zookeeper/pom.xml | 112 +-
.../store/zookeeper/ZookeeperMetadataReport.java | 8 +-
.../zookeeper/ZookeeperMetadataReportFactory.java | 1 -
.../zookeeper/ZookeeperMetadataReportTest.java | 158 +-
dubbo-metadata/dubbo-metadata-rest/pom.xml | 87 +-
.../AbstractAnnotatedMethodParameterProcessor.java | 39 +-
.../AbstractNoAnnotatedParameterProcessor.java | 12 +-
.../rest/AbstractServiceRestMetadataResolver.java | 131 +-
.../rest/AnnotatedMethodParameterProcessor.java | 13 +-
.../org/apache/dubbo/metadata/rest/ArgInfo.java | 24 +-
.../rest/DefaultServiceRestMetadataResolver.java | 11 +-
.../dubbo/metadata/rest/JAXRSClassConstants.java | 5 -
.../org/apache/dubbo/metadata/rest/ParamType.java | 39 +-
.../apache/dubbo/metadata/rest/PathMatcher.java | 65 +-
.../org/apache/dubbo/metadata/rest/PathUtil.java | 14 +-
.../dubbo/metadata/rest/RequestMetadata.java | 49 +-
.../dubbo/metadata/rest/RestMetadataConstants.java | 10 +-
.../dubbo/metadata/rest/RestMethodMetadata.java | 54 +-
.../dubbo/metadata/rest/ServiceRestMetadata.java | 52 +-
.../metadata/rest/ServiceRestMetadataReader.java | 1 -
.../metadata/rest/ServiceRestMetadataResolver.java | 2 +-
.../metadata/rest/SpringMvcClassConstants.java | 6 +-
.../rest/jaxrs/BodyParameterProcessor.java | 16 +-
.../rest/jaxrs/DefaultValueParameterProcessor.java | 11 +-
.../rest/jaxrs/FormBodyParameterProcessor.java | 14 +-
.../rest/jaxrs/HeaderParamParameterProcessor.java | 10 +-
.../jaxrs/JAXRSServiceRestMetadataResolver.java | 12 +-
.../jaxrs/ParamAnnotationParameterProcessor.java | 10 +-
.../rest/jaxrs/PathParamParameterProcessor.java | 2 -
.../dubbo/metadata/rest/media/MediaType.java | 7 +-
.../NoAnnotationServiceRestMetadataResolver.java | 15 +-
.../springmvc/PathVariableParameterProcessor.java | 2 -
.../springmvc/RequestHeaderParameterProcessor.java | 11 +-
.../springmvc/RequestParamParameterProcessor.java | 10 +-
.../SpringMvcServiceRestMetadataResolver.java | 18 +-
.../apache/dubbo/metadata/rest/tag/BodyTag.java | 3 +-
.../dubbo/metadata/rest/tag/NoAnnotationTag.java | 3 +-
.../apache/dubbo/metadata/rest/tag/ParamTag.java | 3 +-
.../org/apache/dubbo/metadata/PathMatcherTest.java | 12 +-
.../org/apache/dubbo/metadata/TestMediaType.java | 1 +
.../dubbo/metadata/rest/DefaultRestService.java | 12 +-
.../apache/dubbo/metadata/rest/RestService.java | 5 +-
.../dubbo/metadata/rest/SpringRestService.java | 43 +-
.../dubbo/metadata/rest/StandardRestService.java | 30 +-
...RestDoubleCheckContainsPathVariableService.java | 1 -
.../rest/api/JaxrsRestDoubleCheckService.java | 1 +
.../dubbo/metadata/rest/api/JaxrsRestService.java | 2 -
.../metadata/rest/api/JaxrsRestServiceImpl.java | 1 -
.../dubbo/metadata/rest/api/JaxrsUsingService.java | 1 -
.../metadata/rest/api/SpringControllerService.java | 49 +-
.../dubbo/metadata/rest/api/SpringRestService.java | 60 +-
.../metadata/rest/api/SpringRestServiceImpl.java | 4 +-
.../metadata/rest/feign/FeignClientController.java | 1 -
.../rest/feign/FeignClientControllerImpl.java | 4 +-
.../JAXRSServiceRestMetadataResolverTest.java | 40 +-
.../rest/jaxrs/JaxrsRestDoubleCheckTest.java | 21 +-
...oAnnotationServiceRestMetadataResolverTest.java | 41 +-
.../rest/springmvc/FeignClientAnnotationTest.java | 14 +-
.../SpringMvcServiceRestMetadataResolverTest.java | 44 +-
dubbo-metadata/pom.xml | 57 +-
dubbo-metrics/dubbo-metrics-api/pom.xml | 82 +-
.../org/apache/dubbo/metrics/aggregate/Pane.java | 1 -
.../metrics/aggregate/SampleAggregatedEntry.java | 2 -
.../dubbo/metrics/aggregate/SlidingWindow.java | 4 +-
.../metrics/aggregate/TimeWindowAggregator.java | 4 +-
.../dubbo/metrics/aggregate/TimeWindowCounter.java | 7 +-
.../metrics/aggregate/TimeWindowQuantile.java | 8 +-
.../collector/ApplicationMetricsCollector.java | 3 -
.../metrics/collector/CombMetricsCollector.java | 12 +-
.../metrics/collector/MethodMetricsCollector.java | 2 -
.../dubbo/metrics/collector/MetricsCollector.java | 5 +-
.../metrics/collector/ServiceMetricsCollector.java | 2 -
.../metrics/collector/stat/MetricsStatHandler.java | 2 -
.../metrics/data/ApplicationStatComposite.java | 8 +-
.../dubbo/metrics/data/BaseStatComposite.java | 13 +-
.../dubbo/metrics/data/MethodStatComposite.java | 20 +-
.../apache/dubbo/metrics/data/RtStatComposite.java | 48 +-
.../dubbo/metrics/data/ServiceStatComposite.java | 14 +-
.../dubbo/metrics/event/MetricsDispatcher.java | 5 +-
.../dubbo/metrics/event/MetricsInitEvent.java | 12 +-
.../event/SimpleMetricsEventMulticaster.java | 1 -
.../listener/AbstractMetricsKeyListener.java | 10 +-
.../metrics/listener/AbstractMetricsListener.java | 5 +-
.../listener/MetricsApplicationListener.java | 34 +-
.../metrics/listener/MetricsLifeListener.java | 7 +-
.../metrics/listener/MetricsServiceListener.java | 26 +-
.../dubbo/metrics/model/ApplicationMetric.java | 6 +-
.../dubbo/metrics/model/ConfigCenterMetric.java | 11 +-
.../dubbo/metrics/model/ErrorCodeMetric.java | 1 -
.../apache/dubbo/metrics/model/MethodMetric.java | 27 +-
.../org/apache/dubbo/metrics/model/Metric.java | 1 -
.../dubbo/metrics/model/MetricsCategory.java | 1 -
.../apache/dubbo/metrics/model/MetricsSupport.java | 102 +-
.../dubbo/metrics/model/ServiceKeyMetric.java | 9 +-
.../dubbo/metrics/model/ThreadPoolMetric.java | 21 +-
.../metrics/model/ThreadPoolRejectMetric.java | 20 +-
.../model/container/AtomicLongContainer.java | 3 -
.../model/container/LongAccumulatorContainer.java | 7 +-
.../metrics/model/container/LongContainer.java | 6 +-
.../dubbo/metrics/model/key/CategoryOverall.java | 8 +-
.../apache/dubbo/metrics/model/key/MetricsCat.java | 9 +-
.../dubbo/metrics/model/key/MetricsKeyWrapper.java | 4 +-
.../dubbo/metrics/model/key/MetricsPlaceValue.java | 1 -
.../metrics/model/sample/CounterMetricSample.java | 7 +-
.../metrics/model/sample/GaugeMetricSample.java | 32 +-
.../dubbo/metrics/model/sample/MetricSample.java | 37 +-
.../metrics/report/AbstractMetricsExport.java | 1 -
.../report/AbstractMetricsReporterFactory.java | 1 -
.../apache/dubbo/metrics/report/MetricsExport.java | 1 -
.../dubbo/metrics/report/MetricsReporter.java | 1 -
.../metrics/report/MetricsReporterFactory.java | 1 -
.../dubbo/metrics/service/MetricsEntity.java | 11 +-
.../dubbo/metrics/service/MetricsService.java | 9 +-
.../metrics/service/MetricsServiceExporter.java | 1 -
.../dubbo/metrics/utils/MetricsSupportUtil.java | 1 -
.../apache/dubbo/metrics/MetricsSupportTest.java | 18 +-
.../apache/dubbo/metrics/aggregate/PaneTest.java | 5 +-
.../dubbo/metrics/aggregate/SlidingWindowTest.java | 12 +-
.../aggregate/TimeWindowAggregatorTest.java | 18 +-
.../metrics/aggregate/TimeWindowCounterTest.java | 1 -
.../metrics/aggregate/TimeWindowQuantileTest.java | 21 +-
.../event/SimpleMetricsEventMulticasterTest.java | 21 +-
.../dubbo/metrics/model/ApplicationMetricTest.java | 35 +-
dubbo-metrics/dubbo-metrics-config-center/pom.xml | 36 +-
.../config/ConfigCenterMetricsConstants.java | 1 -
.../collector/ConfigCenterMetricsCollector.java | 9 +-
.../metrics/config/event/ConfigCenterEvent.java | 18 +-
.../config/event/ConfigCenterSubDispatcher.java | 15 +-
.../ConfigCenterMetricsCollectorTest.java | 16 +-
dubbo-metrics/dubbo-metrics-default/pom.xml | 66 +-
.../org/apache/dubbo/metrics/DefaultConstants.java | 114 +-
.../dubbo/metrics/MetricsGlobalRegistry.java | 13 +-
.../metrics/MetricsScopeModelInitializer.java | 9 +-
...ultMetricsReflectionTypeDescriberRegistrar.java | 3 +-
.../collector/AggregateMetricsCollector.java | 181 +-
.../metrics/collector/DefaultMetricsCollector.java | 81 +-
.../collector/HistogramMetricsCollector.java | 38 +-
.../sample/ErrorCodeMetricsListenRegister.java | 3 +-
.../metrics/collector/sample/ErrorCodeSampler.java | 16 +-
.../sample/MetricThreadPoolExhaustedListener.java | 15 +-
.../sample/MetricsCountSampleConfigurer.java | 11 +-
.../collector/sample/MetricsCountSampler.java | 2 -
.../collector/sample/MetricsNameCountSampler.java | 13 +-
.../metrics/collector/sample/MetricsSampler.java | 1 -
.../sample/SimpleMetricsCountSampler.java | 11 +-
.../collector/sample/ThreadPoolMetricsSampler.java | 102 +-
.../sample/ThreadRejectMetricsCountSampler.java | 24 +-
.../dubbo/metrics/event/DefaultSubDispatcher.java | 80 +-
.../apache/dubbo/metrics/event/RequestEvent.java | 47 +-
.../apache/dubbo/metrics/filter/MetricsFilter.java | 17 +-
.../metrics/filter/MetricsProviderFilter.java | 7 +-
.../metrics/register/HistogramMetricRegister.java | 16 +-
.../dubbo/metrics/register/MetricRegister.java | 5 +-
.../metrics/report/AbstractMetricsReporter.java | 42 +-
.../metrics/report/DefaultMetricsReporter.java | 70 +-
.../report/DefaultMetricsReporterFactory.java | 1 -
.../metrics/report/nop/NopMetricsReporter.java | 13 +-
.../report/nop/NopMetricsReporterFactory.java | 1 -
.../metrics/sample/HistogramMetricSample.java | 9 +-
.../metrics/service/DefaultMetricsService.java | 7 +-
.../filter/support/MetricsClusterFilter.java | 12 +-
.../dubbo/metrics/DefaultMetricsServiceTest.java | 21 +-
.../apache/dubbo/metrics/TestMetricsInvoker.java | 6 +-
.../collector/AggregateMetricsCollectorTest.java | 83 +-
.../metrics/collector/DefaultCollectorTest.java | 132 +-
.../metrics/collector/InitServiceMetricsTest.java | 52 +-
.../sample/ThreadPoolMetricsSamplerTest.java | 13 +-
.../dubbo/metrics/filter/MetricsFilterTest.java | 39 +-
.../metrics/metrics/model/MethodMetricTest.java | 19 +-
.../metrics/model/sample/ErrorCodeSampleTest.java | 15 +-
.../model/sample/GaugeMetricSampleTest.java | 12 +-
.../metrics/model/sample/MetricSampleTest.java | 8 +-
.../metrics/metrics/service/MetricsEntityTest.java | 8 +-
.../cluster/filter/MetricsClusterFilterTest.java | 49 +-
.../dubbo/rpc/cluster/filter/MockInvocation.java | 5 +-
dubbo-metrics/dubbo-metrics-event/pom.xml | 46 +-
.../org/apache/dubbo/metrics/MetricsConstants.java | 4 +-
.../apache/dubbo/metrics/event/MetricsEvent.java | 16 +-
.../dubbo/metrics/event/MetricsEventBus.java | 2 -
.../metrics/event/MetricsEventMulticaster.java | 1 -
.../dubbo/metrics/event/TimeCounterEvent.java | 8 +-
.../exception/MetricsNeverHappenException.java | 1 -
.../dubbo/metrics/listener/MetricsListener.java | 4 -
.../org/apache/dubbo/metrics/model/TimePair.java | 1 -
.../apache/dubbo/metrics/model/key/MetricsKey.java | 45 +-
.../dubbo/metrics/model/key/MetricsLevel.java | 7 +-
.../dubbo/metrics/model/key/TypeWrapper.java | 2 -
dubbo-metrics/dubbo-metrics-metadata/pom.xml | 46 +-
.../metrics/metadata/MetadataMetricsConstants.java | 20 +-
.../collector/MetadataMetricsCollector.java | 2 -
.../metrics/metadata/event/MetadataEvent.java | 26 +-
.../metadata/event/MetadataSubDispatcher.java | 51 +-
.../metadata/MetadataMetricsCollectorTest.java | 271 +-
.../metadata/MetadataStatCompositeTest.java | 49 +-
dubbo-metrics/dubbo-metrics-netty/pom.xml | 46 +-
.../metrics/registry/NettyMetricsConstants.java | 17 +-
.../registry/collector/NettyMetricsCollector.java | 3 -
.../dubbo/metrics/registry/event/NettyEvent.java | 8 +-
.../metrics/registry/event/NettySubDispatcher.java | 11 +-
dubbo-metrics/dubbo-metrics-prometheus/pom.xml | 94 +-
.../prometheus/NopPrometheusMetricsReporter.java | 9 +-
.../prometheus/PrometheusMetricsReporter.java | 24 +-
.../prometheus/PrometheusMetricsReporterCmd.java | 11 +-
.../PrometheusMetricsReporterFactory.java | 25 +-
.../PrometheusMetricsReporterFactoryTest.java | 1 -
.../prometheus/PrometheusMetricsReporterTest.java | 39 +-
.../PrometheusMetricsThreadPoolTest.java | 42 +-
dubbo-metrics/dubbo-metrics-registry/pom.xml | 46 +-
.../metrics/registry/RegistryMetricsConstants.java | 34 +-
.../collector/RegistryMetricsCollector.java | 55 +-
.../registry/collector/RegistryStatComposite.java | 8 +-
.../metrics/registry/event/RegistryEvent.java | 50 +-
.../registry/event/RegistrySpecListener.java | 122 +-
.../registry/event/RegistrySubDispatcher.java | 97 +-
.../collector/RegistryMetricsCollectorTest.java | 256 +-
.../collector/RegistryMetricsSampleTest.java | 33 +-
.../metrics/collector/RegistryMetricsTest.java | 29 +-
.../collector/RegistryStatCompositeTest.java | 84 +-
dubbo-metrics/dubbo-tracing/pom.xml | 181 +-
.../AbstractDefaultDubboObservationConvention.java | 19 +-
.../DefaultDubboClientObservationConvention.java | 11 +-
.../DefaultDubboServerObservationConvention.java | 3 +-
.../tracing/DubboObservationDocumentation.java | 3 -
.../dubbo/tracing/DubboObservationRegistry.java | 34 +-
.../dubbo/tracing/context/DubboClientContext.java | 5 +-
.../dubbo/tracing/context/DubboServerContext.java | 3 +-
.../tracing/exporter/otlp/OTlpSpanExporter.java | 13 +-
.../exporter/zipkin/ZipkinSpanExporter.java | 3 +-
.../tracing/exporter/zipkin/ZipkinSpanHandler.java | 3 +-
.../tracing/filter/ObservationReceiverFilter.java | 8 +-
.../tracing/filter/ObservationSenderFilter.java | 8 +-
.../dubbo/tracing/tracer/TracerProvider.java | 1 -
.../tracer/brave/BravePropagatorProvider.java | 1 -
.../dubbo/tracing/tracer/brave/BraveProvider.java | 66 +-
.../tracing/tracer/otel/OpenTelemetryProvider.java | 89 +-
.../dubbo/tracing/utils/ObservationConstants.java | 1 -
.../dubbo/tracing/utils/PropagationType.java | 2 -
...efaultDubboClientObservationConventionTest.java | 9 +-
...efaultDubboServerObservationConventionTest.java | 6 +-
.../org/apache/dubbo/tracing/MockInvocation.java | 9 +-
.../exporter/otlp/OTlpSpanExporterTest.java | 6 +-
.../exporter/zipkin/ZipkinSpanExporterTest.java | 7 +-
.../exporter/zipkin/ZipkinSpanHandlerTest.java | 6 +-
.../filter/AbstractObservationFilterTest.java | 4 +-
.../filter/ObservationReceiverFilterTest.java | 51 +-
.../filter/ObservationSenderFilterTest.java | 31 +-
.../tracer/PropagatorProviderFactoryTest.java | 2 +-
.../tracer/brave/BravePropagatorProviderTest.java | 2 +-
.../tracing/tracer/brave/BraveProviderTest.java | 21 +-
.../tracer/otel/OTelPropagatorProviderTest.java | 3 +-
.../tracer/otel/OpenTelemetryProviderTest.java | 20 +-
.../tracing/utils/ObservationConventionUtils.java | 15 +-
.../tracing/utils/ObservationSupportUtilTest.java | 1 -
.../dubbo/tracing/utils/PropagationTypeTest.java | 2 +-
dubbo-metrics/pom.xml | 70 +-
dubbo-monitor/dubbo-monitor-api/pom.xml | 43 +-
.../org/apache/dubbo/monitor/MetricsService.java | 1 -
.../java/org/apache/dubbo/monitor/Monitor.java | 4 +-
.../org/apache/dubbo/monitor/MonitorFactory.java | 1 -
.../org/apache/dubbo/monitor/MonitorService.java | 2 -
dubbo-monitor/dubbo-monitor-common/pom.xml | 53 +-
.../monitor/support/AbstractMonitorFactory.java | 20 +-
.../monitor/support/MetricsServiceDetector.java | 1 -
.../monitor/support/MonitorClusterFilter.java | 3 +-
.../dubbo/monitor/support/MonitorFilter.java | 67 +-
.../monitor/support/MonitorServiceDetector.java | 1 -
.../support/AbstractMonitorFactoryTest.java | 14 +-
.../dubbo/monitor/support/MonitorFilterTest.java | 54 +-
dubbo-monitor/dubbo-monitor-default/pom.xml | 138 +-
.../apache/dubbo/monitor/dubbo/DubboMonitor.java | 126 +-
.../dubbo/monitor/dubbo/DubboMonitorFactory.java | 4 +-
.../apache/dubbo/monitor/dubbo/MetricsFilter.java | 102 +-
.../org/apache/dubbo/monitor/dubbo/Statistics.java | 1 -
.../apache/dubbo/monitor/dubbo/StatisticsItem.java | 16 +-
.../monitor/dubbo/DubboMonitorFactoryTest.java | 3 +-
.../dubbo/monitor/dubbo/DubboMonitorTest.java | 118 +-
.../dubbo/monitor/dubbo/MetricsFilterTest.java | 240 +-
.../dubbo/monitor/dubbo/MockMonitorService.java | 1 -
.../apache/dubbo/monitor/dubbo/StatisticsTest.java | 2 +-
.../dubbo/monitor/dubbo/service/DemoService.java | 2 -
dubbo-monitor/pom.xml | 55 +-
dubbo-plugin/dubbo-auth/pom.xml | 49 +-
.../apache/dubbo/auth/AccessKeyAuthenticator.java | 17 +-
.../main/java/org/apache/dubbo/auth/Constants.java | 1 -
.../apache/dubbo/auth/DefaultAccessKeyStorage.java | 1 -
.../auth/exception/AccessKeyNotFoundException.java | 6 +-
.../auth/exception/RpcAuthenticationException.java | 4 +-
.../dubbo/auth/filter/ConsumerSignFilter.java | 3 +-
.../dubbo/auth/filter/ProviderAuthFilter.java | 5 +-
.../org/apache/dubbo/auth/model/AccessKeyPair.java | 15 +-
.../apache/dubbo/auth/spi/AccessKeyStorage.java | 1 -
.../org/apache/dubbo/auth/spi/Authenticator.java | 2 -
.../apache/dubbo/auth/utils/SignatureUtils.java | 10 +-
.../dubbo/auth/AccessKeyAuthenticatorTest.java | 16 +-
.../dubbo/auth/DefaultAccessKeyStorageTest.java | 3 +-
.../dubbo/auth/filter/ConsumerSignFilterTest.java | 3 +-
.../dubbo/auth/filter/ProviderAuthFilterTest.java | 27 +-
.../dubbo/auth/utils/SignatureUtilsTest.java | 8 +-
dubbo-plugin/dubbo-compiler/pom.xml | 157 +-
.../org/apache/dubbo/gen/AbstractGenerator.java | 175 +-
.../org/apache/dubbo/gen/DubboGeneratorPlugin.java | 23 +-
.../apache/dubbo/gen/dubbo/Dubbo3Generator.java | 5 +-
.../org/apache/dubbo/gen/dubbo/DubboGenerator.java | 1 -
.../apache/dubbo/gen/grpc/DubboGrpcGenerator.java | 1 -
.../grpc/reactive/ReactorDubboGrpcGenerator.java | 2 -
.../dubbo/gen/tri/Dubbo3TripleGenerator.java | 1 -
.../tri/reactive/ReactorDubbo3TripleGenerator.java | 1 -
dubbo-plugin/dubbo-filter-cache/pom.xml | 63 +-
.../main/java/org/apache/dubbo/cache/Cache.java | 1 -
.../java/org/apache/dubbo/cache/CacheFactory.java | 1 -
.../org/apache/dubbo/cache/filter/CacheFilter.java | 17 +-
.../dubbo/cache/support/AbstractCacheFactory.java | 1 -
.../cache/support/expiring/ExpiringCache.java | 2 -
.../support/expiring/ExpiringCacheFactory.java | 2 -
.../dubbo/cache/support/expiring/ExpiringMap.java | 27 +-
.../apache/dubbo/cache/support/jcache/JCache.java | 22 +-
.../dubbo/cache/support/jcache/JCacheFactory.java | 1 -
.../apache/dubbo/cache/support/lfu/LfuCache.java | 3 +-
.../dubbo/cache/support/lfu/LfuCacheFactory.java | 1 -
.../apache/dubbo/cache/support/lru/LruCache.java | 1 -
.../dubbo/cache/support/lru/LruCacheFactory.java | 1 -
.../support/threadlocal/ThreadLocalCache.java | 1 -
.../threadlocal/ThreadLocalCacheFactory.java | 1 -
.../apache/dubbo/cache/filter/CacheFilterTest.java | 28 +-
.../cache/support/AbstractCacheFactoryTest.java | 2 +-
.../support/expiring/ExpiringCacheFactoryTest.java | 6 +-
.../cache/support/lru/LruCacheFactoryTest.java | 4 +-
.../threadlocal/ThreadLocalCacheFactoryTest.java | 2 +-
dubbo-plugin/dubbo-filter-validation/pom.xml | 123 +-
.../org/apache/dubbo/validation/Validation.java | 1 -
.../org/apache/dubbo/validation/Validator.java | 1 -
.../dubbo/validation/filter/ValidationFilter.java | 13 +-
.../validation/support/AbstractValidation.java | 1 -
.../support/jvalidation/JValidation.java | 1 -
.../support/jvalidation/JValidationNew.java | 1 -
.../validation/support/jvalidation/JValidator.java | 73 +-
.../support/jvalidation/JValidatorNew.java | 71 +-
.../validation/filter/ValidationFilterTest.java | 25 +-
.../support/jvalidation/JValidationTest.java | 11 +-
.../support/jvalidation/JValidatorTest.java | 89 +-
.../jvalidation/mock/JValidatorTestTarget.java | 16 +-
.../jvalidation/mock/ValidationParameter.java | 3 +-
dubbo-plugin/dubbo-native/pom.xml | 37 +-
.../apache/dubbo/aot/api/ConditionalDescriber.java | 1 -
.../org/apache/dubbo/aot/api/ExecutableMode.java | 49 +-
.../apache/dubbo/aot/api/JdkProxyDescriber.java | 4 +-
.../org/apache/dubbo/aot/api/MemberCategory.java | 178 +-
.../dubbo/aot/api/ResourceBundleDescriber.java | 1 -
.../dubbo/aot/api/ResourcePatternDescriber.java | 9 +-
.../org/apache/dubbo/aot/api/TypeDescriber.java | 11 +-
.../apache/dubbo/aot/generate/AotProcessor.java | 61 +-
.../dubbo/aot/generate/ClassSourceScanner.java | 56 +-
.../dubbo/aot/generate/ExecutableDescriber.java | 10 +-
.../org/apache/dubbo/aot/generate/JarScanner.java | 7 +-
.../aot/generate/NativeClassSourceWriter.java | 39 +-
.../aot/generate/NativeConfigurationWriter.java | 17 +-
.../generate/ProxyConfigMetadataRepository.java | 5 +-
.../dubbo/aot/generate/ProxyConfigWriter.java | 3 +-
.../generate/ReflectConfigMetadataRepository.java | 24 +-
.../dubbo/aot/generate/ReflectionConfigWriter.java | 106 +-
.../generate/ResourceConfigMetadataRepository.java | 3 +-
.../dubbo/aot/generate/ResourceConfigWriter.java | 21 +-
.../apache/dubbo/aot/generate/ResourceScanner.java | 17 +-
.../aot/generate/ResourcePatternDescriberTest.java | 8 +-
dubbo-plugin/dubbo-plugin-access-log/pom.xml | 46 +-
.../apache/dubbo/rpc/filter/AccessLogFilter.java | 61 +-
.../apache/dubbo/rpc/support/AccessLogData.java | 37 +-
.../dubbo/rpc/filter/AccessLogFilterTest.java | 14 +-
.../apache/dubbo/rpc/support/MockInvocation.java | 9 +-
.../org/apache/dubbo/rpc/support/MyInvoker.java | 1 -
.../dubbo-plugin-classloader-filter/pom.xml | 46 +-
.../filter/support/ConsumerClassLoaderFilter.java | 4 +-
.../dubbo/rpc/filter/ClassLoaderFilterTest.java | 7 +-
.../org/apache/dubbo/rpc/support/MyInvoker.java | 1 -
.../dubbo-plugin-cluster-mergeable/pom.xml | 36 +-
.../MergeableClusterScopeModelInitializer.java | 6 +-
.../rpc/cluster/merger/BooleanArrayMerger.java | 2 -
.../dubbo/rpc/cluster/merger/ByteArrayMerger.java | 2 -
.../dubbo/rpc/cluster/merger/CharArrayMerger.java | 1 -
.../rpc/cluster/merger/DoubleArrayMerger.java | 4 +-
.../dubbo/rpc/cluster/merger/FloatArrayMerger.java | 1 -
.../dubbo/rpc/cluster/merger/IntArrayMerger.java | 5 +-
.../dubbo/rpc/cluster/merger/ListMerger.java | 6 +-
.../dubbo/rpc/cluster/merger/LongArrayMerger.java | 4 +-
.../apache/dubbo/rpc/cluster/merger/MapMerger.java | 1 -
.../dubbo/rpc/cluster/merger/MergerFactory.java | 13 +-
.../dubbo/rpc/cluster/merger/ShortArrayMerger.java | 1 -
.../rpc/cluster/support/MergeableCluster.java | 1 -
.../cluster/support/MergeableClusterInvoker.java | 35 +-
.../dubbo/rpc/cluster/merger/DoubleSumMerger.java | 6 +-
.../dubbo/rpc/cluster/merger/FloatSumMerger.java | 3 +-
.../dubbo/rpc/cluster/merger/IntSumMerger.java | 6 +-
.../dubbo/rpc/cluster/merger/LongSumMerger.java | 6 +-
.../dubbo/rpc/cluster/merger/ResultMergerTest.java | 136 +-
.../org/apache/dubbo/rpc/cluster/support/Menu.java | 4 +-
.../dubbo/rpc/cluster/support/MenuService.java | 1 -
.../support/MergeableClusterInvokerTest.java | 205 +-
dubbo-plugin/dubbo-plugin-context/pom.xml | 46 +-
.../filter/support/ConsumerContextFilter.java | 34 +-
.../org/apache/dubbo/rpc/filter/ContextFilter.java | 29 +-
.../apache/dubbo/rpc/filter/ContextFilterTest.java | 4 +-
.../apache/dubbo/rpc/support/MockInvocation.java | 9 +-
.../org/apache/dubbo/rpc/support/MyInvoker.java | 1 -
dubbo-plugin/dubbo-plugin-generic-invoke/pom.xml | 46 +-
.../org/apache/dubbo/rpc/filter/GenericFilter.java | 203 +-
.../apache/dubbo/rpc/filter/GenericImplFilter.java | 73 +-
.../apache/dubbo/rpc/filter/GenericFilterTest.java | 53 +-
.../dubbo/rpc/filter/GenericImplFilterTest.java | 72 +-
.../org/apache/dubbo/rpc/support/DemoService.java | 1 -
.../dubbo-plugin-loadbalance-adaptive/pom.xml | 46 +-
.../java/org/apache/dubbo/rpc/AdaptiveMetrics.java | 30 +-
.../dubbo/rpc/AdaptiveScopeModelInitializer.java | 6 +-
.../cluster/loadbalance/AdaptiveLoadBalance.java | 48 +-
.../rpc/filter/AdaptiveLoadBalanceFilter.java | 37 +-
.../loadbalance/AdaptiveLoadBalanceTest.java | 52 +-
.../cluster/loadbalance/LoadBalanceBaseTest.java | 31 +-
dubbo-plugin/dubbo-plugin-loom/pom.xml | 68 +-
.../threadpool/support/loom/VirtualThreadPool.java | 7 +-
.../support/loom/VirtualThreadPoolTest.java | 15 +-
dubbo-plugin/dubbo-plugin-mock/pom.xml | 46 +-
.../cluster/router/mock/MockInvokersSelector.java | 15 +-
.../router/mock/MockStateRouterFactory.java | 1 -
.../support/wrapper/MockClusterInvoker.java | 56 +-
.../support/wrapper/MockClusterWrapper.java | 3 +-
.../dubbo/rpc/support/MockConfigPostProcessor.java | 15 +-
.../org/apache/dubbo/rpc/support/MockInvoker.java | 51 +-
.../org/apache/dubbo/rpc/support/MockProtocol.java | 2 +-
.../router/mock/MockInvokersSelectorTest.java | 27 +-
.../support/wrapper/MockClusterInvokerTest.java | 301 +-
.../wrapper/MockProviderRpcExceptionTest.java | 38 +-
.../cluster/support/wrapper/MyMockException.java | 2 -
.../apache/dubbo/rpc/support/DemoServiceAMock.java | 3 +-
.../org/apache/dubbo/rpc/support/Greeting.java | 2 +-
.../apache/dubbo/rpc/support/GreetingMock1.java | 5 +-
.../apache/dubbo/rpc/support/GreetingMock2.java | 5 +-
.../support/MockAbstractClusterInvokerTest.java | 43 +-
.../rpc/support/MockConfigPostProcessorTest.java | 6 +-
.../apache/dubbo/rpc/support/MockInvokerTest.java | 80 +-
dubbo-plugin/dubbo-plugin-proxy-bytebuddy/pom.xml | 44 +-
.../rpc/proxy/bytebuddy/ByteBuddyInterceptor.java | 10 +-
.../dubbo/rpc/proxy/bytebuddy/ByteBuddyProxy.java | 34 +-
.../rpc/proxy/bytebuddy/ByteBuddyProxyInvoker.java | 8 +-
.../apache/dubbo/rpc/proxy/AbstractProxyTest.java | 32 +-
.../proxy/bytebuddy/ByteBuddyInterceptorTest.java | 12 +-
.../proxy/bytebuddy/ByteBuddyProxyFactoryTest.java | 1 -
.../proxy/bytebuddy/ByteBuddyProxyInvokerTest.java | 11 +-
.../rpc/proxy/bytebuddy/ByteBuddyProxyTest.java | 7 +-
.../apache/dubbo/rpc/support/DemoServiceImpl.java | 1 -
.../org/apache/dubbo/rpc/support/MyInvoker.java | 1 -
dubbo-plugin/dubbo-plugin-qos-trace/pom.xml | 56 +-
.../dubbo/qos/legacy/ChangeTelnetHandler.java | 5 +-
.../dubbo/qos/legacy/TraceTelnetHandler.java | 9 +-
.../rpc/protocol/dubbo/filter/TraceFilter.java | 18 +-
.../dubbo/qos/legacy/ChangeTelnetHandlerTest.java | 26 +-
.../org/apache/dubbo/qos/legacy/ProtocolUtils.java | 6 +-
.../dubbo/qos/legacy/TraceTelnetHandlerTest.java | 14 +-
.../dubbo/qos/legacy/channel/MockChannel.java | 4 +-
.../dubbo/qos/legacy/service/DemoService.java | 1 -
.../rpc/protocol/dubbo/filter/MockChannel.java | 15 +-
.../rpc/protocol/dubbo/filter/TraceFilterTest.java | 16 +-
dubbo-plugin/dubbo-plugin-router-condition/pom.xml | 36 +-
.../router/condition/ConditionStateRouter.java | 102 +-
.../condition/config/ListenableStateRouter.java | 36 +-
.../condition/config/ProviderAppStateRouter.java | 9 +-
.../config/ServiceStateRouterFactory.java | 1 -
.../config/model/ConditionRouterRule.java | 7 +-
.../config/model/ConditionRuleParser.java | 5 +-
.../matcher/AbstractConditionMatcher.java | 29 +-
.../matcher/argument/ArgumentConditionMatcher.java | 14 +-
.../attachment/AttachmentConditionMatcher.java | 18 +-
.../matcher/param/UrlParamConditionMatcher.java | 1 -
.../matcher/pattern/range/RangeValuePattern.java | 13 +-
.../rpc/cluster/directory/MockDirInvocation.java | 25 +-
.../rpc/cluster/directory/StaticDirectoryTest.java | 26 +-
.../cluster/router/ConfigConditionRouterTest.java | 82 +-
.../dubbo/rpc/cluster/router/MockInvoker.java | 6 +-
.../router/condition/ConditionStateRouterTest.java | 604 +-
.../ProviderAppConditionStateRouterTest.java | 43 +-
dubbo-plugin/dubbo-plugin-router-mesh/pom.xml | 36 +-
.../router/mesh/MeshScopeModelInitializer.java | 7 +-
.../router/mesh/route/MeshAppRuleListener.java | 42 +-
.../cluster/router/mesh/route/MeshEnvListener.java | 1 -
.../cluster/router/mesh/route/MeshRuleCache.java | 37 +-
.../cluster/router/mesh/route/MeshRuleManager.java | 18 +-
.../cluster/router/mesh/route/MeshRuleRouter.java | 62 +-
.../mesh/route/StandardMeshRuleRouterFactory.java | 2 -
.../rpc/cluster/router/mesh/rule/BaseRule.java | 11 +-
.../router/mesh/rule/VsDestinationGroup.java | 2 -
.../rule/destination/ConnectionPoolSettings.java | 5 +-
.../mesh/rule/destination/DestinationRule.java | 7 +-
.../mesh/rule/destination/DestinationRuleSpec.java | 11 +-
.../router/mesh/rule/destination/Subset.java | 7 +-
.../router/mesh/rule/destination/TCPSettings.java | 2 -
.../router/mesh/rule/destination/TcpKeepalive.java | 3 -
.../mesh/rule/destination/TrafficPolicy.java | 6 +-
.../destination/loadbalance/ConsistentHashLB.java | 5 +-
.../loadbalance/LoadBalancerSettings.java | 7 +-
.../rule/destination/loadbalance/SimpleLB.java | 2 -
.../rule/virtualservice/DubboMatchRequest.java | 18 +-
.../mesh/rule/virtualservice/DubboRoute.java | 8 +-
.../mesh/rule/virtualservice/DubboRouteDetail.java | 8 +-
.../rule/virtualservice/VirtualServiceRule.java | 7 +-
.../rule/virtualservice/VirtualServiceSpec.java | 7 +-
.../destination/DubboDestination.java | 3 -
.../destination/DubboRouteDestination.java | 2 -
.../virtualservice/match/DubboAttachmentMatch.java | 4 +-
.../router/mesh/util/MeshRuleDispatcher.java | 11 +-
.../cluster/router/mesh/util/MeshRuleListener.java | 2 -
.../router/mesh/route/MeshAppRuleListenerTest.java | 226 +-
.../router/mesh/route/MeshRuleCacheTest.java | 17 +-
.../router/mesh/route/MeshRuleManagerTest.java | 121 +-
.../router/mesh/route/MeshRuleRouterTest.java | 365 +-
.../route/StandardMeshRuleRouterFactoryTest.java | 6 +-
.../router/mesh/rule/DestinationRuleTest.java | 81 +-
.../router/mesh/rule/VirtualServiceRuleTest.java | 41 +-
.../rule/virtualservice/DubboMatchRequestTest.java | 24 +-
.../match/DubboAttachmentMatchTest.java | 29 +-
.../router/mesh/util/MeshRuleDispatcherTest.java | 61 +-
dubbo-plugin/dubbo-plugin-router-script/pom.xml | 36 +-
.../router/file/FileStateRouterFactory.java | 5 +-
.../cluster/router/script/ScriptStateRouter.java | 55 +-
.../router/script/ScriptStateRouterFactory.java | 1 -
.../router/script/config/AppScriptStateRouter.java | 53 +-
.../router/script/config/model/ScriptRule.java | 4 +-
.../dubbo/rpc/cluster/router/MockInvoker.java | 6 +-
.../cluster/router/file/FileRouterEngineTest.java | 40 +-
.../router/script/ScriptStateRouterTest.java | 83 +-
.../script/config/AppScriptStateRouterTest.java | 53 +-
dubbo-plugin/dubbo-plugin-router-tag/pom.xml | 36 +-
.../rpc/cluster/router/tag/TagStateRouter.java | 80 +-
.../dubbo/rpc/cluster/router/tag/model/Tag.java | 34 +-
.../cluster/router/tag/model/TagRouterRule.java | 67 +-
.../cluster/router/tag/model/TagRuleParser.java | 4 +-
.../dubbo/rpc/cluster/router/MockInvoker.java | 6 +-
.../rpc/cluster/router/tag/TagStateRouterTest.java | 178 +-
dubbo-plugin/dubbo-plugin-token/pom.xml | 46 +-
.../org/apache/dubbo/rpc/filter/TokenFilter.java | 12 +-
.../apache/dubbo/rpc/filter/TokenHeaderFilter.java | 10 +-
.../apache/dubbo/rpc/filter/TokenFilterTest.java | 7 +-
dubbo-plugin/dubbo-plugin-tps/pom.xml | 46 +-
.../apache/dubbo/rpc/filter/ActiveLimitFilter.java | 13 +-
.../dubbo/rpc/filter/ExecuteLimitFilter.java | 19 +-
.../apache/dubbo/rpc/filter/TpsLimitFilter.java | 10 +-
.../dubbo/rpc/filter/tps/DefaultTPSLimiter.java | 6 +-
.../org/apache/dubbo/rpc/filter/tps/StatItem.java | 8 +-
.../apache/dubbo/rpc/filter/tps/TPSLimiter.java | 1 -
.../dubbo/rpc/filter/ActiveLimitFilterTest.java | 22 +-
.../dubbo/rpc/filter/ExecuteLimitFilterTest.java | 15 +-
.../rpc/filter/tps/DefaultTPSLimiterTest.java | 17 +-
.../apache/dubbo/rpc/filter/tps/StatItemTest.java | 13 +-
.../dubbo/rpc/filter/tps/TpsLimitFilterTest.java | 3 +-
.../apache/dubbo/rpc/support/MockInvocation.java | 9 +-
.../org/apache/dubbo/rpc/support/MyInvoker.java | 1 -
.../dubbo/rpc/support/RuntimeExceptionInvoker.java | 1 -
dubbo-plugin/dubbo-qos-api/pom.xml | 51 +-
.../main/java/org/apache/dubbo/qos/api/Cmd.java | 1 -
.../org/apache/dubbo/qos/api/CommandContext.java | 29 +-
.../org/apache/dubbo/qos/api/PermissionLevel.java | 14 +-
.../org/apache/dubbo/qos/api/QosConfiguration.java | 35 +-
dubbo-plugin/dubbo-qos/pom.xml | 133 +-
.../apache/dubbo/qos/QosScopeModelInitializer.java | 8 +-
.../aot/QosReflectionTypeDescriberRegistrar.java | 4 +-
.../dubbo/qos/command/DefaultCommandExecutor.java | 53 +-
.../qos/command/decoder/HttpCommandDecoder.java | 25 +-
.../qos/command/decoder/TelnetCommandDecoder.java | 4 +-
.../apache/dubbo/qos/command/impl/BaseOffline.java | 21 +-
.../apache/dubbo/qos/command/impl/BaseOnline.java | 10 +-
.../dubbo/qos/command/impl/ChangeTelnet.java | 17 +-
.../apache/dubbo/qos/command/impl/CountTelnet.java | 77 +-
.../command/impl/DefaultMetricsReporterCmd.java | 5 +-
.../qos/command/impl/DisableDetailProfiler.java | 5 +-
.../qos/command/impl/DisableRouterSnapshot.java | 12 +-
.../qos/command/impl/DisableSimpleProfiler.java | 5 +-
.../qos/command/impl/EnableDetailProfiler.java | 5 +-
.../qos/command/impl/EnableRouterSnapshot.java | 12 +-
.../qos/command/impl/EnableSimpleProfiler.java | 5 +-
.../apache/dubbo/qos/command/impl/GetAddress.java | 203 +-
.../apache/dubbo/qos/command/impl/GetConfig.java | 89 +-
.../qos/command/impl/GetEnabledRouterSnapshot.java | 7 +-
.../qos/command/impl/GetRecentRouterSnapshot.java | 10 +-
.../dubbo/qos/command/impl/GetRouterSnapshot.java | 36 +-
.../dubbo/qos/command/impl/GracefulShutdown.java | 11 +-
.../org/apache/dubbo/qos/command/impl/Help.java | 23 +-
.../dubbo/qos/command/impl/InvokeTelnet.java | 61 +-
.../org/apache/dubbo/qos/command/impl/Live.java | 26 +-
.../apache/dubbo/qos/command/impl/LoggerInfo.java | 15 +-
.../java/org/apache/dubbo/qos/command/impl/Ls.java | 39 +-
.../org/apache/dubbo/qos/command/impl/Offline.java | 8 +-
.../apache/dubbo/qos/command/impl/OfflineApp.java | 8 +-
.../dubbo/qos/command/impl/OfflineInterface.java | 8 +-
.../org/apache/dubbo/qos/command/impl/Online.java | 8 +-
.../apache/dubbo/qos/command/impl/OnlineApp.java | 9 +-
.../dubbo/qos/command/impl/OnlineInterface.java | 8 +-
.../apache/dubbo/qos/command/impl/PortTelnet.java | 13 +-
.../dubbo/qos/command/impl/PublishMetadata.java | 36 +-
.../apache/dubbo/qos/command/impl/PwdTelnet.java | 12 +-
.../org/apache/dubbo/qos/command/impl/Quit.java | 2 +-
.../org/apache/dubbo/qos/command/impl/Ready.java | 25 +-
.../dubbo/qos/command/impl/SelectTelnet.java | 24 +-
.../qos/command/impl/SerializeCheckStatus.java | 29 +-
.../qos/command/impl/SerializeWarnedClasses.java | 18 +-
.../qos/command/impl/SetProfilerWarnPercent.java | 13 +-
.../dubbo/qos/command/impl/ShutdownTelnet.java | 13 +-
.../org/apache/dubbo/qos/command/impl/Startup.java | 24 +-
.../dubbo/qos/command/impl/SwitchLogLevel.java | 9 +-
.../dubbo/qos/command/impl/SwitchLogger.java | 9 +-
.../org/apache/dubbo/qos/command/impl/Version.java | 10 +-
.../dubbo/qos/command/util/CommandHelper.java | 13 +-
.../qos/command/util/SerializeCheckUtils.java | 6 +-
.../dubbo/qos/command/util/ServiceCheckUtils.java | 31 +-
.../org/apache/dubbo/qos/common/QosConstants.java | 1 -
.../apache/dubbo/qos/legacy/LogTelnetHandler.java | 18 +-
.../DefaultAnonymousAccessPermissionChecker.java | 30 +-
.../qos/probe/impl/DeployerReadinessProbe.java | 1 -
.../qos/probe/impl/ProviderReadinessProbe.java | 6 +-
.../dubbo/qos/protocol/QosProtocolWrapper.java | 9 +-
.../org/apache/dubbo/qos/server/DubboLogo.java | 8 +-
.../java/org/apache/dubbo/qos/server/Server.java | 23 +-
.../server/handler/ForeignHostPermitHandler.java | 14 +-
.../qos/server/handler/HttpProcessHandler.java | 28 +-
.../qos/server/handler/QosProcessHandler.java | 24 +-
.../qos/server/handler/TelnetIdleEventHandler.java | 1 -
.../qos/server/handler/TelnetProcessHandler.java | 17 +-
.../org/apache/dubbo/qos/textui/TComponent.java | 1 -
.../main/java/org/apache/dubbo/qos/textui/TKv.java | 18 +-
.../java/org/apache/dubbo/qos/textui/TLadder.java | 10 +-
.../java/org/apache/dubbo/qos/textui/TTable.java | 55 +-
.../java/org/apache/dubbo/qos/textui/TTree.java | 24 +-
.../qos/command/CommandContextFactoryTest.java | 6 +-
.../dubbo/qos/command/CommandContextTest.java | 10 +-
.../qos/command/DefaultCommandExecutorTest.java | 18 +-
.../apache/dubbo/qos/command/GreetingCommand.java | 13 +-
.../command/decoder/HttpCommandDecoderTest.java | 4 +-
.../dubbo/qos/command/impl/ChangeTelnetTest.java | 33 +-
.../dubbo/qos/command/impl/CountTelnetTest.java | 23 +-
.../dubbo/qos/command/impl/GetConfigTest.java | 24 +-
.../apache/dubbo/qos/command/impl/HelpTest.java | 2 +-
.../dubbo/qos/command/impl/InvokeTelnetTest.java | 92 +-
.../org/apache/dubbo/qos/command/impl/LsTest.java | 49 +-
.../apache/dubbo/qos/command/impl/OfflineTest.java | 27 +-
.../apache/dubbo/qos/command/impl/OnlineTest.java | 27 +-
.../dubbo/qos/command/impl/PortTelnetTest.java | 13 +-
.../qos/command/impl/PublishMetadataTest.java | 17 +-
.../dubbo/qos/command/impl/PwdTelnetTest.java | 9 +-
.../apache/dubbo/qos/command/impl/ReadyTest.java | 19 +-
.../dubbo/qos/command/impl/SelectTelnetTest.java | 42 +-
.../qos/command/impl/SerializeCheckStatusTest.java | 48 +-
.../command/impl/SerializeWarnedClassesTest.java | 27 +-
.../dubbo/qos/command/impl/ShutdownTelnetTest.java | 2 +-
.../apache/dubbo/qos/command/impl/StartupTest.java | 15 +-
.../qos/command/impl/channel/MockNettyChannel.java | 23 +-
.../dubbo/qos/command/util/CommandHelperTest.java | 4 +-
.../qos/command/util/ServiceCheckUtilsTest.java | 44 +-
.../dubbo/qos/legacy/LogTelnetHandlerTest.java | 3 +-
.../dubbo/qos/legacy/service/CustomArgument.java | 4 +-
.../dubbo/qos/legacy/service/DemoService.java | 2 -
.../dubbo/qos/legacy/service/DemoServiceImpl.java | 15 +-
.../org/apache/dubbo/qos/legacy/service/Man.java | 1 -
.../dubbo/qos/legacy/service/NonSerialized.java | 4 +-
.../org/apache/dubbo/qos/legacy/service/Type.java | 4 +-
.../qos/legacy/service/generic/DemoException.java | 1 -
.../qos/legacy/service/generic/DemoService.java | 2 -
.../legacy/service/generic/DemoServiceImpl.java | 2 -
.../legacy/service/generic/GenericServiceTest.java | 66 +-
.../dubbo/qos/legacy/service/generic/User.java | 4 +-
...efaultAnonymousAccessPermissionCheckerTest.java | 8 +-
.../dubbo/qos/protocol/QosProtocolWrapperTest.java | 4 +-
.../handler/ForeignHostPermitHandlerTest.java | 54 +-
.../qos/server/handler/HttpProcessHandlerTest.java | 23 +-
.../qos/server/handler/QosProcessHandlerTest.java | 34 +-
.../server/handler/TelnetProcessHandlerTest.java | 26 +-
.../java/org/apache/dubbo/qos/textui/TKvTest.java | 10 +-
.../org/apache/dubbo/qos/textui/TLadderTest.java | 12 +-
.../org/apache/dubbo/qos/textui/TTableTest.java | 28 +-
.../org/apache/dubbo/qos/textui/TTreeTest.java | 17 +-
dubbo-plugin/dubbo-reactive/pom.xml | 59 +-
.../reactive/AbstractTripleReactorPublisher.java | 14 +-
.../reactive/AbstractTripleReactorSubscriber.java | 6 +-
.../reactive/ClientTripleReactorPublisher.java | 4 +-
.../reactive/ClientTripleReactorSubscriber.java | 1 -
.../reactive/ServerTripleReactorPublisher.java | 1 -
.../reactive/ServerTripleReactorSubscriber.java | 1 -
.../dubbo/reactive/calls/ReactorClientCalls.java | 91 +-
.../dubbo/reactive/calls/ReactorServerCalls.java | 80 +-
.../reactive/handler/ManyToManyMethodHandler.java | 4 +-
.../reactive/handler/ManyToOneMethodHandler.java | 6 +-
.../reactive/handler/OneToManyMethodHandler.java | 6 +-
.../reactive/handler/OneToOneMethodHandler.java | 4 +-
.../dubbo/reactive/CreateObserverAdapter.java | 15 +-
.../reactive/ManyToManyMethodHandlerTest.java | 13 +-
.../dubbo/reactive/ManyToOneMethodHandlerTest.java | 15 +-
.../dubbo/reactive/OneToManyMethodHandlerTest.java | 35 +-
.../dubbo/reactive/OneToOneMethodHandlerTest.java | 11 +-
dubbo-plugin/dubbo-security/pom.xml | 218 +-
.../org/apache/dubbo/security/cert/CertConfig.java | 8 +-
.../dubbo/security/cert/CertDeployerListener.java | 21 +-
.../org/apache/dubbo/security/cert/CertPair.java | 5 +-
.../security/cert/CertScopeModelInitializer.java | 8 +-
.../dubbo/security/cert/DubboCertManager.java | 156 +-
.../dubbo/security/cert/DubboCertProvider.java | 16 +-
.../security/cert/CertDeployerListenerTest.java | 77 +-
.../dubbo/security/cert/DubboCertManagerTest.java | 81 +-
.../dubbo/security/cert/DubboCertProviderTest.java | 34 +-
dubbo-plugin/dubbo-spring-security/pom.xml | 118 +-
.../AuthenticationExceptionTranslatorFilter.java | 22 +-
.../ContextHolderAuthenticationPrepareFilter.java | 13 +-
.../ContextHolderAuthenticationResolverFilter.java | 14 +-
...textHolderParametersSelectedTransferFilter.java | 7 +-
.../spring/security/jackson/ObjectMapperCodec.java | 39 +-
.../jackson/ObjectMapperCodecCustomer.java | 3 +-
.../model/SecurityScopeModelInitializer.java | 28 +-
.../dubbo/spring/security/utils/SecurityNames.java | 10 +-
.../security/jackson/ObjectMapperCodecTest.java | 47 +-
dubbo-plugin/pom.xml | 143 +-
dubbo-registry/dubbo-registry-api/pom.xml | 206 +-
.../java/org/apache/dubbo/registry/Constants.java | 5 +-
.../dubbo/registry/ListenerRegistryWrapper.java | 7 +-
.../org/apache/dubbo/registry/NotifyListener.java | 4 +-
.../org/apache/dubbo/registry/RegistryFactory.java | 1 -
.../dubbo/registry/RegistryFactoryWrapper.java | 7 +-
.../apache/dubbo/registry/RegistryNotifier.java | 14 +-
.../registry/RegistryScopeModelInitializer.java | 4 +-
.../org/apache/dubbo/registry/RegistryService.java | 1 -
.../dubbo/registry/RegistryServiceListener.java | 18 +-
.../RegistryReflectionTypeDescriberRegistrar.java | 4 +-
.../registry/client/AbstractServiceDiscovery.java | 126 +-
.../client/AbstractServiceDiscoveryFactory.java | 1 -
.../registry/client/DefaultServiceInstance.java | 36 +-
.../client/FileSystemServiceDiscovery.java | 214 -
.../dubbo/registry/client/InstanceAddressURL.java | 36 +-
.../dubbo/registry/client/NopServiceDiscovery.java | 12 +-
.../client/OverrideInstanceAddressURL.java | 22 +-
.../client/ReflectionBasedServiceDiscovery.java | 133 +-
.../registry/client/RegistryClusterIdentifier.java | 4 +-
.../dubbo/registry/client/ServiceDiscovery.java | 13 +-
.../registry/client/ServiceDiscoveryFactory.java | 3 +-
.../registry/client/ServiceDiscoveryRegistry.java | 81 +-
.../client/ServiceDiscoveryRegistryDirectory.java | 308 +-
.../client/ServiceDiscoveryRegistryFactory.java | 1 -
.../dubbo/registry/client/ServiceInstance.java | 1 -
.../event/RetryServiceInstancesChangedEvent.java | 2 +-
.../client/event/ServiceInstancesChangedEvent.java | 2 -
.../listener/ServiceInstancesChangedListener.java | 171 +-
.../client/metadata/MetadataServiceDelegation.java | 40 +-
.../metadata/MetadataServiceNameMapping.java | 52 +-
.../registry/client/metadata/MetadataUtils.java | 77 +-
.../metadata/ProtocolPortsMetadataCustomizer.java | 15 +-
.../ServiceInstanceHostPortCustomizer.java | 19 +-
.../ServiceInstanceMetadataCustomizer.java | 3 +-
.../metadata/ServiceInstanceMetadataUtils.java | 35 +-
...CloudServiceInstanceNotificationCustomizer.java | 41 +-
.../StandardMetadataServiceURLBuilder.java | 54 +-
.../DefaultMigrationAddressComparator.java | 14 +-
.../client/migration/MigrationInvoker.java | 110 +-
.../client/migration/MigrationRuleHandler.java | 31 +-
.../client/migration/MigrationRuleListener.java | 90 +-
.../ServiceDiscoveryMigrationInvoker.java | 14 +-
.../client/migration/model/MigrationRule.java | 56 +-
.../client/migration/model/SubMigrationRule.java | 2 +-
.../integration/AbstractConfiguratorListener.java | 25 +-
.../registry/integration/DynamicDirectory.java | 68 +-
.../registry/integration/ExporterFactory.java | 15 +-
.../InterfaceCompatibleRegistryProtocol.java | 14 +-
.../integration/ReferenceCountExporter.java | 8 +-
.../registry/integration/RegistryDirectory.java | 251 +-
.../registry/integration/RegistryProtocol.java | 392 +-
.../dubbo/registry/retry/AbstractRetryTask.java | 16 +-
.../dubbo/registry/retry/FailedRegisteredTask.java | 1 -
.../dubbo/registry/retry/FailedSubscribedTask.java | 1 -
.../registry/retry/FailedUnregisteredTask.java | 1 -
.../registry/retry/FailedUnsubscribedTask.java | 1 -
.../registry/status/RegistryStatusChecker.java | 1 -
.../dubbo/registry/support/AbstractRegistry.java | 141 +-
.../registry/support/AbstractRegistryFactory.java | 25 +-
.../support/CacheableFailbackRegistry.java | 97 +-
.../support/DefaultProviderFirstParams.java | 9 +-
.../dubbo/registry/support/FailbackRegistry.java | 94 +-
.../dubbo/registry/support/RegistryManager.java | 42 +-
.../registry/CacheableFailbackRegistryTest.java | 19 +-
.../registry/ListenerRegistryWrapperTest.java | 21 +-
.../dubbo/registry/MockCacheableRegistryImpl.java | 8 +-
.../java/org/apache/dubbo/registry/MockLogger.java | 76 +-
.../dubbo/registry/PerformanceRegistryTest.java | 25 +-
.../apache/dubbo/registry/PerformanceUtils.java | 12 +-
.../dubbo/registry/RegistryFactoryWrapperTest.java | 8 +-
.../dubbo/registry/RegistryServiceListener1.java | 1 -
.../dubbo/registry/RegistryServiceListener2.java | 1 -
.../dubbo/registry/SimpleRegistryFactory.java | 2 +-
.../java/org/apache/dubbo/registry/ZKTools.java | 235 +-
.../AbstractServiceDiscoveryFactoryTest.java | 8 +-
.../client/DefaultServiceInstanceTest.java | 12 +-
.../client/FileSystemServiceDiscoveryTest.java | 57 -
.../registry/client/InstanceAddressURLTest.java | 84 +-
.../registry/client/ServiceDiscoveryCacheTest.java | 35 +-
.../client/ServiceDiscoveryRegistryTest.java | 78 +-
.../registry/client/ServiceDiscoveryTest.java | 247 -
.../ServiceInstancesChangedListenerTest.java | 97 +-
...ncesChangedListenerWithoutEmptyProtectTest.java | 94 +-
.../DefaultServiceInstanceDeserializerTest.java | 58 -
.../metadata/MetadataServiceNameMappingTest.java | 40 +-
.../metadata/MetadataServiceURLBuilderTest.java | 16 +-
.../ProtocolPortsMetadataCustomizerTest.java | 19 +-
.../ServiceInstanceHostPortCustomizerTest.java | 11 +-
.../ServiceInstanceMetadataCustomizerTest.java | 23 +-
.../metadata/ServiceInstanceMetadataUtilsTest.java | 194 -
.../SpringCloudMetadataServiceURLBuilderTest.java | 8 +-
.../StandardMetadataServiceURLBuilderTest.java | 14 +-
.../metadata/store/CustomizedParamsFilter.java | 4 +-
.../metadata/store/ExcludedParamsFilter.java | 2 +-
.../metadata/store/ExcludedParamsFilter2.java | 2 +-
.../store/InMemoryMetadataServiceTest.java | 216 -
.../metadata/store/MetaCacheManagerTest.java | 34 +-
.../DefaultMigrationAddressComparatorTest.java | 8 +-
.../client/migration/MigrationInvokerTest.java | 26 +-
.../client/migration/MigrationRuleHandlerTest.java | 9 +-
.../migration/MigrationRuleListenerTest.java | 139 +-
.../client/migration/model/MigrationRuleTest.java | 57 +-
.../client/support/MockServiceDiscovery.java | 20 +-
.../integration/CountRegistryProtocolListener.java | 10 +-
.../dubbo/registry/integration/DemoService.java | 4 +-
.../registry/integration/DynamicDirectoryTest.java | 80 +-
.../registry/integration/RegistryProtocolTest.java | 207 +-
.../support/AbstractRegistryFactoryTest.java | 56 +-
.../registry/support/AbstractRegistryTest.java | 47 +-
.../registry/support/FailbackRegistryTest.java | 51 +-
dubbo-registry/dubbo-registry-multicast/pom.xml | 45 +-
.../registry/multicast/MulticastRegistry.java | 94 +-
.../multicast/MulticastRegistryFactory.java | 1 -
.../multicast/MulticastServiceDiscovery.java | 20 +-
.../registry/multicast/MulticastRegistryTest.java | 13 +-
dubbo-registry/dubbo-registry-multiple/pom.xml | 107 +-
.../dubbo/registry/multiple/MultipleRegistry.java | 55 +-
.../registry/multiple/MultipleRegistryFactory.java | 1 -
.../multiple/MultipleServiceDiscovery.java | 32 +-
.../multiple/MultipleRegistry2S2RTest.java | 78 +-
.../multiple/MultipleRegistryTestUtil.java | 10 +-
.../multiple/MultipleServiceDiscoveryTest.java | 42 +-
dubbo-registry/dubbo-registry-nacos/pom.xml | 121 +-
.../registry/nacos/NacosAggregateListener.java | 30 +-
.../registry/nacos/NacosConnectionManager.java | 45 +-
.../registry/nacos/NacosNamingServiceWrapper.java | 161 +-
.../apache/dubbo/registry/nacos/NacosRegistry.java | 240 +-
.../registry/nacos/NacosServiceDiscovery.java | 55 +-
.../nacos/NacosServiceDiscoveryFactory.java | 1 -
.../dubbo/registry/nacos/NacosServiceName.java | 16 +-
.../aot/NacosReflectionTypeDescriberRegistrar.java | 107 +-
.../nacos/util/NacosNamingServiceUtils.java | 12 +-
.../dubbo/registry/nacos/MockNamingService.java | 112 +-
.../nacos/NacosConnectionsManagerTest.java | 43 +-
.../nacos/NacosNamingServiceWrapperTest.java | 448 +-
.../registry/nacos/NacosRegistryFactoryTest.java | 8 +-
.../dubbo/registry/nacos/NacosRegistryTest.java | 88 +-
.../nacos/NacosServiceDiscoveryFactoryTest.java | 5 +-
.../registry/nacos/NacosServiceDiscoveryTest.java | 60 +-
.../nacos/util/NacosNamingServiceUtilsTest.java | 56 +-
dubbo-registry/dubbo-registry-zookeeper/pom.xml | 61 +-
.../registry/zookeeper/ZookeeperInstance.java | 8 +-
.../registry/zookeeper/ZookeeperRegistry.java | 100 +-
.../zookeeper/ZookeeperRegistryFactory.java | 1 -
.../zookeeper/ZookeeperServiceDiscovery.java | 54 +-
.../ZookeeperServiceDiscoveryChangeWatcher.java | 39 +-
.../ZookeeperReflectionTypeDescriberRegistrar.java | 4 +-
.../zookeeper/util/CuratorFrameworkParams.java | 6 +-
.../zookeeper/util/CuratorFrameworkUtils.java | 53 +-
.../registry/zookeeper/ZookeeperRegistryTest.java | 23 +-
.../zookeeper/ZookeeperServiceDiscoveryTest.java | 23 +-
.../zookeeper/util/CuratorFrameworkUtilsTest.java | 30 +-
dubbo-registry/pom.xml | 59 +-
dubbo-remoting/dubbo-remoting-api/pom.xml | 87 +-
.../org/apache/dubbo/remoting/ChannelHandler.java | 2 -
.../java/org/apache/dubbo/remoting/Client.java | 1 -
.../main/java/org/apache/dubbo/remoting/Codec.java | 1 -
.../java/org/apache/dubbo/remoting/Codec2.java | 6 +-
.../java/org/apache/dubbo/remoting/Constants.java | 4 +-
.../java/org/apache/dubbo/remoting/Decodeable.java | 2 -
.../java/org/apache/dubbo/remoting/Dispatcher.java | 1 -
.../java/org/apache/dubbo/remoting/Endpoint.java | 1 -
.../apache/dubbo/remoting/ExecutionException.java | 16 +-
.../apache/dubbo/remoting/RemotingException.java | 19 +-
.../org/apache/dubbo/remoting/RemotingServer.java | 1 -
.../apache/dubbo/remoting/TimeoutException.java | 5 +-
.../org/apache/dubbo/remoting/Transporter.java | 1 -
.../org/apache/dubbo/remoting/Transporters.java | 8 +-
.../remoting/api/AbstractHttpProtocolDetector.java | 12 +-
.../dubbo/remoting/api/AbstractWireProtocol.java | 7 +-
.../dubbo/remoting/api/ProtocolDetector.java | 14 +-
.../api/connection/AbstractConnectionClient.java | 8 +-
.../remoting/api/connection/ConnectionHandler.java | 1 -
.../remoting/api/connection/ConnectionManager.java | 1 -
.../MultiplexProtocolConnectionManager.java | 7 +-
.../SingleProtocolConnectionManager.java | 4 +-
.../remoting/api/pu/ChannelHandlerPretender.java | 1 -
.../apache/dubbo/remoting/api/pu/DefaultCodec.java | 4 +-
.../dubbo/remoting/api/pu/DefaultPuHandler.java | 20 +-
.../api/pu/PortUnificationTransporter.java | 1 -
.../remoting/buffer/AbstractChannelBuffer.java | 13 +-
.../buffer/ByteBufferBackedChannelBuffer.java | 22 +-
.../dubbo/remoting/buffer/ChannelBuffer.java | 5 +-
.../remoting/buffer/ChannelBufferFactory.java | 1 -
.../remoting/buffer/ChannelBufferInputStream.java | 2 -
.../remoting/buffer/ChannelBufferOutputStream.java | 1 -
.../dubbo/remoting/buffer/ChannelBuffers.java | 11 +-
.../buffer/DirectChannelBufferFactory.java | 2 -
.../remoting/buffer/DynamicChannelBuffer.java | 19 -
.../dubbo/remoting/buffer/HeapChannelBuffer.java | 7 +-
.../remoting/buffer/HeapChannelBufferFactory.java | 2 -
.../dubbo/remoting/exchange/ExchangeClient.java | 4 +-
.../dubbo/remoting/exchange/ExchangeHandler.java | 1 -
.../dubbo/remoting/exchange/ExchangeServer.java | 1 -
.../apache/dubbo/remoting/exchange/Exchanger.java | 1 -
.../apache/dubbo/remoting/exchange/Exchangers.java | 11 +-
.../dubbo/remoting/exchange/HeartBeatResponse.java | 2 +-
.../exchange/PortUnificationExchanger.java | 9 +-
.../apache/dubbo/remoting/exchange/Request.java | 3 +-
.../apache/dubbo/remoting/exchange/Response.java | 3 +-
.../remoting/exchange/codec/ExchangeCodec.java | 78 +-
.../remoting/exchange/support/DefaultFuture.java | 71 +-
.../exchange/support/ExchangeHandlerAdapter.java | 1 -
.../support/ExchangeHandlerDispatcher.java | 1 -
.../exchange/support/ExchangeServerDelegate.java | 4 +-
.../remoting/exchange/support/MultiMessage.java | 5 +-
.../dubbo/remoting/exchange/support/Replier.java | 1 -
.../exchange/support/ReplierDispatcher.java | 1 -
.../exchange/support/header/AbstractTimerTask.java | 1 -
.../exchange/support/header/CloseTimerTask.java | 19 +-
.../support/header/HeaderExchangeChannel.java | 30 +-
.../support/header/HeaderExchangeClient.java | 24 +-
.../support/header/HeaderExchangeHandler.java | 28 +-
.../support/header/HeaderExchangeServer.java | 23 +-
.../exchange/support/header/HeaderExchanger.java | 14 +-
.../exchange/support/header/HeartbeatHandler.java | 8 +-
.../support/header/HeartbeatTimerTask.java | 17 +-
.../support/header/ReconnectTimerTask.java | 22 +-
.../dubbo/remoting/telnet/TelnetHandler.java | 1 -
.../dubbo/remoting/telnet/codec/TelnetCodec.java | 28 +-
.../apache/dubbo/remoting/telnet/support/Help.java | 1 -
.../telnet/support/TelnetHandlerAdapter.java | 4 +-
.../dubbo/remoting/telnet/support/TelnetUtils.java | 18 +-
.../telnet/support/command/ClearTelnetHandler.java | 3 +-
.../telnet/support/command/ExitTelnetHandler.java | 1 -
.../telnet/support/command/HelpTelnetHandler.java | 11 +-
.../telnet/support/command/LogTelnetHandler.java | 12 +-
.../support/command/StatusTelnetHandler.java | 5 +-
.../dubbo/remoting/transport/AbstractChannel.java | 9 +-
.../dubbo/remoting/transport/AbstractClient.java | 102 +-
.../dubbo/remoting/transport/AbstractCodec.java | 14 +-
.../dubbo/remoting/transport/AbstractEndpoint.java | 12 +-
.../dubbo/remoting/transport/AbstractServer.java | 45 +-
.../dubbo/remoting/transport/ChannelDelegate.java | 4 +-
.../remoting/transport/ChannelHandlerAdapter.java | 16 +-
.../transport/ChannelHandlerDispatcher.java | 10 +-
.../dubbo/remoting/transport/ClientDelegate.java | 4 +-
.../dubbo/remoting/transport/CodecSupport.java | 40 +-
.../dubbo/remoting/transport/DecodeHandler.java | 1 -
.../remoting/transport/MultiMessageHandler.java | 17 +-
.../dubbo/remoting/transport/ServerDelegate.java | 3 +-
.../remoting/transport/codec/CodecAdapter.java | 4 +-
.../transport/dispatcher/ChannelEventRunnable.java | 54 +-
.../transport/dispatcher/ChannelHandlers.java | 9 +-
.../dispatcher/WrappedChannelHandler.java | 20 +-
.../dispatcher/all/AllChannelHandler.java | 8 +-
.../transport/dispatcher/all/AllDispatcher.java | 1 -
.../ConnectionOrderedChannelHandler.java | 28 +-
.../connection/ConnectionOrderedDispatcher.java | 1 -
.../dispatcher/direct/DirectChannelHandler.java | 1 -
.../dispatcher/direct/DirectDispatcher.java | 1 -
.../dispatcher/execution/ExecutionDispatcher.java | 1 -
.../message/MessageOnlyChannelHandler.java | 3 +-
.../dispatcher/message/MessageOnlyDispatcher.java | 1 -
.../org/apache/dubbo/remoting/utils/UrlUtils.java | 5 +-
.../apache/dubbo/remoting/ChanelHandlerTest.java | 20 +-
.../dubbo/remoting/PerformanceClientCloseTest.java | 75 +-
.../dubbo/remoting/PerformanceClientFixedTest.java | 37 +-
.../dubbo/remoting/PerformanceClientMain.java | 2 -
.../dubbo/remoting/PerformanceClientTest.java | 134 +-
.../dubbo/remoting/PerformanceServerMain.java | 1 -
.../dubbo/remoting/PerformanceServerTest.java | 135 +-
.../apache/dubbo/remoting/PerformanceUtils.java | 12 +-
.../org/apache/dubbo/remoting/TelnetServer.java | 1 -
.../apache/dubbo/remoting/api/EmptyProtocol.java | 13 +-
.../remoting/buffer/AbstractChannelBufferTest.java | 16 +-
.../buffer/ByteBufferBackedChannelBufferTest.java | 2 +-
.../remoting/buffer/ChannelBufferFactoryTest.java | 7 +-
.../remoting/buffer/ChannelBufferStreamTest.java | 40 +-
.../dubbo/remoting/buffer/ChannelBuffersTest.java | 16 +-
.../remoting/buffer/DirectChannelBufferTest.java | 2 +-
.../remoting/buffer/DynamicChannelBufferTest.java | 8 +-
.../remoting/buffer/HeapChannelBufferTest.java | 2 +-
.../dubbo/remoting/codec/AbstractMockChannel.java | 4 +-
.../dubbo/remoting/codec/CodecAdapterTest.java | 1 -
.../remoting/codec/DeprecatedExchangeCodec.java | 31 +-
.../remoting/codec/DeprecatedTelnetCodec.java | 43 +-
.../dubbo/remoting/codec/ExchangeCodecTest.java | 137 +-
.../dubbo/remoting/codec/TelnetCodecTest.java | 138 +-
.../dubbo/remoting/exchange/ExchangersTest.java | 15 +-
.../dubbo/remoting/exchange/MockExchanger.java | 2 +-
.../dubbo/remoting/exchange/RequestTest.java | 1 -
.../dubbo/remoting/exchange/ResponseTest.java | 1 -
.../exchange/support/DefaultFutureTest.java | 70 +-
.../support/ExchangeHandlerDispatcherTest.java | 4 +-
.../exchange/support/MultiMessageTest.java | 12 +-
.../support/header/CloseTimerTaskTest.java | 7 +-
.../support/header/HeaderExchangeChannelTest.java | 15 +-
.../support/header/HeaderExchangeServerTest.java | 15 +-
.../exchange/support/header/HeartBeatTaskTest.java | 14 +-
.../exchange/support/header/MockChannel.java | 9 +-
.../support/header/ReconnectTimerTaskTest.java | 10 +-
.../handler/HeaderExchangeHandlerTest.java | 11 +-
.../dubbo/remoting/handler/MockedChannel.java | 4 +-
.../remoting/handler/MockedChannelHandler.java | 3 +-
.../dubbo/remoting/telnet/TelnetUtilsTest.java | 20 +-
.../telnet/support/ClearTelnetHandlerTest.java | 3 +-
.../telnet/support/HelpTelnetHandlerTest.java | 14 +-
.../telnet/support/StatusTelnetHandlerTest.java | 10 +-
.../telnet/support/TelnetHandlerAdapterTest.java | 12 +-
.../remoting/transport/AbstractCodecTest.java | 36 +-
.../transport/ChannelHandlerDispatcherTest.java | 27 +-
.../dubbo/remoting/transport/CodecSupportTest.java | 5 +-
.../transport/MultiMessageHandlerTest.java | 10 +-
.../dispatcher/ChannelEventRunnableTest.java | 25 +-
dubbo-remoting/dubbo-remoting-http/pom.xml | 128 +-
.../apache/dubbo/remoting/http/BaseRestClient.java | 2 -
.../org/apache/dubbo/remoting/http/HttpBinder.java | 1 -
.../apache/dubbo/remoting/http/HttpHandler.java | 1 -
.../org/apache/dubbo/remoting/http/HttpServer.java | 1 -
.../dubbo/remoting/http/RequestTemplate.java | 18 +-
.../org/apache/dubbo/remoting/http/RestClient.java | 2 -
.../remoting/http/config/HttpClientConfig.java | 4 +-
.../http/factory/AbstractHttpClientFactory.java | 28 +-
.../remoting/http/factory/RestClientFactory.java | 3 -
.../http/factory/impl/ApacheHttpClientFactory.java | 2 -
.../http/factory/impl/OkHttpClientFactory.java | 1 -
.../factory/impl/URLConnectionClientFactory.java | 1 -
.../dubbo/remoting/http/jetty/JettyHttpBinder.java | 1 -
.../dubbo/remoting/http/jetty/JettyHttpServer.java | 11 +-
.../http/restclient/HttpClientRestClient.java | 36 +-
.../remoting/http/restclient/OKHttpRestClient.java | 28 +-
.../http/restclient/URLConnectionRestClient.java | 23 +-
.../remoting/http/servlet/BootstrapListener.java | 3 +-
.../remoting/http/servlet/DispatcherServlet.java | 4 +-
.../remoting/http/servlet/ServletHttpBinder.java | 1 -
.../remoting/http/servlet/ServletHttpServer.java | 1 -
.../remoting/http/servlet/ServletManager.java | 1 +
.../remoting/http/support/AbstractHttpServer.java | 20 +-
.../remoting/http/tomcat/TomcatHttpBinder.java | 1 -
.../remoting/http/tomcat/TomcatHttpServer.java | 4 +-
.../remoting/http/jetty/JettyHttpBinderTest.java | 16 +-
.../http/jetty/JettyLoggerAdapterTest.java | 37 +-
.../dubbo/remoting/http/rest/RestClientTest.java | 48 +-
.../remoting/http/tomcat/TomcatHttpBinderTest.java | 31 +-
dubbo-remoting/dubbo-remoting-http12/pom.xml | 91 +-
.../http12/AbstractServerHttpChannelObserver.java | 15 +-
.../http12/CustomizableHttpChannelObserver.java | 1 -
.../dubbo/remoting/http12/ErrorCodeHolder.java | 1 -
.../remoting/http12/ErrorResponseCustomizer.java | 3 +-
.../remoting/http12/FlowControlStreamObserver.java | 1 -
.../dubbo/remoting/http12/HeadersCustomizer.java | 3 +-
.../apache/dubbo/remoting/http12/HttpChannel.java | 1 -
.../dubbo/remoting/http12/HttpChannelObserver.java | 1 -
.../dubbo/remoting/http12/HttpHeaderNames.java | 1 -
.../apache/dubbo/remoting/http12/HttpHeaders.java | 16 -
.../dubbo/remoting/http12/HttpInputMessage.java | 1 -
.../apache/dubbo/remoting/http12/HttpMetadata.java | 1 -
.../dubbo/remoting/http12/HttpOutputMessage.java | 1 -
.../apache/dubbo/remoting/http12/HttpStatus.java | 1 -
.../remoting/http12/HttpTransportListener.java | 1 -
.../dubbo/remoting/http12/RequestMetadata.java | 1 -
.../dubbo/remoting/http12/TrailersCustomizer.java | 3 +-
.../remoting/http12/command/DataQueueCommand.java | 15 +-
.../http12/command/HeaderQueueCommand.java | 3 +-
.../http12/command/HttpChannelQueueCommand.java | 4 +-
.../remoting/http12/command/QueueCommand.java | 4 +-
.../http12/exception/HttpRequestTimeout.java | 5 +-
.../http12/exception/IllegalPathException.java | 5 +-
.../remoting/http12/h1/Http1OutputMessage.java | 1 -
.../dubbo/remoting/http12/h1/Http1Request.java | 4 +-
.../http12/h1/Http1ServerChannelObserver.java | 3 +-
.../h1/Http1ServerStreamChannelObserver.java | 4 +-
.../http12/h1/Http1ServerTransportListener.java | 4 +-
.../h1/Http1ServerTransportListenerFactory.java | 1 -
.../http12/h2/CancelableTransportListener.java | 4 +-
.../dubbo/remoting/http12/h2/Http2Headers.java | 3 +-
.../remoting/http12/h2/Http2InputMessage.java | 4 +-
.../http12/h2/Http2ServerChannelObserver.java | 5 +-
.../h2/Http2ServerTransportListenerFactory.java | 1 -
.../remoting/http12/h2/Http2TransportListener.java | 4 +-
.../http12/h2/command/ResetQueueCommand.java | 16 +-
.../remoting/http12/message/HttpMessageCodec.java | 9 +-
.../http12/message/HttpMessageCodecFactory.java | 1 -
.../dubbo/remoting/http12/message/JsonCodec.java | 3 +-
.../dubbo/remoting/http12/message/JsonPbCodec.java | 18 +-
.../http12/message/JsonPbCodecFactory.java | 9 +-
.../message/LengthFieldStreamingDecoder.java | 2 +-
.../remoting/http12/message/ListeningDecoder.java | 4 +-
.../dubbo/remoting/http12/message/MediaType.java | 1 -
.../remoting/http12/message/MethodMetadata.java | 19 +-
.../remoting/http12/message/StreamingDecoder.java | 6 +-
.../http12/netty4/HttpWriteQueueHandler.java | 3 +-
.../netty4/NettyHttpChannelFutureListener.java | 4 +-
.../http12/netty4/h1/NettyHttp1Channel.java | 9 +-
.../remoting/http12/netty4/h1/NettyHttp1Codec.java | 37 +-
.../netty4/h1/NettyHttp1ConnectionHandler.java | 45 +-
.../http12/netty4/h2/NettyH2StreamChannel.java | 11 +-
.../http12/netty4/h2/NettyHttp2FrameCodec.java | 30 +-
.../http12/netty4/h2/NettyHttp2FrameHandler.java | 14 +-
.../h2/NettyHttp2ProtocolSelectorHandler.java | 26 +-
dubbo-remoting/dubbo-remoting-netty/pom.xml | 85 +-
.../transport/netty/NettyBackedChannelBuffer.java | 61 -
.../netty/NettyBackedChannelBufferFactory.java | 7 +-
.../remoting/transport/netty/NettyChannel.java | 20 +-
.../remoting/transport/netty/NettyClient.java | 49 +-
.../transport/netty/NettyCodecAdapter.java | 7 +-
.../remoting/transport/netty/NettyHandler.java | 23 +-
.../remoting/transport/netty/NettyHelper.java | 1 -
.../netty/NettyPortUnificationServer.java | 36 +-
.../remoting/transport/netty/NettyServer.java | 21 +-
.../remoting/transport/netty/NettyTransporter.java | 1 -
.../support/header/HeartbeatHandlerTest.java | 33 +-
.../transport/dispatcher/FakeChannelHandlers.java | 4 +-
.../transport/netty/ClientReconnectTest.java | 15 +-
.../transport/netty/ClientToServerTest.java | 46 +-
.../remoting/transport/netty/ClientsTest.java | 10 +-
.../dubbo/remoting/transport/netty/Hello.java | 4 +-
.../netty/NettyBackedChannelBufferTest.java | 1 -
.../remoting/transport/netty/NettyClientTest.java | 22 +-
.../transport/netty/NettyClientToServerTest.java | 1 -
.../remoting/transport/netty/NettyStringTest.java | 13 +-
.../transport/netty/TelnetServerHandler.java | 3 +-
.../remoting/transport/netty/ThreadNameTest.java | 24 +-
.../dubbo/remoting/transport/netty/World.java | 4 +-
.../remoting/transport/netty/WorldHandler.java | 1 -
dubbo-remoting/dubbo-remoting-netty4/pom.xml | 141 +-
.../transport/netty4/Netty4BatchWriteQueue.java | 14 +-
.../transport/netty4/NettyBackedChannelBuffer.java | 69 +-
.../remoting/transport/netty4/NettyChannel.java | 39 +-
.../transport/netty4/NettyChannelHandler.java | 19 +-
.../remoting/transport/netty4/NettyClient.java | 100 +-
.../transport/netty4/NettyClientHandler.java | 10 +-
.../transport/netty4/NettyCodecAdapter.java | 12 +-
.../transport/netty4/NettyConfigOperator.java | 37 +-
.../transport/netty4/NettyConnectionClient.java | 100 +-
.../transport/netty4/NettyConnectionHandler.java | 35 +-
.../transport/netty4/NettyEventLoopFactory.java | 17 +-
.../netty4/NettyPortUnificationServer.java | 79 +-
.../netty4/NettyPortUnificationServerHandler.java | 80 +-
.../netty4/NettyPortUnificationTransporter.java | 4 +-
.../remoting/transport/netty4/NettyServer.java | 88 +-
.../transport/netty4/NettyServerHandler.java | 25 +-
.../transport/netty4/NettySslContextOperator.java | 3 +-
.../transport/netty4/NettyTransporter.java | 1 -
.../Netty4ReflectionTypeDescriberRegistrar.java | 4 +-
.../transport/netty4/logging/FormattingTuple.java | 1 -
.../transport/netty4/logging/MessageFormatter.java | 34 +-
.../transport/netty4/ssl/SslClientTlsHandler.java | 17 +-
.../remoting/transport/netty4/ssl/SslContexts.java | 29 +-
.../transport/netty4/ssl/SslServerTlsHandler.java | 34 +-
.../transport/netty4/ClientReconnectTest.java | 14 +-
.../transport/netty4/ClientToServerTest.java | 10 +-
.../remoting/transport/netty4/ClientsTest.java | 10 +-
.../remoting/transport/netty4/ConnectionTest.java | 19 +-
.../remoting/transport/netty4/DefaultCodec.java | 4 +-
.../remoting/transport/netty4/DemoService.java | 1 -
.../remoting/transport/netty4/DemoServiceImpl.java | 1 -
.../dubbo/remoting/transport/netty4/Hello.java | 4 +-
.../remoting/transport/netty4/MockResult.java | 1 -
.../netty4/NettyBackedChannelBufferTest.java | 2 -
.../transport/netty4/NettyChannelTest.java | 34 +-
.../transport/netty4/NettyClientHandlerTest.java | 11 +-
.../transport/netty4/NettyClientToServerTest.java | 6 +-
.../netty4/NettyEventLoopFactoryTest.java | 7 +-
.../transport/netty4/NettyTransporterTest.java | 12 +-
.../netty4/PortUnificationExchangerTest.java | 2 +-
.../netty4/PortUnificationServerTest.java | 1 -
.../transport/netty4/ReplierDispatcherTest.java | 40 +-
.../remoting/transport/netty4/RpcMessage.java | 2 -
.../transport/netty4/RpcMessageHandler.java | 5 +-
.../dubbo/remoting/transport/netty4/World.java | 4 +-
.../remoting/transport/netty4/WorldHandler.java | 1 -
.../transport/netty4/api/EmptyWireProtocol.java | 13 +-
.../MultiplexProtocolConnectionManagerTest.java | 15 +-
.../api/SingleProtocolConnectionManagerTest.java | 25 +-
.../dubbo-remoting-zookeeper-api/pom.xml | 59 +-
.../remoting/RemotingScopeModelInitializer.java | 22 +-
.../zookeeper/AbstractZookeeperClient.java | 24 +-
.../zookeeper/AbstractZookeeperTransporter.java | 16 +-
.../dubbo/remoting/zookeeper/ChildListener.java | 1 -
.../apache/dubbo/remoting/zookeeper/EventType.java | 3 +-
.../dubbo/remoting/zookeeper/StateListener.java | 1 -
.../dubbo/remoting/zookeeper/ZookeeperClient.java | 1 -
.../remoting/zookeeper/ZookeeperTransporter.java | 3 +-
.../dubbo-remoting-zookeeper-curator5/pom.xml | 100 +-
.../curator5/Curator5ZookeeperClient.java | 122 +-
.../curator5/Curator5ZookeeperTransporter.java | 1 -
...5ZookeeperReflectionTypeDescriberRegistrar.java | 9 +-
.../curator5/Curator5ZookeeperClientTest.java | 190 +-
.../curator5/Curator5ZookeeperTransporterTest.java | 3 +-
.../support/AbstractZookeeperTransporterTest.java | 156 +-
dubbo-remoting/dubbo-remoting-zookeeper/pom.xml | 119 +-
.../zookeeper/curator/CuratorZookeeperClient.java | 144 +-
.../curator/CuratorZookeeperTransporter.java | 2 -
...rZookeeperReflectionTypeDescriberRegistrar.java | 12 +-
.../curator/CuratorZookeeperClientTest.java | 193 +-
.../curator/CuratorZookeeperTransporterTest.java | 4 +-
.../support/AbstractZookeeperTransporterTest.java | 157 +-
dubbo-remoting/pom.xml | 64 +-
dubbo-rpc/dubbo-rpc-api/pom.xml | 83 +-
.../java/org/apache/dubbo/rpc/AppResponse.java | 25 +-
.../org/apache/dubbo/rpc/AsyncContextImpl.java | 3 +-
.../java/org/apache/dubbo/rpc/AsyncRpcResult.java | 28 +-
.../org/apache/dubbo/rpc/CancellationContext.java | 15 +-
.../org/apache/dubbo/rpc/CancellationListener.java | 2 -
.../main/java/org/apache/dubbo/rpc/Constants.java | 1 -
.../org/apache/dubbo/rpc/ExecutableListener.java | 3 -
.../main/java/org/apache/dubbo/rpc/Exporter.java | 1 -
.../org/apache/dubbo/rpc/ExporterListener.java | 1 -
.../src/main/java/org/apache/dubbo/rpc/Filter.java | 4 +-
.../java/org/apache/dubbo/rpc/FutureContext.java | 4 +-
.../main/java/org/apache/dubbo/rpc/Invocation.java | 8 +-
.../main/java/org/apache/dubbo/rpc/InvokeMode.java | 6 +-
.../main/java/org/apache/dubbo/rpc/Invoker.java | 1 -
.../java/org/apache/dubbo/rpc/InvokerListener.java | 1 -
.../java/org/apache/dubbo/rpc/PathResolver.java | 1 -
.../dubbo/rpc/PenetrateAttachmentSelector.java | 8 +-
.../main/java/org/apache/dubbo/rpc/Protocol.java | 1 -
.../java/org/apache/dubbo/rpc/ProtocolServer.java | 6 +-
.../java/org/apache/dubbo/rpc/ProxyFactory.java | 1 -
.../src/main/java/org/apache/dubbo/rpc/Result.java | 1 -
.../java/org/apache/dubbo/rpc/RpcConstants.java | 8 +-
.../main/java/org/apache/dubbo/rpc/RpcContext.java | 100 +-
.../org/apache/dubbo/rpc/RpcContextAttachment.java | 5 +-
.../java/org/apache/dubbo/rpc/RpcException.java | 2 +-
.../java/org/apache/dubbo/rpc/RpcInvocation.java | 309 +-
.../apache/dubbo/rpc/RpcScopeModelInitializer.java | 8 +-
.../dubbo/rpc/RpcServerContextAttachment.java | 28 +-
.../org/apache/dubbo/rpc/RpcServiceContext.java | 20 +-
.../main/java/org/apache/dubbo/rpc/RpcStatus.java | 14 +-
.../java/org/apache/dubbo/rpc/ServerService.java | 2 -
.../org/apache/dubbo/rpc/TimeoutCountDown.java | 6 +-
.../java/org/apache/dubbo/rpc/ZoneDetector.java | 1 -
.../dubbo/rpc/cluster/filter/ClusterFilter.java | 3 +-
.../apache/dubbo/rpc/filter/CompatibleFilter.java | 13 +-
.../apache/dubbo/rpc/filter/DeprecatedFilter.java | 8 +-
.../org/apache/dubbo/rpc/filter/EchoFilter.java | 1 -
.../apache/dubbo/rpc/filter/ExceptionFilter.java | 51 +-
.../dubbo/rpc/filter/ProfilerServerFilter.java | 50 +-
.../dubbo/rpc/filter/RpcExceptionFilter.java | 6 +-
.../org/apache/dubbo/rpc/filter/TimeoutFilter.java | 12 +-
.../rpc/listener/DeprecatedInvokerListener.java | 11 +-
.../rpc/listener/ExporterListenerAdapter.java | 7 +-
.../dubbo/rpc/listener/InjvmExporterListener.java | 4 -
.../dubbo/rpc/listener/InvokerListenerAdapter.java | 7 +-
.../rpc/listener/ListenerExporterWrapper.java | 3 +-
.../dubbo/rpc/listener/ListenerInvokerWrapper.java | 11 +-
.../dubbo/rpc/protocol/AbstractExporter.java | 14 +-
.../apache/dubbo/rpc/protocol/AbstractInvoker.java | 60 +-
.../dubbo/rpc/protocol/AbstractProtocol.java | 13 +-
.../dubbo/rpc/protocol/AbstractProxyProtocol.java | 43 +-
.../apache/dubbo/rpc/protocol/InvokerWrapper.java | 1 -
.../rpc/protocol/PermittedSerializationKeeper.java | 3 +-
.../rpc/protocol/ProtocolListenerWrapper.java | 23 +-
.../rpc/protocol/ProtocolSecurityWrapper.java | 36 +-
.../rpc/protocol/ProtocolSerializationWrapper.java | 5 +-
.../rpc/protocol/ReferenceCountInvokerWrapper.java | 31 +-
.../dubbo/rpc/protocol/dubbo/FutureAdapter.java | 9 +-
.../rpc/protocol/dubbo/filter/FutureFilter.java | 37 +-
.../rpc/proxy/AbstractFallbackJdkProxyFactory.java | 58 +-
.../dubbo/rpc/proxy/AbstractProxyFactory.java | 21 +-
.../dubbo/rpc/proxy/AbstractProxyInvoker.java | 30 +-
.../org/apache/dubbo/rpc/proxy/InvocationUtil.java | 50 +-
.../dubbo/rpc/proxy/InvokerInvocationHandler.java | 8 +-
.../org/apache/dubbo/rpc/proxy/MethodInvoker.java | 15 +-
.../rpc/proxy/javassist/JavassistProxyFactory.java | 66 +-
.../dubbo/rpc/proxy/jdk/JdkProxyFactory.java | 9 +-
.../rpc/proxy/wrapper/StubProxyFactoryWrapper.java | 32 +-
.../dubbo/rpc/stub/BiStreamMethodHandler.java | 1 -
.../dubbo/rpc/stub/FutureToObserverAdaptor.java | 1 -
.../dubbo/rpc/stub/ServerStreamMethodHandler.java | 1 -
.../org/apache/dubbo/rpc/stub/StubInvoker.java | 8 +-
.../apache/dubbo/rpc/stub/StubMethodHandler.java | 2 -
.../apache/dubbo/rpc/stub/StubProxyFactory.java | 1 -
.../org/apache/dubbo/rpc/stub/StubSuppliers.java | 12 +-
.../dubbo/rpc/stub/UnaryStubMethodHandler.java | 1 -
.../dubbo/rpc/support/Dubbo2RpcExceptionUtils.java | 3 +-
.../org/apache/dubbo/rpc/support/RpcUtils.java | 50 +-
.../java/org/apache/dubbo/rpc/AppResponseTest.java | 9 +-
.../apache/dubbo/rpc/CancellationContextTest.java | 6 +-
.../java/org/apache/dubbo/rpc/CustomArgument.java | 4 +-
.../java/org/apache/dubbo/rpc/DemoRequest.java | 1 -
.../org/apache/dubbo/rpc/FutureContextTest.java | 8 +-
.../dubbo/rpc/PenetrateAttachmentSelectorTest.java | 18 +-
.../java/org/apache/dubbo/rpc/RpcContextTest.java | 52 +-
.../org/apache/dubbo/rpc/RpcInvocationTest.java | 3 +-
.../java/org/apache/dubbo/rpc/RpcStatusTest.java | 8 +-
.../org/apache/dubbo/rpc/TimeoutCountDownTest.java | 5 +-
.../rpc/filter/CompatibleFilterFilterTest.java | 28 +-
.../dubbo/rpc/filter/DeprecatedFilterTest.java | 7 +-
.../apache/dubbo/rpc/filter/EchoFilterTest.java | 7 +-
.../dubbo/rpc/filter/ExceptionFilterTest.java | 27 +-
.../apache/dubbo/rpc/filter/TimeoutFilterTest.java | 5 +-
.../dubbo/rpc/protocol/CountInvokerListener.java | 7 +-
.../rpc/protocol/ProtocolListenerWrapperTest.java | 87 +-
.../dubbo/rpc/protocol/dubbo/FutureFilterTest.java | 6 +-
.../apache/dubbo/rpc/proxy/AbstractProxyTest.java | 33 +-
.../org/apache/dubbo/rpc/proxy/DemoRequest.java | 1 -
.../apache/dubbo/rpc/proxy/DemoServiceImpl.java | 13 +-
.../rpc/proxy/InvokerInvocationHandlerTest.java | 7 +-
.../apache/dubbo/rpc/proxy/MethodInvokerTest.java | 19 +-
.../apache/dubbo/rpc/proxy/RemoteServiceImpl.java | 3 +-
.../test/java/org/apache/dubbo/rpc/proxy/Type.java | 4 +-
.../proxy/javassist/JavassistProxyFactoryTest.java | 1 -
.../dubbo/rpc/proxy/jdk/JdkProxyFactoryTest.java | 1 -
.../proxy/wrapper/StubProxyFactoryWrapperTest.java | 1 -
.../dubbo/rpc/stub/BiStreamMethodHandlerTest.java | 15 +-
.../rpc/stub/FutureToObserverAdaptorTest.java | 7 +-
.../rpc/stub/ServerStreamMethodHandlerTest.java | 24 +-
.../org/apache/dubbo/rpc/stub/StubInvokerTest.java | 17 +-
.../dubbo/rpc/stub/StubProxyFactoryTest.java | 15 +-
.../apache/dubbo/rpc/stub/StubSuppliersTest.java | 1 -
.../org/apache/dubbo/rpc/support/DemoService.java | 3 +-
.../apache/dubbo/rpc/support/DemoServiceImpl.java | 17 +-
.../apache/dubbo/rpc/support/DemoServiceStub.java | 2 +-
.../apache/dubbo/rpc/support/LocalException.java | 2 -
.../apache/dubbo/rpc/support/MockInvocation.java | 9 +-
.../org/apache/dubbo/rpc/support/MyInvoker.java | 1 -
.../support/PenetrateAttachmentSelectorMock.java | 11 +-
.../org/apache/dubbo/rpc/support/RpcUtilsTest.java | 265 +-
.../dubbo/rpc/support/RuntimeExceptionInvoker.java | 1 -
.../java/org/apache/dubbo/rpc/support/Type.java | 4 +-
dubbo-rpc/dubbo-rpc-dubbo/pom.xml | 183 +-
.../dubbo/rpc/protocol/dubbo/ByteAccessor.java | 1 -
.../rpc/protocol/dubbo/CallbackServiceCodec.java | 124 +-
.../rpc/protocol/dubbo/ChannelWrappedInvoker.java | 24 +-
.../apache/dubbo/rpc/protocol/dubbo/Constants.java | 3 -
.../protocol/dubbo/DecodeableRpcInvocation.java | 47 +-
.../rpc/protocol/dubbo/DecodeableRpcResult.java | 18 +-
.../dubbo/rpc/protocol/dubbo/DubboCodec.java | 72 +-
.../rpc/protocol/dubbo/DubboCodecSupport.java | 8 +-
.../dubbo/rpc/protocol/dubbo/DubboCountCodec.java | 2 -
.../dubbo/rpc/protocol/dubbo/DubboExporter.java | 1 -
.../rpc/protocol/dubbo/DubboGracefulShutdown.java | 7 +-
.../dubbo/rpc/protocol/dubbo/DubboInvoker.java | 28 +-
.../dubbo/DubboIsolationExecutorSupport.java | 3 +-
.../dubbo/rpc/protocol/dubbo/DubboProtocol.java | 176 +-
.../protocol/dubbo/ExclusiveClientsProvider.java | 3 +-
.../protocol/dubbo/LazyConnectExchangeClient.java | 17 +-
.../dubbo/ReferenceCountExchangeClient.java | 15 +-
.../rpc/protocol/dubbo/SharedClientsProvider.java | 16 +-
.../dubbo/rpc/protocol/dubbo/pu/DubboDetector.java | 7 +-
.../rpc/protocol/dubbo/pu/DubboWireProtocol.java | 1 -
.../protocol/dubbo/status/ServerStatusChecker.java | 1 -
.../dubbo/status/ThreadPoolStatusChecker.java | 21 +-
.../rpc/protocol/dubbo/ArgumentCallbackTest.java | 175 +-
.../dubbo/DecodeableRpcInvocationTest.java | 33 +-
.../protocol/dubbo/DecodeableRpcResultTest.java | 33 +-
.../rpc/protocol/dubbo/DubboCountCodecTest.java | 10 +-
.../protocol/dubbo/DubboInvokerAvailableTest.java | 31 +-
.../rpc/protocol/dubbo/DubboLazyConnectTest.java | 16 +-
.../rpc/protocol/dubbo/DubboProtocolTest.java | 251 +-
.../rpc/protocol/dubbo/ImplicitCallBackTest.java | 406 --
.../dubbo/rpc/protocol/dubbo/MultiThreadTest.java | 35 +-
.../dubbo/ReferenceCountExchangeClientTest.java | 31 +-
.../dubbo/rpc/protocol/dubbo/RpcFilterTest.java | 15 +-
.../dubbo/decode/DubboTelnetDecodeTest.java | 219 +-
.../dubbo/decode/LocalEmbeddedChannel.java | 4 +-
.../rpc/protocol/dubbo/decode/MockChannel.java | 28 +-
.../protocol/dubbo/decode/MockChannelHandler.java | 3 +-
.../rpc/protocol/dubbo/decode/MockHandler.java | 4 +-
.../dubbo/managemode/ChannelHandlersTest.java | 1 +
.../managemode/ConnectChannelHandlerTest.java | 35 +-
.../protocol/dubbo/managemode/MockedChannel.java | 4 +-
.../dubbo/managemode/MockedChannelHandler.java | 3 +-
.../managemode/WrappedChannelHandlerTest.java | 15 +-
.../dubbo/status/ServerStatusCheckerTest.java | 12 +-
.../dubbo/status/ThreadPoolStatusCheckerTest.java | 16 +-
.../rpc/protocol/dubbo/support/CustomArgument.java | 5 +-
.../rpc/protocol/dubbo/support/DemoRequest.java | 1 -
.../rpc/protocol/dubbo/support/DemoService.java | 2 -
.../protocol/dubbo/support/DemoServiceImpl.java | 15 +-
.../dubbo/rpc/protocol/dubbo/support/EnumBak.java | 86 +-
.../dubbo/rpc/protocol/dubbo/support/Man.java | 1 -
.../rpc/protocol/dubbo/support/NonSerialized.java | 4 +-
.../rpc/protocol/dubbo/support/ProtocolUtils.java | 10 +-
.../protocol/dubbo/support/RemoteServiceImpl.java | 3 +-
.../dubbo/rpc/protocol/dubbo/support/Type.java | 4 +-
dubbo-rpc/dubbo-rpc-injvm/pom.xml | 67 +-
.../protocol/injvm/DefaultParamDeepCopyUtil.java | 11 +-
.../dubbo/rpc/protocol/injvm/InjvmExporter.java | 1 -
.../dubbo/rpc/protocol/injvm/InjvmInvoker.java | 111 +-
.../dubbo/rpc/protocol/injvm/InjvmProtocol.java | 1 -
.../dubbo-rpc-injvm/src/test/java/demo/Empty.java | 3 +-
.../java/demo/MultiClassLoaderServiceImpl.java | 4 +-
.../java/demo/MultiClassLoaderServiceRequest.java | 3 +-
.../java/demo/MultiClassLoaderServiceResult.java | 3 +-
.../dubbo/rpc/protocol/injvm/DemoRequest.java | 1 -
.../dubbo/rpc/protocol/injvm/DemoService.java | 1 -
.../dubbo/rpc/protocol/injvm/DemoServiceImpl.java | 13 +-
.../rpc/protocol/injvm/InjvmClassLoaderTest.java | 93 +-
.../rpc/protocol/injvm/InjvmDeepCopyTest.java | 40 +-
.../rpc/protocol/injvm/InjvmProtocolTest.java | 90 +-
.../dubbo/rpc/protocol/injvm/ProtocolTest.java | 17 +-
.../org/apache/dubbo/rpc/protocol/injvm/Type.java | 4 +-
dubbo-rpc/dubbo-rpc-rest/pom.xml | 303 +-
.../apache/dubbo/rpc/protocol/rest/Constants.java | 2 -
.../rpc/protocol/rest/PathAndInvokerMapper.java | 67 +-
.../rpc/protocol/rest/ReferenceCountedClient.java | 12 +-
.../rpc/protocol/rest/RestConstraintViolation.java | 4 +-
.../dubbo/rpc/protocol/rest/RestHeaderEnum.java | 2 -
.../dubbo/rpc/protocol/rest/RestInvoker.java | 45 +-
.../dubbo/rpc/protocol/rest/RestProtocol.java | 70 +-
.../rpc/protocol/rest/RestRPCInvocationUtil.java | 45 +-
.../rpc/protocol/rest/RpcExceptionMapper.java | 5 +-
.../dubbo/rpc/protocol/rest/ViolationReport.java | 3 +-
.../protocol/rest/annotation/BaseParseContext.java | 3 -
.../rpc/protocol/rest/annotation/ParamParser.java | 1 -
.../rest/annotation/ParamParserManager.java | 14 +-
.../consumer/HttpConnectionCreateContext.java | 5 +-
.../inercept/AddMustAttachmentIntercept.java | 12 +-
.../consumer/inercept/AttachmentIntercept.java | 4 +-
.../consumer/inercept/ParamParseIntercept.java | 5 +-
.../consumer/inercept/PathVariableIntercept.java | 12 +-
.../consumer/inercept/RequestHeaderIntercept.java | 12 +-
.../consumer/inercept/SerializeBodyIntercept.java | 22 +-
.../rest/annotation/metadata/MetadataResolver.java | 30 +-
.../parse/consumer/BaseConsumerParamParser.java | 1 -
.../parse/consumer/BodyConsumerParamParser.java | 5 +-
.../param/parse/consumer/ConsumerParseContext.java | 2 -
.../parse/consumer/FormConsumerParamParser.java | 12 +-
.../parse/consumer/HeaderConsumerParamParser.java | 3 -
.../consumer/ParameterConsumerParamParser.java | 4 -
.../parse/provider/BaseProviderParamParser.java | 3 -
.../parse/provider/BodyProviderParamParser.java | 4 +-
.../parse/provider/HeaderProviderParamParser.java | 9 +-
.../NoAnnotationParamProviderParamParser.java | 3 -
.../parse/provider/ParamProviderParamParser.java | 8 +-
.../parse/provider/PathProviderParamParser.java | 5 +-
.../param/parse/provider/ProviderParamParser.java | 4 -
.../param/parse/provider/ProviderParseContext.java | 6 -
.../FeignClientAnnotationConfigPostProcessor.java | 11 +-
.../rpc/protocol/rest/constans/RestConstant.java | 3 -
.../rpc/protocol/rest/deploy/ServiceDeployer.java | 23 +-
.../rest/deploy/ServiceDeployerManager.java | 17 +-
.../exception/CodeStyleNotSupportException.java | 2 +-
.../exception/MediaTypeUnSupportException.java | 2 +-
.../rest/exception/PathNoFoundException.java | 2 +-
.../exception/RemoteServerInternalException.java | 2 +-
.../exception/UnSupportContentTypeException.java | 3 +-
.../rest/exception/mapper/ExceptionHandler.java | 4 -
.../exception/mapper/ExceptionHandlerResult.java | 9 +-
.../rest/exception/mapper/ExceptionMapper.java | 31 +-
.../exception/mapper/RestEasyExceptionMapper.java | 4 +-
.../rest/extension/resteasy/ResteasyContext.java | 84 +-
.../resteasy/filter/DubboBuiltResponse.java | 1 -
.../filter/DubboContainerResponseContextImpl.java | 79 +-
.../DubboPreMatchContainerRequestContext.java | 43 +-
.../resteasy/filter/ResteasyNettyHttpResponse.java | 15 +-
.../ResteasyRequestContainerFilterAdapter.java | 25 +-
.../ResteasyResponseContainerFilterAdapter.java | 33 +-
.../DubboServerWriterInterceptorContext.java | 39 +-
.../ResteasyWriterInterceptorAdapter.java | 62 +-
.../dubbo/rpc/protocol/rest/filter/RestFilter.java | 1 -
.../protocol/rest/filter/RestRequestFilter.java | 4 +-
.../protocol/rest/filter/RestResponseFilter.java | 4 +-
.../rest/filter/RestResponseInterceptor.java | 1 -
.../rest/filter/ServiceInvokeRestFilter.java | 103 +-
.../ServiceInvokeRestResponseInterceptor.java | 7 +-
.../rest/filter/context/FilterContext.java | 3 +-
.../rest/filter/context/RestFilterContext.java | 3 +-
.../rest/filter/context/RestInterceptContext.java | 9 +-
.../protocol/rest/handler/NettyHttpHandler.java | 65 +-
.../swagger/DubboSwaggerApiListingResource.java | 14 +-
.../integration/swagger/DubboSwaggerService.java | 8 +-
.../protocol/rest/message/HttpMessageCodec.java | 6 +-
.../rest/message/HttpMessageCodecManager.java | 29 +-
.../protocol/rest/message/HttpMessageDecode.java | 5 +-
.../protocol/rest/message/HttpMessageEncode.java | 4 -
.../protocol/rest/message/MediaTypeMatcher.java | 7 -
.../rest/message/codec/ByteArrayCodec.java | 2 -
.../rpc/protocol/rest/message/codec/JsonCodec.java | 2 -
.../rest/message/codec/MultiValueCodec.java | 13 +-
.../rest/message/codec/ResteasyResponseCodec.java | 1 -
.../protocol/rest/message/codec/StringCodec.java | 5 +-
.../rpc/protocol/rest/message/codec/TextCodec.java | 1 -
.../rpc/protocol/rest/message/codec/XMLCodec.java | 17 +-
.../rpc/protocol/rest/netty/ChunkOutputStream.java | 14 +-
.../rpc/protocol/rest/netty/HttpResponse.java | 6 -
.../rpc/protocol/rest/netty/NettyHttpResponse.java | 55 +-
.../rest/netty/RestHttpRequestDecoder.java | 45 +-
.../rest/netty/UnSharedHandlerCreator.java | 3 +-
.../rpc/protocol/rest/netty/ssl/SslContexts.java | 28 +-
.../rest/netty/ssl/SslServerTlsHandler.java | 43 +-
.../pair/InvokerAndRestMethodMetadataPair.java | 11 +-
.../protocol/rest/pair/MessageCodecResultPair.java | 2 -
.../rpc/protocol/rest/pu/RestHttp1Detector.java | 1 -
.../protocol/rest/pu/RestHttp1WireProtocol.java | 28 +-
.../protocol/rest/request/NettyRequestFacade.java | 30 +-
.../rpc/protocol/rest/request/RequestFacade.java | 11 +-
.../rpc/protocol/rest/support/ContentType.java | 3 +-
.../util/ConstraintViolationExceptionConvert.java | 8 +-
.../rpc/protocol/rest/util/DataParseUtils.java | 17 +-
.../rpc/protocol/rest/util/HttpHeaderUtil.java | 19 +-
.../rpc/protocol/rest/util/MediaTypeUtil.java | 2 -
.../rpc/protocol/rest/util/MultiValueCreator.java | 26 +-
.../rest/util/NoAnnotationBodyParseUtil.java | 7 +-
.../dubbo/rpc/protocol/rest/util/NumberUtils.java | 8 +-
.../dubbo/rpc/protocol/rest/util/ReflectUtils.java | 15 +-
.../rpc/protocol/rest/DataParseUtilsTest.java | 14 +-
.../dubbo/rpc/protocol/rest/DemoService.java | 9 +-
.../dubbo/rpc/protocol/rest/DemoServiceImpl.java | 16 +-
.../rpc/protocol/rest/ExceptionMapperTest.java | 16 +-
.../protocol/rest/FeignClientRestProtocolTest.java | 32 +-
.../protocol/rest/HttpMessageCodecManagerTest.java | 20 +-
.../rpc/protocol/rest/JaxrsRestProtocolTest.java | 171 +-
.../protocol/rest/JsonCompatibilityCheckTest.java | 23 +-
.../dubbo/rpc/protocol/rest/MediaTypeUtilTest.java | 13 +-
.../rpc/protocol/rest/NettyRequestFacadeTest.java | 32 +-
.../rest/NoAnnotationRestProtocolTest.java | 46 +-
.../dubbo/rpc/protocol/rest/NumberUtilsTest.java | 27 +-
.../rpc/protocol/rest/ResteasyResponseTest.java | 28 +-
.../rpc/protocol/rest/RpcExceptionMapperTest.java | 20 +-
.../dubbo/rpc/protocol/rest/ServiceConfigTest.java | 26 +-
.../protocol/rest/SpringMvcRestProtocolTest.java | 70 +-
.../rpc/protocol/rest/compatibility/Apple.java | 1 -
.../rpc/protocol/rest/compatibility/Fruit.java | 1 -
.../rest/compatibility/RestDemoService.java | 1 -
.../rest/filter/TestContainerRequestFilter.java | 2 +-
.../rpc/protocol/rest/filter/TraceFilter.java | 37 +-
.../rest/filter/TraceRequestAndResponseFilter.java | 36 +-
.../DubboSwaggerApiListingResourceTest.java | 24 +-
.../rest/integration/swagger/SwaggerService.java | 7 +-
.../rest/intercept/DynamicTraceInterceptor.java | 11 +-
.../protocol/rest/mvc/SpringDemoServiceImpl.java | 11 +-
.../protocol/rest/mvc/SpringRestDemoService.java | 17 +-
.../rest/mvc/feign/FeignClientController.java | 1 -
.../rest/mvc/feign/FeignClientControllerImpl.java | 4 +-
.../rest/noannotation/NoAnnotationDemoService.java | 3 -
.../noannotation/NoAnnotationDemoServiceImpl.java | 5 +-
.../protocol/rest/rest/AnotherUserRestService.java | 3 +-
.../rest/rest/AnotherUserRestServiceImpl.java | 4 -
.../rpc/protocol/rest/rest/HttpMethodService.java | 1 -
.../protocol/rest/rest/HttpMethodServiceImpl.java | 3 +-
.../rpc/protocol/rest/rest/RegistrationResult.java | 4 +-
.../rest/rest/RestDemoForTestException.java | 2 +-
.../rpc/protocol/rest/rest/RestDemoService.java | 5 +-
.../protocol/rest/rest/RestDemoServiceImpl.java | 13 +-
.../protocol/rest/rest/TestGetInvokerService.java | 2 -
.../rest/rest/TestGetInvokerServiceImpl.java | 13 +-
dubbo-rpc/dubbo-rpc-triple/pom.xml | 287 +-
.../org/apache/dubbo/rpc/StatusRpcException.java | 4 +-
.../java/org/apache/dubbo/rpc/TriRpcStatus.java | 15 +-
.../rpc/protocol/tri/CancelableStreamObserver.java | 1 -
.../dubbo/rpc/protocol/tri/ClassLoadUtil.java | 1 -
.../rpc/protocol/tri/ClientStreamObserver.java | 3 -
.../dubbo/rpc/protocol/tri/DeadlineFuture.java | 26 +-
.../protocol/tri/DefaultPackableMethodFactory.java | 2 -
.../dubbo/rpc/protocol/tri/ExceptionUtils.java | 1 -
.../dubbo/rpc/protocol/tri/GrpcHttp2Protocol.java | 4 +-
.../dubbo/rpc/protocol/tri/GrpcProtocol.java | 1 -
.../rpc/protocol/tri/Http2ProtocolDetector.java | 2 +-
.../dubbo/rpc/protocol/tri/PbArrayPacker.java | 5 +-
.../apache/dubbo/rpc/protocol/tri/PbUnpack.java | 1 -
.../rpc/protocol/tri/ReflectionPackableMethod.java | 146 +-
.../dubbo/rpc/protocol/tri/RequestMetadata.java | 29 +-
.../rpc/protocol/tri/ServerStreamObserver.java | 2 -
.../rpc/protocol/tri/SingleProtobufUtils.java | 24 +-
.../dubbo/rpc/protocol/tri/TripleConstant.java | 3 -
.../protocol/tri/TripleCustomerProtocolWapper.java | 61 +-
.../dubbo/rpc/protocol/tri/TripleHeaderEnum.java | 8 +-
.../protocol/tri/TripleHttp2FrameCodecBuilder.java | 8 +-
.../rpc/protocol/tri/TripleHttp2Protocol.java | 89 +-
.../dubbo/rpc/protocol/tri/TripleInvoker.java | 126 +-
.../dubbo/rpc/protocol/tri/TriplePathResolver.java | 2 -
.../rpc/protocol/tri/TriplePingPongHandler.java | 14 +-
.../dubbo/rpc/protocol/tri/TripleProtocol.java | 79 +-
.../TripleReflectionTypeDescriberRegistrar.java | 5 +-
.../rpc/protocol/tri/call/AbstractServerCall.java | 149 +-
.../tri/call/AbstractServerCallListener.java | 30 +-
.../tri/call/BiStreamServerCallListener.java | 8 +-
.../dubbo/rpc/protocol/tri/call/ClientCall.java | 6 +-
.../call/ObserverToClientCallListenerAdapter.java | 3 +-
.../tri/call/ReflectionAbstractServerCall.java | 85 +-
.../dubbo/rpc/protocol/tri/call/ServerCall.java | 2 -
.../tri/call/ServerStreamServerCallListener.java | 12 +-
.../protocol/tri/call/StubAbstractServerCall.java | 36 +-
.../rpc/protocol/tri/call/TripleClientCall.java | 127 +-
.../protocol/tri/call/UnaryClientCallListener.java | 6 +-
.../protocol/tri/call/UnaryServerCallListener.java | 12 +-
.../protocol/tri/command/CancelQueueCommand.java | 5 +-
.../tri/command/CreateStreamQueueCommand.java | 15 +-
.../rpc/protocol/tri/command/DataQueueCommand.java | 13 +-
.../tri/command/EndStreamQueueCommand.java | 4 +-
.../protocol/tri/command/HeaderQueueCommand.java | 10 +-
.../rpc/protocol/tri/command/QueuedCommand.java | 2 -
.../protocol/tri/command/StreamQueueCommand.java | 4 +-
.../protocol/tri/command/TextDataQueueCommand.java | 7 +-
.../dubbo/rpc/protocol/tri/compressor/Bzip2.java | 7 +-
.../rpc/protocol/tri/compressor/Compressor.java | 2 -
.../rpc/protocol/tri/compressor/DeCompressor.java | 2 -
.../dubbo/rpc/protocol/tri/compressor/Gzip.java | 2 -
.../rpc/protocol/tri/compressor/Identity.java | 1 -
.../protocol/tri/compressor/MessageEncoding.java | 1 -
.../dubbo/rpc/protocol/tri/compressor/Snappy.java | 1 -
.../dubbo/rpc/protocol/tri/frame/Deframer.java | 1 -
.../dubbo/rpc/protocol/tri/frame/TriDecoder.java | 9 +-
.../tri/h12/AbstractServerCallListener.java | 31 +-
.../tri/h12/AbstractServerTransportListener.java | 114 +-
.../tri/h12/BiStreamServerCallListener.java | 8 +-
.../tri/h12/DefaultHttpMessageListener.java | 4 +-
.../tri/h12/ServerCallToObserverAdapter.java | 1 -
.../tri/h12/ServerStreamServerCallListener.java | 10 +-
.../protocol/tri/h12/TripleProtocolDetector.java | 9 +-
.../protocol/tri/h12/UnaryServerCallListener.java | 10 +-
.../protocol/tri/h12/grpc/GrpcCompositeCodec.java | 18 +-
.../rpc/protocol/tri/h12/grpc/GrpcHeaderNames.java | 1 -
.../h12/grpc/GrpcHttp2ServerTransportListener.java | 45 +-
.../dubbo/rpc/protocol/tri/h12/grpc/GrpcUtils.java | 5 +-
.../tri/h12/grpc/StreamingHttpMessageListener.java | 3 +-
.../tri/h12/grpc/WrapperHttpMessageCodec.java | 27 +-
.../DefaultHttp11ServerTransportListener.java | 24 +-
...efaultHttp11ServerTransportListenerFactory.java | 3 +-
.../http2/GenericHttp2ServerTransportListener.java | 35 +-
...GenericHttp2ServerTransportListenerFactory.java | 4 +-
.../http2/Http2ServerCallToObserverAdapter.java | 3 +-
.../tri/h12/http2/Http2ServerStreamObserver.java | 3 +-
.../protocol/tri/observer/CallStreamObserver.java | 3 -
.../tri/observer/ClientCallToObserverAdapter.java | 7 +-
.../tri/observer/ServerCallToObserverAdapter.java | 11 +-
.../protocol/tri/service/HealthStatusManager.java | 1 -
.../tri/service/ReflectionV1AlphaService.java | 89 +-
.../tri/service/SchemaDescriptorRegistry.java | 12 +-
.../protocol/tri/service/TriBuiltinService.java | 21 +-
.../rpc/protocol/tri/service/TriHealthImpl.java | 40 +-
.../rpc/protocol/tri/stream/AbstractStream.java | 2 -
.../rpc/protocol/tri/stream/ClientStream.java | 17 +-
.../rpc/protocol/tri/stream/ServerStream.java | 9 +-
.../dubbo/rpc/protocol/tri/stream/Stream.java | 8 +-
.../dubbo/rpc/protocol/tri/stream/StreamUtils.java | 51 +-
.../protocol/tri/stream/TripleClientStream.java | 148 +-
.../protocol/tri/stream/TripleServerStream.java | 225 +-
.../tri/stream/TripleStreamChannelFuture.java | 6 +-
.../tri/transport/AbstractH2TransportListener.java | 21 +-
.../protocol/tri/transport/GracefulShutdown.java | 21 +-
.../tri/transport/H2TransportListener.java | 3 -
.../transport/TripleCommandOutBoundHandler.java | 1 -
.../tri/transport/TripleGoAwayHandler.java | 10 +-
.../TripleHttp2ClientResponseHandler.java | 29 +-
.../transport/TripleHttp2FrameServerHandler.java | 42 +-
.../transport/TripleIsolationExecutorSupport.java | 16 +-
.../transport/TripleServerConnectionHandler.java | 29 +-
.../protocol/tri/transport/TripleTailHandler.java | 1 -
.../protocol/tri/transport/TripleWriteQueue.java | 11 +-
.../rpc/protocol/tri/transport/WriteQueue.java | 10 +-
.../apache/dubbo/rpc/stub/StubInvocationUtil.java | 42 +-
.../apache/dubbo/rpc/StatusRpcExceptionTest.java | 5 +-
.../org/apache/dubbo/rpc/TriRpcStatusTest.java | 94 +-
.../protocol/tri/CancelableStreamObserverTest.java | 16 +-
.../dubbo/rpc/protocol/tri/ClassLoadUtilTest.java | 1 -
.../dubbo/rpc/protocol/tri/DeadlineFutureTest.java | 16 +-
.../dubbo/rpc/protocol/tri/DescriptorService.java | 5 -
.../dubbo/rpc/protocol/tri/ExceptionUtilsTest.java | 61 +-
.../apache/dubbo/rpc/protocol/tri/HelloReply.java | 2 -
.../protocol/tri/Http2ProtocolDetectorTest.java | 10 +-
.../dubbo/rpc/protocol/tri/PbUnpackTest.java | 10 +-
.../protocol/tri/ReflectionPackableMethodTest.java | 52 +-
.../rpc/protocol/tri/SingleProtobufUtilsTest.java | 14 +-
.../tri/TripleCustomerProtocolWapperTest.java | 195 +-
.../dubbo/rpc/protocol/tri/TripleInvokerTest.java | 20 +-
.../rpc/protocol/tri/TriplePathResolverTest.java | 10 +-
.../dubbo/rpc/protocol/tri/TripleProtocolTest.java | 40 +-
.../rpc/protocol/tri/call/ClientCallTest.java | 6 +-
.../tri/call/ReflectionServerCallTest.java | 50 +-
.../rpc/protocol/tri/call/StubServerCallTest.java | 35 +-
.../rpc/protocol/tri/compressor/Bzip2Test.java | 19 +-
.../rpc/protocol/tri/compressor/GzipTest.java | 19 +-
.../rpc/protocol/tri/compressor/IdentityTest.java | 5 +-
.../rpc/protocol/tri/compressor/SnappyTest.java | 18 +-
.../rpc/protocol/tri/frame/RecordListener.java | 1 -
.../rpc/protocol/tri/frame/TriDecoderTest.java | 2 -
.../tri/service/HealthStatusManagerTest.java | 30 +-
.../tri/service/TriBuiltinServiceTest.java | 10 +-
.../protocol/tri/service/TriHealthImplTest.java | 55 +-
.../tri/stream/MockClientStreamListener.java | 8 +-
.../rpc/protocol/tri/stream/StreamUtilsTest.java | 24 +-
.../tri/stream/TripleClientStreamTest.java | 50 +-
.../dubbo/rpc/protocol/tri/support/IGreeter.java | 26 +-
.../rpc/protocol/tri/support/IGreeter2Impl.java | 4 +-
.../protocol/tri/support/IGreeterException.java | 2 +-
.../rpc/protocol/tri/support/IGreeterImpl.java | 27 +-
.../protocol/tri/support/MockStreamObserver.java | 24 +-
.../transport/AbstractH2TransportListenerTest.java | 24 +-
.../TripleHttp2ClientResponseHandlerTest.java | 6 +-
.../rpc/protocol/tri/transport/WriteQueueTest.java | 42 +-
.../dubbo/rpc/stub/StubInvocationUtilTest.java | 37 +-
dubbo-rpc/pom.xml | 59 +-
.../dubbo-serialization-api/pom.xml | 46 +-
.../apache/dubbo/common/serialize/Constants.java | 1 -
.../serialize/DefaultMultipleSerialization.java | 12 +-
.../DefaultSerializationExceptionWrapper.java | 6 -
.../common/serialize/MultipleSerialization.java | 5 +-
.../apache/dubbo/common/serialize/ObjectInput.java | 1 -
.../dubbo/common/serialize/ObjectOutput.java | 1 -
.../dubbo/common/serialize/Serialization.java | 3 +-
.../common/serialize/SerializationException.java | 1 -
.../support/DefaultSerializationSelector.java | 7 +-
.../support/SerializableClassRegistry.java | 1 -
.../dubbo-serialization-fastjson2/pom.xml | 55 +-
.../serialize/fastjson2/FastJson2ObjectInput.java | 86 +-
.../serialize/fastjson2/FastJson2ObjectOutput.java | 46 +-
.../fastjson2/FastJson2Serialization.java | 29 +-
.../fastjson2/Fastjson2CreatorManager.java | 13 +-
.../fastjson2/Fastjson2ScopeModelInitializer.java | 8 +-
.../fastjson2/Fastjson2SecurityManager.java | 75 +-
.../fastjson2/FastJson2SerializationTest.java | 105 +-
.../common/serialize/fastjson2/TypeMatchTest.java | 38 +-
.../dubbo-serialization-hessian2/pom.xml | 54 +-
.../hessian2/Hessian2ClassLoaderListener.java | 3 +-
.../serialize/hessian2/Hessian2FactoryManager.java | 19 +-
.../serialize/hessian2/Hessian2ObjectInput.java | 39 +-
.../serialize/hessian2/Hessian2ObjectOutput.java | 15 +-
.../hessian2/Hessian2ScopeModelInitializer.java | 8 +-
.../serialize/hessian2/Hessian2Serialization.java | 15 +-
.../hessian2/Hessian2SerializerFactory.java | 16 +-
.../hessian2/Hessian2SerializationTest.java | 109 +-
.../common/serialize/hessian2/TypeMatchTest.java | 41 +-
.../dubbo-serialization-jdk/pom.xml | 54 +-
.../serialize/java/CompactedJavaSerialization.java | 1 -
.../serialize/java/CompactedObjectInputStream.java | 1 -
.../common/serialize/java/JavaObjectInput.java | 4 +-
.../common/serialize/java/JavaSerialization.java | 21 +-
.../nativejava/NativeJavaObjectInput.java | 3 +-
.../nativejava/NativeJavaObjectOutput.java | 1 -
.../nativejava/NativeJavaSerialization.java | 21 +-
dubbo-serialization/pom.xml | 57 +-
.../dubbo-spring-boot-actuator/pom.xml | 232 +-
.../DubboEndpointAnnotationAutoConfiguration.java | 1 -
.../DubboMetricsAutoConfiguration.java | 9 +-
.../endpoint/DubboConfigsMetadataEndpoint.java | 4 +-
.../actuate/endpoint/DubboMetadataEndpoint.java | 5 +-
.../endpoint/DubboPropertiesMetadataEndpoint.java | 4 +-
.../endpoint/DubboReferencesMetadataEndpoint.java | 4 +-
.../endpoint/DubboServicesMetadataEndpoint.java | 4 +-
.../actuate/endpoint/DubboShutdownEndpoint.java | 5 +-
.../CompatibleConditionalOnEnabledEndpoint.java | 8 +-
.../CompatibleOnEnabledEndpointCondition.java | 14 +-
.../boot/actuate/mertics/DubboMetricsBinder.java | 13 +-
...bboEndpointAnnotationAutoConfigurationTest.java | 83 +-
.../boot/actuate/endpoint/DubboEndpointTest.java | 19 +-
.../dubbo-spring-boot-autoconfigure/pom.xml | 110 +-
.../autoconfigure/BinderDubboConfigBinder.java | 20 +-
.../DubboRelaxedBinding2AutoConfiguration.java | 10 +-
.../autoconfigure/BinderDubboConfigBinderTest.java | 6 +-
.../DubboRelaxedBinding2AutoConfigurationTest.java | 20 +-
...aultPropertiesEnvironmentPostProcessorTest.java | 6 +-
.../dubbo-spring-boot-compatible/actuator/pom.xml | 176 +-
.../DubboEndpointAutoConfiguration.java | 12 +-
.../DubboEndpointMetadataAutoConfiguration.java | 18 +-
.../DubboHealthIndicatorAutoConfiguration.java | 5 +-
...oMvcEndpointManagementContextConfiguration.java | 5 +-
.../boot/actuate/endpoint/DubboEndpoint.java | 5 +-
.../endpoint/metadata/AbstractDubboMetadata.java | 21 +-
.../endpoint/metadata/DubboConfigsMetadata.java | 15 +-
.../actuate/endpoint/metadata/DubboMetadata.java | 4 +-
.../endpoint/metadata/DubboPropertiesMetadata.java | 4 +-
.../endpoint/metadata/DubboReferencesMetadata.java | 11 +-
.../endpoint/metadata/DubboServicesMetadata.java | 9 +-
.../endpoint/metadata/DubboShutdownMetadata.java | 11 +-
.../actuate/endpoint/mvc/DubboMvcEndpoint.java | 34 +-
.../boot/actuate/health/DubboHealthIndicator.java | 32 +-
.../health/DubboHealthIndicatorProperties.java | 7 +-
.../DubboEndpointAutoConfigurationTest.java | 81 +-
.../actuate/health/DubboHealthIndicatorTest.java | 38 +-
.../autoconfigure/pom.xml | 144 +-
.../boot/autoconfigure/DubboAutoConfiguration.java | 16 +-
.../DubboConfigurationProperties.java | 5 +-
.../DubboRelaxedBindingAutoConfiguration.java | 5 +-
.../autoconfigure/RelaxedDubboConfigBinder.java | 12 +-
.../config/ServiceBeanIdConflictProcessor.java | 16 +-
.../DubboApplicationContextInitializer.java | 1 -
.../event/AwaitingNonWebApplicationListener.java | 21 +-
...gBeanDefinitionConflictApplicationListener.java | 37 +-
.../event/WelcomeLogoApplicationListener.java | 19 +-
...oDefaultPropertiesEnvironmentPostProcessor.java | 18 +-
.../apache/dubbo/spring/boot/util/DubboUtils.java | 17 +-
.../org/apache/dubbo/spring/boot/TestSuite.java | 23 +-
.../CompatibleDubboAutoConfigurationTest.java | 12 +-
...ubboAutoConfigurationTestWithoutProperties.java | 10 +-
...DubboAutoConfigurationOnMultipleConfigTest.java | 50 +-
.../DubboAutoConfigurationOnSingleConfigTest.java | 30 +-
.../RelaxedDubboConfigBinderTest.java | 24 +-
.../AwaitingNonWebApplicationListenerTest.java | 58 +-
...nDefinitionConflictApplicationListenerTest.java | 24 +-
.../event/WelcomeLogoApplicationListenerTest.java | 6 +-
...aultPropertiesEnvironmentPostProcessorTest.java | 4 +-
.../dubbo/spring/boot/util/DubboUtilsTest.java | 3 -
.../dubbo-spring-boot-compatible/metadata/pom.xml | 326 +-
.../DubboMetadataGenerateAutoConfiguration.java | 3 +-
.../dubbo-spring-boot-compatible/pom.xml | 111 +-
.../dubbo-spring-boot-interceptor/pom.xml | 63 +-
.../interceptor/DubboTagCookieInterceptor.java | 16 +-
.../DubboTagHeaderOrParameterInterceptor.java | 10 +-
.../dubbo-spring-boot-starter/pom.xml | 50 +-
.../dubbo-nacos-spring-boot-starter/pom.xml | 43 +-
.../dubbo-seata-spring-boot-starter/pom.xml | 65 +-
.../dubbo-sentinel-spring-boot-starter/pom.xml | 51 +-
.../pom.xml | 76 +-
.../dubbo-zookeeper-spring-boot-starter/pom.xml | 54 +-
.../observability/autoconfigure/pom.xml | 262 +-
.../DubboMicrometerTracingAutoConfiguration.java | 21 +-
.../DubboObservationAutoConfiguration.java | 75 +-
.../autoconfigure/ObservabilityUtils.java | 15 +-
.../autoconfigure/ObservationHandlerGrouping.java | 13 +-
.../ObservationRegistryPostProcessor.java | 15 +-
.../ConditionalOnDubboTracingEnable.java | 7 +-
.../brave/BraveAutoConfiguration.java | 135 +-
.../exporter/otlp/OtlpAutoConfiguration.java | 8 +-
.../autoconfigure/exporter/zipkin/HttpSender.java | 16 +-
.../exporter/zipkin/ZipkinAutoConfiguration.java | 16 +-
.../exporter/zipkin/ZipkinConfigurations.java | 62 +-
.../exporter/zipkin/ZipkinRestTemplateSender.java | 2 -
.../exporter/zipkin/ZipkinWebClientSender.java | 5 +-
.../ZipkinRestTemplateBuilderCustomizer.java | 1 -
.../ZipkinWebClientBuilderCustomizer.java | 3 -
.../otel/OpenTelemetryAutoConfiguration.java | 158 +-
...bboMicrometerTracingAutoConfigurationTests.java | 35 +-
.../pom.xml | 48 +-
.../pom.xml | 56 +-
.../pom.xml | 56 +-
.../pom.xml | 56 +-
.../observability/pom.xml | 128 +-
.../dubbo-spring-boot-starters/pom.xml | 42 +-
dubbo-spring-boot/pom.xml | 334 +-
dubbo-test/dubbo-dependencies-all/pom.xml | 1225 ++--
dubbo-test/dubbo-test-check/pom.xml | 154 +-
...bstractRegistryCenterTestExecutionListener.java | 18 +-
.../apache/dubbo/test/check/DubboTestChecker.java | 60 +-
.../dubbo/test/check/RegistryCenterFinished.java | 5 +-
.../test/check/exception/DubboTestException.java | 1 -
.../dubbo/test/check/registrycenter/Config.java | 2 +-
.../dubbo/test/check/registrycenter/Context.java | 3 +-
.../registrycenter/ZookeeperRegistryCenter.java | 13 +-
.../registrycenter/config/ZookeeperConfig.java | 14 +-
.../context/ZookeeperWindowsContext.java | 17 +-
.../initializer/ConfigZookeeperInitializer.java | 31 +-
.../initializer/DownloadZookeeperInitializer.java | 117 +-
.../initializer/UnpackZookeeperInitializer.java | 36 +-
.../processor/FindPidWindowsProcessor.java | 23 +-
.../processor/KillProcessWindowsProcessor.java | 7 +-
.../processor/ResetZookeeperProcessor.java | 10 +-
.../processor/StartZookeeperUnixProcessor.java | 20 +-
.../processor/StartZookeeperWindowsProcessor.java | 20 +-
.../processor/StopZookeeperUnixProcessor.java | 20 +-
.../processor/ZookeeperUnixProcessor.java | 12 +-
.../processor/ZookeeperWindowsProcessor.java | 1 +
dubbo-test/dubbo-test-common/pom.xml | 79 +-
.../org/apache/dubbo/test/common/ErrorHandler.java | 1 -
.../org/apache/dubbo/test/common/SysProps.java | 1 -
.../apache/dubbo/test/common/api/DemoService.java | 1 -
.../dubbo/test/common/api/RestDemoService.java | 1 -
.../dubbo/test/common/impl/DemoServiceImpl.java | 10 +-
.../test/common/impl/GreetingServiceImpl.java | 1 -
.../test/common/impl/RestDemoServiceImpl.java | 2 -
dubbo-test/dubbo-test-modules/pom.xml | 56 +-
.../java/org/apache/dubbo/dependency/FileTest.java | 473 +-
dubbo-test/dubbo-test-spring/pom.xml | 323 +-
.../test/spring/SpringAnnotationBeanTest.java | 5 +-
.../test/spring/SpringJavaConfigBeanTest.java | 19 +-
.../dubbo/test/spring/SpringXmlConfigTest.java | 3 +-
.../spring/context/MockSpringInitCustomizer.java | 21 +-
dubbo-test/dubbo-test-spring3.2/pom.xml | 182 +-
dubbo-test/dubbo-test-spring4.1/pom.xml | 182 +-
dubbo-test/dubbo-test-spring4.2/pom.xml | 182 +-
dubbo-test/pom.xml | 49 +-
dubbo-xds/pom.xml | 226 +-
.../registry/xds/XdsInitializationException.java | 12 +-
.../org/apache/dubbo/registry/xds/XdsRegistry.java | 16 +-
.../dubbo/registry/xds/XdsServiceDiscovery.java | 35 +-
.../registry/xds/XdsServiceDiscoveryFactory.java | 10 +-
.../xds/istio/IstioCitadelCertificateSigner.java | 108 +-
.../dubbo/registry/xds/istio/IstioConstant.java | 61 +-
.../apache/dubbo/registry/xds/istio/IstioEnv.java | 63 +-
.../dubbo/registry/xds/util/AdsObserver.java | 38 +-
.../dubbo/registry/xds/util/NodeBuilder.java | 12 +-
.../dubbo/registry/xds/util/PilotExchanger.java | 127 +-
.../apache/dubbo/registry/xds/util/XdsChannel.java | 82 +-
.../xds/util/bootstrap/BootstrapInfoImpl.java | 40 +-
.../registry/xds/util/bootstrap/Bootstrapper.java | 10 +-
.../xds/util/bootstrap/BootstrapperImpl.java | 39 +-
.../bootstrap/CertificateProviderInfoImpl.java | 6 +-
.../xds/util/bootstrap/ServerInfoImpl.java | 17 +-
.../xds/util/protocol/AbstractProtocol.java | 56 +-
.../xds/util/protocol/delta/DeltaEndpoint.java | 5 +-
.../xds/util/protocol/delta/DeltaListener.java | 4 +-
.../xds/util/protocol/impl/EdsProtocol.java | 31 +-
.../xds/util/protocol/impl/LdsProtocol.java | 37 +-
.../xds/util/protocol/impl/RdsProtocol.java | 40 +-
.../xds/util/protocol/message/Endpoint.java | 19 +-
.../xds/util/protocol/message/EndpointResult.java | 4 +-
.../xds/util/protocol/message/ListenerResult.java | 4 +-
.../xds/util/protocol/message/RouteResult.java | 12 +-
.../cluster/router/xds/EdsEndpointListener.java | 2 -
.../rpc/cluster/router/xds/EdsEndpointManager.java | 47 +-
.../cluster/router/xds/RdsRouteRuleManager.java | 28 +-
.../cluster/router/xds/RdsVirtualHostListener.java | 52 +-
.../cluster/router/xds/XdsRouteRuleListener.java | 2 -
.../dubbo/rpc/cluster/router/xds/XdsRouter.java | 52 +-
.../router/xds/XdsScopeModelInitializer.java | 7 +-
.../rpc/cluster/router/xds/rule/ClusterWeight.java | 1 -
.../cluster/router/xds/rule/DestinationSubset.java | 1 -
.../router/xds/rule/HTTPRouteDestination.java | 1 -
.../rpc/cluster/router/xds/rule/HeaderMatcher.java | 2 -
.../cluster/router/xds/rule/HttpRequestMatch.java | 2 -
.../cluster/router/xds/rule/LongRangeMatch.java | 2 -
.../rpc/cluster/router/xds/rule/PathMatcher.java | 9 +-
.../rpc/cluster/router/xds/rule/XdsRouteRule.java | 4 -
.../xds/util/bootstrap/BootstrapperTest.java | 193 +-
.../xds/util/protocol/impl/DsProtocolTest.java | 542 --
.../xds/util/protocol/impl/EdsProtocolMock.java | 13 +-
.../xds/util/protocol/impl/LdsProtocolMock.java | 20 +-
.../xds/util/protocol/impl/RdsProtocolMock.java | 13 +-
.../cluster/router/xds/EdsEndpointManagerTest.java | 18 +-
.../router/xds/RdsRouteRuleManagerTest.java | 29 +-
.../router/xds/RdsVirtualHostListenerTest.java | 191 +-
.../dubbo/rpc/cluster/router/xds/XdsRouteTest.java | 193 +-
.../cluster/router/xds/rule/HeaderMatcherTest.java | 3 -
.../cluster/router/xds/rule/PathMatcherTest.java | 3 -
pom.xml | 1669 +++--
3497 files changed, 58240 insertions(+), 54451 deletions(-)
diff --git a/dubbo-cluster/pom.xml b/dubbo-cluster/pom.xml
index c21fab1581..0939998741 100644
--- a/dubbo-cluster/pom.xml
+++ b/dubbo-cluster/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -14,110 +15,109 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-parent</artifactId>
- <version>${revision}</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <artifactId>dubbo-cluster</artifactId>
- <packaging>jar</packaging>
- <name>${project.artifactId}</name>
- <description>The cluster module of dubbo project</description>
- <properties>
- <skip_maven_deploy>false</skip_maven_deploy>
- <nashorn-core.version>15.4</nashorn-core.version>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-rpc-api</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>org.yaml</groupId>
- <artifactId>snakeyaml</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-rpc-injvm</artifactId>
- <version>${project.parent.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.curator</groupId>
- <artifactId>curator-framework</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-serialization-hessian2</artifactId>
- <version>${project.parent.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-serialization-fastjson2</artifactId>
- <version>${project.parent.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-test-check</artifactId>
- <version>${project.parent.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-metrics-registry</artifactId>
- <version>${project.parent.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-metrics-default</artifactId>
- <version>${project.parent.version}</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>io.micrometer</groupId>
- <artifactId>micrometer-tracing-integration-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-parent</artifactId>
+ <version>${revision}</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <artifactId>dubbo-cluster</artifactId>
+ <packaging>jar</packaging>
+ <name>${project.artifactId}</name>
+ <description>The cluster module of dubbo project</description>
+ <properties>
+ <skip_maven_deploy>false</skip_maven_deploy>
+ <nashorn-core.version>15.4</nashorn-core.version>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-rpc-api</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.yaml</groupId>
+ <artifactId>snakeyaml</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-rpc-injvm</artifactId>
+ <version>${project.parent.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.curator</groupId>
+ <artifactId>curator-framework</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-serialization-hessian2</artifactId>
+ <version>${project.parent.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-serialization-fastjson2</artifactId>
+ <version>${project.parent.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-test-check</artifactId>
+ <version>${project.parent.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-metrics-registry</artifactId>
+ <version>${project.parent.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-metrics-default</artifactId>
+ <version>${project.parent.version}</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>io.micrometer</groupId>
+ <artifactId>micrometer-tracing-integration-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
- <profiles>
- <!--
+ <profiles>
+ <!--
https://github.com/openjdk/nashorn
Nashorn used to be part of the JDK until Java 14.
This project provides a standalone version of Nashorn suitable for use with Java 11 and later.
-->
- <profile>
- <id>nashorn-jdk11</id>
- <activation>
- <jdk>[11,)</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.openjdk.nashorn</groupId>
- <artifactId>nashorn-core</artifactId>
- <version>${nashorn-core.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
+ <profile>
+ <id>nashorn-jdk11</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.openjdk.nashorn</groupId>
+ <artifactId>nashorn-core</artifactId>
+ <version>${nashorn-core.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
</project>
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/registry/AddressListener.java b/dubbo-cluster/src/main/java/org/apache/dubbo/registry/AddressListener.java
index e45c6e8cd4..c72655478f 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/registry/AddressListener.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/registry/AddressListener.java
@@ -35,8 +35,5 @@ public interface AddressListener {
*/
List<URL> notify(List<URL> addresses, URL consumerUrl, Directory registryDirectory);
- default void destroy(URL consumerUrl, Directory registryDirectory) {
-
- }
-
+ default void destroy(URL consumerUrl, Directory registryDirectory) {}
}
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/Cluster.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/Cluster.java
index 909693cb90..0ddc3628af 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/Cluster.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/Cluster.java
@@ -55,6 +55,8 @@ public interface Cluster {
if (StringUtils.isEmpty(name)) {
name = Cluster.DEFAULT;
}
- return ScopeModelUtil.getApplicationModel(scopeModel).getExtensionLoader(Cluster.class).getExtension(name, wrap);
+ return ScopeModelUtil.getApplicationModel(scopeModel)
+ .getExtensionLoader(Cluster.class)
+ .getExtension(name, wrap);
}
}
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/ClusterScopeModelInitializer.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/ClusterScopeModelInitializer.java
index ede8f85f03..fb9d23b0c3 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/ClusterScopeModelInitializer.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/ClusterScopeModelInitializer.java
@@ -38,6 +38,5 @@ public class ClusterScopeModelInitializer implements ScopeModelInitializer {
}
@Override
- public void initializeModuleModel(ModuleModel moduleModel) {
- }
+ public void initializeModuleModel(ModuleModel moduleModel) {}
}
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/Configurator.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/Configurator.java
index 1f1df9c200..f99b05ac87 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/Configurator.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/Configurator.java
@@ -51,7 +51,6 @@ public interface Configurator extends Comparable<Configurator> {
*/
URL configure(URL url);
-
/**
* Convert override urls to map for use when re-refer. Send all rules every time, the urls will be reassembled and
* calculated
@@ -73,7 +72,9 @@ public interface Configurator extends Comparable<Configurator> {
return Optional.empty();
}
- ConfiguratorFactory configuratorFactory = urls.get(0).getOrDefaultApplicationModel().getExtensionLoader(ConfiguratorFactory.class)
+ ConfiguratorFactory configuratorFactory = urls.get(0)
+ .getOrDefaultApplicationModel()
+ .getExtensionLoader(ConfiguratorFactory.class)
.getAdaptiveExtension();
List<Configurator> configurators = new ArrayList<>(urls.size());
@@ -83,7 +84,8 @@ public interface Configurator extends Comparable<Configurator> {
break;
}
Map<String, String> override = new HashMap<>(url.getParameters());
- //The anyhost parameter of override may be added automatically, it can't change the judgement of changing url
+ // The anyhost parameter of override may be added automatically, it can't change the judgement of changing
+ // url
override.remove(ANYHOST_KEY);
if (CollectionUtils.isEmptyMap(override)) {
continue;
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/ConfiguratorFactory.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/ConfiguratorFactory.java
index 031f597dc0..920d936cb6 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/ConfiguratorFactory.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/ConfiguratorFactory.java
@@ -36,5 +36,4 @@ public interface ConfiguratorFactory {
*/
@Adaptive(CommonConstants.PROTOCOL_KEY)
Configurator getConfigurator(URL url);
-
}
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/Constants.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/Constants.java
index ab8c50b568..0e59f2cacf 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/Constants.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/Constants.java
@@ -100,7 +100,6 @@ public interface Constants {
String OVERRIDE_PROVIDERS_KEY = "providerAddresses";
-
/**
* key for router type, for e.g., "script"/"file", corresponding to ScriptRouterFactory.NAME, FileRouterFactory.NAME
*/
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/LoadBalance.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/LoadBalance.java
index 94b28a8bc3..42a556d2c6 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/LoadBalance.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/LoadBalance.java
@@ -46,5 +46,4 @@ public interface LoadBalance {
*/
@Adaptive("loadbalance")
<T> Invoker<T> select(List<Invoker<T>> invokers, URL url, Invocation invocation) throws RpcException;
-
}
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/Merger.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/Merger.java
index 64bccf8cbd..b505772ccc 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/Merger.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/Merger.java
@@ -22,5 +22,4 @@ import org.apache.dubbo.common.extension.SPI;
public interface Merger<T> {
T merge(T... items);
-
}
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/ProviderURLMergeProcessor.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/ProviderURLMergeProcessor.java
index f38424e4df..4421755bbc 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/ProviderURLMergeProcessor.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/ProviderURLMergeProcessor.java
@@ -33,7 +33,9 @@ public interface ProviderURLMergeProcessor {
*/
URL mergeUrl(URL remoteUrl, Map<String, String> localParametersMap);
- default Map<String, String> mergeLocalParams(Map<String, String> localMap) { return localMap; }
+ default Map<String, String> mergeLocalParams(Map<String, String> localMap) {
+ return localMap;
+ }
default boolean accept(URL providerUrl, Map<String, String> localParametersMap) {
return true;
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/Router.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/Router.java
index 23c4fefca7..678888b4ec 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/Router.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/Router.java
@@ -68,8 +68,8 @@ public interface Router extends Comparable<Router> {
* @return state with route result
* @throws RpcException
*/
- default <T> RouterResult<Invoker<T>> route(List<Invoker<T>> invokers, URL url, Invocation invocation,
- boolean needToPrintMessage) throws RpcException {
+ default <T> RouterResult<Invoker<T>> route(
+ List<Invoker<T>> invokers, URL url, Invocation invocation, boolean needToPrintMessage) throws RpcException {
return new RouterResult<>(route(invokers, url, invocation));
}
@@ -80,9 +80,7 @@ public interface Router extends Comparable<Router> {
* @param invokers invoker list
* @param <T> invoker's type
*/
- default <T> void notify(List<Invoker<T>> invokers) {
-
- }
+ default <T> void notify(List<Invoker<T>> invokers) {}
/**
* To decide whether this router need to execute every time an RPC comes or should only execute when addresses or
@@ -109,7 +107,7 @@ public interface Router extends Comparable<Router> {
int getPriority();
default void stop() {
- //do nothing by default
+ // do nothing by default
}
@Override
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/RouterChain.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/RouterChain.java
index e0d15af1fe..895aa582ba 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/RouterChain.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/RouterChain.java
@@ -16,12 +16,6 @@
*/
package org.apache.dubbo.rpc.cluster;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.concurrent.locks.ReadWriteLock;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
-import java.util.stream.Collectors;
-
import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.config.ConfigurationUtils;
import org.apache.dubbo.common.constants.LoggerCodeConstants;
@@ -36,6 +30,12 @@ import org.apache.dubbo.rpc.cluster.router.state.StateRouterFactory;
import org.apache.dubbo.rpc.model.ModuleModel;
import org.apache.dubbo.rpc.model.ScopeModelUtil;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+import java.util.stream.Collectors;
+
import static org.apache.dubbo.rpc.cluster.Constants.ROUTER_KEY;
/**
@@ -52,31 +52,30 @@ public class RouterChain<T> {
public static <T> RouterChain<T> buildChain(Class<T> interfaceClass, URL url) {
SingleRouterChain<T> chain1 = buildSingleChain(interfaceClass, url);
SingleRouterChain<T> chain2 = buildSingleChain(interfaceClass, url);
- return new RouterChain<>(new SingleRouterChain[]{chain1, chain2});
+ return new RouterChain<>(new SingleRouterChain[] {chain1, chain2});
}
public static <T> SingleRouterChain<T> buildSingleChain(Class<T> interfaceClass, URL url) {
ModuleModel moduleModel = url.getOrDefaultModuleModel();
- List<RouterFactory> extensionFactories = moduleModel.getExtensionLoader(RouterFactory.class)
- .getActivateExtension(url, ROUTER_KEY);
+ List<RouterFactory> extensionFactories =
+ moduleModel.getExtensionLoader(RouterFactory.class).getActivateExtension(url, ROUTER_KEY);
List<Router> routers = extensionFactories.stream()
- .map(factory -> factory.getRouter(url))
- .sorted(Router::compareTo)
- .collect(Collectors.toList());
-
- List<StateRouter<T>> stateRouters = moduleModel
- .getExtensionLoader(StateRouterFactory.class)
- .getActivateExtension(url, ROUTER_KEY)
- .stream()
- .map(factory -> factory.getRouter(interfaceClass, url))
- .collect(Collectors.toList());
+ .map(factory -> factory.getRouter(url))
+ .sorted(Router::compareTo)
+ .collect(Collectors.toList());
+ List<StateRouter<T>> stateRouters =
+ moduleModel.getExtensionLoader(StateRouterFactory.class).getActivateExtension(url, ROUTER_KEY).stream()
+ .map(factory -> factory.getRouter(interfaceClass, url))
+ .collect(Collectors.toList());
- boolean shouldFailFast = Boolean.parseBoolean(ConfigurationUtils.getProperty(moduleModel, Constants.SHOULD_FAIL_FAST_KEY, "true"));
+ boolean shouldFailFast = Boolean.parseBoolean(
+ ConfigurationUtils.getProperty(moduleModel, Constants.SHOULD_FAIL_FAST_KEY, "true"));
- RouterSnapshotSwitcher routerSnapshotSwitcher = ScopeModelUtil.getFrameworkModel(moduleModel).getBeanFactory().getBean(RouterSnapshotSwitcher.class);
+ RouterSnapshotSwitcher routerSnapshotSwitcher =
+ ScopeModelUtil.getFrameworkModel(moduleModel).getBeanFactory().getBean(RouterSnapshotSwitcher.class);
return new SingleRouterChain<>(routers, stateRouters, shouldFailFast, routerSnapshotSwitcher);
}
@@ -106,9 +105,9 @@ public class RouterChain<T> {
// If `availableInvokers` is created from origin invokers => use backup chain
// If `availableInvokers` is created from newly invokers => use main chain
BitList<Invoker<T>> notifying = notifyingInvokers.get();
- if (notifying != null &&
- currentChain == backupChain &&
- availableInvokers.getOriginList() == notifying.getOriginList()) {
+ if (notifying != null
+ && currentChain == backupChain
+ && availableInvokers.getOriginList() == notifying.getOriginList()) {
return mainChain;
}
return currentChain;
@@ -140,7 +139,8 @@ public class RouterChain<T> {
}
// Refresh main chain.
- // No one can request to use main chain. `currentChain` is backup chain. `route` method cannot access main chain.
+ // No one can request to use main chain. `currentChain` is backup chain. `route` method cannot access main
+ // chain.
try {
// Lock main chain to wait all invocation end
// To wait until no one is using main chain.
@@ -157,26 +157,32 @@ public class RouterChain<T> {
}
// Set the reference of newly invokers to temp variable.
- // Reason: The next step will switch the invokers reference in directory, so we should check the `availableInvokers`
- // argument when `route`. If the current invocation use newly invokers, we should use main chain to route, and
+ // Reason: The next step will switch the invokers reference in directory, so we should check the
+ // `availableInvokers`
+ // argument when `route`. If the current invocation use newly invokers, we should use main chain to
+ // route, and
// this can prevent use newly invokers to route backup chain, which can only route origin invokers now.
notifyingInvokers.set(invokers);
// Switch the invokers reference in directory.
- // Cannot switch before update main chain or after backup chain update success. Or that will cause state inconsistent.
+ // Cannot switch before update main chain or after backup chain update success. Or that will cause state
+ // inconsistent.
switchAction.run();
try {
// Lock to prevent directory continue list
- // The invokers reference in directory now should be the newly one and should always use the newly one once lock released.
+ // The invokers reference in directory now should be the newly one and should always use the newly one once
+ // lock released.
lock.writeLock().lock();
// Switch to main chain. Will update backup chain later.
currentChain = mainChain;
// Clean up temp variable.
- // `availableInvokers` check is useless now, because `route` method will no longer receive any `availableInvokers` related
- // with the origin invokers. The getter of invokers reference in directory is locked now, and will return newly invokers
+ // `availableInvokers` check is useless now, because `route` method will no longer receive any
+ // `availableInvokers` related
+ // with the origin invokers. The getter of invokers reference in directory is locked now, and will return
+ // newly invokers
// once lock released.
notifyingInvokers.set(null);
} finally {
@@ -186,7 +192,8 @@ public class RouterChain<T> {
}
// Refresh main chain.
- // No one can request to use main chain. `currentChain` is main chain. `route` method cannot access backup chain.
+ // No one can request to use main chain. `currentChain` is main chain. `route` method cannot access backup
+ // chain.
try {
// Lock main chain to wait all invocation end
backupChain.getLock().writeLock().lock();
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/RuleConverter.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/RuleConverter.java
index f2cecdc4d7..211e03a56a 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/RuleConverter.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/RuleConverter.java
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.dubbo.rpc.cluster;
import org.apache.dubbo.common.URL;
@@ -26,5 +25,4 @@ import java.util.List;
public interface RuleConverter {
List<URL> convert(URL subscribeUrl, Object source);
-
}
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/SingleRouterChain.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/SingleRouterChain.java
index 278722eded..c217bdb0d6 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/SingleRouterChain.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/SingleRouterChain.java
@@ -16,13 +16,6 @@
*/
package org.apache.dubbo.rpc.cluster;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.concurrent.locks.ReadWriteLock;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
-
import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.Version;
import org.apache.dubbo.common.logger.ErrorTypeAwareLogger;
@@ -40,6 +33,13 @@ import org.apache.dubbo.rpc.cluster.router.state.BitList;
import org.apache.dubbo.rpc.cluster.router.state.StateRouter;
import org.apache.dubbo.rpc.cluster.router.state.TailStateRouter;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+
import static org.apache.dubbo.common.constants.LoggerCodeConstants.CLUSTER_FAILED_STOP;
import static org.apache.dubbo.common.constants.LoggerCodeConstants.CLUSTER_NO_VALID_PROVIDER;
import static org.apache.dubbo.common.constants.LoggerCodeConstants.INTERNAL_ERROR;
@@ -79,7 +79,11 @@ public class SingleRouterChain<T> {
private final ReadWriteLock lock = new ReentrantReadWriteLock();
- public SingleRouterChain(List<Router> routers, List<StateRouter<T>> stateRouters, boolean shouldFailFast, RouterSnapshotSwitcher routerSnapshotSwitcher) {
+ public SingleRouterChain(
+ List<Router> routers,
+ List<StateRouter<T>> stateRouters,
+ boolean shouldFailFast,
+ RouterSnapshotSwitcher routerSnapshotSwitcher) {
initWithRouters(routers);
initWithStateRouters(stateRouters);
@@ -134,9 +138,12 @@ public class SingleRouterChain<T> {
public List<Invoker<T>> route(URL url, BitList<Invoker<T>> availableInvokers, Invocation invocation) {
if (invokers.getOriginList() != availableInvokers.getOriginList()) {
- logger.error(INTERNAL_ERROR, "", "Router's invoker size: " + invokers.getOriginList().size() +
- " Invocation's invoker size: " + availableInvokers.getOriginList().size(),
- "Reject to route, because the invokers has changed.");
+ logger.error(
+ INTERNAL_ERROR,
+ "",
+ "Router's invoker size: " + invokers.getOriginList().size() + " Invocation's invoker size: "
+ + availableInvokers.getOriginList().size(),
+ "Reject to route, because the invokers has changed.");
throw new IllegalStateException("reject to route, because the invokers has changed.");
}
if (RpcContext.getServiceContext().isNeedPrintRouterSnapshot()) {
@@ -202,7 +209,8 @@ public class SingleRouterChain<T> {
/**
* Build each router's result
*/
- public RouterSnapshotNode<T> buildRouterSnapshot(URL url, BitList<Invoker<T>> availableInvokers, Invocation invocation) {
+ public RouterSnapshotNode<T> buildRouterSnapshot(
+ URL url, BitList<Invoker<T>> availableInvokers, Invocation invocation) {
BitList<Invoker<T>> resultInvokers = availableInvokers.clone();
RouterSnapshotNode<T> parentNode = new RouterSnapshotNode<T>("Parent", resultInvokers.clone());
parentNode.setNodeOutputInvokers(resultInvokers.clone());
@@ -228,7 +236,8 @@ public class SingleRouterChain<T> {
// Copy resultInvokers to a arrayList. BitList not support
List<Invoker<T>> inputInvokers = new ArrayList<>(commonRouterResult);
- RouterSnapshotNode<T> currentNode = new RouterSnapshotNode<T>(router.getClass().getSimpleName(), inputInvokers);
+ RouterSnapshotNode<T> currentNode =
+ new RouterSnapshotNode<T>(router.getClass().getSimpleName(), inputInvokers);
// append to router node chain
commonRouterNode.appendNode(currentNode);
@@ -268,24 +277,27 @@ public class SingleRouterChain<T> {
}
private void logRouterSnapshot(URL url, Invocation invocation, RouterSnapshotNode<T> snapshotNode) {
- if (snapshotNode.getChainOutputInvokers() == null ||
- snapshotNode.getChainOutputInvokers().isEmpty()) {
+ if (snapshotNode.getChainOutputInvokers() == null
+ || snapshotNode.getChainOutputInvokers().isEmpty()) {
if (logger.isWarnEnabled()) {
String message = "No provider available after route for the service " + url.getServiceKey()
- + " from registry " + url.getAddress()
- + " on the consumer " + NetUtils.getLocalHost()
- + " using the dubbo version " + Version.getVersion() + ". Router snapshot is below: \n" + snapshotNode.toString();
+ + " from registry " + url.getAddress()
+ + " on the consumer " + NetUtils.getLocalHost()
+ + " using the dubbo version " + Version.getVersion() + ". Router snapshot is below: \n"
+ + snapshotNode.toString();
if (routerSnapshotSwitcher.isEnable()) {
routerSnapshotSwitcher.setSnapshot(message);
}
- logger.warn(CLUSTER_NO_VALID_PROVIDER, "No provider available after route for the service", "", message);
+ logger.warn(
+ CLUSTER_NO_VALID_PROVIDER, "No provider available after route for the service", "", message);
}
} else {
if (logger.isInfoEnabled()) {
String message = "Router snapshot service " + url.getServiceKey()
- + " from registry " + url.getAddress()
- + " on the consumer " + NetUtils.getLocalHost()
- + " using the dubbo version " + Version.getVersion() + " is below: \n" + snapshotNode.toString();
+ + " from registry " + url.getAddress()
+ + " on the consumer " + NetUtils.getLocalHost()
+ + " using the dubbo version " + Version.getVersion() + " is below: \n"
+ + snapshotNode.toString();
if (routerSnapshotSwitcher.isEnable()) {
routerSnapshotSwitcher.setSnapshot(message);
}
@@ -330,7 +342,12 @@ public class SingleRouterChain<T> {
try {
router.stop();
} catch (Exception e) {
- logger.error(CLUSTER_FAILED_STOP, "route stop failed", "", "Error trying to stop router " + router.getClass(), e);
+ logger.error(
+ CLUSTER_FAILED_STOP,
+ "route stop failed",
+ "",
+ "Error trying to stop router " + router.getClass(),
+ e);
}
}
routers = Collections.emptyList();
@@ -340,7 +357,12 @@ public class SingleRouterChain<T> {
try {
router.stop();
} catch (Exception e) {
- logger.error(CLUSTER_FAILED_STOP, "StateRouter stop failed", "", "Error trying to stop StateRouter " + router.getClass(), e);
+ logger.error(
+ CLUSTER_FAILED_STOP,
+ "StateRouter stop failed",
+ "",
+ "Error trying to stop StateRouter " + router.getClass(),
+ e);
}
}
stateRouters = Collections.emptyList();
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/AbstractConfigurator.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/AbstractConfigurator.java
index 1a6b1381b9..a72956054a 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/AbstractConfigurator.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/AbstractConfigurator.java
@@ -72,7 +72,10 @@ public abstract class AbstractConfigurator implements Configurator {
@Override
public URL configure(URL url) {
// If override url is not enabled or is invalid, just return.
- if (!configuratorUrl.getParameter(ENABLED_KEY, true) || configuratorUrl.getHost() == null || url == null || url.getHost() == null) {
+ if (!configuratorUrl.getParameter(ENABLED_KEY, true)
+ || configuratorUrl.getHost() == null
+ || url == null
+ || url.getHost() == null) {
logger.info("Cannot apply configurator rule, the rule is disabled or is invalid: \n" + configuratorUrl);
return url;
}
@@ -98,7 +101,9 @@ public abstract class AbstractConfigurator implements Configurator {
@Deprecated
private URL configureDeprecated(URL url) {
- // If override url has port, means it is a provider address. We want to control a specific provider with this override url, it may take effect on the specific provider instance or on consumers holding this provider instance.
+ // If override url has port, means it is a provider address. We want to control a specific provider with this
+ // override url, it may take effect on the specific provider instance or on consumers holding this provider
+ // instance.
if (configuratorUrl.getPort() != 0) {
if (url.getPort() == configuratorUrl.getPort()) {
return configureIfMatch(url.getHost(), url);
@@ -131,7 +136,8 @@ public abstract class AbstractConfigurator implements Configurator {
if (matcher.isMatch(host, url)) {
return doConfigure(url, configuratorUrl.removeParameters(conditionKeys));
} else {
- logger.debug("Cannot apply configurator rule, param mismatch, current params are " + url + ", params in rule is " + matcher);
+ logger.debug("Cannot apply configurator rule, param mismatch, current params are " + url
+ + ", params in rule is " + matcher);
}
} else {
return doConfigure(url, configuratorUrl.removeParameters(conditionKeys));
@@ -141,7 +147,8 @@ public abstract class AbstractConfigurator implements Configurator {
}
}
} else {
- logger.debug("Cannot apply configurator rule, host mismatch, current host is " + host + ", host in rule is " + configuratorUrl.getHost());
+ logger.debug("Cannot apply configurator rule, host mismatch, current host is " + host + ", host in rule is "
+ + configuratorUrl.getHost());
}
return url;
}
@@ -159,15 +166,16 @@ public abstract class AbstractConfigurator implements Configurator {
String[] providerAddresses = providers.split(CommonConstants.COMMA_SEPARATOR);
for (String address : providerAddresses) {
if (address.equals(url.getAddress())
- || address.equals(ANYHOST_VALUE)
- || address.equals(ANYHOST_VALUE + CommonConstants.GROUP_CHAR_SEPARATOR + ANY_VALUE)
- || address.equals(ANYHOST_VALUE + CommonConstants.GROUP_CHAR_SEPARATOR + url.getPort())
- || address.equals(url.getHost())) {
+ || address.equals(ANYHOST_VALUE)
+ || address.equals(ANYHOST_VALUE + CommonConstants.GROUP_CHAR_SEPARATOR + ANY_VALUE)
+ || address.equals(ANYHOST_VALUE + CommonConstants.GROUP_CHAR_SEPARATOR + url.getPort())
+ || address.equals(url.getHost())) {
match = true;
}
}
if (!match) {
- logger.debug("Cannot apply configurator rule, provider address mismatch, current address " + url.getAddress() + ", address in rule is " + providers);
+ logger.debug("Cannot apply configurator rule, provider address mismatch, current address "
+ + url.getAddress() + ", address in rule is " + providers);
return false;
}
}
@@ -175,17 +183,18 @@ public abstract class AbstractConfigurator implements Configurator {
String configApplication = configuratorUrl.getApplication(configuratorUrl.getUsername());
String currentApplication = url.getApplication(url.getUsername());
if (configApplication != null
- && !ANY_VALUE.equals(configApplication)
- && !configApplication.equals(currentApplication)) {
- logger.debug("Cannot apply configurator rule, application name mismatch, current application is " + currentApplication + ", application in rule is " + configApplication);
+ && !ANY_VALUE.equals(configApplication)
+ && !configApplication.equals(currentApplication)) {
+ logger.debug("Cannot apply configurator rule, application name mismatch, current application is "
+ + currentApplication + ", application in rule is " + configApplication);
return false;
}
String configServiceKey = configuratorUrl.getServiceKey();
String currentServiceKey = url.getServiceKey();
- if (!ANY_VALUE.equals(configServiceKey)
- && !configServiceKey.equals(currentServiceKey)) {
- logger.debug("Cannot apply configurator rule, service mismatch, current service is " + currentServiceKey + ", service in rule is " + configServiceKey);
+ if (!ANY_VALUE.equals(configServiceKey) && !configServiceKey.equals(currentServiceKey)) {
+ logger.debug("Cannot apply configurator rule, service mismatch, current service is " + currentServiceKey
+ + ", service in rule is " + configServiceKey);
return false;
}
@@ -202,8 +211,9 @@ public abstract class AbstractConfigurator implements Configurator {
if (startWithTilde) {
conditionKeys.add(key);
}
- if (value != null && !ANY_VALUE.equals(value)
- && !value.equals(url.getParameter(startWithTilde ? key.substring(1) : key))) {
+ if (value != null
+ && !ANY_VALUE.equals(value)
+ && !value.equals(url.getParameter(startWithTilde ? key.substring(1) : key))) {
result = false;
break;
}
@@ -233,5 +243,4 @@ public abstract class AbstractConfigurator implements Configurator {
}
protected abstract URL doConfigure(URL currentUrl, URL configUrl);
-
}
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/absent/AbsentConfigurator.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/absent/AbsentConfigurator.java
index bd8a325463..182f9107cb 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/absent/AbsentConfigurator.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/absent/AbsentConfigurator.java
@@ -32,5 +32,4 @@ public class AbsentConfigurator extends AbstractConfigurator {
public URL doConfigure(URL currentUrl, URL configUrl) {
return currentUrl.addParametersIfAbsent(configUrl.getParameters());
}
-
}
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/absent/AbsentConfiguratorFactory.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/absent/AbsentConfiguratorFactory.java
index 479eb5082a..737d67ca12 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/absent/AbsentConfiguratorFactory.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/absent/AbsentConfiguratorFactory.java
@@ -30,5 +30,4 @@ public class AbsentConfiguratorFactory implements ConfiguratorFactory {
public Configurator getConfigurator(URL url) {
return new AbsentConfigurator(url);
}
-
}
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/override/OverrideConfigurator.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/override/OverrideConfigurator.java
index a61190d7cd..72895aeb8a 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/override/OverrideConfigurator.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/override/OverrideConfigurator.java
@@ -36,5 +36,4 @@ public class OverrideConfigurator extends AbstractConfigurator {
logger.info("Start overriding url " + currentUrl + " with override url " + configUrl);
return currentUrl.addParameters(configUrl.getParameters());
}
-
}
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/override/OverrideConfiguratorFactory.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/override/OverrideConfiguratorFactory.java
index 504ae3b5d7..972eac4cea 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/override/OverrideConfiguratorFactory.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/override/OverrideConfiguratorFactory.java
@@ -30,5 +30,4 @@ public class OverrideConfiguratorFactory implements ConfiguratorFactory {
public Configurator getConfigurator(URL url) {
return new OverrideConfigurator(url);
}
-
}
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/ConfigParser.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/ConfigParser.java
index 7a12e0f379..203033c734 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/ConfigParser.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/ConfigParser.java
@@ -23,14 +23,14 @@ import org.apache.dubbo.common.utils.StringUtils;
import org.apache.dubbo.rpc.cluster.configurator.parser.model.ConfigItem;
import org.apache.dubbo.rpc.cluster.configurator.parser.model.ConfiguratorConfig;
-import org.yaml.snakeyaml.LoaderOptions;
-import org.yaml.snakeyaml.Yaml;
-import org.yaml.snakeyaml.constructor.SafeConstructor;
-
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import org.yaml.snakeyaml.LoaderOptions;
+import org.yaml.snakeyaml.Yaml;
+import org.yaml.snakeyaml.constructor.SafeConstructor;
+
import static org.apache.dubbo.common.constants.CommonConstants.ANYHOST_VALUE;
import static org.apache.dubbo.common.constants.CommonConstants.PROVIDER;
import static org.apache.dubbo.common.constants.RegistryConstants.APP_DYNAMIC_CONFIGURATORS_CATEGORY;
@@ -104,7 +104,12 @@ public class ConfigParser {
if (CollectionUtils.isNotEmpty(apps)) {
apps.forEach(app -> {
StringBuilder tmpUrlBuilder = new StringBuilder(urlBuilder);
- urls.add(appendMatchCondition(URL.valueOf(tmpUrlBuilder.append("&application=").append(app).toString()), item));
+ urls.add(appendMatchCondition(
+ URL.valueOf(tmpUrlBuilder
+ .append("&application=")
+ .append(app)
+ .toString()),
+ item));
});
} else {
urls.add(appendMatchCondition(URL.valueOf(urlBuilder.toString()), item));
@@ -155,8 +160,8 @@ public class ConfigParser {
}
Map<String, String> parameters = item.getParameters();
if (CollectionUtils.isEmptyMap(parameters)) {
- throw new IllegalStateException("Invalid configurator rule, please specify at least one parameter " +
- "you want to change in the rule.");
+ throw new IllegalStateException("Invalid configurator rule, please specify at least one parameter "
+ + "you want to change in the rule.");
}
parameters.forEach((k, v) -> {
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/ConditionMatch.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/ConditionMatch.java
index 4a828d4484..853a6ae8df 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/ConditionMatch.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/ConditionMatch.java
@@ -101,12 +101,11 @@ public class ConditionMatch {
@Override
public String toString() {
- return "ConditionMatch{" +
- "address='" + address + '\'' +
- "providerAddress='" + providerAddress + '\'' +
- ", service='" + service + '\'' +
- ", app='" + app + '\'' +
- ", param='" + param + '\'' +
- '}';
+ return "ConditionMatch{" + "address='"
+ + address + '\'' + "providerAddress='"
+ + providerAddress + '\'' + ", service='"
+ + service + '\'' + ", app='"
+ + app + '\'' + ", param='"
+ + param + '\'' + '}';
}
}
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/ConfigItem.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/ConfigItem.java
index 249baeb556..78547fd7d8 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/ConfigItem.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/ConfigItem.java
@@ -68,32 +68,33 @@ public class ConfigItem {
Object addresses = map.get(ADDRESSES_KEY);
if (addresses != null && List.class.isAssignableFrom(addresses.getClass())) {
- configItem.setAddresses(((List<Object>) addresses).stream()
- .map(String::valueOf).collect(Collectors.toList()));
+ configItem.setAddresses(
+ ((List<Object>) addresses).stream().map(String::valueOf).collect(Collectors.toList()));
}
Object providerAddresses = map.get(PROVIDER_ADDRESSES_KEY);
if (providerAddresses != null && List.class.isAssignableFrom(providerAddresses.getClass())) {
- configItem.setProviderAddresses(((List<Object>) providerAddresses).stream()
- .map(String::valueOf).collect(Collectors.toList()));
+ configItem.setProviderAddresses(((List<Object>) providerAddresses)
+ .stream().map(String::valueOf).collect(Collectors.toList()));
}
Object services = map.get(SERVICES_KEY);
if (services != null && List.class.isAssignableFrom(services.getClass())) {
- configItem.setServices(((List<Object>) services).stream()
- .map(String::valueOf).collect(Collectors.toList()));
+ configItem.setServices(
+ ((List<Object>) services).stream().map(String::valueOf).collect(Collectors.toList()));
}
Object applications = map.get(APPLICATIONS_KEY);
if (applications != null && List.class.isAssignableFrom(applications.getClass())) {
- configItem.setApplications(((List<Object>) applications).stream()
- .map(String::valueOf).collect(Collectors.toList()));
+ configItem.setApplications(
+ ((List<Object>) applications).stream().map(String::valueOf).collect(Collectors.toList()));
}
Object parameters = map.get(PARAMETERS_KEY);
if (parameters != null && Map.class.isAssignableFrom(parameters.getClass())) {
- configItem.setParameters(((Map<String, Object>) parameters).entrySet()
- .stream().collect(Collectors.toMap(Map.Entry::getKey, entry -> entry.getValue().toString())));
+ configItem.setParameters(((Map<String, Object>) parameters)
+ .entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey, entry -> entry.getValue()
+ .toString())));
}
try {
@@ -102,7 +103,12 @@ public class ConfigItem {
configItem.setMatch(PojoUtils.mapToPojo((Map<String, Object>) match, ConditionMatch.class));
}
} catch (Throwable t) {
- logger.error(CLUSTER_FAILED_RECEIVE_RULE, " Failed to parse dynamic configuration rule", String.valueOf(map.get(MATCH_KEY)), "Error occurred when parsing rule component.", t);
+ logger.error(
+ CLUSTER_FAILED_RECEIVE_RULE,
+ " Failed to parse dynamic configuration rule",
+ String.valueOf(map.get(MATCH_KEY)),
+ "Error occurred when parsing rule component.",
+ t);
}
configItem.setSide((String) map.get(SIDE_KEY));
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/ConfiguratorConfig.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/ConfiguratorConfig.java
index 4a9c8e13a1..2b51957c04 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/ConfiguratorConfig.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/ConfiguratorConfig.java
@@ -52,8 +52,8 @@ public class ConfiguratorConfig {
Object configs = map.get(CONFIGS_KEY);
if (configs != null && List.class.isAssignableFrom(configs.getClass())) {
- configuratorConfig.setConfigs(((List<Map<String, Object>>) configs).stream()
- .map(ConfigItem::parseFromMap).collect(Collectors.toList()));
+ configuratorConfig.setConfigs(((List<Map<String, Object>>) configs)
+ .stream().map(ConfigItem::parseFromMap).collect(Collectors.toList()));
}
return configuratorConfig;
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/ParamMatch.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/ParamMatch.java
index 42303e6a49..ad6dae436f 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/ParamMatch.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/ParamMatch.java
@@ -50,9 +50,6 @@ public class ParamMatch {
@Override
public String toString() {
- return "ParamMatch{" +
- "key='" + key + '\'' +
- ", value='" + value + '\'' +
- '}';
+ return "ParamMatch{" + "key='" + key + '\'' + ", value='" + value + '\'' + '}';
}
}
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/directory/AbstractDirectory.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/directory/AbstractDirectory.java
index dab89c0848..087eacbade 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/directory/AbstractDirectory.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/directory/AbstractDirectory.java
@@ -160,18 +160,20 @@ public abstract class AbstractDirectory<T> implements Directory<T> {
// remove some local only parameters
applicationModel = url.getOrDefaultApplicationModel();
- this.queryMap = applicationModel.getBeanFactory().getBean(ClusterUtils.class).mergeLocalParams(queryMap);
+ this.queryMap =
+ applicationModel.getBeanFactory().getBean(ClusterUtils.class).mergeLocalParams(queryMap);
if (consumerUrl == null) {
- String host = isNotEmpty(queryMap.get(REGISTER_IP_KEY)) ? queryMap.get(REGISTER_IP_KEY) : this.url.getHost();
+ String host =
+ isNotEmpty(queryMap.get(REGISTER_IP_KEY)) ? queryMap.get(REGISTER_IP_KEY) : this.url.getHost();
String path = isNotEmpty(queryMap.get(PATH_KEY)) ? queryMap.get(PATH_KEY) : queryMap.get(INTERFACE_KEY);
String consumedProtocol = isNotEmpty(queryMap.get(PROTOCOL_KEY)) ? queryMap.get(PROTOCOL_KEY) : CONSUMER;
URL consumerUrlFrom = this.url
- .setHost(host)
- .setPort(0)
- .setProtocol(consumedProtocol)
- .setPath(path);
+ .setHost(host)
+ .setPort(0)
+ .setProtocol(consumedProtocol)
+ .setPath(path);
if (isUrlFromRegistry) {
// reserve parameters if url is already a consumer url
consumerUrlFrom = consumerUrlFrom.clearParameters();
@@ -179,19 +181,23 @@ public abstract class AbstractDirectory<T> implements Directory<T> {
this.consumerUrl = consumerUrlFrom.addParameters(queryMap);
}
- this.connectivityExecutor = applicationModel.getFrameworkModel().getBeanFactory()
- .getBean(FrameworkExecutorRepository.class).getConnectivityScheduledExecutor();
+ this.connectivityExecutor = applicationModel
+ .getFrameworkModel()
+ .getBeanFactory()
+ .getBean(FrameworkExecutorRepository.class)
+ .getConnectivityScheduledExecutor();
Configuration configuration = ConfigurationUtils.getGlobalConfiguration(url.getOrDefaultModuleModel());
this.reconnectTaskTryCount = configuration.getInt(RECONNECT_TASK_TRY_COUNT, DEFAULT_RECONNECT_TASK_TRY_COUNT);
this.reconnectTaskPeriod = configuration.getInt(RECONNECT_TASK_PERIOD, DEFAULT_RECONNECT_TASK_PERIOD);
setRouterChain(routerChain);
-
}
@Override
public List<Invoker<T>> list(Invocation invocation) throws RpcException {
if (destroyed) {
- throw new RpcException("Directory of type " + this.getClass().getSimpleName() + " already destroyed for service " + getConsumerUrl().getServiceKey() + " from registry " + getUrl());
+ throw new RpcException(
+ "Directory of type " + this.getClass().getSimpleName() + " already destroyed for service "
+ + getConsumerUrl().getServiceKey() + " from registry " + getUrl());
}
BitList<Invoker<T>> availableInvokers;
@@ -222,12 +228,16 @@ public abstract class AbstractDirectory<T> implements Directory<T> {
if (routedResult.isEmpty()) {
// 2-2 - No provider available.
- logger.warn(CLUSTER_NO_VALID_PROVIDER, "provider server or registry center crashed", "",
- "No provider available after connectivity filter for the service " + getConsumerUrl().getServiceKey()
- + " All routed invokers' size: " + routedResult.size()
- + " from registry " + this
- + " on the consumer " + NetUtils.getLocalHost()
- + " using the dubbo version " + Version.getVersion() + ".");
+ logger.warn(
+ CLUSTER_NO_VALID_PROVIDER,
+ "provider server or registry center crashed",
+ "",
+ "No provider available after connectivity filter for the service "
+ + getConsumerUrl().getServiceKey()
+ + " All routed invokers' size: " + routedResult.size()
+ + " from registry " + this
+ + " on the consumer " + NetUtils.getLocalHost()
+ + " using the dubbo version " + Version.getVersion() + ".");
}
return Collections.unmodifiableList(routedResult);
} finally {
@@ -290,68 +300,78 @@ public abstract class AbstractDirectory<T> implements Directory<T> {
// 3. try start check connectivity task
checkConnectivity();
- logger.info("The invoker " + invoker.getUrl() + " has been added to invalidate list due to connectivity problem. " +
- "Will trying to reconnect to it in the background.");
+ logger.info("The invoker " + invoker.getUrl()
+ + " has been added to invalidate list due to connectivity problem. "
+ + "Will trying to reconnect to it in the background.");
}
}
public void checkConnectivity() {
// try to submit task, to ensure there is only one task at most for each directory
if (checkConnectivityPermit.tryAcquire()) {
- this.connectivityCheckFuture = connectivityExecutor.schedule(() -> {
- try {
- if (isDestroyed()) {
- return;
- }
- RpcContext.getServiceContext().setConsumerUrl(getConsumerUrl());
- List<Invoker<T>> needDeleteList = new ArrayList<>();
- List<Invoker<T>> invokersToTry = new ArrayList<>();
-
- // 1. pick invokers from invokersToReconnect
- // limit max reconnectTaskTryCount, prevent this task hang up all the connectivityExecutor for long time
- if (invokersToReconnect.size() < reconnectTaskTryCount) {
- invokersToTry.addAll(invokersToReconnect);
- } else {
- for (int i = 0; i < reconnectTaskTryCount; i++) {
- Invoker<T> tInvoker = invokersToReconnect.get(ThreadLocalRandom.current().nextInt(invokersToReconnect.size()));
- if (!invokersToTry.contains(tInvoker)) {
- // ignore if is selected, invokersToTry's size is always smaller than reconnectTaskTryCount + 1
- invokersToTry.add(tInvoker);
+ this.connectivityCheckFuture = connectivityExecutor.schedule(
+ () -> {
+ try {
+ if (isDestroyed()) {
+ return;
+ }
+ RpcContext.getServiceContext().setConsumerUrl(getConsumerUrl());
+ List<Invoker<T>> needDeleteList = new ArrayList<>();
+ List<Invoker<T>> invokersToTry = new ArrayList<>();
+
+ // 1. pick invokers from invokersToReconnect
+ // limit max reconnectTaskTryCount, prevent this task hang up all the connectivityExecutor
+ // for long time
+ if (invokersToReconnect.size() < reconnectTaskTryCount) {
+ invokersToTry.addAll(invokersToReconnect);
+ } else {
+ for (int i = 0; i < reconnectTaskTryCount; i++) {
+ Invoker<T> tInvoker = invokersToReconnect.get(
+ ThreadLocalRandom.current().nextInt(invokersToReconnect.size()));
+ if (!invokersToTry.contains(tInvoker)) {
+ // ignore if is selected, invokersToTry's size is always smaller than
+ // reconnectTaskTryCount + 1
+ invokersToTry.add(tInvoker);
+ }
+ }
}
- }
- }
- // 2. try to check the invoker's status
- for (Invoker<T> invoker : invokersToTry) {
- if (invokers.contains(invoker)) {
- if (invoker.isAvailable()) {
- needDeleteList.add(invoker);
+ // 2. try to check the invoker's status
+ for (Invoker<T> invoker : invokersToTry) {
+ if (invokers.contains(invoker)) {
+ if (invoker.isAvailable()) {
+ needDeleteList.add(invoker);
+ }
+ } else {
+ needDeleteList.add(invoker);
+ }
}
- } else {
- needDeleteList.add(invoker);
- }
- }
- // 3. recover valid invoker
- for (Invoker<T> tInvoker : needDeleteList) {
- if (invokers.contains(tInvoker)) {
- addValidInvoker(tInvoker);
- logger.info("Recover service address: " + tInvoker.getUrl() + " from invalid list.");
+ // 3. recover valid invoker
+ for (Invoker<T> tInvoker : needDeleteList) {
+ if (invokers.contains(tInvoker)) {
+ addValidInvoker(tInvoker);
+ logger.info(
+ "Recover service address: " + tInvoker.getUrl() + " from invalid list.");
+ }
+ invokersToReconnect.remove(tInvoker);
+ }
+ } finally {
+ checkConnectivityPermit.release();
}
- invokersToReconnect.remove(tInvoker);
- }
- } finally {
- checkConnectivityPermit.release();
- }
- // 4. submit new task if it has more to recover
- if (!invokersToReconnect.isEmpty()) {
- checkConnectivity();
- }
- MetricsEventBus.publish(RegistryEvent.refreshDirectoryEvent(applicationModel, getSummary(), getDirectoryMeta()));
- }, reconnectTaskPeriod, TimeUnit.MILLISECONDS);
+ // 4. submit new task if it has more to recover
+ if (!invokersToReconnect.isEmpty()) {
+ checkConnectivity();
+ }
+ MetricsEventBus.publish(RegistryEvent.refreshDirectoryEvent(
+ applicationModel, getSummary(), getDirectoryMeta()));
+ },
+ reconnectTaskPeriod,
+ TimeUnit.MILLISECONDS);
}
- MetricsEventBus.publish(RegistryEvent.refreshDirectoryEvent(applicationModel, getSummary(), getDirectoryMeta()));
+ MetricsEventBus.publish(
+ RegistryEvent.refreshDirectoryEvent(applicationModel, getSummary(), getDirectoryMeta()));
}
/**
@@ -365,7 +385,8 @@ public abstract class AbstractDirectory<T> implements Directory<T> {
if (invokersInitialized) {
refreshInvokerInternal();
}
- MetricsEventBus.publish(RegistryEvent.refreshDirectoryEvent(applicationModel, getSummary(), getDirectoryMeta()));
+ MetricsEventBus.publish(
+ RegistryEvent.refreshDirectoryEvent(applicationModel, getSummary(), getDirectoryMeta()));
}
protected Map<String, String> getDirectoryMeta() {
@@ -398,7 +419,8 @@ public abstract class AbstractDirectory<T> implements Directory<T> {
removeValidInvoker(invoker);
logger.info("Disable service address: " + invoker.getUrl() + ".");
}
- MetricsEventBus.publish(RegistryEvent.refreshDirectoryEvent(applicationModel, getSummary(), getDirectoryMeta()));
+ MetricsEventBus.publish(
+ RegistryEvent.refreshDirectoryEvent(applicationModel, getSummary(), getDirectoryMeta()));
}
@Override
@@ -411,19 +433,24 @@ public abstract class AbstractDirectory<T> implements Directory<T> {
}
}
- MetricsEventBus.publish(RegistryEvent.refreshDirectoryEvent(applicationModel, getSummary(), getDirectoryMeta()));
+ MetricsEventBus.publish(
+ RegistryEvent.refreshDirectoryEvent(applicationModel, getSummary(), getDirectoryMeta()));
}
protected final void refreshRouter(BitList<Invoker<T>> newlyInvokers, Runnable switchAction) {
try {
routerChain.setInvokers(newlyInvokers.clone(), switchAction);
} catch (Throwable t) {
- logger.error(LoggerCodeConstants.INTERNAL_ERROR, "", "", "Error occurred when refreshing router chain. " +
- "The addresses from notification: " +
- newlyInvokers.stream()
- .map(Invoker::getUrl)
- .map(URL::getAddress)
- .collect(Collectors.joining(", ")), t);
+ logger.error(
+ LoggerCodeConstants.INTERNAL_ERROR,
+ "",
+ "",
+ "Error occurred when refreshing router chain. " + "The addresses from notification: "
+ + newlyInvokers.stream()
+ .map(Invoker::getUrl)
+ .map(URL::getAddress)
+ .collect(Collectors.joining(", ")),
+ t);
throw t;
}
@@ -468,7 +495,8 @@ public abstract class AbstractDirectory<T> implements Directory<T> {
refreshInvokerInternal();
this.invokersInitialized = true;
- MetricsEventBus.publish(RegistryEvent.refreshDirectoryEvent(applicationModel, getSummary(), getDirectoryMeta()));
+ MetricsEventBus.publish(
+ RegistryEvent.refreshDirectoryEvent(applicationModel, getSummary(), getDirectoryMeta()));
}
protected void destroyInvokers() {
@@ -483,7 +511,8 @@ public abstract class AbstractDirectory<T> implements Directory<T> {
synchronized (this.validInvokers) {
result = this.validInvokers.add(invoker);
}
- MetricsEventBus.publish(RegistryEvent.refreshDirectoryEvent(applicationModel, getSummary(), getDirectoryMeta()));
+ MetricsEventBus.publish(
+ RegistryEvent.refreshDirectoryEvent(applicationModel, getSummary(), getDirectoryMeta()));
return result;
}
@@ -492,12 +521,14 @@ public abstract class AbstractDirectory<T> implements Directory<T> {
synchronized (this.validInvokers) {
result = this.validInvokers.remove(invoker);
}
- MetricsEventBus.publish(RegistryEvent.refreshDirectoryEvent(applicationModel, getSummary(), getDirectoryMeta()));
+ MetricsEventBus.publish(
+ RegistryEvent.refreshDirectoryEvent(applicationModel, getSummary(), getDirectoryMeta()));
return result;
}
- protected abstract List<Invoker<T>> doList(SingleRouterChain<T> singleRouterChain,
- BitList<Invoker<T>> invokers, Invocation invocation) throws RpcException;
+ protected abstract List<Invoker<T>> doList(
+ SingleRouterChain<T> singleRouterChain, BitList<Invoker<T>> invokers, Invocation invocation)
+ throws RpcException;
protected String joinValidInvokerAddresses() {
BitList<Invoker<T>> validInvokers = getValidInvokers().clone();
@@ -505,10 +536,10 @@ public abstract class AbstractDirectory<T> implements Directory<T> {
return "empty";
}
return validInvokers.stream()
- .limit(5)
- .map(Invoker::getUrl)
- .map(URL::getAddress)
- .collect(Collectors.joining(","));
+ .limit(5)
+ .map(Invoker::getUrl)
+ .map(URL::getAddress)
+ .collect(Collectors.joining(","));
}
private Map<MetricsKey, Map<String, Integer>> getSummary() {
@@ -527,25 +558,27 @@ public abstract class AbstractDirectory<T> implements Directory<T> {
@Override
public String toString() {
- return "Directory(" +
- "invokers: " + invokers.size() + "[" +
- invokers.stream()
- .map(Invoker::getUrl)
- .map(URL::getAddress)
- .limit(3)
- .collect(Collectors.joining(", ")) + "]" +
- ", validInvokers: " + validInvokers.size() + "[" +
- validInvokers.stream()
- .map(Invoker::getUrl)
- .map(URL::getAddress)
- .limit(3)
- .collect(Collectors.joining(", ")) + "]" +
- ", invokersToReconnect: " + invokersToReconnect.size() + "[" +
- invokersToReconnect.stream()
- .map(Invoker::getUrl)
- .map(URL::getAddress)
- .limit(3)
- .collect(Collectors.joining(", ")) + "]" +
- ')';
+ return "Directory(" + "invokers: "
+ + invokers.size() + "["
+ + invokers.stream()
+ .map(Invoker::getUrl)
+ .map(URL::getAddress)
+ .limit(3)
+ .collect(Collectors.joining(", "))
+ + "]" + ", validInvokers: "
+ + validInvokers.size() + "["
+ + validInvokers.stream()
+ .map(Invoker::getUrl)
+ .map(URL::getAddress)
+ .limit(3)
+ .collect(Collectors.joining(", "))
+ + "]" + ", invokersToReconnect: "
+ + invokersToReconnect.size() + "["
+ + invokersToReconnect.stream()
+ .map(Invoker::getUrl)
+ .map(URL::getAddress)
+ .limit(3)
+ .collect(Collectors.joining(", "))
+ + "]" + ')';
}
}
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/directory/StaticDirectory.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/directory/StaticDirectory.java
index 6fae2eeb8f..14a4a5747f 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/directory/StaticDirectory.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/directory/StaticDirectory.java
@@ -55,7 +55,12 @@ public class StaticDirectory<T> extends AbstractDirectory<T> {
}
public StaticDirectory(URL url, List<Invoker<T>> invokers, RouterChain<T> routerChain) {
- super(url == null && CollectionUtils.isNotEmpty(invokers) ? invokers.get(0).getUrl() : url, routerChain, false);
+ super(
+ url == null && CollectionUtils.isNotEmpty(invokers)
+ ? invokers.get(0).getUrl()
+ : url,
+ routerChain,
+ false);
if (CollectionUtils.isEmpty(invokers)) {
throw new IllegalArgumentException("invokers == null");
}
@@ -101,28 +106,34 @@ public class StaticDirectory<T> extends AbstractDirectory<T> {
public void buildRouterChain() {
RouterChain<T> routerChain = RouterChain.buildChain(getInterface(), getUrl());
- routerChain.setInvokers(getInvokers(), () -> {
- });
+ routerChain.setInvokers(getInvokers(), () -> {});
this.setRouterChain(routerChain);
}
public void notify(List<Invoker<T>> invokers) {
BitList<Invoker<T>> bitList = new BitList<>(invokers);
if (routerChain != null) {
- refreshRouter(bitList.clone(), () -> this.setInvokers(bitList));
+ refreshRouter(bitList.clone(), () -> this.setInvokers(bitList));
} else {
this.setInvokers(bitList);
}
}
@Override
- protected List<Invoker<T>> doList(SingleRouterChain<T> singleRouterChain, BitList<Invoker<T>> invokers, Invocation invocation) throws RpcException {
+ protected List<Invoker<T>> doList(
+ SingleRouterChain<T> singleRouterChain, BitList<Invoker<T>> invokers, Invocation invocation)
+ throws RpcException {
if (singleRouterChain != null) {
try {
List<Invoker<T>> finalInvokers = singleRouterChain.route(getConsumerUrl(), invokers, invocation);
return finalInvokers == null ? BitList.emptyList() : finalInvokers;
} catch (Throwable t) {
- logger.error(CLUSTER_FAILED_SITE_SELECTION, "Failed to execute router", "", "Failed to execute router: " + getUrl() + ", cause: " + t.getMessage(), t);
+ logger.error(
+ CLUSTER_FAILED_SITE_SELECTION,
+ "Failed to execute router",
+ "",
+ "Failed to execute router: " + getUrl() + ", cause: " + t.getMessage(),
+ t);
return BitList.emptyList();
}
}
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/filter/DefaultFilterChainBuilder.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/filter/DefaultFilterChainBuilder.java
index 22a22cd982..4be2ba9ba1 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/filter/DefaultFilterChainBuilder.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/filter/DefaultFilterChainBuilder.java
@@ -47,12 +47,14 @@ public class DefaultFilterChainBuilder implements FilterChainBuilder {
List<ModuleModel> moduleModels = getModuleModelsFromUrl(url);
List<Filter> filters;
if (moduleModels != null && moduleModels.size() == 1) {
- filters = ScopeModelUtil.getExtensionLoader(Filter.class, moduleModels.get(0)).getActivateExtension(url, key, group);
+ filters = ScopeModelUtil.getExtensionLoader(Filter.class, moduleModels.get(0))
+ .getActivateExtension(url, key, group);
} else if (moduleModels != null && moduleModels.size() > 1) {
filters = new ArrayList<>();
List<ExtensionDirector> directors = new ArrayList<>();
for (ModuleModel moduleModel : moduleModels) {
- List<Filter> tempFilters = ScopeModelUtil.getExtensionLoader(Filter.class, moduleModel).getActivateExtension(url, key, group);
+ List<Filter> tempFilters = ScopeModelUtil.getExtensionLoader(Filter.class, moduleModel)
+ .getActivateExtension(url, key, group);
filters.addAll(tempFilters);
directors.add(moduleModel.getExtensionDirector());
}
@@ -62,7 +64,6 @@ public class DefaultFilterChainBuilder implements FilterChainBuilder {
filters = ScopeModelUtil.getExtensionLoader(Filter.class, null).getActivateExtension(url, key, group);
}
-
if (!CollectionUtils.isEmpty(filters)) {
for (int i = filters.size() - 1; i >= 0; i--) {
final Filter filter = filters.get(i);
@@ -79,25 +80,29 @@ public class DefaultFilterChainBuilder implements FilterChainBuilder {
* build consumer cluster filter chain
*/
@Override
- public <T> ClusterInvoker<T> buildClusterInvokerChain(final ClusterInvoker<T> originalInvoker, String key, String group) {
+ public <T> ClusterInvoker<T> buildClusterInvokerChain(
+ final ClusterInvoker<T> originalInvoker, String key, String group) {
ClusterInvoker<T> last = originalInvoker;
URL url = originalInvoker.getUrl();
List<ModuleModel> moduleModels = getModuleModelsFromUrl(url);
List<ClusterFilter> filters;
if (moduleModels != null && moduleModels.size() == 1) {
- filters = ScopeModelUtil.getExtensionLoader(ClusterFilter.class, moduleModels.get(0)).getActivateExtension(url, key, group);
+ filters = ScopeModelUtil.getExtensionLoader(ClusterFilter.class, moduleModels.get(0))
+ .getActivateExtension(url, key, group);
} else if (moduleModels != null && moduleModels.size() > 1) {
filters = new ArrayList<>();
List<ExtensionDirector> directors = new ArrayList<>();
for (ModuleModel moduleModel : moduleModels) {
- List<ClusterFilter> tempFilters = ScopeModelUtil.getExtensionLoader(ClusterFilter.class, moduleModel).getActivateExtension(url, key, group);
+ List<ClusterFilter> tempFilters = ScopeModelUtil.getExtensionLoader(ClusterFilter.class, moduleModel)
+ .getActivateExtension(url, key, group);
filters.addAll(tempFilters);
directors.add(moduleModel.getExtensionDirector());
}
filters = sortingAndDeduplication(filters, directors);
} else {
- filters = ScopeModelUtil.getExtensionLoader(ClusterFilter.class, null).getActivateExtension(url, key, group);
+ filters =
+ ScopeModelUtil.getExtensionLoader(ClusterFilter.class, null).getActivateExtension(url, key, group);
}
if (!CollectionUtils.isEmpty(filters)) {
@@ -141,5 +146,4 @@ public class DefaultFilterChainBuilder implements FilterChainBuilder {
}
return moduleModels;
}
-
}
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/filter/FilterChainBuilder.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/filter/FilterChainBuilder.java
index 815f8821dd..92ab4a5848 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/filter/FilterChainBuilder.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/filter/FilterChainBuilder.java
@@ -92,7 +92,8 @@ public interface FilterChainBuilder {
public Result invoke(Invocation invocation) throws RpcException {
Result asyncResult;
try {
- InvocationProfilerUtils.enterDetailProfiler(invocation, () -> "Filter " + filter.getClass().getName() + " invoke.");
+ InvocationProfilerUtils.enterDetailProfiler(
+ invocation, () -> "Filter " + filter.getClass().getName() + " invoke.");
asyncResult = filter.invoke(nextNode, invocation);
} catch (Exception e) {
InvocationProfilerUtils.releaseDetailProfiler(invocation);
@@ -159,12 +160,11 @@ public interface FilterChainBuilder {
* @param <TYPE>
*/
class ClusterFilterChainNode<T, TYPE extends ClusterInvoker<T>, FILTER extends BaseFilter>
- extends FilterChainNode<T, TYPE, FILTER> implements ClusterInvoker<T> {
+ extends FilterChainNode<T, TYPE, FILTER> implements ClusterInvoker<T> {
public ClusterFilterChainNode(TYPE originalInvoker, Invoker<T> nextNode, FILTER filter) {
super(originalInvoker, nextNode, filter);
}
-
@Override
public URL getRegistryUrl() {
return getOriginalInvoker().getRegistryUrl();
@@ -182,7 +182,8 @@ public interface FilterChainBuilder {
}
class CallbackRegistrationInvoker<T, FILTER extends BaseFilter> implements Invoker<T> {
- private static final ErrorTypeAwareLogger LOGGER = LoggerFactory.getErrorTypeAwareLogger(CallbackRegistrationInvoker.class);
+ private static final ErrorTypeAwareLogger LOGGER =
+ LoggerFactory.getErrorTypeAwareLogger(CallbackRegistrationInvoker.class);
final Invoker<T> filterInvoker;
final List<FILTER> filters;
@@ -223,9 +224,20 @@ public interface FilterChainBuilder {
}
}
} catch (RuntimeException runtimeException) {
- LOGGER.error(CLUSTER_EXECUTE_FILTER_EXCEPTION, "the custom filter is abnormal", "", String.format("Exception occurred while executing the %s filter named %s.", i, filter.getClass().getSimpleName()));
+ LOGGER.error(
+ CLUSTER_EXECUTE_FILTER_EXCEPTION,
+ "the custom filter is abnormal",
+ "",
+ String.format(
+ "Exception occurred while executing the %s filter named %s.",
+ i, filter.getClass().getSimpleName()));
if (LOGGER.isDebugEnabled()) {
- LOGGER.debug(String.format("Whole filter list is: %s", filters.stream().map(tmpFilter -> tmpFilter.getClass().getSimpleName()).collect(Collectors.toList())));
+ LOGGER.debug(String.format(
+ "Whole filter list is: %s",
+ filters.stream()
+ .map(tmpFilter ->
+ tmpFilter.getClass().getSimpleName())
+ .collect(Collectors.toList())));
}
filterRuntimeException = runtimeException;
t = runtimeException;
@@ -264,11 +276,12 @@ public interface FilterChainBuilder {
}
}
- class ClusterCallbackRegistrationInvoker<T, FILTER extends BaseFilter> extends CallbackRegistrationInvoker<T, FILTER>
- implements ClusterInvoker<T> {
+ class ClusterCallbackRegistrationInvoker<T, FILTER extends BaseFilter>
+ extends CallbackRegistrationInvoker<T, FILTER> implements ClusterInvoker<T> {
private ClusterInvoker<T> originalInvoker;
- public ClusterCallbackRegistrationInvoker(ClusterInvoker<T> originalInvoker, Invoker<T> filterInvoker, List<FILTER> filters) {
+ public ClusterCallbackRegistrationInvoker(
+ ClusterInvoker<T> originalInvoker, Invoker<T> filterInvoker, List<FILTER> filters) {
super(filterInvoker, filters);
this.originalInvoker = originalInvoker;
}
@@ -293,10 +306,11 @@ public interface FilterChainBuilder {
}
}
-
- @Experimental("Works for the same purpose as FilterChainNode, replace FilterChainNode with this one when proved stable enough")
+ @Experimental(
+ "Works for the same purpose as FilterChainNode, replace FilterChainNode with this one when proved stable enough")
class CopyOfFilterChainNode<T, TYPE extends Invoker<T>, FILTER extends BaseFilter> implements Invoker<T> {
- private static final ErrorTypeAwareLogger LOGGER = LoggerFactory.getErrorTypeAwareLogger(CopyOfFilterChainNode.class);
+ private static final ErrorTypeAwareLogger LOGGER =
+ LoggerFactory.getErrorTypeAwareLogger(CopyOfFilterChainNode.class);
TYPE originalInvoker;
Invoker<T> nextNode;
FILTER filter;
@@ -330,11 +344,14 @@ public interface FilterChainBuilder {
public Result invoke(Invocation invocation) throws RpcException {
Result asyncResult;
try {
- InvocationProfilerUtils.enterDetailProfiler(invocation, () -> "Filter " + filter.getClass().getName() + " invoke.");
+ InvocationProfilerUtils.enterDetailProfiler(
+ invocation, () -> "Filter " + filter.getClass().getName() + " invoke.");
asyncResult = filter.invoke(nextNode, invocation);
if (!(asyncResult instanceof AsyncRpcResult)) {
- String msg = "The result of filter invocation must be AsyncRpcResult. (If you want to recreate a result, please use AsyncRpcResult.newDefaultAsyncResult.) " +
- "Filter class: " + filter.getClass().getName() + ". Result class: " + asyncResult.getClass().getName() + ".";
+ String msg =
+ "The result of filter invocation must be AsyncRpcResult. (If you want to recreate a result, please use AsyncRpcResult.newDefaultAsyncResult.) "
+ + "Filter class: " + filter.getClass().getName() + ". Result class: "
+ + asyncResult.getClass().getName() + ".";
LOGGER.error(INTERNAL_ERROR, "", "", msg);
throw new RpcException(msg);
}
@@ -372,14 +389,14 @@ public interface FilterChainBuilder {
}
}
- @Experimental("Works for the same purpose as ClusterFilterChainNode, replace ClusterFilterChainNode with this one when proved stable enough")
+ @Experimental(
+ "Works for the same purpose as ClusterFilterChainNode, replace ClusterFilterChainNode with this one when proved stable enough")
class CopyOfClusterFilterChainNode<T, TYPE extends ClusterInvoker<T>, FILTER extends BaseFilter>
- extends CopyOfFilterChainNode<T, TYPE, FILTER> implements ClusterInvoker<T> {
+ extends CopyOfFilterChainNode<T, TYPE, FILTER> implements ClusterInvoker<T> {
public CopyOfClusterFilterChainNode(TYPE originalInvoker, Invoker<T> nextNode, FILTER filter) {
super(originalInvoker, nextNode, filter);
}
-
@Override
public URL getRegistryUrl() {
return getOriginalInvoker().getRegistryUrl();
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/filter/ProtocolFilterWrapper.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/filter/ProtocolFilterWrapper.java
index efbc4540cc..1a8c144c79 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/filter/ProtocolFilterWrapper.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/filter/ProtocolFilterWrapper.java
@@ -62,7 +62,8 @@ public class ProtocolFilterWrapper implements Protocol {
}
private <T> FilterChainBuilder getFilterChainBuilder(URL url) {
- return ScopeModelUtil.getExtensionLoader(FilterChainBuilder.class, url.getScopeModel()).getDefaultExtension();
+ return ScopeModelUtil.getExtensionLoader(FilterChainBuilder.class, url.getScopeModel())
+ .getDefaultExtension();
}
@Override
@@ -83,5 +84,4 @@ public class ProtocolFilterWrapper implements Protocol {
public List<ProtocolServer> getServers() {
return protocol.getServers();
}
-
}
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/filter/support/MetricsConsumerFilter.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/filter/support/MetricsConsumerFilter.java
index 10136c17d8..7e3619094b 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/filter/support/MetricsConsumerFilter.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/filter/support/MetricsConsumerFilter.java
@@ -27,10 +27,11 @@ import org.apache.dubbo.rpc.cluster.filter.ClusterFilter;
import static org.apache.dubbo.common.constants.CommonConstants.CONSUMER;
-@Activate(group = {CONSUMER}, order = Integer.MIN_VALUE + 100)
+@Activate(
+ group = {CONSUMER},
+ order = Integer.MIN_VALUE + 100)
public class MetricsConsumerFilter extends MetricsFilter implements ClusterFilter, BaseFilter.Listener {
- public MetricsConsumerFilter() {
- }
+ public MetricsConsumerFilter() {}
@Override
public Result invoke(Invoker<?> invoker, Invocation invocation) throws RpcException {
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/governance/DefaultGovernanceRuleRepositoryImpl.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/governance/DefaultGovernanceRuleRepositoryImpl.java
index 1d8d7183c3..57913b0a52 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/governance/DefaultGovernanceRuleRepositoryImpl.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/governance/DefaultGovernanceRuleRepositoryImpl.java
@@ -56,5 +56,4 @@ public class DefaultGovernanceRuleRepositoryImpl implements GovernanceRuleReposi
private DynamicConfiguration getDynamicConfiguration() {
return moduleModel.modelEnvironment().getDynamicConfiguration().orElse(null);
}
-
}
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/governance/GovernanceRuleRepository.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/governance/GovernanceRuleRepository.java
index 7c51a04c24..3bd0dd1c99 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/governance/GovernanceRuleRepository.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/governance/GovernanceRuleRepository.java
@@ -36,7 +36,6 @@ public interface GovernanceRuleRepository {
addListener(key, DEFAULT_GROUP, listener);
}
-
/**
* {@link #removeListener(String, String, ConfigurationListener)}
*
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/AbstractLoadBalance.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/AbstractLoadBalance.java
index 59ecd9a305..c4eec1e005 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/AbstractLoadBalance.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/AbstractLoadBalance.java
@@ -47,7 +47,7 @@ public abstract class AbstractLoadBalance implements LoadBalance {
* @return weight which takes warmup into account
*/
static int calculateWarmupWeight(int uptime, int warmup, int weight) {
- int ww = (int) ( uptime / ((float) warmup / weight));
+ int ww = (int) (uptime / ((float) warmup / weight));
return ww < 1 ? 1 : (Math.min(ww, weight));
}
@@ -64,7 +64,6 @@ public abstract class AbstractLoadBalance implements LoadBalance {
protected abstract <T> Invoker<T> doSelect(List<Invoker<T>> invokers, URL url, Invocation invocation);
-
/**
* Get the weight of the invoker's invocation which takes warmup time into account
* if the uptime is within the warmup time, the weight will be reduce proportionally
@@ -94,7 +93,7 @@ public abstract class AbstractLoadBalance implements LoadBalance {
}
int warmup = invoker.getUrl().getParameter(WARMUP_KEY, DEFAULT_WARMUP);
if (uptime > 0 && uptime < warmup) {
- weight = calculateWarmupWeight((int)uptime, warmup, weight);
+ weight = calculateWarmupWeight((int) uptime, warmup, weight);
}
}
}
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/ConsistentHashLoadBalance.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/ConsistentHashLoadBalance.java
index 37386ab186..7fdfd8f79b 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/ConsistentHashLoadBalance.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/ConsistentHashLoadBalance.java
@@ -46,7 +46,8 @@ public class ConsistentHashLoadBalance extends AbstractLoadBalance {
*/
public static final String HASH_ARGUMENTS = "hash.arguments";
- private final ConcurrentMap<String, ConsistentHashSelector<?>> selectors = new ConcurrentHashMap<String, ConsistentHashSelector<?>>();
+ private final ConcurrentMap<String, ConsistentHashSelector<?>> selectors =
+ new ConcurrentHashMap<String, ConsistentHashSelector<?>>();
@SuppressWarnings("unchecked")
@Override
@@ -124,11 +125,10 @@ public class ConsistentHashLoadBalance extends AbstractLoadBalance {
private long hash(byte[] digest, int number) {
return (((long) (digest[3 + number * 4] & 0xFF) << 24)
- | ((long) (digest[2 + number * 4] & 0xFF) << 16)
- | ((long) (digest[1 + number * 4] & 0xFF) << 8)
- | (digest[number * 4] & 0xFF))
+ | ((long) (digest[2 + number * 4] & 0xFF) << 16)
+ | ((long) (digest[1 + number * 4] & 0xFF) << 8)
+ | (digest[number * 4] & 0xFF))
& 0xFFFFFFFFL;
}
}
-
}
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/LeastActiveLoadBalance.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/LeastActiveLoadBalance.java
index 9eb41f6fe9..76f82ebb7d 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/LeastActiveLoadBalance.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/LeastActiveLoadBalance.java
@@ -56,17 +56,18 @@ public class LeastActiveLoadBalance extends AbstractLoadBalance {
// Every least active invoker has the same weight value?
boolean sameWeight = true;
-
// Filter out all the least active invokers
for (int i = 0; i < length; i++) {
Invoker<T> invoker = invokers.get(i);
// Get the active number of the invoker
- int active = RpcStatus.getStatus(invoker.getUrl(), RpcUtils.getMethodName(invocation)).getActive();
+ int active = RpcStatus.getStatus(invoker.getUrl(), RpcUtils.getMethodName(invocation))
+ .getActive();
// Get the weight of the invoker's configuration. The default value is 100.
int afterWarmup = getWeight(invoker, invocation);
// save for later use
weights[i] = afterWarmup;
- // If it is the first invoker or the active number of the invoker is less than the current least active number
+ // If it is the first invoker or the active number of the invoker is less than the current least active
+ // number
if (leastActive == -1 || active < leastActive) {
// Reset the active number of the current invoker to the least active number
leastActive = active;
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/RandomLoadBalance.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/RandomLoadBalance.java
index 1b0b9fce7e..c264aa63a8 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/RandomLoadBalance.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/RandomLoadBalance.java
@@ -78,7 +78,8 @@ public class RandomLoadBalance extends AbstractLoadBalance {
}
}
if (totalWeight > 0 && !sameWeight) {
- // If (not every invoker has the same weight & at least one invoker's weight>0), select randomly based on totalWeight.
+ // If (not every invoker has the same weight & at least one invoker's weight>0), select randomly based on
+ // totalWeight.
int offset = ThreadLocalRandom.current().nextInt(totalWeight);
// Return an invoker based on the random value.
if (length <= 4) {
@@ -92,7 +93,7 @@ public class RandomLoadBalance extends AbstractLoadBalance {
if (i < 0) {
i = -i - 1;
} else {
- while (weights[i+1] == offset) {
+ while (weights[i + 1] == offset) {
i++;
}
i++;
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/RoundRobinLoadBalance.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/RoundRobinLoadBalance.java
index 0ee6a82c5d..f60c0f61b9 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/RoundRobinLoadBalance.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/RoundRobinLoadBalance.java
@@ -37,7 +37,8 @@ public class RoundRobinLoadBalance extends AbstractLoadBalance {
private static final int RECYCLE_PERIOD = 60000;
- private final ConcurrentMap<String, ConcurrentMap<String, WeightedRoundRobin>> methodWeightMap = new ConcurrentHashMap<>();
+ private final ConcurrentMap<String, ConcurrentMap<String, WeightedRoundRobin>> methodWeightMap =
+ new ConcurrentHashMap<>();
protected static class WeightedRoundRobin {
private int weight;
@@ -91,7 +92,8 @@ public class RoundRobinLoadBalance extends AbstractLoadBalance {
@Override
protected <T> Invoker<T> doSelect(List<Invoker<T>> invokers, URL url, Invocation invocation) {
String key = invokers.get(0).getUrl().getServiceKey() + "." + RpcUtils.getMethodName(invocation);
- ConcurrentMap<String, WeightedRoundRobin> map = ConcurrentHashMapUtils.computeIfAbsent(methodWeightMap, key, k -> new ConcurrentHashMap<>());
+ ConcurrentMap<String, WeightedRoundRobin> map =
+ ConcurrentHashMapUtils.computeIfAbsent(methodWeightMap, key, k -> new ConcurrentHashMap<>());
int totalWeight = 0;
long maxCurrent = Long.MIN_VALUE;
long now = System.currentTimeMillis();
@@ -107,7 +109,7 @@ public class RoundRobinLoadBalance extends AbstractLoadBalance {
});
if (weight != weightedRoundRobin.getWeight()) {
- //weight changed
+ // weight changed
weightedRoundRobin.setWeight(weight);
}
long cur = weightedRoundRobin.increaseCurrent();
@@ -129,5 +131,4 @@ public class RoundRobinLoadBalance extends AbstractLoadBalance {
// should not happen here
return invokers.get(0);
}
-
}
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/ShortestResponseLoadBalance.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/ShortestResponseLoadBalance.java
index 1244e76147..09837a3197 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/ShortestResponseLoadBalance.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/ShortestResponseLoadBalance.java
@@ -59,9 +59,15 @@ public class ShortestResponseLoadBalance extends AbstractLoadBalance implements
@Override
public void setApplicationModel(ApplicationModel applicationModel) {
- slidePeriod = applicationModel.modelEnvironment().getConfiguration().getInt(Constants.SHORTEST_RESPONSE_SLIDE_PERIOD, 30_000);
- executorService = applicationModel.getFrameworkModel().getBeanFactory()
- .getBean(FrameworkExecutorRepository.class).getSharedExecutor();
+ slidePeriod = applicationModel
+ .modelEnvironment()
+ .getConfiguration()
+ .getInt(Constants.SHORTEST_RESPONSE_SLIDE_PERIOD, 30_000);
+ executorService = applicationModel
+ .getFrameworkModel()
+ .getBeanFactory()
+ .getBean(FrameworkExecutorRepository.class)
+ .getSharedExecutor();
}
protected static class SlideWindowData {
@@ -118,9 +124,11 @@ public class ShortestResponseLoadBalance extends AbstractLoadBalance implements
for (int i = 0; i < length; i++) {
Invoker<T> invoker = invokers.get(i);
RpcStatus rpcStatus = RpcStatus.getStatus(invoker.getUrl(), RpcUtils.getMethodName(invocation));
- SlideWindowData slideWindowData = ConcurrentHashMapUtils.computeIfAbsent(methodMap, rpcStatus, SlideWindowData::new);
+ SlideWindowData slideWindowData =
+ ConcurrentHashMapUtils.computeIfAbsent(methodMap, rpcStatus, SlideWindowData::new);
- // Calculate the estimated response time from the product of active connections and succeeded average elapsed time.
+ // Calculate the estimated response time from the product of active connections and succeeded average
+ // elapsed time.
long estimateResponse = slideWindowData.getEstimateResponse();
int afterWarmup = getWeight(invoker, invocation);
weights[i] = afterWarmup;
@@ -135,16 +143,15 @@ public class ShortestResponseLoadBalance extends AbstractLoadBalance implements
} else if (estimateResponse == shortestResponse) {
shortestIndexes[shortestCount++] = i;
totalWeight += afterWarmup;
- if (sameWeight && i > 0
- && afterWarmup != firstWeight) {
+ if (sameWeight && i > 0 && afterWarmup != firstWeight) {
sameWeight = false;
}
}
}
if (System.currentTimeMillis() - lastUpdateTime > slidePeriod
- && onResetSlideWindow.compareAndSet(false, true)) {
- //reset slideWindowData in async way
+ && onResetSlideWindow.compareAndSet(false, true)) {
+ // reset slideWindowData in async way
executorService.execute(() -> {
methodMap.values().forEach(SlideWindowData::reset);
lastUpdateTime = System.currentTimeMillis();
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/AbstractRouter.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/AbstractRouter.java
index d677843439..b38581264e 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/AbstractRouter.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/AbstractRouter.java
@@ -28,12 +28,13 @@ public abstract class AbstractRouter implements Router {
private GovernanceRuleRepository ruleRepository;
public AbstractRouter(URL url) {
- this.ruleRepository = url.getOrDefaultModuleModel().getExtensionLoader(GovernanceRuleRepository.class).getDefaultExtension();
+ this.ruleRepository = url.getOrDefaultModuleModel()
+ .getExtensionLoader(GovernanceRuleRepository.class)
+ .getDefaultExtension();
this.url = url;
}
- public AbstractRouter() {
- }
+ public AbstractRouter() {}
@Override
public URL getUrl() {
@@ -67,8 +68,7 @@ public abstract class AbstractRouter implements Router {
this.priority = priority;
}
- public GovernanceRuleRepository getRuleRepository(){
+ public GovernanceRuleRepository getRuleRepository() {
return this.ruleRepository;
}
-
}
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/RouterSnapshotFilter.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/RouterSnapshotFilter.java
index 93f47f800d..62b48dee09 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/RouterSnapshotFilter.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/RouterSnapshotFilter.java
@@ -34,7 +34,7 @@ import static org.apache.dubbo.common.constants.CommonConstants.CONSUMER;
public class RouterSnapshotFilter implements ClusterFilter, BaseFilter.Listener {
private final RouterSnapshotSwitcher switcher;
- private final static Logger logger = LoggerFactory.getLogger(RouterSnapshotFilter.class);
+ private static final Logger logger = LoggerFactory.getLogger(RouterSnapshotFilter.class);
public RouterSnapshotFilter(FrameworkModel frameworkModel) {
this.switcher = frameworkModel.getBeanFactory().getBean(RouterSnapshotSwitcher.class);
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/RouterSnapshotNode.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/RouterSnapshotNode.java
index b0a09759b6..faa57f0a40 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/RouterSnapshotNode.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/RouterSnapshotNode.java
@@ -114,43 +114,55 @@ public class RouterSnapshotNode<T> {
public String toString(int level) {
StringBuilder stringBuilder = new StringBuilder();
- stringBuilder.append("[ ")
- .append(name)
- .append(' ')
- .append("(Input: ").append(beforeSize).append(") ")
- .append("(Current Node Output: ").append(nodeOutputSize).append(") ")
- .append("(Chain Node Output: ").append(chainOutputSize).append(')')
- .append(routerMessage == null ? "" : " Router message: ")
- .append(routerMessage == null ? "" : routerMessage)
- .append(" ] ");
+ stringBuilder
+ .append("[ ")
+ .append(name)
+ .append(' ')
+ .append("(Input: ")
+ .append(beforeSize)
+ .append(") ")
+ .append("(Current Node Output: ")
+ .append(nodeOutputSize)
+ .append(") ")
+ .append("(Chain Node Output: ")
+ .append(chainOutputSize)
+ .append(')')
+ .append(routerMessage == null ? "" : " Router message: ")
+ .append(routerMessage == null ? "" : routerMessage)
+ .append(" ] ");
if (level == 1) {
- stringBuilder.append("Input: ")
- .append(CollectionUtils.isEmpty(inputInvokers) ? "Empty" :
- inputInvokers.subList(0, Math.min(5, inputInvokers.size()))
- .stream()
- .map(Invoker::getUrl)
- .map(URL::getAddress)
- .collect(Collectors.joining(",")))
- .append(" -> ");
-
- stringBuilder.append("Chain Node Output: ")
- .append(CollectionUtils.isEmpty(chainOutputInvokers) ? "Empty" :
- chainOutputInvokers.subList(0, Math.min(5, chainOutputInvokers.size()))
- .stream()
- .map(Invoker::getUrl)
- .map(URL::getAddress)
- .collect(Collectors.joining(",")));
+ stringBuilder
+ .append("Input: ")
+ .append(
+ CollectionUtils.isEmpty(inputInvokers)
+ ? "Empty"
+ : inputInvokers.subList(0, Math.min(5, inputInvokers.size())).stream()
+ .map(Invoker::getUrl)
+ .map(URL::getAddress)
+ .collect(Collectors.joining(",")))
+ .append(" -> ");
+
+ stringBuilder
+ .append("Chain Node Output: ")
+ .append(
+ CollectionUtils.isEmpty(chainOutputInvokers)
+ ? "Empty"
+ : chainOutputInvokers.subList(0, Math.min(5, chainOutputInvokers.size())).stream()
+ .map(Invoker::getUrl)
+ .map(URL::getAddress)
+ .collect(Collectors.joining(",")));
} else {
- stringBuilder.append("Current Node Output: ")
- .append(CollectionUtils.isEmpty(nodeOutputInvokers) ? "Empty" :
- nodeOutputInvokers.subList(0, Math.min(5, nodeOutputInvokers.size()))
- .stream()
- .map(Invoker::getUrl)
- .map(URL::getAddress)
- .collect(Collectors.joining(",")));
+ stringBuilder
+ .append("Current Node Output: ")
+ .append(
+ CollectionUtils.isEmpty(nodeOutputInvokers)
+ ? "Empty"
+ : nodeOutputInvokers.subList(0, Math.min(5, nodeOutputInvokers.size())).stream()
+ .map(Invoker::getUrl)
+ .map(URL::getAddress)
+ .collect(Collectors.joining(",")));
}
-
if (nodeOutputInvokers != null && nodeOutputInvokers.size() > 5) {
stringBuilder.append("...");
}
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/RouterSnapshotSwitcher.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/RouterSnapshotSwitcher.java
index 139a0bcee2..39bda00c27 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/RouterSnapshotSwitcher.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/RouterSnapshotSwitcher.java
@@ -26,7 +26,7 @@ public class RouterSnapshotSwitcher {
private volatile boolean enable;
private final Set<String> enabledService = new ConcurrentHashSet<>();
- private final static int MAX_LENGTH = 1 << 5; // 2 ^ 5 = 31
+ private static final int MAX_LENGTH = 1 << 5; // 2 ^ 5 = 31
private final AtomicInteger offset = new AtomicInteger(0);
private volatile String[] recentSnapshot = new String[MAX_LENGTH];
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/AddressMatch.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/AddressMatch.java
index b8fdc3b578..834a519496 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/AddressMatch.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/AddressMatch.java
@@ -62,7 +62,14 @@ public class AddressMatch {
try {
return input.equals(getCird()) || matchIpExpression(getCird(), input);
} catch (UnknownHostException e) {
- logger.error(CLUSTER_FAILED_EXEC_CONDITION_ROUTER, "Executing routing rule match expression error.", "", String.format("Error trying to match cird formatted address %s with input %s in AddressMatch.", getCird(), input), e);
+ logger.error(
+ CLUSTER_FAILED_EXEC_CONDITION_ROUTER,
+ "Executing routing rule match expression error.",
+ "",
+ String.format(
+ "Error trying to match cird formatted address %s with input %s in AddressMatch.",
+ getCird(), input),
+ e);
}
}
if (getWildcard() != null && input != null) {
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/BoolMatch.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/BoolMatch.java
index c9a6fab9e5..b185cf488e 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/BoolMatch.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/BoolMatch.java
@@ -14,10 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.dubbo.rpc.cluster.router.mesh.rule.virtualservice.match;
-
public class BoolMatch {
private Boolean exact;
@@ -29,8 +27,8 @@ public class BoolMatch {
this.exact = exact;
}
- public boolean isMatch(boolean input){
- if (exact != null){
+ public boolean isMatch(boolean input) {
+ if (exact != null) {
return input == exact;
}
return false;
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/DoubleMatch.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/DoubleMatch.java
index 55db3e232c..b3fd223b89 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/DoubleMatch.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/DoubleMatch.java
@@ -14,10 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.dubbo.rpc.cluster.router.mesh.rule.virtualservice.match;
-
public class DoubleMatch {
private Double exact;
private DoubleRangeMatch range;
@@ -47,7 +45,6 @@ public class DoubleMatch {
this.mod = mod;
}
-
public boolean isMatch(Double input) {
if (exact != null && mod == null) {
return input.equals(exact);
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/DoubleRangeMatch.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/DoubleRangeMatch.java
index ad4ea5633c..6deccf479a 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/DoubleRangeMatch.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/DoubleRangeMatch.java
@@ -14,10 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.dubbo.rpc.cluster.router.mesh.rule.virtualservice.match;
-
public class DoubleRangeMatch {
private Double start;
private Double end;
@@ -38,7 +36,6 @@ public class DoubleRangeMatch {
this.end = end;
}
-
public boolean isMatch(Double input) {
if (start != null && end != null) {
return input.compareTo(start) >= 0 && input.compareTo(end) < 0;
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/DubboMethodArg.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/DubboMethodArg.java
index d02cd0793b..3095e509df 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/DubboMethodArg.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/DubboMethodArg.java
@@ -14,10 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.dubbo.rpc.cluster.router.mesh.rule.virtualservice.match;
-
public class DubboMethodArg {
private int index;
private String type;
@@ -79,12 +77,11 @@ public class DubboMethodArg {
@Override
public String toString() {
- return "DubboMethodArg{" +
- "index=" + index +
- ", type='" + type + '\'' +
- ", str_value=" + str_value +
- ", num_value=" + num_value +
- ", bool_value=" + bool_value +
- '}';
+ return "DubboMethodArg{" + "index="
+ + index + ", type='"
+ + type + '\'' + ", str_value="
+ + str_value + ", num_value="
+ + num_value + ", bool_value="
+ + bool_value + '}';
}
}
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/DubboMethodMatch.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/DubboMethodMatch.java
index f252410478..e724e9f10c 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/DubboMethodMatch.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/DubboMethodMatch.java
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.dubbo.rpc.cluster.router.mesh.rule.virtualservice.match;
import org.apache.dubbo.rpc.Invocation;
@@ -23,7 +22,6 @@ import org.apache.dubbo.rpc.support.RpcUtils;
import java.util.List;
import java.util.Map;
-
public class DubboMethodMatch {
private StringMatch name_match;
private Integer argc;
@@ -73,13 +71,12 @@ public class DubboMethodMatch {
@Override
public String toString() {
- return "DubboMethodMatch{" +
- "name_match=" + name_match +
- ", argc=" + argc +
- ", args=" + args +
- ", argp=" + argp +
- ", headers=" + headers +
- '}';
+ return "DubboMethodMatch{" + "name_match="
+ + name_match + ", argc="
+ + argc + ", args="
+ + args + ", argp="
+ + argp + ", headers="
+ + headers + '}';
}
public boolean isMatch(Invocation invocation) {
@@ -90,8 +87,8 @@ public class DubboMethodMatch {
Integer argc = getArgc();
Object[] arguments = invocation.getArguments();
- if (argc != null &&
- ((argc != 0 && (arguments == null || arguments.length == 0)) || (argc != arguments.length))) {
+ if (argc != null
+ && ((argc != 0 && (arguments == null || arguments.length == 0)) || (argc != arguments.length))) {
return false;
}
@@ -107,7 +104,7 @@ public class DubboMethodMatch {
for (int index = 0; index < argp.size(); index++) {
boolean match = argp.get(index).isMatch(parameterTypes[index].getName())
- || argp.get(index).isMatch(parameterTypes[index].getSimpleName());
+ || argp.get(index).isMatch(parameterTypes[index].getSimpleName());
if (!match) {
return false;
}
@@ -134,4 +131,3 @@ public class DubboMethodMatch {
return true;
}
}
-
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/ListBoolMatch.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/ListBoolMatch.java
index 570a5e8551..940d9a8b1f 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/ListBoolMatch.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/ListBoolMatch.java
@@ -14,10 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.dubbo.rpc.cluster.router.mesh.rule.virtualservice.match;
-
import java.util.List;
public class ListBoolMatch {
@@ -41,4 +39,3 @@ public class ListBoolMatch {
return false;
}
}
-
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/ListDoubleMatch.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/ListDoubleMatch.java
index 0a19334ecc..d1599521d9 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/ListDoubleMatch.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/ListDoubleMatch.java
@@ -14,12 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.dubbo.rpc.cluster.router.mesh.rule.virtualservice.match;
import java.util.List;
-
public class ListDoubleMatch {
private List<DoubleMatch> oneof;
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/ListStringMatch.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/ListStringMatch.java
index 0fce727503..4c555780e6 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/ListStringMatch.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/ListStringMatch.java
@@ -14,12 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.dubbo.rpc.cluster.router.mesh.rule.virtualservice.match;
import java.util.List;
-
public class ListStringMatch {
private List<StringMatch> oneof;
@@ -31,7 +29,6 @@ public class ListStringMatch {
this.oneof = oneof;
}
-
public boolean isMatch(String input) {
for (StringMatch stringMatch : oneof) {
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/StringMatch.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/StringMatch.java
index dda2de7df3..3a2a85b5fd 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/StringMatch.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/StringMatch.java
@@ -14,10 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.dubbo.rpc.cluster.router.mesh.rule.virtualservice.match;
-
import static org.apache.dubbo.common.constants.CommonConstants.ANY_VALUE;
public class StringMatch {
@@ -28,7 +26,6 @@ public class StringMatch {
private String empty;
private String wildcard;
-
public String getExact() {
return exact;
}
@@ -98,12 +95,11 @@ public class StringMatch {
@Override
public String toString() {
- return "StringMatch{" +
- "exact='" + exact + '\'' +
- ", prefix='" + prefix + '\'' +
- ", regex='" + regex + '\'' +
- ", noempty='" + noempty + '\'' +
- ", empty='" + empty + '\'' +
- '}';
+ return "StringMatch{" + "exact='"
+ + exact + '\'' + ", prefix='"
+ + prefix + '\'' + ", regex='"
+ + regex + '\'' + ", noempty='"
+ + noempty + '\'' + ", empty='"
+ + empty + '\'' + '}';
}
}
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/state/AbstractStateRouter.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/state/AbstractStateRouter.java
index 2b25ed5564..f3f1bd208a 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/state/AbstractStateRouter.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/state/AbstractStateRouter.java
@@ -47,9 +47,11 @@ public abstract class AbstractStateRouter<T> implements StateRouter<T> {
public AbstractStateRouter(URL url) {
moduleModel = url.getOrDefaultModuleModel();
- this.ruleRepository = moduleModel.getExtensionLoader(GovernanceRuleRepository.class).getDefaultExtension();
+ this.ruleRepository =
+ moduleModel.getExtensionLoader(GovernanceRuleRepository.class).getDefaultExtension();
this.url = url;
- this.shouldFailFast = Boolean.parseBoolean(ConfigurationUtils.getProperty(moduleModel, Constants.SHOULD_FAIL_FAST_KEY, "true"));
+ this.shouldFailFast = Boolean.parseBoolean(
+ ConfigurationUtils.getProperty(moduleModel, Constants.SHOULD_FAIL_FAST_KEY, "true"));
}
@Override
@@ -89,7 +91,13 @@ public abstract class AbstractStateRouter<T> implements StateRouter<T> {
}
@Override
- public final BitList<Invoker<T>> route(BitList<Invoker<T>> invokers, URL url, Invocation invocation, boolean needToPrintMessage, Holder<RouterSnapshotNode<T>> nodeHolder) throws RpcException {
+ public final BitList<Invoker<T>> route(
+ BitList<Invoker<T>> invokers,
+ URL url,
+ Invocation invocation,
+ boolean needToPrintMessage,
+ Holder<RouterSnapshotNode<T>> nodeHolder)
+ throws RpcException {
if (needToPrintMessage && (nodeHolder == null || nodeHolder.get() == null)) {
needToPrintMessage = false;
}
@@ -151,17 +159,26 @@ public abstract class AbstractStateRouter<T> implements StateRouter<T> {
* @param messageHolder message holder when router should current router print message
* @return routed result
*/
- protected abstract BitList<Invoker<T>> doRoute(BitList<Invoker<T>> invokers, URL url, Invocation invocation,
- boolean needToPrintMessage, Holder<RouterSnapshotNode<T>> nodeHolder,
- Holder<String> messageHolder) throws RpcException;
+ protected abstract BitList<Invoker<T>> doRoute(
+ BitList<Invoker<T>> invokers,
+ URL url,
+ Invocation invocation,
+ boolean needToPrintMessage,
+ Holder<RouterSnapshotNode<T>> nodeHolder,
+ Holder<String> messageHolder)
+ throws RpcException;
/**
* Call next router to get result
*
* @param invokers current router filtered invokers
*/
- protected final BitList<Invoker<T>> continueRoute(BitList<Invoker<T>> invokers, URL url, Invocation invocation,
- boolean needToPrintMessage, Holder<RouterSnapshotNode<T>> nodeHolder) {
+ protected final BitList<Invoker<T>> continueRoute(
+ BitList<Invoker<T>> invokers,
+ URL url,
+ Invocation invocation,
+ boolean needToPrintMessage,
+ Holder<RouterSnapshotNode<T>> nodeHolder) {
if (nextRouter != null) {
return nextRouter.route(invokers, url, invocation, needToPrintMessage, nodeHolder);
} else {
@@ -192,9 +209,7 @@ public abstract class AbstractStateRouter<T> implements StateRouter<T> {
@Override
public final String buildSnapshot() {
- return doBuildSnapshot() +
- " v \n" +
- nextRouter.buildSnapshot();
+ return doBuildSnapshot() + " v \n" + nextRouter.buildSnapshot();
}
protected String doBuildSnapshot() {
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/state/BitList.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/state/BitList.java
index b3fda63948..2c04539b07 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/state/BitList.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/state/BitList.java
@@ -55,7 +55,7 @@ import java.util.concurrent.ThreadLocalRandom;
public class BitList<E> extends AbstractList<E> implements Cloneable {
private final BitSet rootSet;
private volatile List<E> originList;
- private final static BitList emptyList = new BitList(Collections.emptyList());
+ private static final BitList emptyList = new BitList(Collections.emptyList());
private volatile List<E> tailList = null;
public BitList(List<E> originList) {
@@ -367,7 +367,8 @@ public class BitList<E> extends AbstractList<E> implements Cloneable {
copiedTailList = null;
resultSet.set(toIndex, resultSet.length(), false);
} else {
- copiedTailList = copiedTailList == null ? null : copiedTailList.subList(0, toIndex - rootSet.cardinality());
+ copiedTailList =
+ copiedTailList == null ? null : copiedTailList.subList(0, toIndex - rootSet.cardinality());
}
}
if (fromIndex > 0) {
@@ -375,7 +376,9 @@ public class BitList<E> extends AbstractList<E> implements Cloneable {
resultSet.set(0, fromIndex, false);
} else {
resultSet.clear();
- copiedTailList = copiedTailList == null ? null : copiedTailList.subList(fromIndex - rootSet.cardinality(), copiedTailList.size());
+ copiedTailList = copiedTailList == null
+ ? null
+ : copiedTailList.subList(fromIndex - rootSet.cardinality(), copiedTailList.size());
}
}
return new BitList<>(originList, resultSet, copiedTailList);
@@ -551,6 +554,7 @@ public class BitList<E> extends AbstractList<E> implements Cloneable {
@Override
public BitList<E> clone() {
- return new BitList<>(originList, (BitSet) rootSet.clone(), tailList == null ? null : new LinkedList<>(tailList));
+ return new BitList<>(
+ originList, (BitSet) rootSet.clone(), tailList == null ? null : new LinkedList<>(tailList));
}
}
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/state/CacheableStateRouterFactory.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/state/CacheableStateRouterFactory.java
index 91d28bbbbc..3447fc79f7 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/state/CacheableStateRouterFactory.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/state/CacheableStateRouterFactory.java
@@ -32,7 +32,8 @@ public abstract class CacheableStateRouterFactory implements StateRouterFactory
@Override
public <T> StateRouter<T> getRouter(Class<T> interfaceClass, URL url) {
- return ConcurrentHashMapUtils.computeIfAbsent(routerMap, url.getServiceKey(), k -> createRouter(interfaceClass, url));
+ return ConcurrentHashMapUtils.computeIfAbsent(
+ routerMap, url.getServiceKey(), k -> createRouter(interfaceClass, url));
}
protected abstract <T> StateRouter<T> createRouter(Class<T> interfaceClass, URL url);
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/state/RouterGroupingState.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/state/RouterGroupingState.java
index fed028b7e2..8eabe70160 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/state/RouterGroupingState.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/state/RouterGroupingState.java
@@ -48,29 +48,32 @@ public class RouterGroupingState<T> {
@Override
public String toString() {
StringBuilder stringBuilder = new StringBuilder();
- stringBuilder.append(routerName)
- .append(' ')
- .append(" Total: ")
- .append(total)
- .append("\n");
+ stringBuilder
+ .append(routerName)
+ .append(' ')
+ .append(" Total: ")
+ .append(total)
+ .append("\n");
for (Map.Entry<String, BitList<Invoker<T>>> entry : grouping.entrySet()) {
BitList<Invoker<T>> invokers = entry.getValue();
- stringBuilder.append("[ ")
- .append(entry.getKey())
- .append(" -> ")
- .append(invokers.isEmpty() ?
- "Empty" :
- invokers.stream()
- .limit(5)
- .map(Invoker::getUrl)
- .map(URL::getAddress)
- .collect(Collectors.joining(",")))
- .append(invokers.size() > 5 ? "..." : "")
- .append(" (Total: ")
- .append(invokers.size())
- .append(") ]")
- .append("\n");
+ stringBuilder
+ .append("[ ")
+ .append(entry.getKey())
+ .append(" -> ")
+ .append(
+ invokers.isEmpty()
+ ? "Empty"
+ : invokers.stream()
+ .limit(5)
+ .map(Invoker::getUrl)
+ .map(URL::getAddress)
+ .collect(Collectors.joining(",")))
+ .append(invokers.size() > 5 ? "..." : "")
+ .append(" (Total: ")
+ .append(invokers.size())
+ .append(") ]")
+ .append("\n");
}
return stringBuilder.toString();
}
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/state/StateRouter.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/state/StateRouter.java
index 94d82fd405..ccfa60c5de 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/state/StateRouter.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/state/StateRouter.java
@@ -55,8 +55,13 @@ public interface StateRouter<T> {
* @return state with route result
* @since 3.0
*/
- BitList<Invoker<T>> route(BitList<Invoker<T>> invokers, URL url, Invocation invocation,
- boolean needToPrintMessage, Holder<RouterSnapshotNode<T>> nodeHolder) throws RpcException;
+ BitList<Invoker<T>> route(
+ BitList<Invoker<T>> invokers,
+ URL url,
+ Invocation invocation,
+ boolean needToPrintMessage,
+ Holder<RouterSnapshotNode<T>> nodeHolder)
+ throws RpcException;
/**
* To decide whether this router need to execute every time an RPC comes or should only execute when addresses or
@@ -92,7 +97,7 @@ public interface StateRouter<T> {
String buildSnapshot();
default void stop() {
- //do nothing by default
+ // do nothing by default
}
/**
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/state/TailStateRouter.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/state/TailStateRouter.java
index 8a0780c763..e5b4a999ee 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/state/TailStateRouter.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/state/TailStateRouter.java
@@ -31,14 +31,10 @@ public class TailStateRouter<T> implements StateRouter<T> {
return INSTANCE;
}
- private TailStateRouter() {
-
- }
+ private TailStateRouter() {}
@Override
- public void setNextRouter(StateRouter<T> nextRouter) {
-
- }
+ public void setNextRouter(StateRouter<T> nextRouter) {}
@Override
public URL getUrl() {
@@ -46,7 +42,13 @@ public class TailStateRouter<T> implements StateRouter<T> {
}
@Override
- public BitList<Invoker<T>> route(BitList<Invoker<T>> invokers, URL url, Invocation invocation, boolean needToPrintMessage, Holder<RouterSnapshotNode<T>> nodeHolder) throws RpcException {
+ public BitList<Invoker<T>> route(
+ BitList<Invoker<T>> invokers,
+ URL url,
+ Invocation invocation,
+ boolean needToPrintMessage,
+ Holder<RouterSnapshotNode<T>> nodeHolder)
+ throws RpcException {
return invokers;
}
@@ -61,9 +63,7 @@ public class TailStateRouter<T> implements StateRouter<T> {
}
@Override
- public void notify(BitList<Invoker<T>> invokers) {
-
- }
+ public void notify(BitList<Invoker<T>> invokers) {}
@Override
public String buildSnapshot() {
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/AbstractClusterInvoker.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/AbstractClusterInvoker.java
index 745e602f1f..4411eae7a9 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/AbstractClusterInvoker.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/AbstractClusterInvoker.java
@@ -61,7 +61,8 @@ import static org.apache.dubbo.rpc.cluster.Constants.DEFAULT_CLUSTER_STICKY;
*/
public abstract class AbstractClusterInvoker<T> implements ClusterInvoker<T> {
- private static final ErrorTypeAwareLogger logger = LoggerFactory.getErrorTypeAwareLogger(AbstractClusterInvoker.class);
+ private static final ErrorTypeAwareLogger logger =
+ LoggerFactory.getErrorTypeAwareLogger(AbstractClusterInvoker.class);
protected Directory<T> directory;
@@ -75,8 +76,7 @@ public abstract class AbstractClusterInvoker<T> implements ClusterInvoker<T> {
private volatile Invoker<T> stickyInvoker = null;
- public AbstractClusterInvoker() {
- }
+ public AbstractClusterInvoker() {}
public AbstractClusterInvoker(Directory<T> directory) {
this(directory, directory.getUrl());
@@ -88,7 +88,7 @@ public abstract class AbstractClusterInvoker<T> implements ClusterInvoker<T> {
}
this.directory = directory;
- //sticky: invoker.isAvailable() should always be checked before using when availablecheck is true.
+ // sticky: invoker.isAvailable() should always be checked before using when availablecheck is true.
this.availableCheck = url.getParameter(CLUSTER_AVAILABLE_CHECK_KEY, DEFAULT_CLUSTER_AVAILABLE_CHECK);
Configuration configuration = ConfigurationUtils.getGlobalConfiguration(url.getOrDefaultModuleModel());
this.reselectCount = configuration.getInt(RESELECT_COUNT, DEFAULT_RESELECT_COUNT);
@@ -152,22 +152,23 @@ public abstract class AbstractClusterInvoker<T> implements ClusterInvoker<T> {
* @return the invoker which will final to do invoke.
* @throws RpcException exception
*/
- protected Invoker<T> select(LoadBalance loadbalance, Invocation invocation,
- List<Invoker<T>> invokers, List<Invoker<T>> selected) throws RpcException {
+ protected Invoker<T> select(
+ LoadBalance loadbalance, Invocation invocation, List<Invoker<T>> invokers, List<Invoker<T>> selected)
+ throws RpcException {
if (CollectionUtils.isEmpty(invokers)) {
return null;
}
String methodName = invocation == null ? StringUtils.EMPTY_STRING : RpcUtils.getMethodName(invocation);
- boolean sticky = invokers.get(0).getUrl()
- .getMethodParameter(methodName, CLUSTER_STICKY_KEY, DEFAULT_CLUSTER_STICKY);
+ boolean sticky =
+ invokers.get(0).getUrl().getMethodParameter(methodName, CLUSTER_STICKY_KEY, DEFAULT_CLUSTER_STICKY);
- //ignore overloaded method
+ // ignore overloaded method
if (stickyInvoker != null && !invokers.contains(stickyInvoker)) {
stickyInvoker = null;
}
- //ignore concurrency problem
+ // ignore concurrency problem
if (sticky && stickyInvoker != null && (selected == null || !selected.contains(stickyInvoker))) {
if (availableCheck && stickyInvoker.isAvailable()) {
return stickyInvoker;
@@ -183,8 +184,9 @@ public abstract class AbstractClusterInvoker<T> implements ClusterInvoker<T> {
return invoker;
}
- private Invoker<T> doSelect(LoadBalance loadbalance, Invocation invocation,
- List<Invoker<T>> invokers, List<Invoker<T>> selected) throws RpcException {
+ private Invoker<T> doSelect(
+ LoadBalance loadbalance, Invocation invocation, List<Invoker<T>> invokers, List<Invoker<T>> selected)
+ throws RpcException {
if (CollectionUtils.isEmpty(invokers)) {
return null;
@@ -196,7 +198,7 @@ public abstract class AbstractClusterInvoker<T> implements ClusterInvoker<T> {
}
Invoker<T> invoker = loadbalance.select(invokers, getUrl(), invocation);
- //If the `invoker` is in the `selected` or invoker is unavailable && availablecheck is true, reselect.
+ // If the `invoker` is in the `selected` or invoker is unavailable && availablecheck is true, reselect.
boolean isSelected = selected != null && selected.contains(invoker);
boolean isUnavailable = availableCheck && !invoker.isAvailable() && getUrl() != null;
@@ -209,17 +211,28 @@ public abstract class AbstractClusterInvoker<T> implements ClusterInvoker<T> {
if (rInvoker != null) {
invoker = rInvoker;
} else {
- //Check the index of current selected invoker, if it's not the last one, choose the one at index+1.
+ // Check the index of current selected invoker, if it's not the last one, choose the one at index+1.
int index = invokers.indexOf(invoker);
try {
- //Avoid collision
+ // Avoid collision
invoker = invokers.get((index + 1) % invokers.size());
} catch (Exception e) {
- logger.warn(CLUSTER_FAILED_RESELECT_INVOKERS,"select invokers exception","",e.getMessage() + " may because invokers list dynamic change, ignore.",e);
+ logger.warn(
+ CLUSTER_FAILED_RESELECT_INVOKERS,
+ "select invokers exception",
+ "",
+ e.getMessage() + " may because invokers list dynamic change, ignore.",
+ e);
}
}
} catch (Throwable t) {
- logger.error(CLUSTER_FAILED_RESELECT_INVOKERS,"failed to reselect invokers","","cluster reselect fail reason is :" + t.getMessage() + " if can not solve, you can set cluster.availablecheck=false in url",t);
+ logger.error(
+ CLUSTER_FAILED_RESELECT_INVOKERS,
+ "failed to reselect invokers",
+ "",
+ "cluster reselect fail reason is :" + t.getMessage()
+ + " if can not solve, you can set cluster.availablecheck=false in url",
+ t);
}
}
@@ -238,8 +251,13 @@ public abstract class AbstractClusterInvoker<T> implements ClusterInvoker<T> {
* @return the reselect result to do invoke
* @throws RpcException exception
*/
- private Invoker<T> reselect(LoadBalance loadbalance, Invocation invocation,
- List<Invoker<T>> invokers, List<Invoker<T>> selected, boolean availableCheck) throws RpcException {
+ private Invoker<T> reselect(
+ LoadBalance loadbalance,
+ Invocation invocation,
+ List<Invoker<T>> invokers,
+ List<Invoker<T>> selected,
+ boolean availableCheck)
+ throws RpcException {
// Allocating one in advance, this list is certain to be used.
List<Invoker<T>> reselectInvokers = new ArrayList<>(Math.min(invokers.size(), reselectCount));
@@ -247,9 +265,12 @@ public abstract class AbstractClusterInvoker<T> implements ClusterInvoker<T> {
// 1. Try picking some invokers not in `selected`.
// 1.1. If all selectable invokers' size is smaller than reselectCount, just add all
// 1.2. If all selectable invokers' size is greater than reselectCount, randomly select reselectCount.
- // The result size of invokers might smaller than reselectCount due to disAvailable or de-duplication (might be zero).
- // This means there is probable that reselectInvokers is empty however all invoker list may contain available invokers.
- // Use reselectCount can reduce retry times if invokers' size is huge, which may lead to long time hang up.
+ // The result size of invokers might smaller than reselectCount due to disAvailable or de-duplication
+ // (might be zero).
+ // This means there is probable that reselectInvokers is empty however all invoker list may contain
+ // available invokers.
+ // Use reselectCount can reduce retry times if invokers' size is huge, which may lead to long time
+ // hang up.
if (reselectCount >= invokers.size()) {
for (Invoker<T> invoker : invokers) {
// check if available
@@ -290,7 +311,7 @@ public abstract class AbstractClusterInvoker<T> implements ClusterInvoker<T> {
if (selected != null) {
for (Invoker<T> invoker : selected) {
if ((invoker.isAvailable()) // available first
- && !reselectInvokers.contains(invoker)) {
+ && !reselectInvokers.contains(invoker)) {
reselectInvokers.add(invoker);
}
}
@@ -325,10 +346,10 @@ public abstract class AbstractClusterInvoker<T> implements ClusterInvoker<T> {
checkWhetherDestroyed();
// binding attachments into invocation.
-// Map<String, Object> contextAttachments = RpcContext.getClientAttachment().getObjectAttachments();
-// if (contextAttachments != null && contextAttachments.size() != 0) {
-// ((RpcInvocation) invocation).addObjectAttachmentsIfAbsent(contextAttachments);
-// }
+ // Map<String, Object> contextAttachments = RpcContext.getClientAttachment().getObjectAttachments();
+ // if (contextAttachments != null && contextAttachments.size() != 0) {
+ // ((RpcInvocation) invocation).addObjectAttachmentsIfAbsent(contextAttachments);
+ // }
InvocationProfilerUtils.enterDetailProfiler(invocation, () -> "Router route.");
List<Invoker<T>> invokers = list(invocation);
@@ -339,7 +360,8 @@ public abstract class AbstractClusterInvoker<T> implements ClusterInvoker<T> {
LoadBalance loadbalance = initLoadBalance(invokers, invocation);
RpcUtils.attachInvocationIdIfAsync(getUrl(), invocation);
- InvocationProfilerUtils.enterDetailProfiler(invocation, () -> "Cluster " + this.getClass().getName() + " invoke.");
+ InvocationProfilerUtils.enterDetailProfiler(
+ invocation, () -> "Cluster " + this.getClass().getName() + " invoke.");
try {
return doInvoke(invocation, invokers, loadbalance);
} finally {
@@ -349,9 +371,10 @@ public abstract class AbstractClusterInvoker<T> implements ClusterInvoker<T> {
protected void checkWhetherDestroyed() {
if (destroyed.get()) {
- throw new RpcException("Rpc cluster invoker for " + getInterface() + " on consumer " + NetUtils.getLocalHost()
- + " use dubbo version " + Version.getVersion()
- + " is now destroyed! Can not invoke any more.");
+ throw new RpcException(
+ "Rpc cluster invoker for " + getInterface() + " on consumer " + NetUtils.getLocalHost()
+ + " use dubbo version " + Version.getVersion()
+ + " is now destroyed! Can not invoke any more.");
}
}
@@ -362,13 +385,17 @@ public abstract class AbstractClusterInvoker<T> implements ClusterInvoker<T> {
protected void checkInvokers(List<Invoker<T>> invokers, Invocation invocation) {
if (CollectionUtils.isEmpty(invokers)) {
- throw new RpcException(RpcException.NO_INVOKER_AVAILABLE_AFTER_FILTER, "Failed to invoke the method "
- + RpcUtils.getMethodName(invocation) + " in the service " + getInterface().getName()
- + ". No provider available for the service " + getDirectory().getConsumerUrl().getServiceKey()
- + " from registry " + getDirectory()
- + " on the consumer " + NetUtils.getLocalHost()
- + " using the dubbo version " + Version.getVersion()
- + ". Please check if the providers have been started and registered.");
+ throw new RpcException(
+ RpcException.NO_INVOKER_AVAILABLE_AFTER_FILTER,
+ "Failed to invoke the method "
+ + RpcUtils.getMethodName(invocation) + " in the service "
+ + getInterface().getName()
+ + ". No provider available for the service "
+ + getDirectory().getConsumerUrl().getServiceKey()
+ + " from registry " + getDirectory()
+ + " on the consumer " + NetUtils.getLocalHost()
+ + " using the dubbo version " + Version.getVersion()
+ + ". Please check if the providers have been started and registered.");
}
}
@@ -377,7 +404,9 @@ public abstract class AbstractClusterInvoker<T> implements ClusterInvoker<T> {
Result result;
try {
if (ProfilerSwitch.isEnableSimpleProfiler()) {
- InvocationProfilerUtils.enterProfiler(invocation, "Invoker invoke. Target Address: " + invoker.getUrl().getAddress());
+ InvocationProfilerUtils.enterProfiler(
+ invocation,
+ "Invoker invoke. Target Address: " + invoker.getUrl().getAddress());
}
setRemote(invoker, invocation);
result = invoker.invoke(invocation);
@@ -416,8 +445,8 @@ public abstract class AbstractClusterInvoker<T> implements ClusterInvoker<T> {
return result;
}
- protected abstract Result doInvoke(Invocation invocation, List<Invoker<T>> invokers,
- LoadBalance loadbalance) throws RpcException;
+ protected abstract Result doInvoke(Invocation invocation, List<Invoker<T>> invokers, LoadBalance loadbalance)
+ throws RpcException;
protected List<Invoker<T>> list(Invocation invocation) throws RpcException {
return getDirectory().list(invocation);
@@ -437,17 +466,17 @@ public abstract class AbstractClusterInvoker<T> implements ClusterInvoker<T> {
protected LoadBalance initLoadBalance(List<Invoker<T>> invokers, Invocation invocation) {
ApplicationModel applicationModel = ScopeModelUtil.getApplicationModel(invocation.getModuleModel());
if (CollectionUtils.isNotEmpty(invokers)) {
- return applicationModel.getExtensionLoader(LoadBalance.class).getExtension(
- invokers.get(0).getUrl().getMethodParameter(
- RpcUtils.getMethodName(invocation), LOADBALANCE_KEY, DEFAULT_LOADBALANCE
- )
- );
+ return applicationModel
+ .getExtensionLoader(LoadBalance.class)
+ .getExtension(invokers.get(0)
+ .getUrl()
+ .getMethodParameter(
+ RpcUtils.getMethodName(invocation), LOADBALANCE_KEY, DEFAULT_LOADBALANCE));
} else {
return applicationModel.getExtensionLoader(LoadBalance.class).getExtension(DEFAULT_LOADBALANCE);
}
}
-
private Invoker<T> setContext(Invoker<T> invoker) {
return setContext(invoker, null);
}
@@ -456,7 +485,10 @@ public abstract class AbstractClusterInvoker<T> implements ClusterInvoker<T> {
RpcServiceContext context = RpcContext.getServiceContext();
Invoker<?> originInvoker = context.getInvoker();
context.setInvoker(invoker)
- .setConsumerUrl(null != consumerUrl ? consumerUrl : RpcContext.getServiceContext().getConsumerUrl());
+ .setConsumerUrl(
+ null != consumerUrl
+ ? consumerUrl
+ : RpcContext.getServiceContext().getConsumerUrl());
return (Invoker<T>) originInvoker;
}
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/AvailableClusterInvoker.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/AvailableClusterInvoker.java
index cf71aa2370..184332680d 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/AvailableClusterInvoker.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/AvailableClusterInvoker.java
@@ -36,7 +36,8 @@ public class AvailableClusterInvoker<T> extends AbstractClusterInvoker<T> {
}
@Override
- public Result doInvoke(Invocation invocation, List<Invoker<T>> invokers, LoadBalance loadbalance) throws RpcException {
+ public Result doInvoke(Invocation invocation, List<Invoker<T>> invokers, LoadBalance loadbalance)
+ throws RpcException {
for (Invoker<T> invoker : invokers) {
if (invoker.isAvailable()) {
return invokeWithContext(invoker, invocation);
@@ -44,5 +45,4 @@ public class AvailableClusterInvoker<T> extends AbstractClusterInvoker<T> {
}
throw new RpcException("No provider available in " + invokers);
}
-
}
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/BroadcastCluster.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/BroadcastCluster.java
index c9798de61a..9c4137dadb 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/BroadcastCluster.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/BroadcastCluster.java
@@ -30,5 +30,4 @@ public class BroadcastCluster extends AbstractCluster {
public <T> AbstractClusterInvoker<T> doJoin(Directory<T> directory) throws RpcException {
return new BroadcastClusterInvoker<>(directory);
}
-
}
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/BroadcastClusterInvoker.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/BroadcastClusterInvoker.java
index bdf8f6f02e..83141fefb9 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/BroadcastClusterInvoker.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/BroadcastClusterInvoker.java
@@ -39,7 +39,8 @@ import static org.apache.dubbo.common.constants.LoggerCodeConstants.CLUSTER_ERRO
*/
public class BroadcastClusterInvoker<T> extends AbstractClusterInvoker<T> {
- private static final ErrorTypeAwareLogger logger = LoggerFactory.getErrorTypeAwareLogger(BroadcastClusterInvoker.class);
+ private static final ErrorTypeAwareLogger logger =
+ LoggerFactory.getErrorTypeAwareLogger(BroadcastClusterInvoker.class);
private static final String BROADCAST_FAIL_PERCENT_KEY = "broadcast.fail.percent";
private static final int MAX_BROADCAST_FAIL_PERCENT = 100;
private static final int MIN_BROADCAST_FAIL_PERCENT = 0;
@@ -50,19 +51,23 @@ public class BroadcastClusterInvoker<T> extends AbstractClusterInvoker<T> {
@Override
@SuppressWarnings({"unchecked", "rawtypes"})
- public Result doInvoke(final Invocation invocation, List<Invoker<T>> invokers, LoadBalance loadbalance) throws RpcException {
+ public Result doInvoke(final Invocation invocation, List<Invoker<T>> invokers, LoadBalance loadbalance)
+ throws RpcException {
RpcContext.getServiceContext().setInvokers((List) invokers);
RpcException exception = null;
Result result = null;
URL url = getUrl();
// The value range of broadcast.fail.threshold must be 0~100.
- // 100 means that an exception will be thrown last, and 0 means that as long as an exception occurs, it will be thrown.
+ // 100 means that an exception will be thrown last, and 0 means that as long as an exception occurs, it will be
+ // thrown.
// see https://github.com/apache/dubbo/pull/7174
int broadcastFailPercent = url.getParameter(BROADCAST_FAIL_PERCENT_KEY, MAX_BROADCAST_FAIL_PERCENT);
if (broadcastFailPercent < MIN_BROADCAST_FAIL_PERCENT || broadcastFailPercent > MAX_BROADCAST_FAIL_PERCENT) {
- logger.info(String.format("The value corresponding to the broadcast.fail.percent parameter must be between 0 and 100. " +
- "The current setting is %s, which is reset to 100.", broadcastFailPercent));
+ logger.info(String.format(
+ "The value corresponding to the broadcast.fail.percent parameter must be between 0 and 100. "
+ + "The current setting is %s, which is reset to 100.",
+ broadcastFailPercent));
broadcastFailPercent = MAX_BROADCAST_FAIL_PERCENT;
}
@@ -72,17 +77,29 @@ public class BroadcastClusterInvoker<T> extends AbstractClusterInvoker<T> {
Invoker<T> invoker = invokers.get(i);
RpcContext.RestoreContext restoreContext = new RpcContext.RestoreContext();
try {
- RpcInvocation subInvocation = new RpcInvocation(invocation.getTargetServiceUniqueName(),
- invocation.getServiceModel(), invocation.getMethodName(), invocation.getServiceName(), invocation.getProtocolServiceKey(),
- invocation.getParameterTypes(), invocation.getArguments(), invocation.copyObjectAttachments(),
- invocation.getInvoker(), Collections.synchronizedMap(new HashMap<>(invocation.getAttributes())),
- invocation instanceof RpcInvocation ? ((RpcInvocation) invocation).getInvokeMode() : null);
+ RpcInvocation subInvocation = new RpcInvocation(
+ invocation.getTargetServiceUniqueName(),
+ invocation.getServiceModel(),
+ invocation.getMethodName(),
+ invocation.getServiceName(),
+ invocation.getProtocolServiceKey(),
+ invocation.getParameterTypes(),
+ invocation.getArguments(),
+ invocation.copyObjectAttachments(),
+ invocation.getInvoker(),
+ Collections.synchronizedMap(new HashMap<>(invocation.getAttributes())),
+ invocation instanceof RpcInvocation ? ((RpcInvocation) invocation).getInvokeMode() : null);
result = invokeWithContext(invoker, subInvocation);
if (null != result && result.hasException()) {
Throwable resultException = result.getException();
if (null != resultException) {
exception = getRpcException(result.getException());
- logger.warn(CLUSTER_ERROR_RESPONSE,"provider return error response","",exception.getMessage(),exception);
+ logger.warn(
+ CLUSTER_ERROR_RESPONSE,
+ "provider return error response",
+ "",
+ exception.getMessage(),
+ exception);
failIndex++;
if (failIndex == failThresholdIndex) {
break;
@@ -91,7 +108,12 @@ public class BroadcastClusterInvoker<T> extends AbstractClusterInvoker<T> {
}
} catch (Throwable e) {
exception = getRpcException(e);
- logger.warn(CLUSTER_ERROR_RESPONSE,"provider return error response","",exception.getMessage(),exception);
+ logger.warn(
+ CLUSTER_ERROR_RESPONSE,
+ "provider return error response",
+ "",
+ exception.getMessage(),
+ exception);
failIndex++;
if (failIndex == failThresholdIndex) {
break;
@@ -106,14 +128,15 @@ public class BroadcastClusterInvoker<T> extends AbstractClusterInvoker<T> {
if (exception != null) {
if (failIndex == failThresholdIndex) {
if (logger.isDebugEnabled()) {
- logger.debug(
- String.format("The number of BroadcastCluster call failures has reached the threshold %s", failThresholdIndex));
-
+ logger.debug(String.format(
+ "The number of BroadcastCluster call failures has reached the threshold %s",
+ failThresholdIndex));
}
} else {
if (logger.isDebugEnabled()) {
- logger.debug(String.format("The number of BroadcastCluster call failures has not reached the threshold %s, fail size is %s",
- failThresholdIndex, failIndex));
+ logger.debug(String.format(
+ "The number of BroadcastCluster call failures has not reached the threshold %s, fail size is %s",
+ failThresholdIndex, failIndex));
}
}
throw exception;
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/ClusterUtils.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/ClusterUtils.java
index eca3993964..591f16a377 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/ClusterUtils.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/ClusterUtils.java
@@ -26,7 +26,6 @@ import java.util.Map;
import static org.apache.dubbo.common.constants.CommonConstants.URL_MERGE_PROCESSOR_KEY;
-
/**
* ClusterUtils
*/
@@ -45,9 +44,13 @@ public class ClusterUtils implements ScopeModelAware {
ProviderURLMergeProcessor providerUrlMergeProcessor;
if (StringUtils.isNotEmpty(ump)) {
- providerUrlMergeProcessor = applicationModel.getExtensionLoader(ProviderURLMergeProcessor.class).getExtension(ump);
+ providerUrlMergeProcessor = applicationModel
+ .getExtensionLoader(ProviderURLMergeProcessor.class)
+ .getExtension(ump);
} else {
- providerUrlMergeProcessor = applicationModel.getExtensionLoader(ProviderURLMergeProcessor.class).getExtension("default");
+ providerUrlMergeProcessor = applicationModel
+ .getExtensionLoader(ProviderURLMergeProcessor.class)
+ .getExtension("default");
}
return providerUrlMergeProcessor.mergeUrl(remoteUrl, localMap);
@@ -58,13 +61,15 @@ public class ClusterUtils implements ScopeModelAware {
ProviderURLMergeProcessor providerUrlMergeProcessor;
if (StringUtils.isNotEmpty(ump)) {
- providerUrlMergeProcessor = applicationModel.getExtensionLoader(ProviderURLMergeProcessor.class).getExtension(ump);
+ providerUrlMergeProcessor = applicationModel
+ .getExtensionLoader(ProviderURLMergeProcessor.class)
+ .getExtension(ump);
} else {
- providerUrlMergeProcessor = applicationModel.getExtensionLoader(ProviderURLMergeProcessor.class).getExtension("default");
+ providerUrlMergeProcessor = applicationModel
+ .getExtensionLoader(ProviderURLMergeProcessor.class)
+ .getExtension("default");
}
return providerUrlMergeProcessor.mergeLocalParams(localMap);
-
}
-
}
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/FailbackCluster.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/FailbackCluster.java
index 0916f724bc..7bfaadef9d 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/FailbackCluster.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/FailbackCluster.java
@@ -26,11 +26,10 @@ import org.apache.dubbo.rpc.cluster.support.wrapper.AbstractCluster;
*/
public class FailbackCluster extends AbstractCluster {
- public final static String NAME = "failback";
+ public static final String NAME = "failback";
@Override
public <T> AbstractClusterInvoker<T> doJoin(Directory<T> directory) throws RpcException {
return new FailbackClusterInvoker<>(directory);
}
-
}
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/FailbackClusterInvoker.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/FailbackClusterInvoker.java
index 1a20839768..5dbc97d105 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/FailbackClusterInvoker.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/FailbackClusterInvoker.java
@@ -53,7 +53,8 @@ import static org.apache.dubbo.rpc.cluster.Constants.FAIL_BACK_TASKS_KEY;
*/
public class FailbackClusterInvoker<T> extends AbstractClusterInvoker<T> {
- private static final ErrorTypeAwareLogger logger = LoggerFactory.getErrorTypeAwareLogger(FailbackClusterInvoker.class);
+ private static final ErrorTypeAwareLogger logger =
+ LoggerFactory.getErrorTypeAwareLogger(FailbackClusterInvoker.class);
private static final long RETRY_FAILED_PERIOD = 5;
@@ -81,27 +82,41 @@ public class FailbackClusterInvoker<T> extends AbstractClusterInvoker<T> {
failbackTasks = failbackTasksConfig;
}
- private void addFailed(LoadBalance loadbalance, Invocation invocation, List<Invoker<T>> invokers, Invoker<T> lastInvoker, URL consumerUrl) {
+ private void addFailed(
+ LoadBalance loadbalance,
+ Invocation invocation,
+ List<Invoker<T>> invokers,
+ Invoker<T> lastInvoker,
+ URL consumerUrl) {
if (failTimer == null) {
synchronized (this) {
if (failTimer == null) {
failTimer = new HashedWheelTimer(
- new NamedThreadFactory("failback-cluster-timer", true),
- 1,
- TimeUnit.SECONDS, 32, failbackTasks);
+ new NamedThreadFactory("failback-cluster-timer", true),
+ 1,
+ TimeUnit.SECONDS,
+ 32,
+ failbackTasks);
}
}
}
- RetryTimerTask retryTimerTask = new RetryTimerTask(loadbalance, invocation, invokers, lastInvoker, retries, RETRY_FAILED_PERIOD, consumerUrl);
+ RetryTimerTask retryTimerTask = new RetryTimerTask(
+ loadbalance, invocation, invokers, lastInvoker, retries, RETRY_FAILED_PERIOD, consumerUrl);
try {
failTimer.newTimeout(retryTimerTask, RETRY_FAILED_PERIOD, TimeUnit.SECONDS);
} catch (Throwable e) {
- logger.error(CLUSTER_TIMER_RETRY_FAILED,"add newTimeout exception","","Failback background works error, invocation->" + invocation + ", exception: " + e.getMessage(),e);
+ logger.error(
+ CLUSTER_TIMER_RETRY_FAILED,
+ "add newTimeout exception",
+ "",
+ "Failback background works error, invocation->" + invocation + ", exception: " + e.getMessage(),
+ e);
}
}
@Override
- protected Result doInvoke(Invocation invocation, List<Invoker<T>> invokers, LoadBalance loadbalance) throws RpcException {
+ protected Result doInvoke(Invocation invocation, List<Invoker<T>> invokers, LoadBalance loadbalance)
+ throws RpcException {
Invoker<T> invoker = null;
URL consumerUrl = RpcContext.getServiceContext().getConsumerUrl();
try {
@@ -110,10 +125,14 @@ public class FailbackClusterInvoker<T> extends AbstractClusterInvoker<T> {
// Then the serviceContext will be cleared after the call is completed.
return invokeWithContextAsync(invoker, invocation, consumerUrl);
} catch (Throwable e) {
- logger.error(CLUSTER_FAILED_INVOKE_SERVICE,"Failback to invoke method and start to retries",
- "","Failback to invoke method " + RpcUtils.getMethodName(invocation) +
- ", wait for retry in background. Ignored exception: "
- + e.getMessage() + ", ",e);
+ logger.error(
+ CLUSTER_FAILED_INVOKE_SERVICE,
+ "Failback to invoke method and start to retries",
+ "",
+ "Failback to invoke method " + RpcUtils.getMethodName(invocation)
+ + ", wait for retry in background. Ignored exception: "
+ + e.getMessage() + ", ",
+ e);
if (retries > 0) {
addFailed(loadbalance, invocation, invokers, invoker, consumerUrl);
}
@@ -150,8 +169,14 @@ public class FailbackClusterInvoker<T> extends AbstractClusterInvoker<T> {
*/
private int retriedTimes = 0;
- RetryTimerTask(LoadBalance loadbalance, Invocation invocation, List<Invoker<T>> invokers, Invoker<T> lastInvoker,
- int retries, long tick, URL consumerUrl) {
+ RetryTimerTask(
+ LoadBalance loadbalance,
+ Invocation invocation,
+ List<Invoker<T>> invokers,
+ Invoker<T> lastInvoker,
+ int retries,
+ long tick,
+ URL consumerUrl) {
this.loadbalance = loadbalance;
this.invocation = invocation;
this.invokers = invokers;
@@ -164,15 +189,28 @@ public class FailbackClusterInvoker<T> extends AbstractClusterInvoker<T> {
@Override
public void run(Timeout timeout) {
try {
- logger.info("Attempt to retry to invoke method " + RpcUtils.getMethodName(invocation) +
- ". The total will retry " + retries + " times, the current is the " + retriedTimes + " retry");
- Invoker<T> retryInvoker = select(loadbalance, invocation, invokers, Collections.singletonList(lastInvoker));
+ logger.info("Attempt to retry to invoke method " + RpcUtils.getMethodName(invocation)
+ + ". The total will retry " + retries + " times, the current is the " + retriedTimes
+ + " retry");
+ Invoker<T> retryInvoker =
+ select(loadbalance, invocation, invokers, Collections.singletonList(lastInvoker));
lastInvoker = retryInvoker;
invokeWithContextAsync(retryInvoker, invocation, consumerUrl);
} catch (Throwable e) {
- logger.error(CLUSTER_FAILED_INVOKE_SERVICE,"Failed retry to invoke method","","Failed retry to invoke method " + RpcUtils.getMethodName(invocation) + ", waiting again.",e);
+ logger.error(
+ CLUSTER_FAILED_INVOKE_SERVICE,
+ "Failed retry to invoke method",
+ "",
+ "Failed retry to invoke method " + RpcUtils.getMethodName(invocation) + ", waiting again.",
+ e);
if ((++retriedTimes) >= retries) {
- logger.error(CLUSTER_FAILED_INVOKE_SERVICE,"Failed retry to invoke method and retry times exceed threshold","","Failed retry times exceed threshold (" + retries + "), We have to abandon, invocation->" + invocation,e);
+ logger.error(
+ CLUSTER_FAILED_INVOKE_SERVICE,
+ "Failed retry to invoke method and retry times exceed threshold",
+ "",
+ "Failed retry times exceed threshold (" + retries + "), We have to abandon, invocation->"
+ + invocation,
+ e);
} else {
rePut(timeout);
}
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/FailfastCluster.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/FailfastCluster.java
index 2a04a1535b..0c9fe5a1d2 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/FailfastCluster.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/FailfastCluster.java
@@ -26,11 +26,10 @@ import org.apache.dubbo.rpc.cluster.support.wrapper.AbstractCluster;
*/
public class FailfastCluster extends AbstractCluster {
- public final static String NAME = "failfast";
+ public static final String NAME = "failfast";
@Override
public <T> AbstractClusterInvoker<T> doJoin(Directory<T> directory) throws RpcException {
return new FailfastClusterInvoker<>(directory);
}
-
}
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/FailfastClusterInvoker.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/FailfastClusterInvoker.java
index 87b3b45c5a..f8f7e04dbc 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/FailfastClusterInvoker.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/FailfastClusterInvoker.java
@@ -41,7 +41,8 @@ public class FailfastClusterInvoker<T> extends AbstractClusterInvoker<T> {
}
@Override
- public Result doInvoke(Invocation invocation, List<Invoker<T>> invokers, LoadBalance loadbalance) throws RpcException {
+ public Result doInvoke(Invocation invocation, List<Invoker<T>> invokers, LoadBalance loadbalance)
+ throws RpcException {
Invoker<T> invoker = select(loadbalance, invocation, invokers, null);
try {
return invokeWithContext(invoker, invocation);
@@ -49,13 +50,16 @@ public class FailfastClusterInvoker<T> extends AbstractClusterInvoker<T> {
if (e instanceof RpcException && ((RpcException) e).isBiz()) { // biz exception.
throw (RpcException) e;
}
- throw new RpcException(e instanceof RpcException ? ((RpcException) e).getCode() : 0,
- "Failfast invoke providers " + invoker.getUrl() + " " + loadbalance.getClass().getSimpleName()
- + " for service " + getInterface().getName()
- + " method " + RpcUtils.getMethodName(invocation) + " on consumer " + NetUtils.getLocalHost()
- + " use dubbo version " + Version.getVersion()
- + ", but no luck to perform the invocation. Last error is: " + e.getMessage(),
- e.getCause() != null ? e.getCause() : e);
+ throw new RpcException(
+ e instanceof RpcException ? ((RpcException) e).getCode() : 0,
+ "Failfast invoke providers " + invoker.getUrl() + " "
+ + loadbalance.getClass().getSimpleName()
+ + " for service " + getInterface().getName()
+ + " method " + RpcUtils.getMethodName(invocation) + " on consumer "
+ + NetUtils.getLocalHost()
+ + " use dubbo version " + Version.getVersion()
+ + ", but no luck to perform the invocation. Last error is: " + e.getMessage(),
+ e.getCause() != null ? e.getCause() : e);
}
}
}
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/FailoverCluster.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/FailoverCluster.java
index e9e6101b05..7bf6b3300f 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/FailoverCluster.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/FailoverCluster.java
@@ -26,11 +26,10 @@ import org.apache.dubbo.rpc.cluster.support.wrapper.AbstractCluster;
*/
public class FailoverCluster extends AbstractCluster {
- public final static String NAME = "failover";
+ public static final String NAME = "failover";
@Override
public <T> AbstractClusterInvoker<T> doJoin(Directory<T> directory) throws RpcException {
return new FailoverClusterInvoker<>(directory);
}
-
}
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/FailoverClusterInvoker.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/FailoverClusterInvoker.java
index b0cdb8ff53..a840773c51 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/FailoverClusterInvoker.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/FailoverClusterInvoker.java
@@ -47,7 +47,8 @@ import static org.apache.dubbo.common.constants.LoggerCodeConstants.CLUSTER_FAIL
*/
public class FailoverClusterInvoker<T> extends AbstractClusterInvoker<T> {
- private static final ErrorTypeAwareLogger logger = LoggerFactory.getErrorTypeAwareLogger(FailoverClusterInvoker.class);
+ private static final ErrorTypeAwareLogger logger =
+ LoggerFactory.getErrorTypeAwareLogger(FailoverClusterInvoker.class);
public FailoverClusterInvoker(Directory<T> directory) {
super(directory);
@@ -55,7 +56,8 @@ public class FailoverClusterInvoker<T> extends AbstractClusterInvoker<T> {
@Override
@SuppressWarnings({"unchecked", "rawtypes"})
- public Result doInvoke(Invocation invocation, final List<Invoker<T>> invokers, LoadBalance loadbalance) throws RpcException {
+ public Result doInvoke(Invocation invocation, final List<Invoker<T>> invokers, LoadBalance loadbalance)
+ throws RpcException {
List<Invoker<T>> copyInvokers = invokers;
String methodName = RpcUtils.getMethodName(invocation);
int len = calculateInvokeTimes(methodName);
@@ -64,8 +66,8 @@ public class FailoverClusterInvoker<T> extends AbstractClusterInvoker<T> {
List<Invoker<T>> invoked = new ArrayList<Invoker<T>>(copyInvokers.size()); // invoked invokers.
Set<String> providers = new HashSet<String>(len);
for (int i = 0; i < len; i++) {
- //Reselect before retry to avoid a change of candidate `invokers`.
- //NOTE: if `invokers` changed, then `invoked` also lose accuracy.
+ // Reselect before retry to avoid a change of candidate `invokers`.
+ // NOTE: if `invokers` changed, then `invoked` also lose accuracy.
if (i > 0) {
checkWhetherDestroyed();
copyInvokers = list(invocation);
@@ -79,15 +81,22 @@ public class FailoverClusterInvoker<T> extends AbstractClusterInvoker<T> {
try {
Result result = invokeWithContext(invoker, invocation);
if (le != null && logger.isWarnEnabled()) {
- logger.warn(CLUSTER_FAILED_MULTIPLE_RETRIES,"failed to retry do invoke","","Although retry the method " + methodName
- + " in the service " + getInterface().getName()
- + " was successful by the provider " + invoker.getUrl().getAddress()
- + ", but there have been failed providers " + providers
- + " (" + providers.size() + "/" + copyInvokers.size()
- + ") from the registry " + directory.getUrl().getAddress()
- + " on the consumer " + NetUtils.getLocalHost()
- + " using the dubbo version " + Version.getVersion() + ". Last error is: "
- + le.getMessage(),le);
+ logger.warn(
+ CLUSTER_FAILED_MULTIPLE_RETRIES,
+ "failed to retry do invoke",
+ "",
+ "Although retry the method " + methodName
+ + " in the service " + getInterface().getName()
+ + " was successful by the provider "
+ + invoker.getUrl().getAddress()
+ + ", but there have been failed providers " + providers
+ + " (" + providers.size() + "/" + copyInvokers.size()
+ + ") from the registry "
+ + directory.getUrl().getAddress()
+ + " on the consumer " + NetUtils.getLocalHost()
+ + " using the dubbo version " + Version.getVersion() + ". Last error is: "
+ + le.getMessage(),
+ le);
}
success = true;
return result;
@@ -104,14 +113,17 @@ public class FailoverClusterInvoker<T> extends AbstractClusterInvoker<T> {
}
}
}
- throw new RpcException(le.getCode(), "Failed to invoke the method "
- + methodName + " in the service " + getInterface().getName()
- + ". Tried " + len + " times of the providers " + providers
- + " (" + providers.size() + "/" + copyInvokers.size()
- + ") from the registry " + directory.getUrl().getAddress()
- + " on the consumer " + NetUtils.getLocalHost() + " using the dubbo version "
- + Version.getVersion() + ". Last error is: "
- + le.getMessage(), le.getCause() != null ? le.getCause() : le);
+ throw new RpcException(
+ le.getCode(),
+ "Failed to invoke the method "
+ + methodName + " in the service " + getInterface().getName()
+ + ". Tried " + len + " times of the providers " + providers
+ + " (" + providers.size() + "/" + copyInvokers.size()
+ + ") from the registry " + directory.getUrl().getAddress()
+ + " on the consumer " + NetUtils.getLocalHost() + " using the dubbo version "
+ + Version.getVersion() + ". Last error is: "
+ + le.getMessage(),
+ le.getCause() != null ? le.getCause() : le);
}
private int calculateInvokeTimes(String methodName) {
@@ -128,5 +140,4 @@ public class FailoverClusterInvoker<T> extends AbstractClusterInvoker<T> {
return len;
}
-
}
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/FailsafeCluster.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/FailsafeCluster.java
index 7064950489..baaa1191f3 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/FailsafeCluster.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/FailsafeCluster.java
@@ -26,11 +26,10 @@ import org.apache.dubbo.rpc.cluster.support.wrapper.AbstractCluster;
*/
public class FailsafeCluster extends AbstractCluster {
- public final static String NAME = "failsafe";
+ public static final String NAME = "failsafe";
@Override
public <T> AbstractClusterInvoker<T> doJoin(Directory<T> directory) throws RpcException {
return new FailsafeClusterInvoker<>(directory);
}
-
}
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/FailsafeClusterInvoker.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/FailsafeClusterInvoker.java
index 78c3540895..ba255405c7 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/FailsafeClusterInvoker.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/FailsafeClusterInvoker.java
@@ -38,19 +38,26 @@ import static org.apache.dubbo.common.constants.LoggerCodeConstants.CLUSTER_ERRO
*
*/
public class FailsafeClusterInvoker<T> extends AbstractClusterInvoker<T> {
- private static final ErrorTypeAwareLogger logger = LoggerFactory.getErrorTypeAwareLogger(FailsafeClusterInvoker.class);
+ private static final ErrorTypeAwareLogger logger =
+ LoggerFactory.getErrorTypeAwareLogger(FailsafeClusterInvoker.class);
public FailsafeClusterInvoker(Directory<T> directory) {
super(directory);
}
@Override
- public Result doInvoke(Invocation invocation, List<Invoker<T>> invokers, LoadBalance loadbalance) throws RpcException {
+ public Result doInvoke(Invocation invocation, List<Invoker<T>> invokers, LoadBalance loadbalance)
+ throws RpcException {
try {
Invoker<T> invoker = select(loadbalance, invocation, invokers, null);
return invokeWithContext(invoker, invocation);
} catch (Throwable e) {
- logger.error(CLUSTER_ERROR_RESPONSE,"Failsafe for provider exception","","Failsafe ignore exception: " + e.getMessage(),e);
+ logger.error(
+ CLUSTER_ERROR_RESPONSE,
+ "Failsafe for provider exception",
+ "",
+ "Failsafe ignore exception: " + e.getMessage(),
+ e);
return AsyncRpcResult.newDefaultAsyncResult(null, null, invocation); // ignore
}
}
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/ForkingCluster.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/ForkingCluster.java
index 83ecbb8c3b..82f1784e76 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/ForkingCluster.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/ForkingCluster.java
@@ -26,11 +26,10 @@ import org.apache.dubbo.rpc.cluster.support.wrapper.AbstractCluster;
*/
public class ForkingCluster extends AbstractCluster {
- public final static String NAME = "forking";
+ public static final String NAME = "forking";
@Override
public <T> AbstractClusterInvoker<T> doJoin(Directory<T> directory) throws RpcException {
return new ForkingClusterInvoker<>(directory);
}
-
}
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/ForkingClusterInvoker.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/ForkingClusterInvoker.java
index b2f0d2e095..b9d67834f3 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/ForkingClusterInvoker.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/ForkingClusterInvoker.java
@@ -59,13 +59,18 @@ public class ForkingClusterInvoker<T> extends AbstractClusterInvoker<T> {
public ForkingClusterInvoker(Directory<T> directory) {
super(directory);
- executor = directory.getUrl().getOrDefaultFrameworkModel().getBeanFactory()
- .getBean(FrameworkExecutorRepository.class).getSharedExecutor();
+ executor = directory
+ .getUrl()
+ .getOrDefaultFrameworkModel()
+ .getBeanFactory()
+ .getBean(FrameworkExecutorRepository.class)
+ .getSharedExecutor();
}
@Override
@SuppressWarnings({"unchecked", "rawtypes"})
- public Result doInvoke(final Invocation invocation, List<Invoker<T>> invokers, LoadBalance loadbalance) throws RpcException {
+ public Result doInvoke(final Invocation invocation, List<Invoker<T>> invokers, LoadBalance loadbalance)
+ throws RpcException {
try {
final List<Invoker<T>> selected;
final int forks = getUrl().getParameter(FORKS_KEY, DEFAULT_FORKS);
@@ -77,7 +82,7 @@ public class ForkingClusterInvoker<T> extends AbstractClusterInvoker<T> {
while (selected.size() < forks) {
Invoker<T> invoker = select(loadbalance, invocation, invokers, selected);
if (!selected.contains(invoker)) {
- //Avoid add the same invoker several times.
+ // Avoid add the same invoker several times.
selected.add(invoker);
}
}
@@ -87,34 +92,43 @@ public class ForkingClusterInvoker<T> extends AbstractClusterInvoker<T> {
final BlockingQueue<Object> ref = new LinkedBlockingQueue<>(1);
selected.forEach(invoker -> {
URL consumerUrl = RpcContext.getServiceContext().getConsumerUrl();
- CompletableFuture.<Object>supplyAsync(() -> {
- if (ref.size() > 0) {
- return null;
- }
- return invokeWithContextAsync(invoker, invocation, consumerUrl);
- }, executor).whenComplete((v, t) -> {
- if (t == null) {
- ref.offer(v);
- } else {
- int value = count.incrementAndGet();
- if (value >= selected.size()) {
- ref.offer(t);
- }
- }
- });
+ CompletableFuture.<Object>supplyAsync(
+ () -> {
+ if (ref.size() > 0) {
+ return null;
+ }
+ return invokeWithContextAsync(invoker, invocation, consumerUrl);
+ },
+ executor)
+ .whenComplete((v, t) -> {
+ if (t == null) {
+ ref.offer(v);
+ } else {
+ int value = count.incrementAndGet();
+ if (value >= selected.size()) {
+ ref.offer(t);
+ }
+ }
+ });
});
try {
Object ret = ref.poll(timeout, TimeUnit.MILLISECONDS);
if (ret instanceof Throwable) {
- Throwable e = ret instanceof CompletionException ? ((CompletionException) ret).getCause() : (Throwable) ret;
- throw new RpcException(e instanceof RpcException ? ((RpcException) e).getCode() : RpcException.UNKNOWN_EXCEPTION,
- "Failed to forking invoke provider " + selected + ", but no luck to perform the invocation. " +
- "Last error is: " + e.getMessage(), e.getCause() != null ? e.getCause() : e);
+ Throwable e = ret instanceof CompletionException
+ ? ((CompletionException) ret).getCause()
+ : (Throwable) ret;
+ throw new RpcException(
+ e instanceof RpcException ? ((RpcException) e).getCode() : RpcException.UNKNOWN_EXCEPTION,
+ "Failed to forking invoke provider " + selected
+ + ", but no luck to perform the invocation. " + "Last error is: " + e.getMessage(),
+ e.getCause() != null ? e.getCause() : e);
}
return (Result) ret;
} catch (InterruptedException e) {
- throw new RpcException("Failed to forking invoke provider " + selected + ", " +
- "but no luck to perform the invocation. Last error is: " + e.getMessage(), e);
+ throw new RpcException(
+ "Failed to forking invoke provider " + selected + ", "
+ + "but no luck to perform the invocation. Last error is: " + e.getMessage(),
+ e);
}
} finally {
// clear attachments which is binding to current thread.
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/merger/DefaultProviderURLMergeProcessor.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/merger/DefaultProviderURLMergeProcessor.java
index 8610bc893f..8a97a0f21f 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/merger/DefaultProviderURLMergeProcessor.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/merger/DefaultProviderURLMergeProcessor.java
@@ -43,7 +43,6 @@ import static org.apache.dubbo.common.constants.CommonConstants.THREAD_NAME_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.TIMESTAMP_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.VERSION_KEY;
-
public class DefaultProviderURLMergeProcessor implements ProviderURLMergeProcessor {
@Override
@@ -104,14 +103,18 @@ public class DefaultProviderURLMergeProcessor implements ProviderURLMergeProcess
// Combine filters and listeners on Provider and Consumer
String remoteFilter = remoteMap.get(REFERENCE_FILTER_KEY);
String localFilter = copyOfLocalMap.get(REFERENCE_FILTER_KEY);
- if (remoteFilter != null && remoteFilter.length() > 0
- && localFilter != null && localFilter.length() > 0) {
+ if (remoteFilter != null
+ && remoteFilter.length() > 0
+ && localFilter != null
+ && localFilter.length() > 0) {
map.put(REFERENCE_FILTER_KEY, remoteFilter + "," + localFilter);
}
String remoteListener = remoteMap.get(INVOKER_LISTENER_KEY);
String localListener = copyOfLocalMap.get(INVOKER_LISTENER_KEY);
- if (remoteListener != null && remoteListener.length() > 0
- && localListener != null && localListener.length() > 0) {
+ if (remoteListener != null
+ && remoteListener.length() > 0
+ && localListener != null
+ && localListener.length() > 0) {
map.put(INVOKER_LISTENER_KEY, remoteListener + "," + localListener);
}
}
@@ -119,5 +122,4 @@ public class DefaultProviderURLMergeProcessor implements ProviderURLMergeProcess
return remoteUrl.clearParameters().addParameters(map);
}
-
}
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/registry/ZoneAwareCluster.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/registry/ZoneAwareCluster.java
index cfd36e1254..a1cbf14e60 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/registry/ZoneAwareCluster.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/registry/ZoneAwareCluster.java
@@ -23,11 +23,10 @@ import org.apache.dubbo.rpc.cluster.support.wrapper.AbstractCluster;
public class ZoneAwareCluster extends AbstractCluster {
- public final static String NAME = "zone-aware";
+ public static final String NAME = "zone-aware";
@Override
protected <T> AbstractClusterInvoker<T> doJoin(Directory<T> directory) throws RpcException {
return new ZoneAwareClusterInvoker<T>(directory);
}
-
}
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/registry/ZoneAwareClusterInvoker.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/registry/ZoneAwareClusterInvoker.java
index f6550cb8af..c537f03381 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/registry/ZoneAwareClusterInvoker.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/registry/ZoneAwareClusterInvoker.java
@@ -55,7 +55,8 @@ public class ZoneAwareClusterInvoker<T> extends AbstractClusterInvoker<T> {
public ZoneAwareClusterInvoker(Directory<T> directory) {
super(directory);
- ExtensionLoader<ZoneDetector> loader = directory.getConsumerUrl().getOrDefaultApplicationModel().getExtensionLoader(ZoneDetector.class);
+ ExtensionLoader<ZoneDetector> loader =
+ directory.getConsumerUrl().getOrDefaultApplicationModel().getExtensionLoader(ZoneDetector.class);
if (loader.hasExtension("default")) {
zoneDetector = loader.getExtension("default");
}
@@ -63,12 +64,13 @@ public class ZoneAwareClusterInvoker<T> extends AbstractClusterInvoker<T> {
@Override
@SuppressWarnings({"unchecked", "rawtypes"})
- public Result doInvoke(Invocation invocation, final List<Invoker<T>> invokers, LoadBalance loadbalance) throws RpcException {
- // First, pick the invoker (XXXClusterInvoker) that comes from the local registry, distinguish by a 'preferred' key.
+ public Result doInvoke(Invocation invocation, final List<Invoker<T>> invokers, LoadBalance loadbalance)
+ throws RpcException {
+ // First, pick the invoker (XXXClusterInvoker) that comes from the local registry, distinguish by a 'preferred'
+ // key.
for (Invoker<T> invoker : invokers) {
ClusterInvoker<T> clusterInvoker = (ClusterInvoker<T>) invoker;
- if (clusterInvoker.isAvailable() && clusterInvoker.getRegistryUrl()
- .getParameter(PREFERRED_KEY, false)) {
+ if (clusterInvoker.isAvailable() && clusterInvoker.getRegistryUrl().getParameter(PREFERRED_KEY, false)) {
return clusterInvoker.invoke(invocation);
}
}
@@ -85,25 +87,32 @@ public class ZoneAwareClusterInvoker<T> extends AbstractClusterInvoker<T> {
if (StringUtils.isNotEmpty(zone)) {
for (Invoker<T> invoker : invokers) {
ClusterInvoker<T> clusterInvoker = (ClusterInvoker<T>) invoker;
- if (clusterInvoker.isAvailable() && zone.equals(clusterInvoker.getRegistryUrl().getParameter(ZONE_KEY))) {
+ if (clusterInvoker.isAvailable()
+ && zone.equals(clusterInvoker.getRegistryUrl().getParameter(ZONE_KEY))) {
return clusterInvoker.invoke(invocation);
}
}
if (StringUtils.isNotEmpty(force) && "true".equalsIgnoreCase(force)) {
- throw new IllegalStateException("No registry instance in zone or no available providers in the registry, zone: "
- + zone
- + ", registries: " + invokers.stream().map(invoker -> ((ClusterInvoker<T>) invoker).getRegistryUrl().toString()).collect(Collectors.joining(",")));
+ throw new IllegalStateException(
+ "No registry instance in zone or no available providers in the registry, zone: "
+ + zone
+ + ", registries: "
+ + invokers.stream()
+ .map(invoker -> ((ClusterInvoker<T>) invoker)
+ .getRegistryUrl()
+ .toString())
+ .collect(Collectors.joining(",")));
}
}
-
// load balance among all registries, with registry weight count in.
Invoker<T> balancedInvoker = select(loadbalance, invocation, invokers, null);
- if (balancedInvoker!=null && balancedInvoker.isAvailable()) {
+ if (balancedInvoker != null && balancedInvoker.isAvailable()) {
return balancedInvoker.invoke(invocation);
}
- // If none of the invokers has a preferred signal or is picked by the loadbalancer, pick the first one available.
+ // If none of the invokers has a preferred signal or is picked by the loadbalancer, pick the first one
+ // available.
for (Invoker<T> invoker : invokers) {
ClusterInvoker<T> clusterInvoker = (ClusterInvoker<T>) invoker;
if (clusterInvoker.isAvailable()) {
@@ -113,5 +122,4 @@ public class ZoneAwareClusterInvoker<T> extends AbstractClusterInvoker<T> {
throw new RpcException("No provider available in " + invokers);
}
-
}
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/wrapper/AbstractCluster.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/wrapper/AbstractCluster.java
index 2a19a54e68..98082f971c 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/wrapper/AbstractCluster.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/wrapper/AbstractCluster.java
@@ -45,7 +45,10 @@ public abstract class AbstractCluster implements Cluster {
private <T> Invoker<T> buildClusterInterceptors(AbstractClusterInvoker<T> clusterInvoker) {
AbstractClusterInvoker<T> last = buildInterceptorInvoker(new ClusterFilterInvoker<>(clusterInvoker));
- if (Boolean.parseBoolean(ConfigurationUtils.getProperty(clusterInvoker.getDirectory().getConsumerUrl().getScopeModel(), CLUSTER_INTERCEPTOR_COMPATIBLE_KEY, "false"))) {
+ if (Boolean.parseBoolean(ConfigurationUtils.getProperty(
+ clusterInvoker.getDirectory().getConsumerUrl().getScopeModel(),
+ CLUSTER_INTERCEPTOR_COMPATIBLE_KEY,
+ "false"))) {
return build27xCompatibleClusterInterceptors(clusterInvoker, last);
}
return last;
@@ -61,7 +64,10 @@ public abstract class AbstractCluster implements Cluster {
}
private <T> AbstractClusterInvoker<T> buildInterceptorInvoker(AbstractClusterInvoker<T> invoker) {
- List<InvocationInterceptorBuilder> builders = ScopeModelUtil.getApplicationModel(invoker.getUrl().getScopeModel()).getExtensionLoader(InvocationInterceptorBuilder.class).getActivateExtensions();
+ List<InvocationInterceptorBuilder> builders = ScopeModelUtil.getApplicationModel(
+ invoker.getUrl().getScopeModel())
+ .getExtensionLoader(InvocationInterceptorBuilder.class)
+ .getActivateExtensions();
if (CollectionUtils.isEmpty(builders)) {
return invoker;
}
@@ -74,13 +80,17 @@ public abstract class AbstractCluster implements Cluster {
private final ClusterInvoker<T> filterInvoker;
public ClusterFilterInvoker(AbstractClusterInvoker<T> invoker) {
- List<FilterChainBuilder> builders = ScopeModelUtil.getApplicationModel(invoker.getUrl().getScopeModel()).getExtensionLoader(FilterChainBuilder.class).getActivateExtensions();
+ List<FilterChainBuilder> builders = ScopeModelUtil.getApplicationModel(
+ invoker.getUrl().getScopeModel())
+ .getExtensionLoader(FilterChainBuilder.class)
+ .getActivateExtensions();
if (CollectionUtils.isEmpty(builders)) {
filterInvoker = invoker;
} else {
ClusterInvoker<T> tmpInvoker = invoker;
for (FilterChainBuilder builder : builders) {
- tmpInvoker = builder.buildClusterInvokerChain(tmpInvoker, REFERENCE_FILTER_KEY, CommonConstants.CONSUMER);
+ tmpInvoker = builder.buildClusterInvokerChain(
+ tmpInvoker, REFERENCE_FILTER_KEY, CommonConstants.CONSUMER);
}
filterInvoker = tmpInvoker;
}
@@ -96,8 +106,6 @@ public abstract class AbstractCluster implements Cluster {
return filterInvoker.getDirectory();
}
-
-
@Override
public URL getRegistryUrl() {
return filterInvoker.getRegistryUrl();
@@ -118,8 +126,9 @@ public abstract class AbstractCluster implements Cluster {
* Use ClusterInvoker<T> to replace AbstractClusterInvoker<T> in the future.
*/
@Override
- protected Result doInvoke(Invocation invocation, List<Invoker<T>> invokers, LoadBalance loadbalance) throws RpcException {
- return null;
+ protected Result doInvoke(Invocation invocation, List<Invoker<T>> invokers, LoadBalance loadbalance)
+ throws RpcException {
+ return null;
}
public ClusterInvoker<T> getFilterInvoker() {
@@ -130,10 +139,12 @@ public abstract class AbstractCluster implements Cluster {
static class InvocationInterceptorInvoker<T> extends AbstractClusterInvoker<T> {
private ClusterInvoker<T> interceptorInvoker;
- public InvocationInterceptorInvoker(AbstractClusterInvoker<T> invoker, List<InvocationInterceptorBuilder> builders) {
+ public InvocationInterceptorInvoker(
+ AbstractClusterInvoker<T> invoker, List<InvocationInterceptorBuilder> builders) {
ClusterInvoker<T> tmpInvoker = invoker;
for (InvocationInterceptorBuilder builder : builders) {
- tmpInvoker = builder.buildClusterInterceptorChain(tmpInvoker, INVOCATION_INTERCEPTOR_KEY, CommonConstants.CONSUMER);
+ tmpInvoker = builder.buildClusterInterceptorChain(
+ tmpInvoker, INVOCATION_INTERCEPTOR_KEY, CommonConstants.CONSUMER);
}
interceptorInvoker = tmpInvoker;
}
@@ -168,14 +179,19 @@ public abstract class AbstractCluster implements Cluster {
* Use ClusterInvoker<T> to replace AbstractClusterInvoker<T> in the future.
*/
@Override
- protected Result doInvoke(Invocation invocation, List<Invoker<T>> invokers, LoadBalance loadbalance) throws RpcException {
+ protected Result doInvoke(Invocation invocation, List<Invoker<T>> invokers, LoadBalance loadbalance)
+ throws RpcException {
return null;
}
}
@Deprecated
- private <T> ClusterInvoker<T> build27xCompatibleClusterInterceptors(AbstractClusterInvoker<T> clusterInvoker, AbstractClusterInvoker<T> last) {
- List<ClusterInterceptor> interceptors = ScopeModelUtil.getApplicationModel(clusterInvoker.getUrl().getScopeModel()).getExtensionLoader(ClusterInterceptor.class).getActivateExtensions();
+ private <T> ClusterInvoker<T> build27xCompatibleClusterInterceptors(
+ AbstractClusterInvoker<T> clusterInvoker, AbstractClusterInvoker<T> last) {
+ List<ClusterInterceptor> interceptors = ScopeModelUtil.getApplicationModel(
+ clusterInvoker.getUrl().getScopeModel())
+ .getExtensionLoader(ClusterInterceptor.class)
+ .getActivateExtensions();
if (!interceptors.isEmpty()) {
for (int i = interceptors.size() - 1; i >= 0; i--) {
@@ -194,9 +210,10 @@ public abstract class AbstractCluster implements Cluster {
private final ClusterInterceptor interceptor;
private final AbstractClusterInvoker<T> next;
- public InterceptorInvokerNode(AbstractClusterInvoker<T> clusterInvoker,
- ClusterInterceptor interceptor,
- AbstractClusterInvoker<T> next) {
+ public InterceptorInvokerNode(
+ AbstractClusterInvoker<T> clusterInvoker,
+ ClusterInterceptor interceptor,
+ AbstractClusterInvoker<T> next) {
this.clusterInvoker = clusterInvoker;
this.interceptor = interceptor;
this.next = next;
@@ -257,11 +274,10 @@ public abstract class AbstractCluster implements Cluster {
}
@Override
- protected Result doInvoke(Invocation invocation, List<Invoker<T>> invokers, LoadBalance loadbalance) throws RpcException {
+ protected Result doInvoke(Invocation invocation, List<Invoker<T>> invokers, LoadBalance loadbalance)
+ throws RpcException {
// The only purpose is to build an interceptor chain, so the cluster related logic doesn't matter.
return null;
}
}
-
-
}
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/wrapper/ScopeClusterInvoker.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/wrapper/ScopeClusterInvoker.java
index d1d47645f7..50e172b149 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/wrapper/ScopeClusterInvoker.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/wrapper/ScopeClusterInvoker.java
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.dubbo.rpc.cluster.support.wrapper;
import org.apache.dubbo.common.URL;
@@ -62,7 +61,6 @@ public class ScopeClusterInvoker<T> implements ClusterInvoker<T>, ExporterChange
private static final ErrorTypeAwareLogger logger = LoggerFactory.getErrorTypeAwareLogger(ScopeClusterInvoker.class);
-
private final Object createLock = new Object();
private Protocol protocolSPI;
private final Directory<T> directory;
@@ -144,26 +142,30 @@ public class ScopeClusterInvoker<T> implements ClusterInvoker<T>, ExporterChange
// When broadcasting, it should be called remotely.
if (isBroadcast()) {
if (logger.isDebugEnabled()) {
- logger.debug("Performing broadcast call for method: " + RpcUtils.getMethodName(invocation) + " of service: " + getUrl().getServiceKey());
+ logger.debug("Performing broadcast call for method: " + RpcUtils.getMethodName(invocation)
+ + " of service: " + getUrl().getServiceKey());
}
return invoker.invoke(invocation);
}
if (peerFlag) {
if (logger.isDebugEnabled()) {
- logger.debug("Performing point-to-point call for method: " + RpcUtils.getMethodName(invocation) + " of service: " + getUrl().getServiceKey());
+ logger.debug("Performing point-to-point call for method: " + RpcUtils.getMethodName(invocation)
+ + " of service: " + getUrl().getServiceKey());
}
// If it's a point-to-point direct connection, invoke the original Invoker
return invoker.invoke(invocation);
}
if (isInjvmExported()) {
if (logger.isDebugEnabled()) {
- logger.debug("Performing local JVM call for method: " + RpcUtils.getMethodName(invocation) + " of service: " + getUrl().getServiceKey());
+ logger.debug("Performing local JVM call for method: " + RpcUtils.getMethodName(invocation)
+ + " of service: " + getUrl().getServiceKey());
}
// If it's exported to the local JVM, invoke the corresponding Invoker
return injvmInvoker.invoke(invocation);
}
if (logger.isDebugEnabled()) {
- logger.debug("Performing remote call for method: " + RpcUtils.getMethodName(invocation) + " of service: " + getUrl().getServiceKey());
+ logger.debug("Performing remote call for method: " + RpcUtils.getMethodName(invocation) + " of service: "
+ + getUrl().getServiceKey());
}
// Otherwise, delegate the invocation to the original Invoker
return invoker.invoke(invocation);
@@ -179,7 +181,7 @@ public class ScopeClusterInvoker<T> implements ClusterInvoker<T>, ExporterChange
return;
}
if (getUrl().getServiceKey().equals(exporter.getInvoker().getUrl().getServiceKey())
- && exporter.getInvoker().getUrl().getProtocol().equalsIgnoreCase(LOCAL_PROTOCOL)) {
+ && exporter.getInvoker().getUrl().getProtocol().equalsIgnoreCase(LOCAL_PROTOCOL)) {
createInjvmInvoker(exporter);
isExported.compareAndSet(false, true);
}
@@ -188,7 +190,7 @@ public class ScopeClusterInvoker<T> implements ClusterInvoker<T>, ExporterChange
@Override
public void onExporterChangeUnExport(Exporter<?> exporter) {
if (getUrl().getServiceKey().equals(exporter.getInvoker().getUrl().getServiceKey())
- && exporter.getInvoker().getUrl().getProtocol().equalsIgnoreCase(LOCAL_PROTOCOL)) {
+ && exporter.getInvoker().getUrl().getProtocol().equalsIgnoreCase(LOCAL_PROTOCOL)) {
destroyInjvmInvoker();
isExported.compareAndSet(true, false);
}
@@ -211,21 +213,26 @@ public class ScopeClusterInvoker<T> implements ClusterInvoker<T>, ExporterChange
return;
}
// Check if the service has been exported through Injvm protocol
- if (injvmInvoker == null && LOCAL_PROTOCOL.equalsIgnoreCase(getRegistryUrl().getProtocol())) {
+ if (injvmInvoker == null
+ && LOCAL_PROTOCOL.equalsIgnoreCase(getRegistryUrl().getProtocol())) {
injvmInvoker = invoker;
isExported.compareAndSet(false, true);
injvmFlag = true;
return;
}
// Check if the service has been exported through Injvm protocol or the SCOPE_LOCAL parameter is set
- if (Boolean.TRUE.toString().equalsIgnoreCase(isInjvm) || SCOPE_LOCAL.equalsIgnoreCase(getUrl().getParameter(SCOPE_KEY))) {
+ if (Boolean.TRUE.toString().equalsIgnoreCase(isInjvm)
+ || SCOPE_LOCAL.equalsIgnoreCase(getUrl().getParameter(SCOPE_KEY))) {
injvmFlag = true;
} else if (isInjvm == null) {
injvmFlag = isNotRemoteOrGeneric();
}
- protocolSPI = getUrl().getApplicationModel().getExtensionLoader(Protocol.class).getAdaptiveExtension();
- injvmExporterListener = getUrl().getOrDefaultFrameworkModel().getBeanFactory().getBean(InjvmExporterListener.class);
+ protocolSPI = getUrl().getApplicationModel()
+ .getExtensionLoader(Protocol.class)
+ .getAdaptiveExtension();
+ injvmExporterListener =
+ getUrl().getOrDefaultFrameworkModel().getBeanFactory().getBean(InjvmExporterListener.class);
injvmExporterListener.addExporterChangeListener(this, getUrl().getServiceKey());
}
@@ -235,8 +242,8 @@ public class ScopeClusterInvoker<T> implements ClusterInvoker<T>, ExporterChange
* @return boolean
*/
private boolean isNotRemoteOrGeneric() {
- return !SCOPE_REMOTE.equalsIgnoreCase(getUrl().getParameter(SCOPE_KEY)) &&
- !getUrl().getParameter(GENERIC_KEY, false);
+ return !SCOPE_REMOTE.equalsIgnoreCase(getUrl().getParameter(SCOPE_KEY))
+ && !getUrl().getParameter(GENERIC_KEY, false);
}
/**
@@ -262,15 +269,16 @@ public class ScopeClusterInvoker<T> implements ClusterInvoker<T>, ExporterChange
// When calling locally, determine whether it does not meet the requirements
if (!isExportedValue && (isForceLocal() || localOnce)) {
// If it's supposed to be exported to the local JVM ,but it's not, throw an exception
- throw new RpcException("Local service for " + getUrl().getServiceInterface() + " has not been exposed yet!");
+ throw new RpcException(
+ "Local service for " + getUrl().getServiceInterface() + " has not been exposed yet!");
}
return isExportedValue && injvmFlag;
}
private boolean isForceLocal() {
- return SCOPE_LOCAL.equalsIgnoreCase(getUrl().getParameter(SCOPE_KEY)) ||
- Boolean.TRUE.toString().equalsIgnoreCase(getUrl().getParameter(LOCAL_PROTOCOL));
+ return SCOPE_LOCAL.equalsIgnoreCase(getUrl().getParameter(SCOPE_KEY))
+ || Boolean.TRUE.toString().equalsIgnoreCase(getUrl().getParameter(LOCAL_PROTOCOL));
}
/**
@@ -280,18 +288,26 @@ public class ScopeClusterInvoker<T> implements ClusterInvoker<T>, ExporterChange
if (injvmInvoker == null) {
synchronized (createLock) {
if (injvmInvoker == null) {
- URL url = new ServiceConfigURL(LOCAL_PROTOCOL, NetUtils.getLocalHost(), getUrl().getPort(),
- getInterface().getName(), getUrl().getParameters());
+ URL url = new ServiceConfigURL(
+ LOCAL_PROTOCOL,
+ NetUtils.getLocalHost(),
+ getUrl().getPort(),
+ getInterface().getName(),
+ getUrl().getParameters());
url = url.setScopeModel(getUrl().getScopeModel());
url = url.setServiceModel(getUrl().getServiceModel());
- DubboServiceAddressURL consumerUrl = new DubboServiceAddressURL(url.getUrlAddress(), url.getUrlParam(),
- exporter.getInvoker().getUrl(), null);
+ DubboServiceAddressURL consumerUrl = new DubboServiceAddressURL(
+ url.getUrlAddress(),
+ url.getUrlParam(),
+ exporter.getInvoker().getUrl(),
+ null);
Invoker<?> invoker = protocolSPI.refer(getInterface(), consumerUrl);
List<Invoker<?>> invokers = new ArrayList<>();
invokers.add(invoker);
- injvmInvoker = Cluster.getCluster(url.getScopeModel(), Cluster.DEFAULT, false).join(new StaticDirectory(url, invokers), true);
+ injvmInvoker = Cluster.getCluster(url.getScopeModel(), Cluster.DEFAULT, false)
+ .join(new StaticDirectory(url, invokers), true);
}
}
}
@@ -309,11 +325,10 @@ public class ScopeClusterInvoker<T> implements ClusterInvoker<T>, ExporterChange
@Override
public String toString() {
- return "ScopeClusterInvoker{" +
- "directory=" + directory +
- ", isExported=" + isExported +
- ", peerFlag=" + peerFlag +
- ", injvmFlag=" + injvmFlag +
- '}';
+ return "ScopeClusterInvoker{" + "directory="
+ + directory + ", isExported="
+ + isExported + ", peerFlag="
+ + peerFlag + ", injvmFlag="
+ + injvmFlag + '}';
}
}
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/wrapper/ScopeClusterWrapper.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/wrapper/ScopeClusterWrapper.java
index f76b8710c6..0513f35843 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/wrapper/ScopeClusterWrapper.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/wrapper/ScopeClusterWrapper.java
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.dubbo.rpc.cluster.support.wrapper;
import org.apache.dubbo.common.extension.Wrapper;
@@ -36,8 +35,7 @@ public class ScopeClusterWrapper implements Cluster {
@Override
public <T> Invoker<T> join(Directory<T> directory, boolean buildFilterChain) throws RpcException {
- return new ScopeClusterInvoker<>(directory,
- this.cluster.join(directory, buildFilterChain));
+ return new ScopeClusterInvoker<>(directory, this.cluster.join(directory, buildFilterChain));
}
public Cluster getCluster() {
diff --git a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/ConfiguratorTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/ConfiguratorTest.java
index bdf95198df..7227362ccd 100644
--- a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/ConfiguratorTest.java
+++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/ConfiguratorTest.java
@@ -21,13 +21,13 @@ import org.apache.dubbo.rpc.cluster.configurator.absent.AbsentConfigurator;
import org.apache.dubbo.rpc.cluster.configurator.override.OverrideConfigurator;
import org.apache.dubbo.rpc.cluster.configurator.parser.ConfigParser;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
import java.util.Collections;
import java.util.List;
import java.util.Optional;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
/**
* {@link Configurator}
*/
@@ -39,16 +39,17 @@ class ConfiguratorTest {
Optional<List<Configurator>> emptyOptional = Configurator.toConfigurators(Collections.emptyList());
Assertions.assertEquals(Optional.empty(), emptyOptional);
- String configData = "[\"override://0.0.0.0/com.xx.Service?category=configurators&timeout=6666&disabled=true&dynamic=false&enabled=true&group=dubbo&priority=2&version=1.0\"" +
- ", \"absent://0.0.0.0/com.xx.Service?category=configurators&timeout=6666&disabled=true&dynamic=false&enabled=true&group=dubbo&priority=1&version=1.0\" ]";
+ String configData =
+ "[\"override://0.0.0.0/com.xx.Service?category=configurators&timeout=6666&disabled=true&dynamic=false&enabled=true&group=dubbo&priority=2&version=1.0\""
+ + ", \"absent://0.0.0.0/com.xx.Service?category=configurators&timeout=6666&disabled=true&dynamic=false&enabled=true&group=dubbo&priority=1&version=1.0\" ]";
List<URL> urls = ConfigParser.parseConfigurators(configData);
Optional<List<Configurator>> optionalList = Configurator.toConfigurators(urls);
Assertions.assertTrue(optionalList.isPresent());
List<Configurator> configurators = optionalList.get();
Assertions.assertEquals(configurators.size(), 2);
- // The hosts of AbsentConfigurator and OverrideConfigurator are equal, but the priority of OverrideConfigurator is higher
+ // The hosts of AbsentConfigurator and OverrideConfigurator are equal, but the priority of OverrideConfigurator
+ // is higher
Assertions.assertTrue(configurators.get(0) instanceof AbsentConfigurator);
Assertions.assertTrue(configurators.get(1) instanceof OverrideConfigurator);
}
-
}
diff --git a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/RouterChainTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/RouterChainTest.java
deleted file mode 100644
index 01911e6ce2..0000000000
--- a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/RouterChainTest.java
+++ /dev/null
@@ -1,253 +0,0 @@
-///*
-// * Licensed to the Apache Software Foundation (ASF) under one or more
-// * contributor license agreements. See the NOTICE file distributed with
-// * this work for additional information regarding copyright ownership.
-// * The ASF licenses this file to You under the Apache License, Version 2.0
-// * (the "License"); you may not use this file except in compliance with
-// * the License. You may obtain a copy of the License at
-// *
-// * http://www.apache.org/licenses/LICENSE-2.0
-// *
-// * Unless required by applicable law or agreed to in writing, software
-// * distributed under the License is distributed on an "AS IS" BASIS,
-// * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// * See the License for the specific language governing permissions and
-// * limitations under the License.
-// */
-//package org.apache.dubbo.rpc.cluster;
-//
-//
-//import java.util.Arrays;
-//import java.util.HashMap;
-//import java.util.List;
-//import java.util.Map;
-//import java.util.concurrent.ConcurrentHashMap;
-//
-//import org.apache.dubbo.common.URL;
-//import org.apache.dubbo.common.config.configcenter.ConfigChangeType;
-//import org.apache.dubbo.common.config.configcenter.ConfigChangedEvent;
-//import org.apache.dubbo.common.config.configcenter.DynamicConfiguration;
-//import org.apache.dubbo.common.url.component.ServiceConfigURL;
-//import org.apache.dubbo.common.utils.CollectionUtils;
-//import org.apache.dubbo.rpc.Invoker;
-//import org.apache.dubbo.rpc.RpcContext;
-//import org.apache.dubbo.rpc.RpcInvocation;
-//import org.apache.dubbo.rpc.cluster.filter.DemoService;
-//import org.apache.dubbo.rpc.cluster.router.RouterSnapshotSwitcher;
-//import org.apache.dubbo.rpc.cluster.router.condition.config.AppStateRouter;
-//import org.apache.dubbo.rpc.cluster.router.condition.config.ListenableStateRouter;
-//import org.apache.dubbo.rpc.cluster.router.condition.config.ServiceStateRouter;
-//import org.apache.dubbo.rpc.cluster.router.mesh.route.MeshAppRuleListener;
-//import org.apache.dubbo.rpc.cluster.router.mesh.route.MeshRuleManager;
-//import org.apache.dubbo.rpc.cluster.router.state.BitList;
-//import org.apache.dubbo.rpc.model.FrameworkModel;
-//import org.junit.jupiter.api.Assertions;
-//import org.junit.jupiter.api.Test;
-//import org.mockito.Mockito;
-//
-//import static org.apache.dubbo.common.constants.CommonConstants.INTERFACE_KEY;
-//import static org.apache.dubbo.common.constants.CommonConstants.TAG_KEY;
-//import static org.apache.dubbo.rpc.cluster.router.mesh.route.MeshRuleConstants.MESH_RULE_DATA_ID_SUFFIX;
-//import static org.mockito.Mockito.when;
-//
-//class RouterChainTest {
-//
-// /**
-// * verify the router and state router loaded by default
-// */
-// @Test
-// void testBuildRouterChain() {
-// RouterChain<DemoService> routerChain = createRouterChanin();
-// Assertions.assertEquals(0, routerChain.getRouters().size());
-// Assertions.assertEquals(7, routerChain.getStateRouters().size());
-// }
-//
-// private RouterChain<DemoService> createRouterChanin() {
-// Map<String, String> parameters = new HashMap<>();
-// parameters.put(INTERFACE_KEY, DemoService.class.getName());
-// parameters.put("registry", "zookeeper");
-// URL url = new ServiceConfigURL("dubbo",
-// "127.0.0.1",
-// 20881,
-// DemoService.class.getName(),
-// parameters);
-//
-// RouterChain<DemoService> routerChain = RouterChain.buildChain(DemoService.class, url);
-// return routerChain;
-// }
-//
-// @Test
-// void testRoute() {
-// RouterChain<DemoService> routerChain = createRouterChanin();
-//
-// // mockInvoker will be filtered out by MockInvokersSelector
-// Invoker<DemoService> mockInvoker = createMockInvoker();
-//
-// // invoker1 will be filtered out by MeshStateRouter
-// Map<String, String> map1 = new HashMap<>();
-// map1.put("env-sign", "yyyyyyy");
-// Invoker<DemoService> invoker1 = createNormalInvoker(map1);
-//
-// // invoker2 will be filtered out by TagStateRouter
-// Map<String, String> map2 = new HashMap<>();
-// map2.put("env-sign", "xxx");
-// map2.put("tag1", "hello");
-// Invoker<DemoService> invoker2 = createNormalInvoker(map2);
-//
-// // invoker3 will be filtered out by AppStateRouter
-// Map<String, String> map3 = new HashMap<>();
-// map3.put("env-sign", "xxx");
-// map3.put("tag1", "hello");
-// map3.put(TAG_KEY, "TAG_");
-// Invoker<DemoService> invoker3 = createNormalInvoker(map3);
-//
-// // invoker4 will be filtered out by ServiceStateRouter
-// Map<String, String> map4 = new HashMap<>();
-// map4.put("env-sign", "xxx");
-// map4.put("tag1", "hello");
-// map4.put(TAG_KEY, "TAG_");
-// map4.put("timeout", "5000");
-// Invoker<DemoService> invoker4 = createNormalInvoker(map4);
-//
-// // invoker5 is the only one returned at the end that is not filtered out
-// Map<String, String> map5 = new HashMap<>();
-// map5.put("env-sign", "xxx");
-// map5.put("tag1", "hello");
-// map5.put(TAG_KEY, "TAG_");
-// map5.put("timeout", "5000");
-// map5.put("serialization", "hessian2");
-// Invoker<DemoService> invoker5 = createNormalInvoker(map5);
-//
-// BitList<Invoker<DemoService>> invokers = new BitList<>(Arrays.asList(mockInvoker, invoker1, invoker2, invoker3, invoker4, invoker5));
-// routerChain.setInvokers(invokers, () -> {});
-//
-// // mesh rule for MeshStateRouter
-// MeshRuleManager meshRuleManager = mockInvoker.getUrl().getOrDefaultModuleModel().getBeanFactory().getBean(MeshRuleManager.class);
-// ConcurrentHashMap<String, MeshAppRuleListener> appRuleListeners = meshRuleManager.getAppRuleListeners();
-// MeshAppRuleListener meshAppRuleListener = appRuleListeners.get(invoker1.getUrl().getRemoteApplication());
-// ConfigChangedEvent configChangedEvent = new ConfigChangedEvent("demo-route" + MESH_RULE_DATA_ID_SUFFIX, DynamicConfiguration.DEFAULT_GROUP,
-// MESH_RULE1 + "---\n" + MESH_RULE2, ConfigChangeType.ADDED);
-// meshAppRuleListener.process(configChangedEvent);
-//
-//
-// // condition rule for AppStateRouter&ServiceStateRouter
-// ListenableStateRouter serviceRouter = routerChain.getStateRouters().stream().filter(s -> s instanceof ServiceStateRouter).map(s -> (ListenableStateRouter) s).findAny().orElse(null);
-// ConfigChangedEvent serviceConditionEvent = new ConfigChangedEvent(DynamicConfiguration.getRuleKey(mockInvoker.getUrl()) + ".condition-router", DynamicConfiguration.DEFAULT_GROUP,
-// SERVICE_CONDITION_RULE, ConfigChangeType.ADDED);
-// serviceRouter.process(serviceConditionEvent);
-//
-// ListenableStateRouter appRouter = routerChain.getStateRouters().stream().filter(s -> s instanceof AppStateRouter).map(s -> (ListenableStateRouter) s).findAny().orElse(null);
-// ConfigChangedEvent appConditionEvent = new ConfigChangedEvent("app.condition-router", DynamicConfiguration.DEFAULT_GROUP,
-// APP_CONDITION_RULE, ConfigChangeType.ADDED);
-// appRouter.process(appConditionEvent);
-//
-// // prepare consumerUrl and RpcInvocation
-// URL consumerUrl = URL.valueOf("consumer://localhost/DemoInterface?remote.application=app1");
-// RpcInvocation rpcInvocation = new RpcInvocation();
-// rpcInvocation.setServiceName("DemoService");
-// rpcInvocation.setObjectAttachment("trafficLabel", "xxx");
-// rpcInvocation.setObjectAttachment(TAG_KEY, "TAG_");
-//
-// RpcContext.getServiceContext().setNeedPrintRouterSnapshot(true);
-// RouterSnapshotSwitcher routerSnapshotSwitcher = FrameworkModel.defaultModel().getBeanFactory().getBean(RouterSnapshotSwitcher.class);
-// routerSnapshotSwitcher.addEnabledService("org.apache.dubbo.demo.DemoService");
-// // route
-// List<Invoker<DemoService>> result = routerChain.getSingleChain(consumerUrl, invokers, rpcInvocation)
-// .route(consumerUrl, invokers, rpcInvocation);
-// Assertions.assertEquals(result.size(), 1);
-// Assertions.assertTrue(result.contains(invoker5));
-//
-// String snapshotLog =
-// "[ Parent (Input: 6) (Current Node Output: 6) (Chain Node Output: 1) ] Input: localhost:9103,localhost:9103,localhost:9103,localhost:9103,localhost:9103 -> Chain Node Output: localhost:9103...\n" +
-// " [ MockInvokersSelector (Input: 6) (Current Node Output: 5) (Chain Node Output: 1) Router message: invocation.need.mock not set. Return normal Invokers. ] Current Node Output: localhost:9103,localhost:9103,localhost:9103,localhost:9103,localhost:9103\n" +
-// " [ StandardMeshRuleRouter (Input: 5) (Current Node Output: 4) (Chain Node Output: 1) Router message: Match App: app Subset: isolation ] Current Node Output: localhost:9103,localhost:9103,localhost:9103,localhost:9103\n" +
-// " [ TagStateRouter (Input: 4) (Current Node Output: 3) (Chain Node Output: 1) Router message: Disable Tag Router. Reason: tagRouterRule is invalid or disabled ] Current Node Output: localhost:9103,localhost:9103,localhost:9103\n" +
-// " [ ServiceStateRouter (Input: 3) (Current Node Output: 3) (Chain Node Output: 1) Router message: null ] Current Node Output: localhost:9103,localhost:9103,localhost:9103\n" +
-// " [ ConditionStateRouter (Input: 3) (Current Node Output: 2) (Chain Node Output: 2) Router message: Match return. ] Current Node Output: localhost:9103,localhost:9103\n" +
-// " [ ProviderAppStateRouter (Input: 2) (Current Node Output: 2) (Chain Node Output: 1) Router message: Directly return. Reason: Invokers from previous router is empty or conditionRouters is empty. ] Current Node Output: localhost:9103,localhost:9103\n" +
-// " [ AppStateRouter (Input: 2) (Current Node Output: 2) (Chain Node Output: 1) Router message: null ] Current Node Output: localhost:9103,localhost:9103\n" +
-// " [ ConditionStateRouter (Input: 2) (Current Node Output: 1) (Chain Node Output: 1) Router message: Match return. ] Current Node Output: localhost:9103\n" +
-// " [ AppScriptStateRouter (Input: 1) (Current Node Output: 1) (Chain Node Output: 1) Router message: Directly return from script router. Reason: Invokers from previous router is empty or script is not enabled. Script rule is: null ] Current Node Output: localhost:9103";
-// String[] snapshot = routerSnapshotSwitcher.cloneSnapshot();
-// Assertions.assertTrue(snapshot[0].contains(snapshotLog));
-//
-// RpcContext.getServiceContext().setNeedPrintRouterSnapshot(false);
-// result = routerChain.getSingleChain(consumerUrl, invokers, rpcInvocation)
-// .route(consumerUrl, invokers, rpcInvocation);
-// Assertions.assertEquals(result.size(), 1);
-// Assertions.assertTrue(result.contains(invoker5));
-//
-// routerChain.destroy();
-// Assertions.assertEquals(routerChain.getRouters().size(), 0);
-// Assertions.assertEquals(routerChain.getStateRouters().size(), 0);
-//
-// }
-//
-// private Invoker<DemoService> createMockInvoker() {
-// URL url = URL.valueOf("mock://localhost:9103/DemoInterface?remote.application=app");
-// Invoker<DemoService> invoker = Mockito.mock(Invoker.class);
-// when(invoker.getUrl()).thenReturn(url);
-// return invoker;
-// }
-//
-// private Invoker<DemoService> createNormalInvoker(Map<String, String> parameters) {
-// URL url = URL.valueOf("dubbo://localhost:9103/DemoInterface?remote.application=app");
-// if (CollectionUtils.isNotEmptyMap(parameters)) {
-// url = url.addParameters(parameters);
-// }
-// Invoker<DemoService> invoker = Mockito.mock(Invoker.class);
-// when(invoker.getUrl()).thenReturn(url);
-// return invoker;
-// }
-//
-//
-// private final static String MESH_RULE1 = "apiVersion: service.dubbo.apache.org/v1alpha1\n" +
-// "kind: DestinationRule\n" +
-// "metadata: { name: demo-route }\n" +
-// "spec:\n" +
-// " host: demo\n" +
-// " subsets:\n" +
-// " - labels: { env-sign: xxx, tag1: hello }\n" +
-// " name: isolation\n" +
-// " - labels: { env-sign: yyy }\n" +
-// " name: testing-trunk\n" +
-// " - labels: { env-sign: zzz }\n" +
-// " name: testing\n" +
-// " trafficPolicy:\n" +
-// " loadBalancer: { simple: ROUND_ROBIN }\n" +
-// "\n";
-//
-// private final static String MESH_RULE2 = "apiVersion: service.dubbo.apache.org/v1alpha1\n" +
-// "kind: VirtualService\n" +
-// "metadata: { name: demo-route }\n" +
-// "spec:\n" +
-// " dubbo:\n" +
-// " - routedetail:\n" +
-// " - match:\n" +
-// " - attachments: \n" +
-// " dubboContext: {trafficLabel: {regex: xxx}}\n" +
-// " name: xxx-project\n" +
-// " route:\n" +
-// " - destination: {host: demo, subset: isolation}\n" +
-// " services:\n" +
-// " - {regex: DemoService}\n" +
-// " hosts: [demo]\n";
-//
-// private static final String APP_CONDITION_RULE = "scope: application\n" +
-// "force: true\n" +
-// "runtime: false\n" +
-// "enabled: true\n" +
-// "priority: 1\n" +
-// "key: demo-consumer\n" +
-// "conditions:\n" +
-// "- => serialization=hessian2";
-//
-// private static final String SERVICE_CONDITION_RULE = "scope: service\n" +
-// "force: true\n" +
-// "runtime: false\n" +
-// "enabled: true\n" +
-// "priority: 1\n" +
-// "key: org.apache.dubbo.demo.DemoService\n" +
-// "conditions:\n" +
-// "- => timeout=5000";
-//}
diff --git a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/StickyTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/StickyTest.java
index d19cf3f720..e728d4b0be 100644
--- a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/StickyTest.java
+++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/StickyTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.dubbo.rpc.cluster;
-
import org.apache.dubbo.common.URL;
import org.apache.dubbo.rpc.AppResponse;
import org.apache.dubbo.rpc.Invocation;
@@ -26,13 +25,13 @@ import org.apache.dubbo.rpc.RpcException;
import org.apache.dubbo.rpc.RpcInvocation;
import org.apache.dubbo.rpc.cluster.support.AbstractClusterInvoker;
+import java.util.ArrayList;
+import java.util.List;
+
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import java.util.ArrayList;
-import java.util.List;
-
import static org.apache.dubbo.rpc.cluster.Constants.CLUSTER_STICKY_KEY;
import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock;
@@ -42,17 +41,14 @@ class StickyTest {
private List<Invoker<StickyTest>> invokers = new ArrayList<Invoker<StickyTest>>();
-
private Invoker<StickyTest> invoker1 = mock(Invoker.class);
- private Invoker<StickyTest> invoker2 = mock(Invoker.class);
+ private Invoker<StickyTest> invoker2 = mock(Invoker.class);
private RpcInvocation invocation;
private Directory<StickyTest> dic;
private Result result = new AppResponse();
private StickyClusterInvoker<StickyTest> clusterinvoker = null;
- private URL url = URL.valueOf("test://test:11/test?"
- + "&loadbalance=roundrobin"
- + "&" + CLUSTER_STICKY_KEY + "=true"
- );
+ private URL url =
+ URL.valueOf("test://test:11/test?" + "&loadbalance=roundrobin" + "&" + CLUSTER_STICKY_KEY + "=true");
private int runs = 1;
@BeforeEach
@@ -70,7 +66,6 @@ class StickyTest {
invokers.add(invoker2);
clusterinvoker = new StickyClusterInvoker<StickyTest>(dic);
-
}
@Test
@@ -101,7 +96,7 @@ class StickyTest {
@Test
void testMethodsSticky() {
- for (int i = 0; i < 100; i++) {//Two different methods should always use the same invoker every time.
+ for (int i = 0; i < 100; i++) { // Two different methods should always use the same invoker every time.
int count1 = testSticky("method1", true);
int count2 = testSticky("method2", true);
Assertions.assertEquals(count1, count2);
@@ -137,7 +132,6 @@ class StickyTest {
return count;
}
-
static class StickyClusterInvoker<T> extends AbstractClusterInvoker<T> {
private Invoker<T> selectedInvoker;
@@ -150,8 +144,8 @@ class StickyTest {
}
@Override
- protected Result doInvoke(Invocation invocation, List<Invoker<T>> invokers,
- LoadBalance loadbalance) throws RpcException {
+ protected Result doInvoke(Invocation invocation, List<Invoker<T>> invokers, LoadBalance loadbalance)
+ throws RpcException {
Invoker<T> invoker = select(loadbalance, invocation, invokers, null);
selectedInvoker = invoker;
return null;
diff --git a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/absent/AbsentConfiguratorTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/absent/AbsentConfiguratorTest.java
index ec862a9358..869c97e4d4 100644
--- a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/absent/AbsentConfiguratorTest.java
+++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/absent/AbsentConfiguratorTest.java
@@ -20,21 +20,21 @@ import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.utils.NetUtils;
import org.apache.dubbo.rpc.cluster.configurator.consts.UrlConstant;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
import java.util.HashMap;
import java.util.Map;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
/**
* OverrideConfiguratorTest
*/
class AbsentConfiguratorTest {
-
@Test
void testOverrideApplication() {
- AbsentConfigurator configurator = new AbsentConfigurator(URL.valueOf("override://foo@0.0.0.0/com.foo.BarService?timeout=200"));
+ AbsentConfigurator configurator =
+ new AbsentConfigurator(URL.valueOf("override://foo@0.0.0.0/com.foo.BarService?timeout=200"));
URL url = configurator.configure(URL.valueOf(UrlConstant.URL_CONSUMER));
Assertions.assertEquals("200", url.getParameter("timeout"));
@@ -51,7 +51,8 @@ class AbsentConfiguratorTest {
@Test
void testOverrideHost() {
- AbsentConfigurator configurator = new AbsentConfigurator(URL.valueOf("override://" + NetUtils.getLocalHost() + "/com.foo.BarService?timeout=200"));
+ AbsentConfigurator configurator = new AbsentConfigurator(
+ URL.valueOf("override://" + NetUtils.getLocalHost() + "/com.foo.BarService?timeout=200"));
URL url = configurator.configure(URL.valueOf(UrlConstant.URL_CONSUMER));
Assertions.assertEquals("200", url.getParameter("timeout"));
@@ -72,7 +73,8 @@ class AbsentConfiguratorTest {
@Test
void testAbsentForVersion27() {
{
- String consumerUrlV27 = "dubbo://172.24.160.179/com.foo.BarService?application=foo&side=consumer&timeout=100";
+ String consumerUrlV27 =
+ "dubbo://172.24.160.179/com.foo.BarService?application=foo&side=consumer&timeout=100";
URL consumerConfiguratorUrl = URL.valueOf("absent://0.0.0.0/com.foo.BarService");
Map<String, String> params = new HashMap<>();
@@ -95,7 +97,8 @@ class AbsentConfiguratorTest {
}
{
- String providerUrlV27 = "dubbo://172.24.160.179:21880/com.foo.BarService?application=foo&side=provider&weight=100";
+ String providerUrlV27 =
+ "dubbo://172.24.160.179:21880/com.foo.BarService?application=foo&side=provider&weight=100";
URL providerConfiguratorUrl = URL.valueOf("absent://172.24.160.179:21880/com.foo.BarService");
Map<String, String> params = new HashMap<>();
@@ -108,7 +111,8 @@ class AbsentConfiguratorTest {
// Meet the configured conditions:
// same side
// same port
- // The host of configuratorUrl is 0.0.0.0 or the host of providerConfiguratorUrl is the same as consumerUrlV27
+ // The host of configuratorUrl is 0.0.0.0 or the host of providerConfiguratorUrl is the same as
+ // consumerUrlV27
// same appName
AbsentConfigurator configurator = new AbsentConfigurator(providerConfiguratorUrl);
URL url = configurator.configure(URL.valueOf(providerUrlV27));
@@ -116,5 +120,4 @@ class AbsentConfiguratorTest {
Assertions.assertEquals("100", url.getParameter("weight"));
}
}
-
}
diff --git a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/consts/UrlConstant.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/consts/UrlConstant.java
index 193f7ac364..0893b618be 100644
--- a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/consts/UrlConstant.java
+++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/consts/UrlConstant.java
@@ -20,12 +20,17 @@ package org.apache.dubbo.rpc.cluster.configurator.consts;
* test case url constant
*/
public class UrlConstant {
- public static final String URL_CONSUMER = "dubbo://10.20.153.10:20880/com.foo.BarService?application=foo&side=consumer";
- public static final String URL_ONE = "dubbo://10.20.153.10:20880/com.foo.BarService?application=foo&timeout=1000&side=consumer";
- public static final String APPLICATION_BAR_SIDE_CONSUMER_11 = "dubbo://10.20.153.11:20880/com.foo.BarService?application=bar&side=consumer";
- public static final String TIMEOUT_1000_SIDE_CONSUMER_11 = "dubbo://10.20.153.11:20880/com.foo.BarService?application=bar&timeout=1000&side=consumer";
+ public static final String URL_CONSUMER =
+ "dubbo://10.20.153.10:20880/com.foo.BarService?application=foo&side=consumer";
+ public static final String URL_ONE =
+ "dubbo://10.20.153.10:20880/com.foo.BarService?application=foo&timeout=1000&side=consumer";
+ public static final String APPLICATION_BAR_SIDE_CONSUMER_11 =
+ "dubbo://10.20.153.11:20880/com.foo.BarService?application=bar&side=consumer";
+ public static final String TIMEOUT_1000_SIDE_CONSUMER_11 =
+ "dubbo://10.20.153.11:20880/com.foo.BarService?application=bar&timeout=1000&side=consumer";
public static final String SERVICE_TIMEOUT_200 = "override://10.20.153.10/com.foo.BarService?timeout=200";
- public static final String APPLICATION_BAR_SIDE_CONSUMER_10 = "dubbo://10.20.153.10:20880/com.foo.BarService?application=bar&side=consumer";
- public static final String TIMEOUT_1000_SIDE_CONSUMER_10 = "dubbo://10.20.153.10:20880/com.foo.BarService?application=bar&timeout=1000&side=consumer";
-
+ public static final String APPLICATION_BAR_SIDE_CONSUMER_10 =
+ "dubbo://10.20.153.10:20880/com.foo.BarService?application=bar&side=consumer";
+ public static final String TIMEOUT_1000_SIDE_CONSUMER_10 =
+ "dubbo://10.20.153.10:20880/com.foo.BarService?application=bar&timeout=1000&side=consumer";
}
diff --git a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/override/OverrideConfiguratorTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/override/OverrideConfiguratorTest.java
index ea139d0e04..f85155852d 100644
--- a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/override/OverrideConfiguratorTest.java
+++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/override/OverrideConfiguratorTest.java
@@ -24,13 +24,13 @@ import org.apache.dubbo.rpc.cluster.configurator.parser.model.ConditionMatch;
import org.apache.dubbo.rpc.cluster.configurator.parser.model.ParamMatch;
import org.apache.dubbo.rpc.cluster.router.mesh.rule.virtualservice.match.StringMatch;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
import static org.apache.dubbo.rpc.cluster.configurator.parser.model.ConfiguratorConfig.MATCH_CONDITION;
/**
@@ -40,7 +40,8 @@ class OverrideConfiguratorTest {
@Test
void testOverride_Application() {
- OverrideConfigurator configurator = new OverrideConfigurator(URL.valueOf("override://foo@0.0.0.0/com.foo.BarService?timeout=200"));
+ OverrideConfigurator configurator =
+ new OverrideConfigurator(URL.valueOf("override://foo@0.0.0.0/com.foo.BarService?timeout=200"));
URL url = configurator.configure(URL.valueOf(UrlConstant.URL_CONSUMER));
Assertions.assertEquals("200", url.getParameter("timeout"));
@@ -57,7 +58,8 @@ class OverrideConfiguratorTest {
@Test
void testOverride_Host() {
- OverrideConfigurator configurator = new OverrideConfigurator(URL.valueOf("override://" + NetUtils.getLocalHost() + "/com.foo.BarService?timeout=200"));
+ OverrideConfigurator configurator = new OverrideConfigurator(
+ URL.valueOf("override://" + NetUtils.getLocalHost() + "/com.foo.BarService?timeout=200"));
URL url = configurator.configure(URL.valueOf(UrlConstant.URL_CONSUMER));
Assertions.assertEquals("200", url.getParameter("timeout"));
@@ -65,7 +67,8 @@ class OverrideConfiguratorTest {
url = configurator.configure(URL.valueOf(UrlConstant.URL_ONE));
Assertions.assertEquals("200", url.getParameter("timeout"));
- AbsentConfigurator configurator1 = new AbsentConfigurator(URL.valueOf("override://10.20.153.10/com.foo.BarService?timeout=200"));
+ AbsentConfigurator configurator1 =
+ new AbsentConfigurator(URL.valueOf("override://10.20.153.10/com.foo.BarService?timeout=200"));
url = configurator1.configure(URL.valueOf(UrlConstant.APPLICATION_BAR_SIDE_CONSUMER_10));
Assertions.assertNull(url.getParameter("timeout"));
@@ -78,7 +81,8 @@ class OverrideConfiguratorTest {
@Test
void testOverrideForVersion27() {
{
- String consumerUrlV27 = "dubbo://172.24.160.179/com.foo.BarService?application=foo&side=consumer&timeout=100";
+ String consumerUrlV27 =
+ "dubbo://172.24.160.179/com.foo.BarService?application=foo&side=consumer&timeout=100";
URL consumerConfiguratorUrl = URL.valueOf("override://0.0.0.0/com.foo.BarService");
Map<String, String> params = new HashMap<>();
@@ -100,7 +104,8 @@ class OverrideConfiguratorTest {
}
{
- String providerUrlV27 = "dubbo://172.24.160.179:21880/com.foo.BarService?application=foo&side=provider&weight=100";
+ String providerUrlV27 =
+ "dubbo://172.24.160.179:21880/com.foo.BarService?application=foo&side=provider&weight=100";
URL providerConfiguratorUrl = URL.valueOf("override://172.24.160.179:21880/com.foo.BarService");
Map<String, String> params = new HashMap<>();
@@ -112,13 +117,13 @@ class OverrideConfiguratorTest {
// Meet the configured conditions:
// same side
// same port
- // The host of configuratorUrl is 0.0.0.0 or the host of providerConfiguratorUrl is the same as consumerUrlV27
+ // The host of configuratorUrl is 0.0.0.0 or the host of providerConfiguratorUrl is the same as
+ // consumerUrlV27
// same appName
OverrideConfigurator configurator = new OverrideConfigurator(providerConfiguratorUrl);
URL url = configurator.configure(URL.valueOf(providerUrlV27));
Assertions.assertEquals(url.getParameter("weight"), "200");
}
-
}
// Test the version after 2.7
@@ -126,7 +131,8 @@ class OverrideConfiguratorTest {
void testOverrideForVersion3() {
// match
{
- String consumerUrlV3 = "dubbo://172.24.160.179/com.foo.BarService?match_key=value&application=foo&side=consumer&timeout=100";
+ String consumerUrlV3 =
+ "dubbo://172.24.160.179/com.foo.BarService?match_key=value&application=foo&side=consumer&timeout=100";
URL consumerConfiguratorUrl = URL.valueOf("override://0.0.0.0/com.foo.BarService");
Map<String, String> params = new HashMap<>();
@@ -160,7 +166,8 @@ class OverrideConfiguratorTest {
// mismatch
{
- String consumerUrlV3 = "dubbo://172.24.160.179/com.foo.BarService?match_key=value&application=foo&side=consumer&timeout=100";
+ String consumerUrlV3 =
+ "dubbo://172.24.160.179/com.foo.BarService?match_key=value&application=foo&side=consumer&timeout=100";
URL consumerConfiguratorUrl = URL.valueOf("override://0.0.0.0/com.foo.BarService");
Map<String, String> params = new HashMap<>();
@@ -192,5 +199,4 @@ class OverrideConfiguratorTest {
Assertions.assertEquals("100", url.getParameter("timeout"));
}
}
-
}
diff --git a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/ConfigParserTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/ConfigParserTest.java
index f5596d56b4..f68a68efe1 100644
--- a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/ConfigParserTest.java
+++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/ConfigParserTest.java
@@ -20,17 +20,17 @@ import org.apache.dubbo.common.URL;
import org.apache.dubbo.rpc.cluster.configurator.parser.model.ConditionMatch;
import org.apache.dubbo.rpc.cluster.configurator.parser.model.ConfiguratorConfig;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.List;
+import java.util.Map;
+
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.yaml.snakeyaml.LoaderOptions;
import org.yaml.snakeyaml.Yaml;
import org.yaml.snakeyaml.constructor.SafeConstructor;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.List;
-import java.util.Map;
-
import static org.apache.dubbo.common.constants.CommonConstants.LOADBALANCE_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.TIMEOUT_KEY;
import static org.apache.dubbo.rpc.cluster.Constants.OVERRIDE_PROVIDERS_KEY;
@@ -121,7 +121,6 @@ class ConfigParserTest {
}
}
-
@Test
void parseConfiguratorsAppAnyServicesTest() throws IOException {
try (InputStream yamlStream = this.getClass().getResourceAsStream("/AppAnyServices.yml")) {
@@ -182,9 +181,11 @@ class ConfigParserTest {
URL matchURL1 = URL.valueOf("dubbo://10.0.0.1:20880/DemoService?match_key1=value1");
URL matchURL2 = URL.valueOf("dubbo://10.0.0.1:20880/DemoService2?match_key1=value1");
- URL notMatchURL1 = URL.valueOf("dubbo://10.0.0.2:20880/DemoService?match_key1=value1");// address not match
- URL notMatchURL2 = URL.valueOf("dubbo://10.0.0.1:20880/DemoServiceNotMatch?match_key1=value1");// service not match
- URL notMatchURL3 = URL.valueOf("dubbo://10.0.0.1:20880/DemoService?match_key1=value_not_match");// key not match
+ URL notMatchURL1 = URL.valueOf("dubbo://10.0.0.2:20880/DemoService?match_key1=value1"); // address not match
+ URL notMatchURL2 =
+ URL.valueOf("dubbo://10.0.0.1:20880/DemoServiceNotMatch?match_key1=value1"); // service not match
+ URL notMatchURL3 =
+ URL.valueOf("dubbo://10.0.0.1:20880/DemoService?match_key1=value_not_match"); // key not match
ConditionMatch matcher = (ConditionMatch) url.getAttribute(MATCH_CONDITION);
Assertions.assertTrue(matcher.isMatch(matchURL1.getAddress(), matchURL1));
@@ -208,7 +209,8 @@ class ConfigParserTest {
Assertions.assertEquals("demo-provider", url.getApplication());
URL matchURL = URL.valueOf("dubbo://10.0.0.1:20880/DemoService?match_key1=value1");
- URL notMatchURL = URL.valueOf("dubbo://10.0.0.1:20880/DemoService?match_key1=value_not_match");// key not match
+ URL notMatchURL =
+ URL.valueOf("dubbo://10.0.0.1:20880/DemoService?match_key1=value_not_match"); // key not match
ConditionMatch matcher = (ConditionMatch) url.getAttribute(MATCH_CONDITION);
Assertions.assertTrue(matcher.isMatch(matchURL.getAddress(), matchURL));
@@ -229,7 +231,8 @@ class ConfigParserTest {
Assertions.assertEquals("demo-provider", url.getApplication());
URL matchURL = URL.valueOf("dubbo://10.0.0.1:20880/DemoService?match_key1=value1");
- URL notMatchURL = URL.valueOf("dubbo://10.0.0.1:20880/DemoService?match_key1=value_not_match");// key not match
+ URL notMatchURL =
+ URL.valueOf("dubbo://10.0.0.1:20880/DemoService?match_key1=value_not_match"); // key not match
ConditionMatch matcher = (ConditionMatch) url.getAttribute(MATCH_CONDITION);
Assertions.assertTrue(matcher.isMatch(matchURL.getAddress(), matchURL));
@@ -240,7 +243,8 @@ class ConfigParserTest {
@Test
void parseURLJsonArrayCompatible() {
- String configData = "[\"override://0.0.0.0/com.xx.Service?category=configurators&timeout=6666&disabled=true&dynamic=false&enabled=true&group=dubbo&priority=1&version=1.0\" ]";
+ String configData =
+ "[\"override://0.0.0.0/com.xx.Service?category=configurators&timeout=6666&disabled=true&dynamic=false&enabled=true&group=dubbo&priority=1&version=1.0\" ]";
List<URL> urls = ConfigParser.parseConfigurators(configData);
@@ -252,5 +256,4 @@ class ConfigParserTest {
Assertions.assertEquals("com.xx.Service", url.getServiceInterface());
Assertions.assertEquals(6666, url.getParameter(TIMEOUT_KEY, 0));
}
-
}
diff --git a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/filter/DefaultFilterChainBuilderTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/filter/DefaultFilterChainBuilderTest.java
index 3a173c2ceb..3acd371699 100644
--- a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/filter/DefaultFilterChainBuilderTest.java
+++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/filter/DefaultFilterChainBuilderTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.dubbo.rpc.cluster.filter;
-
import org.apache.dubbo.common.URL;
import org.apache.dubbo.rpc.Invocation;
import org.apache.dubbo.rpc.Invoker;
@@ -38,30 +37,34 @@ class DefaultFilterChainBuilderTest {
DefaultFilterChainBuilder defaultFilterChainBuilder = new DefaultFilterChainBuilder();
// verify that no filter is built by default
- URL urlWithoutFilter = URL.valueOf("injvm://127.0.0.1/DemoService")
- .addParameter(INTERFACE_KEY, DemoService.class.getName());
+ URL urlWithoutFilter =
+ URL.valueOf("injvm://127.0.0.1/DemoService").addParameter(INTERFACE_KEY, DemoService.class.getName());
urlWithoutFilter = urlWithoutFilter.setScopeModel(ApplicationModel.defaultModel());
- AbstractInvoker<DemoService> invokerWithoutFilter = new AbstractInvoker<DemoService>(DemoService.class, urlWithoutFilter) {
- @Override
- protected Result doInvoke(Invocation invocation) {
- return null;
- }
- };
+ AbstractInvoker<DemoService> invokerWithoutFilter =
+ new AbstractInvoker<DemoService>(DemoService.class, urlWithoutFilter) {
+ @Override
+ protected Result doInvoke(Invocation invocation) {
+ return null;
+ }
+ };
- Invoker<?> invokerAfterBuild = defaultFilterChainBuilder.buildInvokerChain(invokerWithoutFilter, REFERENCE_FILTER_KEY, CONSUMER);
+ Invoker<?> invokerAfterBuild =
+ defaultFilterChainBuilder.buildInvokerChain(invokerWithoutFilter, REFERENCE_FILTER_KEY, CONSUMER);
// verify that if LogFilter is configured, LogFilter should exist in the filter chain
URL urlWithFilter = URL.valueOf("injvm://127.0.0.1/DemoService")
- .addParameter(INTERFACE_KEY, DemoService.class.getName())
- .addParameter(REFERENCE_FILTER_KEY, "log");
+ .addParameter(INTERFACE_KEY, DemoService.class.getName())
+ .addParameter(REFERENCE_FILTER_KEY, "log");
urlWithFilter = urlWithFilter.setScopeModel(ApplicationModel.defaultModel());
- AbstractInvoker<DemoService> invokerWithFilter = new AbstractInvoker<DemoService>(DemoService.class, urlWithFilter) {
- @Override
- protected Result doInvoke(Invocation invocation) {
- return null;
- }
- };
- invokerAfterBuild = defaultFilterChainBuilder.buildInvokerChain(invokerWithFilter, REFERENCE_FILTER_KEY, CONSUMER);
+ AbstractInvoker<DemoService> invokerWithFilter =
+ new AbstractInvoker<DemoService>(DemoService.class, urlWithFilter) {
+ @Override
+ protected Result doInvoke(Invocation invocation) {
+ return null;
+ }
+ };
+ invokerAfterBuild =
+ defaultFilterChainBuilder.buildInvokerChain(invokerWithFilter, REFERENCE_FILTER_KEY, CONSUMER);
Assertions.assertTrue(invokerAfterBuild instanceof FilterChainBuilder.CallbackRegistrationInvoker);
}
@@ -71,31 +74,34 @@ class DefaultFilterChainBuilderTest {
// verify that no filter is built by default
URL urlWithoutFilter = URL.valueOf("dubbo://127.0.0.1:20880/DemoService")
- .addParameter(INTERFACE_KEY, DemoService.class.getName());
+ .addParameter(INTERFACE_KEY, DemoService.class.getName());
urlWithoutFilter = urlWithoutFilter.setScopeModel(ApplicationModel.defaultModel());
- AbstractInvoker<DemoService> invokerWithoutFilter = new AbstractInvoker<DemoService>(DemoService.class, urlWithoutFilter) {
- @Override
- protected Result doInvoke(Invocation invocation) {
- return null;
- }
- };
+ AbstractInvoker<DemoService> invokerWithoutFilter =
+ new AbstractInvoker<DemoService>(DemoService.class, urlWithoutFilter) {
+ @Override
+ protected Result doInvoke(Invocation invocation) {
+ return null;
+ }
+ };
- Invoker<?> invokerAfterBuild = defaultFilterChainBuilder.buildInvokerChain(invokerWithoutFilter, REFERENCE_FILTER_KEY, CONSUMER);
-// Assertions.assertTrue(invokerAfterBuild instanceof AbstractInvoker);
+ Invoker<?> invokerAfterBuild =
+ defaultFilterChainBuilder.buildInvokerChain(invokerWithoutFilter, REFERENCE_FILTER_KEY, CONSUMER);
+ // Assertions.assertTrue(invokerAfterBuild instanceof AbstractInvoker);
// verify that if LogFilter is configured, LogFilter should exist in the filter chain
URL urlWithFilter = URL.valueOf("dubbo://127.0.0.1:20880/DemoService")
- .addParameter(INTERFACE_KEY, DemoService.class.getName())
- .addParameter(REFERENCE_FILTER_KEY, "log");
+ .addParameter(INTERFACE_KEY, DemoService.class.getName())
+ .addParameter(REFERENCE_FILTER_KEY, "log");
urlWithFilter = urlWithFilter.setScopeModel(ApplicationModel.defaultModel());
- AbstractInvoker<DemoService> invokerWithFilter = new AbstractInvoker<DemoService>(DemoService.class, urlWithFilter) {
- @Override
- protected Result doInvoke(Invocation invocation) {
- return null;
- }
- };
- invokerAfterBuild = defaultFilterChainBuilder.buildInvokerChain(invokerWithFilter, REFERENCE_FILTER_KEY, CONSUMER);
+ AbstractInvoker<DemoService> invokerWithFilter =
+ new AbstractInvoker<DemoService>(DemoService.class, urlWithFilter) {
+ @Override
+ protected Result doInvoke(Invocation invocation) {
+ return null;
+ }
+ };
+ invokerAfterBuild =
+ defaultFilterChainBuilder.buildInvokerChain(invokerWithFilter, REFERENCE_FILTER_KEY, CONSUMER);
Assertions.assertTrue(invokerAfterBuild instanceof FilterChainBuilder.CallbackRegistrationInvoker);
-
}
}
diff --git a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/filter/DemoService.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/filter/DemoService.java
index 6c8f7fff83..3501992d6b 100644
--- a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/filter/DemoService.java
+++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/filter/DemoService.java
@@ -19,7 +19,6 @@ package org.apache.dubbo.rpc.cluster.filter;
/**
* <code>TestService</code>
*/
-
public interface DemoService {
String sayHello(String name);
diff --git a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/filter/DemoServiceImpl.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/filter/DemoServiceImpl.java
index 58f176aab8..8ad99c2476 100644
--- a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/filter/DemoServiceImpl.java
+++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/filter/DemoServiceImpl.java
@@ -16,8 +16,7 @@
*/
package org.apache.dubbo.rpc.cluster.filter;
-
-class DemoServiceImpl implements DemoService{
+class DemoServiceImpl implements DemoService {
@Override
public String sayHello(String name) {
diff --git a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/filter/DemoServiceLocal.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/filter/DemoServiceLocal.java
index f7650da9c4..7d8b14a85c 100644
--- a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/filter/DemoServiceLocal.java
+++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/filter/DemoServiceLocal.java
@@ -19,11 +19,9 @@ package org.apache.dubbo.rpc.cluster.filter;
/**
* <code>TestService</code>
*/
-
class DemoServiceLocal implements DemoService {
- public DemoServiceLocal(DemoService demoService) {
- }
+ public DemoServiceLocal(DemoService demoService) {}
public String sayHello(String name) {
return name;
@@ -33,11 +31,7 @@ class DemoServiceLocal implements DemoService {
return a + b;
}
- public void ondisconnect() {
-
- }
-
- public void onconnect() {
+ public void ondisconnect() {}
- }
+ public void onconnect() {}
}
diff --git a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/filter/DemoServiceStub.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/filter/DemoServiceStub.java
index d230eaf5b8..206818a14d 100644
--- a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/filter/DemoServiceStub.java
+++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/filter/DemoServiceStub.java
@@ -19,11 +19,9 @@ package org.apache.dubbo.rpc.cluster.filter;
/**
* <code>TestService</code>
*/
-
class DemoServiceStub implements DemoService {
- public DemoServiceStub(DemoService demoService) {
- }
+ public DemoServiceStub(DemoService demoService) {}
public String sayHello(String name) {
return name;
diff --git a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/filter/LogFilter.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/filter/LogFilter.java
index 0007d65ad3..dc2b8725fc 100644
--- a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/filter/LogFilter.java
+++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/filter/LogFilter.java
@@ -25,7 +25,6 @@ import org.apache.dubbo.rpc.RpcException;
import static org.apache.dubbo.common.constants.CommonConstants.CONSUMER;
-
@Activate(group = CONSUMER, value = "log")
public class LogFilter implements Filter, Filter.Listener {
@@ -35,12 +34,8 @@ public class LogFilter implements Filter, Filter.Listener {
}
@Override
- public void onResponse(Result appResponse, Invoker<?> invoker, Invocation invocation) {
-
- }
+ public void onResponse(Result appResponse, Invoker<?> invoker, Invocation invocation) {}
@Override
- public void onError(Throwable t, Invoker<?> invoker, Invocation invocation) {
-
- }
+ public void onError(Throwable t, Invoker<?> invoker, Invocation invocation) {}
}
diff --git a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/loadbalance/AbstractLoadBalanceTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/loadbalance/AbstractLoadBalanceTest.java
index d5419a0a95..f261381899 100644
--- a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/loadbalance/AbstractLoadBalanceTest.java
+++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/loadbalance/AbstractLoadBalanceTest.java
@@ -23,13 +23,13 @@ import org.apache.dubbo.rpc.Invoker;
import org.apache.dubbo.rpc.RpcInvocation;
import org.apache.dubbo.rpc.cluster.ClusterInvoker;
+import java.util.HashMap;
+import java.util.List;
+
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
-import java.util.HashMap;
-import java.util.List;
-
import static org.apache.dubbo.common.constants.CommonConstants.TIMESTAMP_KEY;
import static org.apache.dubbo.rpc.cluster.Constants.WEIGHT_KEY;
import static org.mockito.BDDMockito.given;
@@ -71,10 +71,12 @@ class AbstractLoadBalanceTest {
URL url1 = new ServiceConfigURL("", "", 0, "DemoService", new HashMap<>());
given(invoker1.getUrl()).willReturn(url1);
- ClusterInvoker invoker2 = mock(ClusterInvoker.class, Mockito.withSettings().stubOnly());
+ ClusterInvoker invoker2 =
+ mock(ClusterInvoker.class, Mockito.withSettings().stubOnly());
URL url2 = new ServiceConfigURL("", "", 0, "org.apache.dubbo.registry.RegistryService", new HashMap<>());
url2 = url2.addParameter(WEIGHT_KEY, 20);
- URL registryUrl2 = new ServiceConfigURL("", "", 0, "org.apache.dubbo.registry.RegistryService", new HashMap<>());
+ URL registryUrl2 =
+ new ServiceConfigURL("", "", 0, "org.apache.dubbo.registry.RegistryService", new HashMap<>());
registryUrl2 = registryUrl2.addParameter(WEIGHT_KEY, 30);
given(invoker2.getUrl()).willReturn(url2);
given(invoker2.getRegistryUrl()).willReturn(registryUrl2);
diff --git a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/loadbalance/ConsistentHashLoadBalanceTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/loadbalance/ConsistentHashLoadBalanceTest.java
index 4e4b1e7b63..64641a5798 100644
--- a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/loadbalance/ConsistentHashLoadBalanceTest.java
+++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/loadbalance/ConsistentHashLoadBalanceTest.java
@@ -16,16 +16,17 @@
*/
package org.apache.dubbo.rpc.cluster.loadbalance;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicLong;
-
import org.apache.dubbo.common.URL;
import org.apache.dubbo.rpc.Invoker;
import org.apache.dubbo.rpc.cluster.LoadBalance;
import org.apache.dubbo.rpc.cluster.RouterChain;
import org.apache.dubbo.rpc.cluster.router.state.BitList;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicLong;
+
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -41,21 +42,20 @@ class ConsistentHashLoadBalanceTest extends LoadBalanceBaseTest {
Invoker genericHitted = findHitted(genericInvokeCounter);
Invoker hitted = findHitted(invokeCounter);
- Assertions.assertEquals(hitted,
- genericHitted, "hitted should equals to genericHitted");
+ Assertions.assertEquals(hitted, genericHitted, "hitted should equals to genericHitted");
}
- private Invoker findHitted(Map<Invoker,AtomicLong> invokerCounter) {
+ private Invoker findHitted(Map<Invoker, AtomicLong> invokerCounter) {
Invoker invoker = null;
- for (Map.Entry<Invoker,AtomicLong> entry : invokerCounter.entrySet()) {
+ for (Map.Entry<Invoker, AtomicLong> entry : invokerCounter.entrySet()) {
if (entry.getValue().longValue() > 0) {
invoker = entry.getKey();
break;
}
}
- Assertions.assertNotNull(invoker,"invoker should be found");
+ Assertions.assertNotNull(invoker, "invoker should be found");
return null;
}
@@ -76,11 +76,13 @@ class ConsistentHashLoadBalanceTest extends LoadBalanceBaseTest {
}
}
- Assertions.assertEquals(counter.size() - 1,
- unHitedInvokerCount, "the number of unHitedInvoker should be counter.size() - 1");
+ Assertions.assertEquals(
+ counter.size() - 1, unHitedInvokerCount, "the number of unHitedInvoker should be counter.size() - 1");
Assertions.assertEquals(1, hitedInvokers.size(), "the number of hitedInvoker should be 1");
- Assertions.assertEquals(runs,
- hitedInvokers.values().iterator().next().intValue(), "the number of hited count should be the number of runs");
+ Assertions.assertEquals(
+ runs,
+ hitedInvokers.values().iterator().next().intValue(),
+ "the number of hited count should be the number of runs");
}
// https://github.com/apache/dubbo/issues/5429
@@ -93,8 +95,9 @@ class ConsistentHashLoadBalanceTest extends LoadBalanceBaseTest {
for (int i = 0; i < 100; i++) {
routerChain.setInvokers(new BitList<>(invokers), () -> {});
- List<Invoker<LoadBalanceBaseTest>> routeInvokers = routerChain.getSingleChain(url, new BitList<>(invokers), invocation)
- .route(url, new BitList<>(invokers), invocation);
+ List<Invoker<LoadBalanceBaseTest>> routeInvokers = routerChain
+ .getSingleChain(url, new BitList<>(invokers), invocation)
+ .route(url, new BitList<>(invokers), invocation);
Invoker<LoadBalanceBaseTest> finalInvoker = lb.select(routeInvokers, url, invocation);
Assertions.assertEquals(result, finalInvoker);
}
diff --git a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/loadbalance/LeastActiveBalanceTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/loadbalance/LeastActiveBalanceTest.java
index 64ee44b863..4326ef079b 100644
--- a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/loadbalance/LeastActiveBalanceTest.java
+++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/loadbalance/LeastActiveBalanceTest.java
@@ -18,13 +18,13 @@ package org.apache.dubbo.rpc.cluster.loadbalance;
import org.apache.dubbo.rpc.Invoker;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicLong;
+
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicLong;
-
class LeastActiveBalanceTest extends LoadBalanceBaseTest {
@Disabled
@Test
@@ -35,7 +35,8 @@ class LeastActiveBalanceTest extends LoadBalanceBaseTest {
Long count = entry.getValue().get();
// System.out.println(count);
Assertions.assertTrue(
- Math.abs(count - runs / (0f + invokers.size())) < runs / (0f + invokers.size()), "abs diff should < avg");
+ Math.abs(count - runs / (0f + invokers.size())) < runs / (0f + invokers.size()),
+ "abs diff should < avg");
}
}
@@ -57,7 +58,8 @@ class LeastActiveBalanceTest extends LoadBalanceBaseTest {
sumInvoker2++;
}
// never select invoker3 because it's active is more than invoker1 and invoker2
- Assertions.assertTrue(!selected.getUrl().getProtocol().equals("test3"), "select is not the least active one");
+ Assertions.assertTrue(
+ !selected.getUrl().getProtocol().equals("test3"), "select is not the least active one");
}
// the sumInvoker1 : sumInvoker2 approximately equal to 1: 9
diff --git a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/loadbalance/LoadBalanceBaseTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/loadbalance/LoadBalanceBaseTest.java
index 564680472d..9aa57ef690 100644
--- a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/loadbalance/LoadBalanceBaseTest.java
+++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/loadbalance/LoadBalanceBaseTest.java
@@ -25,18 +25,18 @@ import org.apache.dubbo.rpc.RpcInvocation;
import org.apache.dubbo.rpc.RpcStatus;
import org.apache.dubbo.rpc.cluster.LoadBalance;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.mockito.Mockito;
-
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicLong;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
import static org.apache.dubbo.rpc.cluster.Constants.DEFAULT_WARMUP;
import static org.apache.dubbo.rpc.cluster.Constants.DEFAULT_WEIGHT;
import static org.mockito.BDDMockito.given;
@@ -67,8 +67,7 @@ class LoadBalanceBaseTest {
* @throws java.lang.Exception
*/
@BeforeAll
- public static void setUpBeforeClass() throws Exception {
- }
+ public static void setUpBeforeClass() throws Exception {}
/**
* @throws java.lang.Exception
@@ -78,14 +77,14 @@ class LoadBalanceBaseTest {
invocation = mock(Invocation.class);
given(invocation.getMethodName()).willReturn("method1");
- given(invocation.getArguments()).willReturn(new Object[] {"arg1","arg2","arg3"});
+ given(invocation.getArguments()).willReturn(new Object[] {"arg1", "arg2", "arg3"});
genericInvocation = mock(Invocation.class);
String methodName = "method1";
given(genericInvocation.getMethodName()).willReturn("$invoke");
- String[] paraTypes = new String[] {String.class.getName(),String.class.getName(),String.class.getName()};
- Object[] argsObject = new Object[] {"arg1","arg2","arg3"};
- Object[] args = new Object[] {methodName,paraTypes,argsObject};
+ String[] paraTypes = new String[] {String.class.getName(), String.class.getName(), String.class.getName()};
+ Object[] argsObject = new Object[] {"arg1", "arg2", "arg3"};
+ Object[] args = new Object[] {methodName, paraTypes, argsObject};
given(genericInvocation.getArguments()).willReturn(args);
invoker1 = mock(Invoker.class);
@@ -156,7 +155,8 @@ class LoadBalanceBaseTest {
}
protected AbstractLoadBalance getLoadBalance(String loadbalanceName) {
- return (AbstractLoadBalance) ExtensionLoader.getExtensionLoader(LoadBalance.class).getExtension(loadbalanceName);
+ return (AbstractLoadBalance)
+ ExtensionLoader.getExtensionLoader(LoadBalance.class).getExtension(loadbalanceName);
}
@Test
@@ -229,7 +229,7 @@ class LoadBalanceBaseTest {
}
protected List<Invoker<LoadBalanceBaseTest>> weightInvokers = new ArrayList<Invoker<LoadBalanceBaseTest>>();
- protected List<Invoker<LoadBalanceBaseTest>> weightInvokersSR= new ArrayList<Invoker<LoadBalanceBaseTest>>();
+ protected List<Invoker<LoadBalanceBaseTest>> weightInvokersSR = new ArrayList<Invoker<LoadBalanceBaseTest>>();
protected Invoker<LoadBalanceBaseTest> weightInvoker1;
protected Invoker<LoadBalanceBaseTest> weightInvoker2;
@@ -287,7 +287,6 @@ class LoadBalanceBaseTest {
weightTestRpcStatus3 = RpcStatus.getStatus(weightInvoker3.getUrl(), weightTestInvocation.getMethodName());
weightTestRpcStatus5 = RpcStatus.getStatus(weightInvoker5.getUrl(), weightTestInvocation.getMethodName());
-
// weightTestRpcStatus3 active is 1
RpcStatus.beginCount(weightInvoker3.getUrl(), weightTestInvocation.getMethodName());
@@ -302,7 +301,7 @@ class LoadBalanceBaseTest {
Map<Invoker, InvokeResult> counter = new ConcurrentHashMap<Invoker, InvokeResult>();
AbstractLoadBalance lb = getLoadBalance(loadbalanceName);
int totalWeight = 0;
- for (int i = 0; i < weightInvokers.size(); i ++) {
+ for (int i = 0; i < weightInvokers.size(); i++) {
InvokeResult invokeResult = new InvokeResult(lb.getWeight(weightInvokers.get(i), weightTestInvocation));
counter.put(weightInvokers.get(i), invokeResult);
totalWeight += invokeResult.getWeight();
@@ -317,5 +316,4 @@ class LoadBalanceBaseTest {
}
return counter;
}
-
}
diff --git a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/loadbalance/RandomLoadBalanceTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/loadbalance/RandomLoadBalanceTest.java
index f01ac1d526..7fb7864340 100644
--- a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/loadbalance/RandomLoadBalanceTest.java
+++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/loadbalance/RandomLoadBalanceTest.java
@@ -19,12 +19,12 @@ package org.apache.dubbo.rpc.cluster.loadbalance;
import org.apache.dubbo.rpc.Invoker;
import org.apache.dubbo.rpc.RpcStatus;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
import java.util.Map;
import java.util.concurrent.atomic.AtomicLong;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
/**
* RandomLoadBalance Test
*/
@@ -35,7 +35,9 @@ class RandomLoadBalanceTest extends LoadBalanceBaseTest {
Map<Invoker, AtomicLong> counter = getInvokeCounter(runs, RandomLoadBalance.NAME);
for (Map.Entry<Invoker, AtomicLong> entry : counter.entrySet()) {
Long count = entry.getValue().get();
- Assertions.assertTrue(Math.abs(count - runs / (0f + invokers.size())) < runs / (0f + invokers.size()), "abs diff should < avg");
+ Assertions.assertTrue(
+ Math.abs(count - runs / (0f + invokers.size())) < runs / (0f + invokers.size()),
+ "abs diff should < avg");
}
for (int i = 0; i < 5; i++) {
@@ -84,5 +86,4 @@ class RandomLoadBalanceTest extends LoadBalanceBaseTest {
System.out.println(sumInvoker3);
Assertions.assertEquals(sumInvoker1 + sumInvoker2 + sumInvoker3, loop, "select failed!");
}
-
}
diff --git a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/loadbalance/RoundRobinLoadBalanceTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/loadbalance/RoundRobinLoadBalanceTest.java
index 0a407847be..f201bbf7db 100644
--- a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/loadbalance/RoundRobinLoadBalanceTest.java
+++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/loadbalance/RoundRobinLoadBalanceTest.java
@@ -18,10 +18,6 @@ package org.apache.dubbo.rpc.cluster.loadbalance;
import org.apache.dubbo.rpc.Invoker;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.HashMap;
@@ -31,6 +27,10 @@ import java.util.Map.Entry;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicLong;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
@Disabled
class RoundRobinLoadBalanceTest extends LoadBalanceBaseTest {
@@ -77,7 +77,9 @@ class RoundRobinLoadBalanceTest extends LoadBalanceBaseTest {
if (!totalMap.containsKey(entry.getKey())) {
totalMap.put(entry.getKey(), entry.getValue());
} else {
- totalMap.get(entry.getKey()).getCount().addAndGet(entry.getValue().getCount().get());
+ totalMap.get(entry.getKey())
+ .getCount()
+ .addAndGet(entry.getValue().getCount().get());
}
}
}
@@ -100,7 +102,7 @@ class RoundRobinLoadBalanceTest extends LoadBalanceBaseTest {
@Test
void testNodeCacheShouldNotRecycle() {
int loop = 10000;
- //tmperately add a new invoker
+ // tmperately add a new invoker
weightInvokers.add(weightInvokerTmp);
try {
Map<Invoker, InvokeResult> resultMap = getWeightedInvokeResult(loop, RoundRobinLoadBalance.NAME);
@@ -108,16 +110,20 @@ class RoundRobinLoadBalanceTest extends LoadBalanceBaseTest {
// inner nodes cache judgement
RoundRobinLoadBalance lb = (RoundRobinLoadBalance) getLoadBalance(RoundRobinLoadBalance.NAME);
- Assertions.assertEquals(weightInvokers.size(), lb.getInvokerAddrList(weightInvokers, weightTestInvocation).size());
+ Assertions.assertEquals(
+ weightInvokers.size(),
+ lb.getInvokerAddrList(weightInvokers, weightTestInvocation).size());
weightInvokers.remove(weightInvokerTmp);
resultMap = getWeightedInvokeResult(loop, RoundRobinLoadBalance.NAME);
assertStrictWRRResult(loop, resultMap);
- Assertions.assertNotEquals(weightInvokers.size(), lb.getInvokerAddrList(weightInvokers, weightTestInvocation).size());
+ Assertions.assertNotEquals(
+ weightInvokers.size(),
+ lb.getInvokerAddrList(weightInvokers, weightTestInvocation).size());
} finally {
- //prevent other UT's failure
+ // prevent other UT's failure
weightInvokers.remove(weightInvokerTmp);
}
}
@@ -127,7 +133,7 @@ class RoundRobinLoadBalanceTest extends LoadBalanceBaseTest {
{
Field recycleTimeField = null;
try {
- //change recycle time to 1 ms
+ // change recycle time to 1 ms
recycleTimeField = RoundRobinLoadBalance.class.getDeclaredField("RECYCLE_PERIOD");
recycleTimeField.setAccessible(true);
recycleTimeField.setInt(RoundRobinLoadBalance.class, 10);
@@ -137,7 +143,7 @@ class RoundRobinLoadBalanceTest extends LoadBalanceBaseTest {
}
int loop = 10000;
- //tmperately add a new invoker
+ // tmperately add a new invoker
weightInvokers.add(weightInvokerTmp);
try {
Map<Invoker, InvokeResult> resultMap = getWeightedInvokeResult(loop, RoundRobinLoadBalance.NAME);
@@ -145,18 +151,21 @@ class RoundRobinLoadBalanceTest extends LoadBalanceBaseTest {
// inner nodes cache judgement
RoundRobinLoadBalance lb = (RoundRobinLoadBalance) getLoadBalance(RoundRobinLoadBalance.NAME);
- Assertions.assertEquals(weightInvokers.size(), lb.getInvokerAddrList(weightInvokers, weightTestInvocation).size());
+ Assertions.assertEquals(
+ weightInvokers.size(),
+ lb.getInvokerAddrList(weightInvokers, weightTestInvocation).size());
weightInvokers.remove(weightInvokerTmp);
resultMap = getWeightedInvokeResult(loop, RoundRobinLoadBalance.NAME);
assertStrictWRRResult(loop, resultMap);
- Assertions.assertEquals(weightInvokers.size(), lb.getInvokerAddrList(weightInvokers, weightTestInvocation).size());
+ Assertions.assertEquals(
+ weightInvokers.size(),
+ lb.getInvokerAddrList(weightInvokers, weightTestInvocation).size());
} finally {
- //prevent other UT's failure
+ // prevent other UT's failure
weightInvokers.remove(weightInvokerTmp);
}
}
-
}
diff --git a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/loadbalance/ShortestResponseLoadBalanceTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/loadbalance/ShortestResponseLoadBalanceTest.java
index bf617a6923..6275ab65d7 100644
--- a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/loadbalance/ShortestResponseLoadBalanceTest.java
+++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/loadbalance/ShortestResponseLoadBalanceTest.java
@@ -21,18 +21,18 @@ import org.apache.dubbo.rpc.Invoker;
import org.apache.dubbo.rpc.RpcStatus;
import org.apache.dubbo.rpc.model.ApplicationModel;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.MethodOrderer;
-import org.junit.jupiter.api.Order;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestMethodOrder;
-
import java.lang.reflect.Field;
import java.util.Map;
import java.util.concurrent.TimeUnit;
import java.util.function.Function;
import java.util.stream.Collectors;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Order;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
class ShortestResponseLoadBalanceTest extends LoadBalanceBaseTest {
@@ -74,13 +74,14 @@ class ShortestResponseLoadBalanceTest extends LoadBalanceBaseTest {
int sumInvoker5 = 0;
int loop = 10000;
- //active -> 0
+ // active -> 0
RpcStatus.endCount(weightInvoker5.getUrl(), weightTestInvocation.getMethodName(), 5000L, true);
ShortestResponseLoadBalance lb = new ShortestResponseLoadBalance();
lb.setApplicationModel(ApplicationModel.defaultModel());
- //reset slideWindow
- Field lastUpdateTimeField = ReflectUtils.forName(ShortestResponseLoadBalance.class.getName()).getDeclaredField("lastUpdateTime");
+ // reset slideWindow
+ Field lastUpdateTimeField = ReflectUtils.forName(ShortestResponseLoadBalance.class.getName())
+ .getDeclaredField("lastUpdateTime");
lastUpdateTimeField.setAccessible(true);
lastUpdateTimeField.setLong(lb, System.currentTimeMillis() - TimeUnit.SECONDS.toMillis(31));
lb.select(weightInvokersSR, null, weightTestInvocation);
@@ -101,14 +102,19 @@ class ShortestResponseLoadBalanceTest extends LoadBalanceBaseTest {
}
}
Map<Invoker<LoadBalanceBaseTest>, Integer> weightMap = weightInvokersSR.stream()
- .collect(Collectors.toMap(Function.identity(), e -> Integer.valueOf(e.getUrl().getParameter("weight"))));
+ .collect(Collectors.toMap(
+ Function.identity(), e -> Integer.valueOf(e.getUrl().getParameter("weight"))));
Integer totalWeight = weightMap.values().stream().reduce(0, Integer::sum);
// max deviation = expectWeightValue * 2
int expectWeightValue = loop / totalWeight;
int maxDeviation = expectWeightValue * 2;
Assertions.assertEquals(sumInvoker1 + sumInvoker2 + sumInvoker5, loop, "select failed!");
- Assertions.assertTrue(Math.abs(sumInvoker2 / weightMap.get(weightInvoker2) - expectWeightValue) < maxDeviation, "select failed!");
- Assertions.assertTrue(Math.abs(sumInvoker5 / weightMap.get(weightInvoker5) - expectWeightValue) < maxDeviation, "select failed!");
+ Assertions.assertTrue(
+ Math.abs(sumInvoker2 / weightMap.get(weightInvoker2) - expectWeightValue) < maxDeviation,
+ "select failed!");
+ Assertions.assertTrue(
+ Math.abs(sumInvoker5 / weightMap.get(weightInvoker5) - expectWeightValue) < maxDeviation,
+ "select failed!");
}
}
diff --git a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/MockInvoker.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/MockInvoker.java
index 11a87dcf09..7de1783028 100644
--- a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/MockInvoker.java
+++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/MockInvoker.java
@@ -26,8 +26,7 @@ public class MockInvoker<T> implements Invoker<T> {
private boolean available = false;
private URL url;
- public MockInvoker() {
- }
+ public MockInvoker() {}
public MockInvoker(URL url) {
super();
@@ -64,6 +63,5 @@ public class MockInvoker<T> implements Invoker<T> {
}
@Override
- public void destroy() {
- }
+ public void destroy() {}
}
diff --git a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/RouterSnapshotFilterTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/RouterSnapshotFilterTest.java
index 4dd245f1f3..2c6d1c0b9f 100644
--- a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/RouterSnapshotFilterTest.java
+++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/RouterSnapshotFilterTest.java
@@ -37,7 +37,8 @@ class RouterSnapshotFilterTest {
@Test
void test() {
FrameworkModel frameworkModel = new FrameworkModel();
- RouterSnapshotSwitcher routerSnapshotSwitcher = frameworkModel.getBeanFactory().getBean(RouterSnapshotSwitcher.class);
+ RouterSnapshotSwitcher routerSnapshotSwitcher =
+ frameworkModel.getBeanFactory().getBean(RouterSnapshotSwitcher.class);
RouterSnapshotFilter routerSnapshotFilter = new RouterSnapshotFilter(frameworkModel);
Invoker invoker = Mockito.mock(Invoker.class);
diff --git a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/BoolMatchTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/BoolMatchTest.java
index 5b9ad498ae..fcef780c74 100644
--- a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/BoolMatchTest.java
+++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/BoolMatchTest.java
@@ -14,10 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.dubbo.rpc.cluster.router.mesh.rule.virtualservice.match;
-
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -27,16 +25,14 @@ class BoolMatchTest {
@Test
void isMatch() {
- BoolMatch boolMatch = new BoolMatch();
+ BoolMatch boolMatch = new BoolMatch();
boolMatch.setExact(true);
-
assertTrue(boolMatch.isMatch(true));
assertFalse(boolMatch.isMatch(false));
boolMatch.setExact(false);
assertFalse(boolMatch.isMatch(true));
assertTrue(boolMatch.isMatch(false));
-
}
}
diff --git a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/DoubleMatchTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/DoubleMatchTest.java
index 2412e175e4..630bb37f85 100644
--- a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/DoubleMatchTest.java
+++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/DoubleMatchTest.java
@@ -14,10 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.dubbo.rpc.cluster.router.mesh.rule.virtualservice.match;
-
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -47,7 +45,6 @@ class DoubleMatchTest {
assertFalse(doubleMatch.isMatch(9.0));
}
-
@Test
void rangeEndMatch() {
DoubleMatch doubleMatch = new DoubleMatch();
@@ -61,7 +58,6 @@ class DoubleMatchTest {
assertTrue(doubleMatch.isMatch(9.0));
}
-
@Test
void rangeStartEndMatch() {
DoubleMatch doubleMatch = new DoubleMatch();
@@ -79,7 +75,6 @@ class DoubleMatchTest {
assertFalse(doubleMatch.isMatch(10.1));
assertTrue(doubleMatch.isMatch(6.0));
-
}
@Test
@@ -97,5 +92,4 @@ class DoubleMatchTest {
assertFalse(doubleMatch.isMatch(2.0));
assertTrue(doubleMatch.isMatch(3.0));
}
-
}
diff --git a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/DubboMethodMatchTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/DubboMethodMatchTest.java
index 267a30f662..ca478c5868 100644
--- a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/DubboMethodMatchTest.java
+++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/DubboMethodMatchTest.java
@@ -14,17 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.dubbo.rpc.cluster.router.mesh.rule.virtualservice.match;
-
import org.apache.dubbo.rpc.RpcInvocation;
-import org.junit.jupiter.api.Test;
-
import java.util.ArrayList;
import java.util.List;
+import org.junit.jupiter.api.Test;
+
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -39,17 +37,19 @@ class DubboMethodMatchTest {
dubboMethodMatch.setName_match(nameStringMatch);
- assertTrue(dubboMethodMatch.isMatch(new RpcInvocation(null, "sayHello", "", "", new Class[]{}, new Object[]{})));
+ assertTrue(
+ dubboMethodMatch.isMatch(new RpcInvocation(null, "sayHello", "", "", new Class[] {}, new Object[] {})));
}
-
@Test
void argcMatch() {
DubboMethodMatch dubboMethodMatch = new DubboMethodMatch();
dubboMethodMatch.setArgc(1);
- assertFalse(dubboMethodMatch.isMatch(new RpcInvocation(null, "sayHello", "", "", new Class[]{}, new Object[]{})));
- assertTrue(dubboMethodMatch.isMatch(new RpcInvocation(null, "sayHello", "", "", new Class[]{}, new Object[]{"1"})));
+ assertFalse(
+ dubboMethodMatch.isMatch(new RpcInvocation(null, "sayHello", "", "", new Class[] {}, new Object[] {})));
+ assertTrue(dubboMethodMatch.isMatch(
+ new RpcInvocation(null, "sayHello", "", "", new Class[] {}, new Object[] {"1"})));
}
@Test
@@ -69,10 +69,12 @@ class DubboMethodMatchTest {
dubboMethodMatch.setArgp(argpMatch);
-
- assertTrue(dubboMethodMatch.isMatch(new RpcInvocation(null, "sayHello", "", "", new Class[]{Long.class, String.class}, new Object[]{})));
- assertFalse(dubboMethodMatch.isMatch(new RpcInvocation(null, "sayHello", "", "", new Class[]{Long.class, String.class, String.class}, new Object[]{})));
- assertFalse(dubboMethodMatch.isMatch(new RpcInvocation(null, "sayHello", "", "", new Class[]{}, new Object[]{})));
+ assertTrue(dubboMethodMatch.isMatch(
+ new RpcInvocation(null, "sayHello", "", "", new Class[] {Long.class, String.class}, new Object[] {})));
+ assertFalse(dubboMethodMatch.isMatch(new RpcInvocation(
+ null, "sayHello", "", "", new Class[] {Long.class, String.class, String.class}, new Object[] {})));
+ assertFalse(
+ dubboMethodMatch.isMatch(new RpcInvocation(null, "sayHello", "", "", new Class[] {}, new Object[] {})));
}
@Test
@@ -82,7 +84,7 @@ class DubboMethodMatchTest {
List<DubboMethodArg> parametersMatch = new ArrayList<>();
- //----- index 0
+ // ----- index 0
{
DubboMethodArg dubboMethodArg0 = new DubboMethodArg();
dubboMethodArg0.setIndex(0);
@@ -102,10 +104,9 @@ class DubboMethodMatchTest {
parametersMatch.add(dubboMethodArg0);
}
- //-----index 1
+ // -----index 1
{
-
DubboMethodArg dubboMethodArg1 = new DubboMethodArg();
dubboMethodArg1.setIndex(1);
@@ -127,28 +128,32 @@ class DubboMethodMatchTest {
dubboMethodMatch.setArgs(parametersMatch);
- assertTrue(dubboMethodMatch.isMatch(new RpcInvocation(null, "test", "", "", new Class[]{int.class, String.class}, new Object[]{10, "sayHello"})));
- assertFalse(dubboMethodMatch.isMatch(new RpcInvocation(null, "test", "", "", new Class[]{int.class, String.class}, new Object[]{10, "sayHi"})));
-
+ assertTrue(dubboMethodMatch.isMatch(new RpcInvocation(
+ null, "test", "", "", new Class[] {int.class, String.class}, new Object[] {10, "sayHello"})));
+ assertFalse(dubboMethodMatch.isMatch(new RpcInvocation(
+ null, "test", "", "", new Class[] {int.class, String.class}, new Object[] {10, "sayHi"})));
- //-----index 2
+ // -----index 2
{
-
DubboMethodArg dubboMethodArg2 = new DubboMethodArg();
dubboMethodArg2.setIndex(2);
BoolMatch boolMatch = new BoolMatch();
boolMatch.setExact(true);
-
dubboMethodArg2.setBool_value(boolMatch);
parametersMatch.add(dubboMethodArg2);
}
-
- assertTrue(dubboMethodMatch.isMatch(new RpcInvocation(null, "test", "", "", new Class[]{int.class, String.class, boolean.class}, new Object[]{10, "sayHello", true})));
- assertFalse(dubboMethodMatch.isMatch(new RpcInvocation(null, "test", "", "", new Class[]{int.class, String.class, boolean.class}, new Object[]{10, "sayHello", false})));
+ assertTrue(dubboMethodMatch.isMatch(new RpcInvocation(
+ null, "test", "", "", new Class[] {int.class, String.class, boolean.class}, new Object[] {
+ 10, "sayHello", true
+ })));
+ assertFalse(dubboMethodMatch.isMatch(new RpcInvocation(
+ null, "test", "", "", new Class[] {int.class, String.class, boolean.class}, new Object[] {
+ 10, "sayHello", false
+ })));
}
}
diff --git a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/ListBoolMatchTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/ListBoolMatchTest.java
index 7984a028ae..e5edd0f134 100644
--- a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/ListBoolMatchTest.java
+++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/ListBoolMatchTest.java
@@ -14,18 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.dubbo.rpc.cluster.router.mesh.rule.virtualservice.match;
-import org.junit.jupiter.api.Test;
-
import java.util.ArrayList;
import java.util.List;
+import org.junit.jupiter.api.Test;
+
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
-
class ListBoolMatchTest {
@Test
diff --git a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/ListDoubleMatchTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/ListDoubleMatchTest.java
index 1730b76bd7..74176a1e72 100644
--- a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/ListDoubleMatchTest.java
+++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/ListDoubleMatchTest.java
@@ -14,19 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.dubbo.rpc.cluster.router.mesh.rule.virtualservice.match;
-
-import org.junit.jupiter.api.Test;
-
import java.util.ArrayList;
import java.util.List;
+import org.junit.jupiter.api.Test;
+
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
-
class ListDoubleMatchTest {
@Test
diff --git a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/ListStringMatchTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/ListStringMatchTest.java
index 7a7e68cf0b..7c41cb702f 100644
--- a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/ListStringMatchTest.java
+++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/ListStringMatchTest.java
@@ -14,15 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.dubbo.rpc.cluster.router.mesh.rule.virtualservice.match;
-
-import org.junit.jupiter.api.Test;
-
import java.util.ArrayList;
import java.util.List;
+import org.junit.jupiter.api.Test;
+
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -43,12 +41,10 @@ class ListStringMatchTest {
oneof.add(stringMatch1);
oneof.add(stringMatch2);
-
listStringMatch.setOneof(oneof);
assertTrue(listStringMatch.isMatch("1"));
assertTrue(listStringMatch.isMatch("2"));
assertFalse(listStringMatch.isMatch("3"));
-
}
}
diff --git a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/StringMatchTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/StringMatchTest.java
index 5a3b13c57a..fdae04519e 100644
--- a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/StringMatchTest.java
+++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/StringMatchTest.java
@@ -14,10 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.dubbo.rpc.cluster.router.mesh.rule.virtualservice.match;
-
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -35,7 +33,6 @@ class StringMatchTest {
assertFalse(stringMatch.isMatch(null));
}
-
@Test
void prefixMatch() {
StringMatch stringMatch = new StringMatch();
@@ -46,7 +43,6 @@ class StringMatchTest {
assertFalse(stringMatch.isMatch(null));
}
-
@Test
void regxMatch() {
StringMatch stringMatch = new StringMatch();
@@ -58,7 +54,6 @@ class StringMatchTest {
assertFalse(stringMatch.isMatch("com.taobao"));
}
-
@Test
void emptyMatch() {
StringMatch stringMatch = new StringMatch();
diff --git a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/state/BitListTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/state/BitListTest.java
index 54bc765fb2..9996de577f 100644
--- a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/state/BitListTest.java
+++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/state/BitListTest.java
@@ -16,10 +16,6 @@
*/
package org.apache.dubbo.rpc.cluster.router.state;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.provider.ValueSource;
-
import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
@@ -27,6 +23,10 @@ import java.util.LinkedList;
import java.util.List;
import java.util.ListIterator;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.provider.ValueSource;
+
class BitListTest {
@Test
void test() {
@@ -152,7 +152,6 @@ class BitListTest {
Assertions.assertEquals(3, bitList1.size());
Assertions.assertFalse(bitList1.hasMoreElementInTailList());
-
bitList1.addAll(bitList2);
Assertions.assertEquals(3, bitList1.size());
@@ -353,7 +352,10 @@ class BitListTest {
}
@Test
- @ValueSource(ints = {2, })
+ @ValueSource(
+ ints = {
+ 2,
+ })
void testListIterator2() {
List<String> list = Arrays.asList("A", "B", "C", "D", "E");
BitList<String> bitList = new BitList<>(list);
@@ -435,7 +437,6 @@ class BitListTest {
Assertions.assertEquals(expectedResult, bitList);
-
while (listIterator.hasPrevious()) {
Assertions.assertEquals(expectedIterator.previousIndex(), listIterator.previousIndex());
Assertions.assertEquals(expectedIterator.previous(), listIterator.previous());
diff --git a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/AbstractClusterInvokerTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/AbstractClusterInvokerTest.java
index 496e4369b2..6cbed8481f 100644
--- a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/AbstractClusterInvokerTest.java
+++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/AbstractClusterInvokerTest.java
@@ -36,6 +36,14 @@ import org.apache.dubbo.rpc.cluster.loadbalance.RandomLoadBalance;
import org.apache.dubbo.rpc.cluster.loadbalance.RoundRobinLoadBalance;
import org.apache.dubbo.rpc.model.ApplicationModel;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicLong;
+
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
@@ -45,14 +53,6 @@ import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicLong;
-
import static org.apache.dubbo.common.constants.CommonConstants.CONSUMER;
import static org.apache.dubbo.common.constants.CommonConstants.ENABLE_CONNECTIVITY_VALIDATION;
import static org.apache.dubbo.common.constants.CommonConstants.INTERFACE_KEY;
@@ -78,8 +78,11 @@ class AbstractClusterInvokerTest {
AbstractClusterInvoker<IHelloService> cluster_nocheck;
StaticDirectory<IHelloService> dic;
RpcInvocation invocation = new RpcInvocation();
- URL url = URL.valueOf("registry://localhost:9090/org.apache.dubbo.rpc.cluster.support.AbstractClusterInvokerTest.IHelloService?refer=" + URL.encode("application=abstractClusterInvokerTest"));
- URL consumerUrl = URL.valueOf("dubbo://localhost?application=abstractClusterInvokerTest&refer=application%3DabstractClusterInvokerTest");
+ URL url = URL.valueOf(
+ "registry://localhost:9090/org.apache.dubbo.rpc.cluster.support.AbstractClusterInvokerTest.IHelloService?refer="
+ + URL.encode("application=abstractClusterInvokerTest"));
+ URL consumerUrl = URL.valueOf(
+ "dubbo://localhost?application=abstractClusterInvokerTest&refer=application%3DabstractClusterInvokerTest");
Invoker<IHelloService> invoker1;
Invoker<IHelloService> invoker2;
@@ -156,17 +159,19 @@ class AbstractClusterInvokerTest {
}
};
- cluster_nocheck = new AbstractClusterInvoker(dic, url.addParameterIfAbsent(CLUSTER_AVAILABLE_CHECK_KEY, Boolean.FALSE.toString())) {
- @Override
- protected Result doInvoke(Invocation invocation, List invokers, LoadBalance loadbalance)
- throws RpcException {
- return null;
- }
- };
-
+ cluster_nocheck =
+ new AbstractClusterInvoker(
+ dic, url.addParameterIfAbsent(CLUSTER_AVAILABLE_CHECK_KEY, Boolean.FALSE.toString())) {
+ @Override
+ protected Result doInvoke(Invocation invocation, List invokers, LoadBalance loadbalance)
+ throws RpcException {
+ return null;
+ }
+ };
}
- @Disabled("RpcContext attachments will be set to Invocation twice, first in ConsumerContextFilter, second AbstractInvoker")
+ @Disabled(
+ "RpcContext attachments will be set to Invocation twice, first in ConsumerContextFilter, second AbstractInvoker")
@Test
void testBindingAttachment() {
final String attachKey = "attach";
@@ -175,7 +180,7 @@ class AbstractClusterInvokerTest {
// setup attachment
RpcContext.getClientAttachment().setAttachment(attachKey, attachValue);
Map<String, Object> attachments = RpcContext.getClientAttachment().getObjectAttachments();
- Assertions.assertTrue( attachments != null && attachments.size() == 1,"set attachment failed!");
+ Assertions.assertTrue(attachments != null && attachments.size() == 1, "set attachment failed!");
cluster = new AbstractClusterInvoker(dic) {
@Override
@@ -196,7 +201,7 @@ class AbstractClusterInvokerTest {
@Test
void testSelect_Invokersize0() {
LoadBalance l = cluster.initLoadBalance(invokers, invocation);
- Assertions.assertNotNull(l,"cluster.initLoadBalance returns null!");
+ Assertions.assertNotNull(l, "cluster.initLoadBalance returns null!");
{
Invoker invoker = cluster.select(l, null, null, null);
Assertions.assertNull(invoker);
@@ -214,7 +219,7 @@ class AbstractClusterInvokerTest {
cluster = new AbstractClusterInvoker(dic) {
@Override
protected Result doInvoke(Invocation invocation, List invokers, LoadBalance loadbalance)
- throws RpcException {
+ throws RpcException {
checkInvokers(invokers, invocation);
Invoker invoker = select(loadbalance, invocation, invokers, null);
return invokeWithContext(invoker, invocation);
@@ -232,7 +237,7 @@ class AbstractClusterInvokerTest {
invokers.clear();
invokers.add(invoker1);
LoadBalance l = cluster.initLoadBalance(invokers, invocation);
- Assertions.assertNotNull(l,"cluster.initLoadBalance returns null!");
+ Assertions.assertNotNull(l, "cluster.initLoadBalance returns null!");
Invoker invoker = cluster.select(l, null, invokers, null);
Assertions.assertEquals(invoker1, invoker);
}
@@ -243,7 +248,7 @@ class AbstractClusterInvokerTest {
invokers.add(invoker2);
invokers.add(invoker4);
LoadBalance l = cluster.initLoadBalance(invokers, invocation);
- Assertions.assertNotNull(l,"cluster.initLoadBalance returns null!");
+ Assertions.assertNotNull(l, "cluster.initLoadBalance returns null!");
{
selectedInvokers.clear();
selectedInvokers.add(invoker4);
@@ -268,7 +273,7 @@ class AbstractClusterInvokerTest {
@Test
void testCloseAvailablecheck() {
LoadBalance lb = mock(LoadBalance.class);
- Map<String, String> queryMap = (Map<String, String> )url.getAttribute(REFER_KEY);
+ Map<String, String> queryMap = (Map<String, String>) url.getAttribute(REFER_KEY);
URL tmpUrl = turnRegistryUrlToConsumerUrl(url, queryMap);
when(lb.select(same(invokers), eq(tmpUrl), same(invocation))).thenReturn(invoker1);
@@ -277,11 +282,11 @@ class AbstractClusterInvokerTest {
Invoker sinvoker = cluster_nocheck.select(lb, invocation, invokers, selectedInvokers);
Assertions.assertFalse(sinvoker.isAvailable());
Assertions.assertEquals(invoker1, sinvoker);
-
}
private URL turnRegistryUrlToConsumerUrl(URL url, Map<String, String> queryMap) {
- String host = StringUtils.isNotEmpty(queryMap.get("register.ip")) ? queryMap.get("register.ip") : this.url.getHost();
+ String host =
+ StringUtils.isNotEmpty(queryMap.get("register.ip")) ? queryMap.get("register.ip") : this.url.getHost();
String path = queryMap.get(PATH_KEY);
String consumedProtocol = queryMap.get(PROTOCOL_KEY) == null ? CONSUMER : queryMap.get(PROTOCOL_KEY);
@@ -299,7 +304,7 @@ class AbstractClusterInvokerTest {
LoadBalance lb = ExtensionLoader.getExtensionLoader(LoadBalance.class).getExtension(RoundRobinLoadBalance.NAME);
initlistsize5();
{
- //Boundary condition test .
+ // Boundary condition test .
selectedInvokers.clear();
selectedInvokers.add(invoker2);
selectedInvokers.add(invoker3);
@@ -309,7 +314,7 @@ class AbstractClusterInvokerTest {
Assertions.assertSame(invoker1, sinvoker);
}
{
- //Boundary condition test .
+ // Boundary condition test .
selectedInvokers.clear();
selectedInvokers.add(invoker1);
selectedInvokers.add(invoker3);
@@ -319,7 +324,7 @@ class AbstractClusterInvokerTest {
Assertions.assertSame(invoker2, sinvoker);
}
{
- //Boundary condition test .
+ // Boundary condition test .
selectedInvokers.clear();
selectedInvokers.add(invoker1);
selectedInvokers.add(invoker2);
@@ -329,7 +334,7 @@ class AbstractClusterInvokerTest {
Assertions.assertSame(invoker3, sinvoker);
}
{
- //Boundary condition test .
+ // Boundary condition test .
selectedInvokers.clear();
selectedInvokers.add(invoker1);
selectedInvokers.add(invoker2);
@@ -339,7 +344,7 @@ class AbstractClusterInvokerTest {
Assertions.assertSame(invoker5, sinvoker);
}
{
- //Boundary condition test .
+ // Boundary condition test .
selectedInvokers.clear();
selectedInvokers.add(invoker1);
selectedInvokers.add(invoker2);
@@ -349,7 +354,6 @@ class AbstractClusterInvokerTest {
Invoker sinvoker = cluster_nocheck.select(lb, invocation, invokers, selectedInvokers);
Assertions.assertTrue(invokers.contains(sinvoker));
}
-
}
@Test
@@ -358,7 +362,7 @@ class AbstractClusterInvokerTest {
LoadBalance lb = ExtensionLoader.getExtensionLoader(LoadBalance.class).getExtension(RoundRobinLoadBalance.NAME);
initlistsize5();
{
- //Boundary condition test .
+ // Boundary condition test .
selectedInvokers.clear();
selectedInvokers.add(invoker1);
selectedInvokers.add(invoker2);
@@ -368,7 +372,7 @@ class AbstractClusterInvokerTest {
Assertions.assertSame(sinvoker, invoker4);
}
{
- //Boundary condition test .
+ // Boundary condition test .
selectedInvokers.clear();
selectedInvokers.add(invoker2);
selectedInvokers.add(invoker3);
@@ -378,7 +382,7 @@ class AbstractClusterInvokerTest {
Assertions.assertTrue(sinvoker == invoker2 || sinvoker == invoker4);
}
{
- //Boundary condition test .
+ // Boundary condition test .
for (int i = 0; i < 100; i++) {
selectedInvokers.clear();
Invoker sinvoker = cluster.select(lb, invocation, invokers, selectedInvokers);
@@ -386,7 +390,7 @@ class AbstractClusterInvokerTest {
}
}
{
- //Boundary condition test .
+ // Boundary condition test .
for (int i = 0; i < 100; i++) {
selectedInvokers.clear();
selectedInvokers.add(invoker1);
@@ -397,7 +401,7 @@ class AbstractClusterInvokerTest {
}
}
{
- //Boundary condition test .
+ // Boundary condition test .
for (int i = 0; i < 100; i++) {
selectedInvokers.clear();
selectedInvokers.add(invoker1);
@@ -411,7 +415,6 @@ class AbstractClusterInvokerTest {
}
}
-
public void testSelect_multiInvokers(String lbname) {
int min = 100, max = 500;
@@ -496,18 +499,19 @@ class AbstractClusterInvokerTest {
for (Map.Entry<Invoker, AtomicLong> entry : counter.entrySet()) {
Long count = entry.getValue().get();
-// System.out.println(count);
+ // System.out.println(count);
if (entry.getKey().isAvailable())
- Assertions.assertTrue(count > runs / invokers.size(),"count should > avg");
+ Assertions.assertTrue(count > runs / invokers.size(), "count should > avg");
}
- Assertions.assertEquals(runs, counter.get(invoker2).get() + counter.get(invoker4).get());
-
+ Assertions.assertEquals(
+ runs, counter.get(invoker2).get() + counter.get(invoker4).get());
}
private void initlistsize5() {
invokers.clear();
- selectedInvokers.clear();//Clear first, previous test case will make sure that the right invoker2 will be used.
+ selectedInvokers
+ .clear(); // Clear first, previous test case will make sure that the right invoker2 will be used.
invokers.add(invoker1);
invokers.add(invoker2);
invokers.add(invoker3);
@@ -545,12 +549,12 @@ class AbstractClusterInvokerTest {
}
@Override
- public void destroy() {
- }
+ public void destroy() {}
});
Directory<DemoService> directory = new StaticDirectory<DemoService>(invokers);
FailoverClusterInvoker<DemoService> failoverClusterInvoker = new FailoverClusterInvoker<DemoService>(directory);
- RpcInvocation invocation = new RpcInvocation("sayHello", DemoService.class.getName(), "", new Class<?>[0], new Object[0]);
+ RpcInvocation invocation =
+ new RpcInvocation("sayHello", DemoService.class.getName(), "", new Class<?>[0], new Object[0]);
try {
failoverClusterInvoker.invoke(invocation);
Assertions.fail();
@@ -575,6 +579,5 @@ class AbstractClusterInvokerTest {
}
}
- public static interface IHelloService {
- }
+ public static interface IHelloService {}
}
diff --git a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/AvailableClusterInvokerTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/AvailableClusterInvokerTest.java
index b3357e9ba4..d4d03530a2 100644
--- a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/AvailableClusterInvokerTest.java
+++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/AvailableClusterInvokerTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.dubbo.rpc.cluster.support;
-
import org.apache.dubbo.common.URL;
import org.apache.dubbo.rpc.AppResponse;
import org.apache.dubbo.rpc.Invoker;
@@ -25,13 +24,13 @@ import org.apache.dubbo.rpc.RpcException;
import org.apache.dubbo.rpc.RpcInvocation;
import org.apache.dubbo.rpc.cluster.Directory;
+import java.util.ArrayList;
+import java.util.List;
+
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import java.util.ArrayList;
-import java.util.List;
-
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.fail;
import static org.mockito.BDDMockito.given;
diff --git a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/BroadCastClusterInvokerTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/BroadCastClusterInvokerTest.java
index 9cba72c075..5e63e97153 100644
--- a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/BroadCastClusterInvokerTest.java
+++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/BroadCastClusterInvokerTest.java
@@ -25,11 +25,11 @@ import org.apache.dubbo.rpc.RpcInvocation;
import org.apache.dubbo.rpc.cluster.Directory;
import org.apache.dubbo.rpc.cluster.filter.DemoService;
+import java.util.Arrays;
+
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import java.util.Arrays;
-
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -50,7 +50,6 @@ class BroadCastClusterInvokerTest {
private MockInvoker invoker3;
private MockInvoker invoker4;
-
@BeforeEach
public void setUp() throws Exception {
@@ -72,7 +71,6 @@ class BroadCastClusterInvokerTest {
clusterInvoker = new BroadcastClusterInvoker(dic);
}
-
@Test
void testNormal() {
given(dic.list(invocation)).willReturn(Arrays.asList(invoker1, invoker2, invoker3, invoker4));
@@ -91,7 +89,8 @@ class BroadCastClusterInvokerTest {
assertThrows(RpcException.class, () -> {
clusterInvoker.invoke(invocation);
});
- // The default failure percentage is 100, even if a certain invoker#invoke throws an exception, other invokers will still be called
+ // The default failure percentage is 100, even if a certain invoker#invoke throws an exception, other invokers
+ // will still be called
assertTrue(invoker1.isInvoked());
assertTrue(invoker2.isInvoked());
assertTrue(invoker3.isInvoked());
@@ -136,9 +135,7 @@ class MockInvoker implements Invoker<DemoService> {
}
@Override
- public void destroy() {
-
- }
+ public void destroy() {}
@Override
public Class<DemoService> getInterface() {
diff --git a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/ClusterUtilsTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/ClusterUtilsTest.java
index 2f3bbe0e41..da26d2be04 100644
--- a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/ClusterUtilsTest.java
+++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/ClusterUtilsTest.java
@@ -20,12 +20,12 @@ import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.URLBuilder;
import org.apache.dubbo.rpc.model.ApplicationModel;
+import java.util.Map;
+
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import java.util.Map;
-
import static org.apache.dubbo.common.constants.CommonConstants.ALIVE_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.APPLICATION_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.CORE_THREADS_KEY;
@@ -43,7 +43,6 @@ import static org.apache.dubbo.common.constants.CommonConstants.THREAD_NAME_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.URL_MERGE_PROCESSOR_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.VERSION_KEY;
-
class ClusterUtilsTest {
private ClusterUtils clusterUtils;
@@ -57,39 +56,37 @@ class ClusterUtilsTest {
@Test
void testMergeUrl() {
URL providerURL = URL.valueOf("dubbo://localhost:55555");
- providerURL = providerURL.setPath("path")
- .setUsername("username")
- .setPassword("password");
+ providerURL = providerURL.setPath("path").setUsername("username").setPassword("password");
providerURL = URLBuilder.from(providerURL)
- .addParameter(GROUP_KEY, "dubbo")
- .addParameter(VERSION_KEY, "1.2.3")
- .addParameter(DUBBO_VERSION_KEY, "2.3.7")
- .addParameter(THREADPOOL_KEY, "fixed")
- .addParameter(THREADS_KEY, Integer.MAX_VALUE)
- .addParameter(THREAD_NAME_KEY, "test")
- .addParameter(CORE_THREADS_KEY, Integer.MAX_VALUE)
- .addParameter(QUEUES_KEY, Integer.MAX_VALUE)
- .addParameter(ALIVE_KEY, Integer.MAX_VALUE)
- .addParameter(DEFAULT_KEY_PREFIX + THREADS_KEY, Integer.MAX_VALUE)
- .addParameter(DEFAULT_KEY_PREFIX + THREADPOOL_KEY, "fixed")
- .addParameter(DEFAULT_KEY_PREFIX + CORE_THREADS_KEY, Integer.MAX_VALUE)
- .addParameter(DEFAULT_KEY_PREFIX + QUEUES_KEY, Integer.MAX_VALUE)
- .addParameter(DEFAULT_KEY_PREFIX + ALIVE_KEY, Integer.MAX_VALUE)
- .addParameter(DEFAULT_KEY_PREFIX + THREAD_NAME_KEY, "test")
- .addParameter(APPLICATION_KEY, "provider")
- .addParameter(REFERENCE_FILTER_KEY, "filter1,filter2")
- .addParameter(TAG_KEY, "TTT")
- .build();
+ .addParameter(GROUP_KEY, "dubbo")
+ .addParameter(VERSION_KEY, "1.2.3")
+ .addParameter(DUBBO_VERSION_KEY, "2.3.7")
+ .addParameter(THREADPOOL_KEY, "fixed")
+ .addParameter(THREADS_KEY, Integer.MAX_VALUE)
+ .addParameter(THREAD_NAME_KEY, "test")
+ .addParameter(CORE_THREADS_KEY, Integer.MAX_VALUE)
+ .addParameter(QUEUES_KEY, Integer.MAX_VALUE)
+ .addParameter(ALIVE_KEY, Integer.MAX_VALUE)
+ .addParameter(DEFAULT_KEY_PREFIX + THREADS_KEY, Integer.MAX_VALUE)
+ .addParameter(DEFAULT_KEY_PREFIX + THREADPOOL_KEY, "fixed")
+ .addParameter(DEFAULT_KEY_PREFIX + CORE_THREADS_KEY, Integer.MAX_VALUE)
+ .addParameter(DEFAULT_KEY_PREFIX + QUEUES_KEY, Integer.MAX_VALUE)
+ .addParameter(DEFAULT_KEY_PREFIX + ALIVE_KEY, Integer.MAX_VALUE)
+ .addParameter(DEFAULT_KEY_PREFIX + THREAD_NAME_KEY, "test")
+ .addParameter(APPLICATION_KEY, "provider")
+ .addParameter(REFERENCE_FILTER_KEY, "filter1,filter2")
+ .addParameter(TAG_KEY, "TTT")
+ .build();
// Verify default ProviderURLMergeProcessor
URL consumerURL = new URLBuilder(DUBBO_PROTOCOL, "localhost", 55555)
- .addParameter(PID_KEY, "1234")
- .addParameter(THREADPOOL_KEY, "foo")
- .addParameter(APPLICATION_KEY, "consumer")
- .addParameter(REFERENCE_FILTER_KEY, "filter3")
- .addParameter(TAG_KEY, "UUU")
- .build();
+ .addParameter(PID_KEY, "1234")
+ .addParameter(THREADPOOL_KEY, "foo")
+ .addParameter(APPLICATION_KEY, "consumer")
+ .addParameter(REFERENCE_FILTER_KEY, "filter3")
+ .addParameter(TAG_KEY, "UUU")
+ .build();
URL url = clusterUtils.mergeUrl(providerURL, consumerURL.getParameters());
@@ -123,13 +120,13 @@ class ClusterUtilsTest {
// Verify custom ProviderURLMergeProcessor
URL consumerUrlForTag = new URLBuilder(DUBBO_PROTOCOL, "localhost", 55555)
- .addParameter(PID_KEY, "1234")
- .addParameter(THREADPOOL_KEY, "foo")
- .addParameter(APPLICATION_KEY, "consumer")
- .addParameter(REFERENCE_FILTER_KEY, "filter3")
- .addParameter(TAG_KEY, "UUU")
- .addParameter(URL_MERGE_PROCESSOR_KEY, "tag")
- .build();
+ .addParameter(PID_KEY, "1234")
+ .addParameter(THREADPOOL_KEY, "foo")
+ .addParameter(APPLICATION_KEY, "consumer")
+ .addParameter(REFERENCE_FILTER_KEY, "filter3")
+ .addParameter(TAG_KEY, "UUU")
+ .addParameter(URL_MERGE_PROCESSOR_KEY, "tag")
+ .build();
URL urlForTag = clusterUtils.mergeUrl(providerURL, consumerUrlForTag.getParameters());
Assertions.assertEquals("UUU", urlForTag.getParameter(TAG_KEY));
@@ -140,14 +137,14 @@ class ClusterUtilsTest {
// Verify default ProviderURLMergeProcessor
URL consumerURL = new URLBuilder(DUBBO_PROTOCOL, "localhost", 55555)
- .addParameter(PID_KEY, "1234")
- .addParameter(THREADPOOL_KEY, "foo")
- .addParameter(APPLICATION_KEY, "consumer")
- .addParameter(REFERENCE_FILTER_KEY, "filter3")
- .addParameter(TAG_KEY, "UUU")
- .build();
+ .addParameter(PID_KEY, "1234")
+ .addParameter(THREADPOOL_KEY, "foo")
+ .addParameter(APPLICATION_KEY, "consumer")
+ .addParameter(REFERENCE_FILTER_KEY, "filter3")
+ .addParameter(TAG_KEY, "UUU")
+ .build();
- Map<String,String> params = clusterUtils.mergeLocalParams(consumerURL.getParameters());
+ Map<String, String> params = clusterUtils.mergeLocalParams(consumerURL.getParameters());
Assertions.assertEquals("1234", params.get(PID_KEY));
Assertions.assertEquals("foo", params.get(THREADPOOL_KEY));
@@ -157,15 +154,15 @@ class ClusterUtilsTest {
// Verify custom ProviderURLMergeProcessor
URL consumerUrlForTag = new URLBuilder(DUBBO_PROTOCOL, "localhost", 55555)
- .addParameter(PID_KEY, "1234")
- .addParameter(THREADPOOL_KEY, "foo")
- .addParameter(APPLICATION_KEY, "consumer")
- .addParameter(REFERENCE_FILTER_KEY, "filter3")
- .addParameter(TAG_KEY, "UUU")
- .addParameter(URL_MERGE_PROCESSOR_KEY, "tag")
- .build();
-
- Map<String,String> paramsForTag = clusterUtils.mergeLocalParams(consumerUrlForTag.getParameters());
+ .addParameter(PID_KEY, "1234")
+ .addParameter(THREADPOOL_KEY, "foo")
+ .addParameter(APPLICATION_KEY, "consumer")
+ .addParameter(REFERENCE_FILTER_KEY, "filter3")
+ .addParameter(TAG_KEY, "UUU")
+ .addParameter(URL_MERGE_PROCESSOR_KEY, "tag")
+ .build();
+
+ Map<String, String> paramsForTag = clusterUtils.mergeLocalParams(consumerUrlForTag.getParameters());
Assertions.assertEquals("1234", paramsForTag.get(PID_KEY));
Assertions.assertEquals("foo", paramsForTag.get(THREADPOOL_KEY));
diff --git a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/ConnectivityValidationTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/ConnectivityValidationTest.java
index 23cb42831f..a2f6b1499f 100644
--- a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/ConnectivityValidationTest.java
+++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/ConnectivityValidationTest.java
@@ -28,15 +28,7 @@ import org.apache.dubbo.rpc.RpcInvocation;
import org.apache.dubbo.rpc.cluster.Directory;
import org.apache.dubbo.rpc.cluster.LoadBalance;
import org.apache.dubbo.rpc.cluster.directory.StaticDirectory;
-
import org.apache.dubbo.rpc.model.ApplicationModel;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.mockito.Mockito;
import java.util.Collections;
import java.util.HashSet;
@@ -45,6 +37,14 @@ import java.util.List;
import java.util.Set;
import java.util.concurrent.ThreadLocalRandom;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
import static org.mockito.Mockito.when;
@SuppressWarnings("all")
@@ -143,7 +143,8 @@ class ConnectivityValidationTest {
Assertions.assertEquals(5, directory.list(invocation).size());
- Assertions.assertNotNull(clusterInvoker.select(loadBalance, invocation, directory.list(invocation), Collections.emptyList()));
+ Assertions.assertNotNull(
+ clusterInvoker.select(loadBalance, invocation, directory.list(invocation), Collections.emptyList()));
when(invoker1.isAvailable()).thenReturn(false);
when(invoker2.isAvailable()).thenReturn(false);
@@ -159,20 +160,23 @@ class ConnectivityValidationTest {
invokerSet.add(invoker1);
waitRefresh(invokerSet);
Assertions.assertEquals(1, directory.list(invocation).size());
- Assertions.assertNotNull(clusterInvoker.select(loadBalance, invocation, directory.list(invocation), Collections.emptyList()));
+ Assertions.assertNotNull(
+ clusterInvoker.select(loadBalance, invocation, directory.list(invocation), Collections.emptyList()));
when(invoker2.isAvailable()).thenReturn(true);
invokerSet.add(invoker2);
waitRefresh(invokerSet);
... 217293 lines suppressed ...