This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch 3.2 in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit 1efe576197f2bfe9ded1f9d80fdde0663e31c5dc Merge: 734c9c3f4a 4af8606b1d Author: Albumen Kevin <[email protected]> AuthorDate: Tue Nov 22 14:23:29 2022 +0800 Merge branch 'apache-3.1' into apache-3.2 # Conflicts: # dubbo-common/src/test/java/org/apache/dubbo/common/utils/JsonUtilsTest.java # dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/migration/model/MigrationRuleTest.java # dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/api/ConnectionTest.java # dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/api/MultiplexProtocolConnectionManagerTest.java # dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/api/SingleProtocolConnectionManagerTest.java # dubbo-remoting/dubbo-remoting-netty4/src/test/java/org/apache/dubbo/remoting/transport/netty4/NettyChannelTest.java # dubbo-remoting/dubbo-remoting-netty4/src/test/java/org/apache/dubbo/remoting/transport/netty4/PortUnificationExchangerTest.java # dubbo-rpc/dubbo-rpc-triple/src/test/java/org/apache/dubbo/rpc/protocol/tri/TripleInvokerTest.java # dubbo-rpc/dubbo-rpc-triple/src/test/java/org/apache/dubbo/rpc/protocol/tri/transport/WriteQueueTest.java .../apache/dubbo/rpc/cluster/ConfiguratorTest.java | 5 +- .../apache/dubbo/rpc/cluster/RouterChainTest.java | 6 +- .../org/apache/dubbo/rpc/cluster/StickyTest.java | 12 +-- .../absent/AbsentConfiguratorTest.java | 8 +- .../override/OverrideConfiguratorTest.java | 8 +- .../configurator/parser/ConfigParserTest.java | 22 ++--- .../rpc/cluster/directory/MockDirInvocation.java | 2 +- .../rpc/cluster/directory/StaticDirectoryTest.java | 4 +- .../filter/DefaultFilterChainBuilderTest.java | 6 +- .../dubbo/rpc/cluster/filter/DemoServiceImpl.java | 2 +- .../dubbo/rpc/cluster/filter/DemoServiceLocal.java | 2 +- .../dubbo/rpc/cluster/filter/DemoServiceMock.java | 2 +- .../dubbo/rpc/cluster/filter/DemoServiceStub.java | 2 +- .../dubbo/rpc/cluster/filter/MockService.java | 2 +- .../loadbalance/AbstractLoadBalanceTest.java | 6 +- .../loadbalance/ConsistentHashLoadBalanceTest.java | 6 +- .../loadbalance/LeastActiveBalanceTest.java | 6 +- .../cluster/loadbalance/LoadBalanceBaseTest.java | 4 +- .../cluster/loadbalance/RandomLoadBalanceTest.java | 6 +- .../loadbalance/RoundRobinLoadBalanceTest.java | 10 +-- .../ShortestResponseLoadBalanceTest.java | 2 +- .../dubbo/rpc/cluster/merger/ResultMergerTest.java | 42 +++++----- .../cluster/router/ConfigConditionRouterTest.java | 10 +-- .../cluster/router/RouterSnapshotFilterTest.java | 4 +- .../router/condition/ConditionStateRouterTest.java | 28 +++---- .../cluster/router/file/FileRouterEngineTest.java | 8 +- .../router/mesh/route/MeshAppRuleListenerTest.java | 14 ++-- .../router/mesh/route/MeshRuleCacheTest.java | 6 +- .../router/mesh/route/MeshRuleManagerTest.java | 8 +- .../router/mesh/route/MeshRuleRouterTest.java | 10 +-- .../route/StandardMeshRuleRouterFactoryTest.java | 4 +- .../router/mesh/rule/DestinationRuleTest.java | 6 +- .../router/mesh/rule/VirtualServiceRuleTest.java | 4 +- .../rule/virtualservice/DubboMatchRequestTest.java | 4 +- .../rule/virtualservice/match/BoolMatchTest.java | 4 +- .../rule/virtualservice/match/DoubleMatchTest.java | 12 +-- .../match/DubboAttachmentMatchTest.java | 8 +- .../virtualservice/match/DubboMethodMatchTest.java | 10 +-- .../virtualservice/match/ListBoolMatchTest.java | 4 +- .../virtualservice/match/ListDoubleMatchTest.java | 4 +- .../virtualservice/match/ListStringMatchTest.java | 4 +- .../rule/virtualservice/match/StringMatchTest.java | 12 +-- .../router/mesh/util/MeshRuleDispatcherTest.java | 6 +- .../router/mock/MockInvokersSelectorTest.java | 4 +- .../router/script/ScriptStateRouterTest.java | 10 +-- .../rpc/cluster/router/state/BitListTest.java | 62 +++++++------- .../rpc/cluster/router/tag/TagStateRouterTest.java | 6 +- .../support/AbstractClusterInvokerTest.java | 33 ++++---- .../support/AvailableClusterInvokerTest.java | 6 +- .../support/BroadCastClusterInvokerTest.java | 8 +- .../rpc/cluster/support/ClusterUtilsTest.java | 6 +- .../support/ConnectivityValidationTest.java | 8 +- .../support/FailSafeClusterInvokerTest.java | 8 +- .../support/FailbackClusterInvokerTest.java | 6 +- .../support/FailfastClusterInvokerTest.java | 10 +-- .../support/FailoverClusterInvokerTest.java | 20 ++--- .../cluster/support/ForkingClusterInvokerTest.java | 10 +-- .../org/apache/dubbo/rpc/cluster/support/Menu.java | 2 +- .../support/MergeableClusterInvokerTest.java | 18 ++-- .../DefaultProviderURLMergeProcessorTest.java | 6 +- .../registry/ZoneAwareClusterInvokerTest.java | 8 +- .../support/wrapper/AbstractClusterTest.java | 4 +- .../support/wrapper/MockClusterInvokerTest.java | 58 ++++++------- .../wrapper/MockProviderRpcExceptionTest.java | 4 +- .../src/main/java/org/apache/dubbo/common/URL.java | 60 +++++++++---- .../dubbo/common/BaseServiceMetadataTest.java | 6 +- .../common/CommonScopeModelInitializerTest.java | 6 +- .../dubbo/common/InterfaceAddressURLTest.java | 14 ++-- .../common/PojoUtilsForNonPublicStaticTest.java | 6 +- .../common/ProtocolServiceKeyMatcherTest.java | 6 +- .../dubbo/common/ProtocolServiceKeyTest.java | 6 +- .../apache/dubbo/common/ServiceKeyMatcherTest.java | 10 +-- .../org/apache/dubbo/common/ServiceKeyTest.java | 6 +- .../org/apache/dubbo/common/URLBuilderTest.java | 20 ++--- .../org/apache/dubbo/common/URLStrParserTest.java | 8 +- .../test/java/org/apache/dubbo/common/URLTest.java | 97 ++++++++++----------- .../common/beans/InstantiationStrategyTest.java | 6 +- .../dubbo/common/beans/ScopeBeanFactoryTest.java | 6 +- .../common/beanutil/JavaBeanAccessorTest.java | 8 +- .../common/beanutil/JavaBeanSerializeUtilTest.java | 42 +++++----- .../dubbo/common/bytecode/ClassGeneratorTest.java | 10 +-- .../apache/dubbo/common/bytecode/MixinTest.java | 6 +- .../apache/dubbo/common/bytecode/ProxyTest.java | 8 +- .../apache/dubbo/common/bytecode/WrapperTest.java | 32 +++---- .../common/cache/FileCacheStoreFactoryTest.java | 2 +- .../dubbo/common/cache/FileCacheStoreTest.java | 2 +- .../compiler/support/AdaptiveCompilerTest.java | 6 +- .../common/compiler/support/ClassUtilsTest.java | 30 +++---- .../common/compiler/support/JavaCodeTest.java | 4 +- .../compiler/support/JavassistCompilerTest.java | 12 +-- .../common/compiler/support/JdkCompilerTest.java | 16 ++-- .../concurrent/CompletableFutureTaskTest.java | 14 ++-- .../common/config/CompositeConfigurationTest.java | 6 +- .../common/config/ConfigurationCacheTest.java | 6 +- .../common/config/ConfigurationUtilsTest.java | 16 ++-- .../config/EnvironmentConfigurationTest.java | 6 +- .../dubbo/common/config/EnvironmentTest.java | 8 +- .../common/config/InmemoryConfigurationTest.java | 2 +- .../config/OrderedPropertiesConfigurationTest.java | 6 +- .../common/config/PrefixedConfigurationTest.java | 6 +- .../common/config/PropertiesConfigurationTest.java | 6 +- .../common/config/SystemConfigurationTest.java | 6 +- .../AbstractDynamicConfigurationFactoryTest.java | 6 +- .../AbstractDynamicConfigurationTest.java | 28 +++---- .../config/configcenter/ConfigChangeTypeTest.java | 6 +- .../configcenter/ConfigChangedEventTest.java | 10 +-- .../DynamicConfigurationFactoryTest.java | 6 +- .../FileSystemDynamicConfigurationFactoryTest.java | 6 +- .../file/FileSystemDynamicConfigurationTest.java | 12 +-- .../common/constants/CommonConstantsTest.java | 6 +- .../apache/dubbo/common/convert/ConverterTest.java | 8 +- .../convert/StringToBooleanConverterTest.java | 8 +- .../convert/StringToCharArrayConverterTest.java | 8 +- .../convert/StringToCharacterConverterTest.java | 8 +- .../convert/StringToDoubleConverterTest.java | 8 +- .../common/convert/StringToFloatConverterTest.java | 8 +- .../convert/StringToIntegerConverterTest.java | 8 +- .../common/convert/StringToLongConverterTest.java | 8 +- .../convert/StringToOptionalConverterTest.java | 8 +- .../common/convert/StringToShortConverterTest.java | 8 +- .../convert/StringToStringConverterTest.java | 8 +- .../convert/multiple/MultiValueConverterTest.java | 6 +- .../multiple/StringToArrayConverterTest.java | 12 +-- .../StringToBlockingDequeConverterTest.java | 12 +-- .../StringToBlockingQueueConverterTest.java | 12 +-- .../multiple/StringToCollectionConverterTest.java | 12 +-- .../multiple/StringToDequeConverterTest.java | 12 +-- .../multiple/StringToListConverterTest.java | 12 +-- .../StringToNavigableSetConverterTest.java | 12 +-- .../multiple/StringToQueueConverterTest.java | 12 +-- .../convert/multiple/StringToSetConverterTest.java | 12 +-- .../multiple/StringToSortedSetConverterTest.java | 12 +-- .../StringToTransferQueueConverterTest.java | 12 +-- .../extension/AdaptiveClassCodeGeneratorTest.java | 6 +- .../common/extension/ExtensionDirectorTest.java | 14 ++-- .../common/extension/ExtensionLoaderTest.java | 96 ++++++++++----------- .../extension/ExtensionLoader_Adaptive_Test.java | 34 ++++---- ...tensionLoader_Adaptive_UseJdkCompiler_Test.java | 4 +- .../extension/ExtensionLoader_Compatible_Test.java | 6 +- .../inject/AdaptiveExtensionInjectorTest.java | 6 +- .../extension/support/ActivateComparatorTest.java | 8 +- .../common/extension/wrapper/WrapperTest.java | 6 +- .../dubbo/common/function/PredicatesTest.java | 12 +-- .../apache/dubbo/common/function/StreamsTest.java | 10 +-- .../dubbo/common/function/ThrowableActionTest.java | 6 +- .../common/function/ThrowableConsumerTest.java | 6 +- .../common/function/ThrowableFunctionTest.java | 6 +- .../java/org/apache/dubbo/common/io/BytesTest.java | 30 +++---- .../apache/dubbo/common/io/StreamUtilsTest.java | 16 ++-- .../common/io/UnsafeByteArrayInputStreamTest.java | 16 ++-- .../common/io/UnsafeByteArrayOutputStreamTest.java | 14 ++-- .../dubbo/common/io/UnsafeStringReaderTest.java | 12 +-- .../dubbo/common/io/UnsafeStringWriterTest.java | 18 ++-- .../apache/dubbo/common/json/GsonUtilsTest.java | 8 +- .../apache/dubbo/common/lang/PrioritizedTest.java | 10 +-- .../common/lang/ShutdownHookCallbacksTest.java | 8 +- .../dubbo/common/logger/LoggerAdapterTest.java | 4 +- .../dubbo/common/logger/LoggerFactoryTest.java | 16 ++-- .../org/apache/dubbo/common/logger/LoggerTest.java | 4 +- .../dubbo/common/logger/slf4j/Slf4jLoggerTest.java | 6 +- .../support/FailsafeErrorTypeAwareLoggerTest.java | 12 +-- .../common/logger/support/FailsafeLoggerTest.java | 10 +-- .../collector/DefaultMetricsCollectorTest.java | 10 +-- .../dubbo/common/metrics/event/RTEventTest.java | 5 +- .../common/metrics/event/RequestEventTest.java | 5 +- .../common/metrics/model/MethodMetricTest.java | 12 ++- .../model/sample/GaugeMetricSampleTest.java | 5 +- .../metrics/model/sample/MetricSampleTest.java | 5 +- .../common/metrics/service/MetricsEntityTest.java | 5 +- .../apache/dubbo/common/profiler/ProfilerTest.java | 8 +- .../resource/GlobalResourcesRepositoryTest.java | 6 +- .../org/apache/dubbo/common/status/StatusTest.java | 10 +-- .../reporter/FrameworkStatusReportServiceTest.java | 6 +- .../status/support/LoadStatusCheckerTest.java | 6 +- .../status/support/MemoryStatusCheckerTest.java | 6 +- .../common/status/support/StatusUtilsTest.java | 10 +-- .../common/store/support/SimpleDataStoreTest.java | 10 +-- .../threadlocal/InternalThreadLocalTest.java | 26 +++--- .../NamedInternalThreadFactoryTest.java | 6 +- .../MemoryLimitedLinkedBlockingQueueTest.java | 6 +- .../MemorySafeLinkedBlockingQueueTest.java | 9 +- .../common/threadpool/ThreadlessExecutorTest.java | 7 +- .../ThreadPoolExhaustedEventListenerTest.java | 6 +- .../event/ThreadPoolExhaustedEventTest.java | 6 +- .../threadpool/manager/ExecutorRepositoryTest.java | 10 +-- .../manager/FrameworkExecutorRepositoryTest.java | 8 +- .../threadpool/serial/SerializingExecutorTest.java | 4 +- .../support/AbortPolicyWithReportTest.java | 12 +-- .../support/cached/CachedThreadPoolTest.java | 8 +- .../support/eager/EagerThreadPoolExecutorTest.java | 10 +-- .../support/eager/EagerThreadPoolTest.java | 8 +- .../threadpool/support/eager/TaskQueueTest.java | 16 ++-- .../support/fixed/FixedThreadPoolTest.java | 8 +- .../support/limited/LimitedThreadPoolTest.java | 8 +- .../dubbo/common/timer/HashedWheelTimerTest.java | 10 +-- .../org/apache/dubbo/common/url/URLParamTest.java | 20 ++--- .../dubbo/common/utils/AnnotationUtilsTest.java | 34 ++++---- .../apache/dubbo/common/utils/ArrayUtilsTest.java | 8 +- .../org/apache/dubbo/common/utils/AssertTest.java | 18 ++-- .../common/utils/AtomicPositiveIntegerTest.java | 34 ++++---- .../apache/dubbo/common/utils/CIDRUtilsTest.java | 8 +- .../utils/ClassLoaderResourceLoaderTest.java | 6 +- .../apache/dubbo/common/utils/ClassUtilsTest.java | 26 +++--- .../dubbo/common/utils/CollectionUtilsTest.java | 37 ++++---- .../common/utils/CompatibleTypeUtilsTest.java | 6 +- .../apache/dubbo/common/utils/ConfigUtilsTest.java | 54 ++++++------ .../apache/dubbo/common/utils/DefaultPageTest.java | 6 +- .../dubbo/common/utils/DubboAppenderTest.java | 17 ++-- .../dubbo/common/utils/ExecutorUtilTest.java | 14 ++-- .../apache/dubbo/common/utils/FieldUtilsTest.java | 12 +-- .../org/apache/dubbo/common/utils/HolderTest.java | 6 +- .../org/apache/dubbo/common/utils/IOUtilsTest.java | 24 +++--- .../org/apache/dubbo/common/utils/JVMUtilTest.java | 4 +- .../apache/dubbo/common/utils/JsonUtilsTest.java | 6 +- .../apache/dubbo/common/utils/LFUCacheTest.java | 12 +-- .../apache/dubbo/common/utils/LRU2CacheTest.java | 8 +- .../apache/dubbo/common/utils/LogHelperTest.java | 14 ++-- .../org/apache/dubbo/common/utils/LogTest.java | 12 +-- .../org/apache/dubbo/common/utils/LogUtilTest.java | 20 ++--- .../apache/dubbo/common/utils/MD5UtilsTest.java | 6 +- .../apache/dubbo/common/utils/MemberUtilsTest.java | 10 ++- .../apache/dubbo/common/utils/MethodUtilsTest.java | 16 ++-- .../dubbo/common/utils/NamedThreadFactoryTest.java | 8 +- ...sInterfaceDisplayNameHasMetaCharactersTest.java | 6 +- .../apache/dubbo/common/utils/NetUtilsTest.java | 2 +- .../apache/dubbo/common/utils/ParametersTest.java | 4 +- .../apache/dubbo/common/utils/PojoUtilsTest.java | 76 ++++++++--------- .../dubbo/common/utils/ReflectUtilsTest.java | 76 ++++++++--------- .../dubbo/common/utils/RegexPropertiesTest.java | 6 +- .../common/utils/SerializeClassCheckerTest.java | 12 +-- .../org/apache/dubbo/common/utils/StackTest.java | 24 +++--- .../StringConstantFieldValuePredicateTest.java | 6 +- .../apache/dubbo/common/utils/StringUtilsTest.java | 78 ++++++++--------- .../apache/dubbo/common/utils/UrlUtilsTest.java | 66 +++++++-------- .../apache/dubbo/common/version/VersionTest.java | 16 ++-- .../dubbo/config/AbstractInterfaceConfigTest.java | 52 ++++++------ .../context/ConfigConfigurationAdapterTest.java | 6 +- .../dubbo/config/context/ConfigManagerTest.java | 40 ++++----- .../dubbo/metadata/definition/MetadataTest.java | 12 +-- .../definition/ServiceDefinitionBuilderTest.java | 6 +- .../definition/TypeDefinitionBuilderTest.java | 6 +- .../dubbo/rpc/model/ApplicationModelTest.java | 14 ++-- .../apache/dubbo/rpc/model/FrameworkModelTest.java | 12 +-- .../rpc/model/FrameworkServiceRepositoryTest.java | 6 +- .../apache/dubbo/rpc/model/ModuleModelTest.java | 10 +-- .../rpc/model/ModuleServiceRepositoryTest.java | 6 +- .../rpc/model/ReflectionMethodDescriptorTest.java | 2 +- .../rpc/model/ReflectionServiceDescriptorTest.java | 2 +- .../ScopeModelAwareExtensionProcessorTest.java | 8 +- .../org/apache/dubbo/rpc/model/ScopeModelTest.java | 6 +- .../apache/dubbo/rpc/model/ScopeModelUtilTest.java | 7 +- .../dubbo/rpc/model/ServiceRepositoryTest.java | 6 +- .../dubbo/rpc/service/GenericExceptionTest.java | 3 +- .../ServiceDescriptorInternalCacheTest.java | 2 +- .../dubbo/rpc/support/ProtocolUtilsTest.java | 6 +- .../apache/dubbo/config/AbstractConfigTest.java | 68 +++++++-------- .../dubbo/config/AbstractMethodConfigTest.java | 28 +++---- .../dubbo/config/AbstractReferenceConfigTest.java | 36 ++++---- .../dubbo/config/AbstractServiceConfigTest.java | 38 ++++----- .../apache/dubbo/config/ApplicationConfigTest.java | 50 +++++------ .../apache/dubbo/config/ArgumentConfigTest.java | 12 +-- .../dubbo/config/ConfigCenterConfigTest.java | 28 +++---- .../config/ConfigScopeModelInitializerTest.java | 6 +- .../apache/dubbo/config/ConsumerConfigTest.java | 30 +++---- .../dubbo/config/MetadataReportConfigTest.java | 6 +- .../org/apache/dubbo/config/MethodConfigTest.java | 44 +++++----- .../org/apache/dubbo/config/MetricsConfigTest.java | 12 +-- .../org/apache/dubbo/config/ModuleConfigTest.java | 22 ++--- .../org/apache/dubbo/config/MonitorConfigTest.java | 24 +++--- .../apache/dubbo/config/ProtocolConfigTest.java | 62 +++++++------- .../apache/dubbo/config/ProviderConfigTest.java | 54 ++++++------ .../apache/dubbo/config/ReferenceConfigTest.java | 47 ++++++----- .../apache/dubbo/config/RegistryConfigTest.java | 50 +++++------ .../org/apache/dubbo/config/ServiceConfigTest.java | 48 +++++------ .../dubbo/config/bootstrap/DubboBootstrapTest.java | 28 +++---- .../dubbo/config/bootstrap/MultiInstanceTest.java | 28 +++---- .../bootstrap/builders/AbstractBuilderTest.java | 2 +- .../builders/AbstractInterfaceBuilderTest.java | 2 +- .../builders/AbstractMethodBuilderTest.java | 2 +- .../builders/AbstractReferenceBuilderTest.java | 2 +- .../builders/AbstractServiceBuilderTest.java | 2 +- .../bootstrap/builders/ApplicationBuilderTest.java | 2 +- .../bootstrap/builders/ArgumentBuilderTest.java | 2 +- .../builders/ConfigCenterBuilderTest.java | 2 +- .../bootstrap/builders/ConsumerBuilderTest.java | 2 +- .../builders/MetadataReportBuilderTest.java | 2 +- .../bootstrap/builders/MethodBuilderTest.java | 2 +- .../bootstrap/builders/ModuleBuilderTest.java | 2 +- .../bootstrap/builders/MonitorBuilderTest.java | 2 +- .../bootstrap/builders/ProtocolBuilderTest.java | 2 +- .../bootstrap/builders/ProviderBuilderTest.java | 2 +- .../bootstrap/builders/ReferenceBuilderTest.java | 2 +- .../bootstrap/builders/RegistryBuilderTest.java | 2 +- .../bootstrap/builders/ServiceBuilderTest.java | 6 +- .../org/apache/dubbo/config/cache/CacheTest.java | 10 +-- .../dubbo/config/integration/IntegrationTest.java | 2 +- ...egistryCenterExportMetadataIntegrationTest.java | 4 +- ...egistryCenterExportProviderIntegrationTest.java | 4 +- ...MultipleRegistryCenterInjvmIntegrationTest.java | 4 +- ...terServiceDiscoveryRegistryIntegrationTest.java | 4 +- ...RegistryCenterDubboProtocolIntegrationTest.java | 4 +- ...egistryCenterExportMetadataIntegrationTest.java | 4 +- ...egistryCenterExportProviderIntegrationTest.java | 4 +- .../SingleRegistryCenterInjvmIntegrationTest.java | 4 +- .../DelegateProviderMetaDataInvokerTest.java | 6 +- ...dataServiceURLParamsMetadataCustomizerTest.java | 5 +- .../dubbo/config/nested/AggregationConfigTest.java | 10 +-- .../dubbo/config/nested/PrometheusConfigTest.java | 8 +- .../config/url/ExporterSideConfigUrlTest.java | 12 +-- .../dubbo/config/url/InvokerSideConfigUrlTest.java | 10 +-- .../config/utils/ConfigValidationUtilsTest.java | 15 ++-- .../dubbo/config/utils/ReferenceCacheTest.java | 16 ++-- .../metadata/MetadataServiceExporterTest.java | 2 +- .../org/apache/dubbo/config/spring/ConfigTest.java | 26 +++--- .../dubbo/config/spring/JavaConfigBeanTest.java | 6 +- .../dubbo/config/spring/ServiceBeanTest.java | 6 +- .../DubboConfigAliasPostProcessorTest.java | 5 +- .../factory/annotation/MergedAnnotationTest.java | 8 +- .../annotation/MethodConfigCallbackTest.java | 6 +- .../factory/annotation/ParameterConvertTest.java | 6 +- .../ReferenceAnnotationBeanPostProcessorTest.java | 12 +-- .../factory/annotation/ReferenceCreatorTest.java | 6 +- .../ServiceAnnotationPostProcessorTest.java | 8 +- .../annotation/ServiceBeanNameBuilderTest.java | 10 +-- ...gDefaultPropertyValueBeanPostProcessorTest.java | 5 +- .../MultipleServicesWithMethodConfigsTest.java | 5 +- .../config/YamlPropertySourceFactoryTest.java | 6 +- .../XmlReferenceBeanConditionalTest.java | 6 +- ...nfigAnnotationReferenceBeanConditionalTest.java | 6 +- .../JavaConfigRawReferenceBeanConditionalTest.java | 6 +- .../configprops/SpringBootConfigPropsTest.java | 6 +- .../SpringBootMultipleConfigPropsTest.java | 6 +- .../importxml/SpringBootImportDubboXmlTest.java | 6 +- .../importxml2/SpringBootImportAndScanTest.java | 6 +- .../context/KeepRunningOnSpringClosedTest.java | 6 +- .../DubboComponentScanRegistrarTest.java | 6 +- .../annotation/DubboConfigConfigurationTest.java | 8 +- .../context/annotation/EnableDubboConfigTest.java | 4 +- .../spring/context/annotation/EnableDubboTest.java | 8 +- .../customize/DubboSpringInitCustomizerTest.java | 6 +- .../properties/DefaultDubboConfigBinderTest.java | 6 +- .../extension/SpringExtensionInjectorTest.java | 6 +- .../spring/issues/issue6000/Issue6000Test.java | 6 +- .../spring/issues/issue6252/Issue6252Test.java | 6 +- .../spring/issues/issue7003/Issue7003Test.java | 6 +- .../issue9172/MultipleConsumerAndProviderTest.java | 6 +- .../issues/issue9207/ConfigCenterBeanTest.java | 6 +- .../consumer/PropertyConfigurerTest.java | 6 +- .../consumer2/PropertySourcesConfigurerTest.java | 6 +- .../consumer3/PropertySourcesInJavaConfigTest.java | 8 +- .../reference/DubboConfigBeanInitializerTest.java | 6 +- .../config/spring/reference/ReferenceKeyTest.java | 16 ++-- .../javaconfig/JavaConfigReferenceBeanTest.java | 22 ++--- .../spring/reference/localcall/LocalCallTest.java | 6 +- .../LocalCallReferenceAnnotationTest.java | 6 +- .../LocalCallMultipleReferenceAnnotationsTest.java | 6 +- .../localcallmix/LocalCallReferenceMixTest.java | 6 +- .../registry/nacos/nacos/NacosServiceNameTest.java | 12 +-- .../spring/schema/DubboNamespaceHandlerTest.java | 30 +++---- .../config/spring/schema/GenericServiceTest.java | 6 +- .../schema/GenericServiceWithoutInterfaceTest.java | 6 +- .../spring/status/DataSourceStatusCheckerTest.java | 12 +-- .../spring/status/SpringStatusCheckerTest.java | 12 +-- .../config/spring/util/EnvironmentUtilsTest.java | 8 +- .../apollo/ApolloDynamicConfigurationTest.java | 10 +-- .../nacos/NacosDynamicConfigurationTest.java | 10 +-- .../ZookeeperDynamicConfigurationTest.java | 12 +-- .../container/spring/SpringContainerTest.java | 6 +- .../apache/dubbo/cache/filter/CacheFilterTest.java | 4 +- .../cache/support/AbstractCacheFactoryTest.java | 2 +- .../support/expiring/ExpiringCacheFactoryTest.java | 14 ++-- .../cache/support/jcache/JCacheFactoryTest.java | 8 +- .../cache/support/lru/LruCacheFactoryTest.java | 6 +- .../threadlocal/ThreadLocalCacheFactoryTest.java | 6 +- .../validation/filter/ValidationFilterTest.java | 14 ++-- .../support/jvalidation/JValidationTest.java | 8 +- .../support/jvalidation/JValidatorTest.java | 18 ++-- .../kubernetes/KubernetesServiceDiscoveryTest.java | 12 +-- .../metadata/AbstractServiceNameMappingTest.java | 2 +- .../apache/dubbo/metadata/MetadataInfoTest.java | 18 ++-- .../dubbo/metadata/ServiceNameMappingTest.java | 10 +-- .../report/MetadataReportInstanceTest.java | 3 +- .../report/identifier/KeyTypeEnumTest.java | 4 +- .../report/identifier/MetadataIdentifierTest.java | 4 +- .../support/AbstractMetadataReportFactoryTest.java | 10 +-- .../report/support/AbstractMetadataReportTest.java | 18 ++-- .../JAXRSServiceRestMetadataResolverTest.java | 6 +- .../SpringMvcServiceRestMetadataResolverTest.java | 6 +- .../metadata/test/JTestMetadataReport4Test.java | 2 +- .../protobuf/ProtobufTypeBuilderTest.java | 4 +- .../builder/ArrayTypeDefinitionBuilderTest.java | 6 +- .../CollectionTypeDefinitionBuilderTest.java | 6 +- .../builder/EnumTypeDefinitionBuilderTest.java | 6 +- .../builder/GeneralTypeDefinitionBuilderTest.java | 6 +- .../builder/MapTypeDefinitionBuilderTest.java | 6 +- .../PrimitiveTypeDefinitionBuilderTest.java | 6 +- .../builder/ServiceDefinitionBuilderTest.java | 4 +- .../builder/SimpleTypeDefinitionBuilderTest.java | 6 +- .../AnnotatedMethodParameterProcessorTest.java | 2 +- .../processing/util/AnnotationUtilsTest.java | 18 ++-- .../annotation/processing/util/FieldUtilsTest.java | 20 ++--- .../processing/util/LoggerUtilsTest.java | 8 +- .../processing/util/MemberUtilsTest.java | 10 +-- .../processing/util/MethodUtilsTest.java | 22 ++--- .../util/ServiceAnnotationUtilsTest.java | 14 ++-- .../annotation/processing/util/TypeUtilsTest.java | 46 +++++----- .../apache/dubbo/metadata/tools/CompilerTest.java | 4 +- .../metadata/tools/DefaultRestServiceTest.java | 4 +- .../dubbo/metadata/tools/RestServiceTest.java | 4 +- .../metadata/tools/SpringRestServiceTest.java | 4 +- .../metadata/tools/StandardRestServiceTest.java | 4 +- .../store/redis/RedisMetadataReportTest.java | 14 ++-- .../zookeeper/ZookeeperMetadataReportTest.java | 20 ++--- .../metrics/aggregate/TimeWindowCounterTest.java | 6 +- .../metrics/aggregate/TimeWindowQuantileTest.java | 6 +- .../collector/AggregateMetricsCollectorTest.java | 12 ++- .../dubbo/metrics/filter/MetricsFilterTest.java | 41 ++++----- .../PrometheusMetricsReporterFactoryTest.java | 5 +- .../prometheus/PrometheusMetricsReporterTest.java | 11 +-- .../support/AbstractMonitorFactoryTest.java | 10 +-- .../dubbo/monitor/support/MonitorFilterTest.java | 16 ++-- .../monitor/dubbo/DubboMonitorFactoryTest.java | 6 +- .../dubbo/monitor/dubbo/DubboMonitorTest.java | 14 ++-- .../dubbo/monitor/dubbo/MetricsFilterTest.java | 6 +- .../apache/dubbo/monitor/dubbo/StatisticsTest.java | 8 +- .../dubbo/auth/AccessKeyAuthenticatorTest.java | 2 +- .../dubbo/auth/DefaultAccessKeyStorageTest.java | 2 +- .../dubbo/auth/filter/ConsumerSignFilterTest.java | 2 +- .../dubbo/auth/filter/ProviderAuthFilterTest.java | 2 +- .../dubbo/auth/utils/SignatureUtilsTest.java | 4 +- .../qos/command/CommandContextFactoryTest.java | 6 +- .../dubbo/qos/command/CommandContextTest.java | 6 +- .../qos/command/DefaultCommandExecutorTest.java | 8 +- .../command/decoder/HttpCommandDecoderTest.java | 8 +- .../command/decoder/TelnetCommandDecoderTest.java | 6 +- .../dubbo/qos/command/impl/ChangeTelnetTest.java | 18 ++-- .../dubbo/qos/command/impl/CountTelnetTest.java | 6 +- .../apache/dubbo/qos/command/impl/HelpTest.java | 8 +- .../dubbo/qos/command/impl/InvokeTelnetTest.java | 26 +++--- .../apache/dubbo/qos/command/impl/LiveTest.java | 6 +- .../org/apache/dubbo/qos/command/impl/LsTest.java | 6 +- .../apache/dubbo/qos/command/impl/OfflineTest.java | 6 +- .../apache/dubbo/qos/command/impl/OnlineTest.java | 6 +- .../dubbo/qos/command/impl/PortTelnetTest.java | 14 ++-- .../qos/command/impl/PublishMetadataTest.java | 6 +- .../dubbo/qos/command/impl/PwdTelnetTest.java | 10 +-- .../apache/dubbo/qos/command/impl/QuitTest.java | 6 +- .../apache/dubbo/qos/command/impl/ReadyTest.java | 6 +- .../dubbo/qos/command/impl/SelectTelnetTest.java | 10 +-- .../dubbo/qos/command/impl/ShutdownTelnetTest.java | 8 +- .../apache/dubbo/qos/command/impl/StartupTest.java | 6 +- .../dubbo/qos/command/util/CommandHelperTest.java | 10 +-- .../qos/command/util/ServiceCheckUtilsTest.java | 8 +- .../dubbo/qos/legacy/ChangeTelnetHandlerTest.java | 18 ++-- .../dubbo/qos/legacy/LogTelnetHandlerTest.java | 8 +- .../dubbo/qos/legacy/TraceTelnetHandlerTest.java | 6 +- .../legacy/service/generic/GenericServiceTest.java | 14 ++-- .../dubbo/qos/protocol/QosProtocolWrapperTest.java | 9 +- .../qos/server/handler/HttpProcessHandlerTest.java | 10 +-- .../server/handler/LocalHostPermitHandlerTest.java | 6 +- .../qos/server/handler/QosProcessHandlerTest.java | 8 +- .../server/handler/TelnetProcessHandlerTest.java | 12 +-- .../java/org/apache/dubbo/qos/textui/TKvTest.java | 8 +- .../org/apache/dubbo/qos/textui/TLadderTest.java | 6 +- .../org/apache/dubbo/qos/textui/TTableTest.java | 8 +- .../org/apache/dubbo/qos/textui/TTreeTest.java | 6 +- .../reactive/ManyToManyMethodHandlerTest.java | 3 +- .../dubbo/reactive/ManyToOneMethodHandlerTest.java | 5 +- .../dubbo/reactive/OneToManyMethodHandlerTest.java | 5 +- .../dubbo/reactive/OneToOneMethodHandlerTest.java | 3 +- .../registry/ListenerRegistryWrapperTest.java | 4 +- .../dubbo/registry/PerformanceRegistryTest.java | 4 +- .../dubbo/registry/RegistryFactoryWrapperTest.java | 4 +- .../AbstractServiceDiscoveryFactoryTest.java | 4 +- .../client/DefaultServiceInstanceTest.java | 6 +- .../registry/client/InstanceAddressURLTest.java | 6 +- .../client/ServiceDiscoveryRegistryTest.java | 10 +-- .../ServiceInstancesChangedListenerTest.java | 2 +- .../metadata/MetadataServiceNameMappingTest.java | 8 +- .../metadata/MetadataServiceURLBuilderTest.java | 2 +- .../ProtocolPortsMetadataCustomizerTest.java | 4 +- .../ServiceInstanceMetadataCustomizerTest.java | 6 +- .../SpringCloudMetadataServiceURLBuilderTest.java | 4 +- .../StandardMetadataServiceURLBuilderTest.java | 4 +- .../metadata/store/MetaCacheManagerTest.java | 6 +- .../DefaultMigrationAddressComparatorTest.java | 4 +- .../client/migration/MigrationInvokerTest.java | 8 +- .../client/migration/MigrationRuleHandlerTest.java | 4 +- .../migration/MigrationRuleListenerTest.java | 8 +- .../client/migration/model/MigrationRuleTest.java | 4 +- .../registry/integration/DynamicDirectoryTest.java | 6 +- .../registry/integration/RegistryProtocolTest.java | 16 ++-- .../support/AbstractRegistryFactoryTest.java | 8 +- .../registry/support/AbstractRegistryTest.java | 48 +++++------ .../registry/support/FailbackRegistryTest.java | 10 +-- .../multicast/MulticastRegistryFactoryTest.java | 4 +- .../multiple/MultipleRegistry2S2RTest.java | 10 +-- .../registry/nacos/NacosRegistryFactoryTest.java | 6 +- .../dubbo/registry/nacos/NacosRegistryTest.java | 12 +-- .../nacos/NacosServiceDiscoveryFactoryTest.java | 4 +- .../registry/nacos/NacosServiceDiscoveryTest.java | 10 +-- .../nacos/util/NacosNamingServiceUtilsTest.java | 8 +- .../registry/zookeeper/ZookeeperRegistryTest.java | 26 +++--- .../zookeeper/ZookeeperServiceDiscoveryTest.java | 4 +- .../apache/dubbo/remoting/ChanelHandlerTest.java | 4 +- .../dubbo/remoting/PerformanceClientCloseTest.java | 4 +- .../dubbo/remoting/PerformanceClientFixedTest.java | 4 +- .../dubbo/remoting/PerformanceClientTest.java | 2 +- .../dubbo/remoting/PerformanceServerTest.java | 4 +- .../apache/dubbo/remoting/TransportersTest.java | 6 +- .../remoting/buffer/AbstractChannelBufferTest.java | 98 +++++++++++----------- .../buffer/ByteBufferBackedChannelBufferTest.java | 2 +- .../remoting/buffer/ChannelBufferFactoryTest.java | 4 +- .../remoting/buffer/ChannelBufferStreamTest.java | 14 ++-- .../dubbo/remoting/buffer/ChannelBuffersTest.java | 14 ++-- .../remoting/buffer/DirectChannelBufferTest.java | 2 +- .../remoting/buffer/DynamicChannelBufferTest.java | 10 +-- .../remoting/buffer/HeapChannelBufferTest.java | 2 +- .../dubbo/remoting/codec/ExchangeCodecTest.java | 43 +++++----- .../dubbo/remoting/codec/TelnetCodecTest.java | 28 +++---- .../dubbo/remoting/exchange/ExchangersTest.java | 6 +- .../dubbo/remoting/exchange/RequestTest.java | 4 +- .../dubbo/remoting/exchange/ResponseTest.java | 4 +- .../exchange/support/DefaultFutureTest.java | 10 +-- .../support/ExchangeHandlerDispatcherTest.java | 4 +- .../exchange/support/MultiMessageTest.java | 4 +- .../support/header/CloseTimerTaskTest.java | 4 +- .../support/header/HeaderExchangeChannelTest.java | 56 ++++++------- .../support/header/HeaderExchangeServerTest.java | 4 +- .../exchange/support/header/HeartBeatTaskTest.java | 4 +- .../support/header/ReconnectTimerTaskTest.java | 4 +- .../handler/ConnectChannelHandlerTest.java | 12 +-- .../handler/HeaderExchangeHandlerTest.java | 20 ++--- .../handler/WrappedChannelHandlerTest.java | 14 ++-- .../dubbo/remoting/telnet/TelnetUtilsTest.java | 6 +- .../telnet/support/ClearTelnetHandlerTest.java | 4 +- .../telnet/support/ExitTelnetHandlerTest.java | 4 +- .../telnet/support/HelpTelnetHandlerTest.java | 4 +- .../telnet/support/StatusTelnetHandlerTest.java | 4 +- .../telnet/support/TelnetHandlerAdapterTest.java | 2 +- .../remoting/transport/AbstractCodecTest.java | 8 +- .../transport/ChannelHandlerDispatcherTest.java | 4 +- .../dubbo/remoting/transport/CodecSupportTest.java | 5 +- .../remoting/transport/DecodeHandlerTest.java | 4 +- .../transport/MultiMessageHandlerTest.java | 4 +- .../remoting/transport/codec/CodecAdapterTest.java | 2 +- .../dispatcher/ChannelEventRunnableTest.java | 4 +- .../transport/dispatcher/ChannelHandlersTest.java | 4 +- .../dubbo/remoting/utils/PayloadDropperTest.java | 4 +- .../apache/dubbo/remoting/utils/UrlUtilsTest.java | 6 +- .../remoting/http/jetty/JettyHttpBinderTest.java | 4 +- .../http/jetty/JettyLoggerAdapterTest.java | 12 +-- .../remoting/http/tomcat/TomcatHttpBinderTest.java | 4 +- .../support/header/HeartbeatHandlerTest.java | 8 +- .../transport/netty/ClientReconnectTest.java | 4 +- .../transport/netty/ClientToServerTest.java | 2 +- .../remoting/transport/netty/ClientsTest.java | 10 +-- .../netty/NettyBackedChannelBufferTest.java | 5 +- .../remoting/transport/netty/NettyClientTest.java | 6 +- .../transport/netty/NettyClientToServerTest.java | 2 +- .../remoting/transport/netty/NettyStringTest.java | 4 +- .../remoting/transport/netty/ThreadNameTest.java | 4 +- .../transport/netty4/ClientReconnectTest.java | 4 +- .../transport/netty4/ClientToServerTest.java | 2 +- .../remoting/transport/netty4/ClientsTest.java | 10 +-- .../netty4/NettyBackedChannelBufferTest.java | 8 +- .../transport/netty4/NettyChannelTest.java | 12 +-- .../transport/netty4/NettyClientHandlerTest.java | 4 +- .../transport/netty4/NettyClientToServerTest.java | 2 +- .../transport/netty4/NettyCodecAdapterTest.java | 4 +- .../netty4/NettyEventLoopFactoryTest.java | 2 +- .../transport/netty4/NettyTransporterTest.java | 6 +- .../netty4/PortUnificationExchangerTest.java | 2 +- .../netty4/PortUnificationServerTest.java | 4 +- .../transport/netty4/ReplierDispatcherTest.java | 6 +- .../curator5/Curator5ZookeeperClientTest.java | 20 ++--- .../curator5/Curator5ZookeeperTransporterTest.java | 4 +- .../support/AbstractZookeeperTransporterTest.java | 20 ++--- .../curator/CuratorZookeeperClientTest.java | 20 ++--- .../curator/CuratorZookeeperTransporterTest.java | 4 +- .../support/AbstractZookeeperTransporterTest.java | 20 ++--- .../java/org/apache/dubbo/rpc/AppResponseTest.java | 16 ++-- .../apache/dubbo/rpc/CancellationContextTest.java | 6 +- .../org/apache/dubbo/rpc/FutureContextTest.java | 4 +- .../dubbo/rpc/PenetrateAttachmentSelectorTest.java | 4 +- .../java/org/apache/dubbo/rpc/RpcContextTest.java | 20 ++--- .../org/apache/dubbo/rpc/RpcInvocationTest.java | 4 +- .../java/org/apache/dubbo/rpc/RpcStatusTest.java | 8 +- .../org/apache/dubbo/rpc/TimeoutCountDownTest.java | 4 +- .../dubbo/rpc/filter/AccessLogFilterTest.java | 6 +- .../dubbo/rpc/filter/ActiveLimitFilterTest.java | 16 ++-- .../dubbo/rpc/filter/ClassLoaderFilterTest.java | 4 +- .../rpc/filter/CompatibleFilterFilterTest.java | 14 ++-- .../apache/dubbo/rpc/filter/ContextFilterTest.java | 6 +- .../dubbo/rpc/filter/DeprecatedFilterTest.java | 4 +- .../apache/dubbo/rpc/filter/EchoFilterTest.java | 6 +- .../dubbo/rpc/filter/ExceptionFilterTest.java | 10 +-- .../apache/dubbo/rpc/filter/GenericFilterTest.java | 10 +-- .../dubbo/rpc/filter/GenericImplFilterTest.java | 8 +- .../apache/dubbo/rpc/filter/TimeoutFilterTest.java | 6 +- .../apache/dubbo/rpc/filter/TokenFilterTest.java | 8 +- .../rpc/filter/tps/DefaultTPSLimiterTest.java | 12 +-- .../apache/dubbo/rpc/filter/tps/StatItemTest.java | 8 +- .../dubbo/rpc/filter/tps/TpsLimitFilterTest.java | 6 +- .../rpc/protocol/ProtocolListenerWrapperTest.java | 6 +- .../apache/dubbo/rpc/proxy/AbstractProxyTest.java | 4 +- .../rpc/proxy/InvokerInvocationHandlerTest.java | 4 +- .../proxy/javassist/JavassistProxyFactoryTest.java | 2 +- .../dubbo/rpc/proxy/jdk/JdkProxyFactoryTest.java | 2 +- .../proxy/wrapper/StubProxyFactoryWrapperTest.java | 4 +- .../rpc/stub/FutureToObserverAdaptorTest.java | 2 +- .../apache/dubbo/rpc/support/MockInvokerTest.java | 20 ++--- .../org/apache/dubbo/rpc/support/RpcUtilsTest.java | 32 +++---- .../rpc/protocol/dubbo/ArgumentCallbackTest.java | 14 ++-- .../dubbo/DecodeableRpcInvocationTest.java | 5 +- .../protocol/dubbo/DecodeableRpcResultTest.java | 5 +- .../rpc/protocol/dubbo/DubboCountCodecTest.java | 4 +- .../protocol/dubbo/DubboInvokerAvailableTest.java | 13 ++- .../rpc/protocol/dubbo/DubboLazyConnectTest.java | 10 +-- .../rpc/protocol/dubbo/DubboProtocolTest.java | 14 ++-- .../dubbo/rpc/protocol/dubbo/FutureFilterTest.java | 6 +- .../dubbo/rpc/protocol/dubbo/MultiThreadTest.java | 4 +- .../dubbo/ReferenceCountExchangeClientTest.java | 12 +-- .../dubbo/rpc/protocol/dubbo/RpcFilterTest.java | 4 +- .../dubbo/decode/DubboTelnetDecodeTest.java | 14 ++-- .../rpc/protocol/dubbo/filter/TraceFilterTest.java | 6 +- .../dubbo/status/ServerStatusCheckerTest.java | 4 +- .../dubbo/status/ThreadPoolStatusCheckerTest.java | 4 +- .../dubbo/rpc/protocol/grpc/GrpcProtocolTest.java | 4 +- .../rpc/protocol/injvm/InjvmClassLoaderTest.java | 4 +- .../rpc/protocol/injvm/InjvmDeepCopyTest.java | 4 +- .../rpc/protocol/injvm/InjvmProtocolTest.java | 10 +-- .../dubbo/rpc/protocol/injvm/ProtocolTest.java | 4 +- .../dubbo/rpc/protocol/rest/RestProtocolTest.java | 24 +++--- .../rpc/protocol/rest/RpcExceptionMapperTest.java | 6 +- .../DubboSwaggerApiListingResourceTest.java | 4 +- .../org/apache/dubbo/rpc/TriRpcStatusTest.java | 4 +- .../dubbo/rpc/protocol/tri/DeadlineFutureTest.java | 2 +- .../protocol/tri/Http2ProtocolDetectorTest.java | 6 +- .../protocol/tri/ReflectionPackableMethodTest.java | 30 +++---- .../rpc/protocol/tri/SingleProtobufUtilsTest.java | 4 +- .../dubbo/rpc/protocol/tri/TripleInvokerTest.java | 2 +- .../rpc/protocol/tri/TriplePathResolverTest.java | 10 +-- .../dubbo/rpc/protocol/tri/TripleProtocolTest.java | 4 +- .../rpc/protocol/tri/compressor/Bzip2Test.java | 2 +- .../rpc/protocol/tri/compressor/GzipTest.java | 2 +- .../rpc/protocol/tri/compressor/IdentityTest.java | 2 +- .../rpc/protocol/tri/compressor/SnappyTest.java | 2 +- .../rpc/protocol/tri/frame/TriDecoderTest.java | 2 +- .../tri/service/TriBuiltinServiceTest.java | 4 +- .../protocol/tri/service/TriHealthImplTest.java | 6 +- .../tri/stream/TripleClientStreamTest.java | 2 +- .../TripleHttp2ClientResponseHandlerTest.java | 8 +- .../rpc/protocol/tri/transport/WriteQueueTest.java | 6 +- ...bboEndpointAnnotationAutoConfigurationTest.java | 16 ++-- .../boot/actuate/endpoint/DubboEndpointTest.java | 6 +- .../autoconfigure/BinderDubboConfigBinderTest.java | 6 +- .../DubboRelaxedBinding2AutoConfigurationTest.java | 6 +- ...aultPropertiesEnvironmentPostProcessorTest.java | 8 +- .../xds/util/bootstrap/BootstrapperTest.java | 9 +- 660 files changed, 3507 insertions(+), 3451 deletions(-) diff --cc dubbo-common/src/test/java/org/apache/dubbo/common/utils/JsonUtilsTest.java index 15f75a954e,3757082ac8..d0993c3add --- a/dubbo-common/src/test/java/org/apache/dubbo/common/utils/JsonUtilsTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/JsonUtilsTest.java @@@ -73,96 -60,8 +73,96 @@@ class JsonUtilsTest JsonUtils.setJson(null); } + @Test + public void consistentTest() { + List<Object> objs = new LinkedList<>(); + + { + objs.add(null); + } + + { + Map<String, String> map = new HashMap<>(); + map.put("a", "a"); + objs.add(map); + } + + { + TestObjectA a = new TestObjectA(); + objs.add(a); + } + + { + TestObjectA a = new TestObjectA(); + a.setTestEnum(TestEnum.TYPE_A); + objs.add(a); + } + + { + TestObjectB b = new TestObjectB(); + objs.add(b); + } + + { + TestObjectB b = new TestObjectB(); + b.setInnerA(new TestObjectB.Inner()); + b.setInnerB(new TestObjectB.Inner()); + objs.add(b); + } + + { + TestObjectB b = new TestObjectB(); + TestObjectB.Inner inner1 = new TestObjectB.Inner(); + TestObjectB.Inner inner2 = new TestObjectB.Inner(); + inner1.setName("Test"); + inner2.setName("Test"); + b.setInnerA(inner1); + b.setInnerB(inner2); + objs.add(b); + } + + { + TestObjectB b = new TestObjectB(); + TestObjectB.Inner inner1 = new TestObjectB.Inner(); + inner1.setName("Test"); + b.setInnerA(inner1); + b.setInnerB(inner1); + objs.add(b); + } + + for (Object obj : objs) { + + // prefer use fastjson2 + JsonUtils.setJson(null); + System.setProperty("dubbo.json-framework.prefer", "fastjson2"); + Assertions.assertInstanceOf(FastJson2Impl.class, JsonUtils.getJson()); + String fromFastjson2 = JsonUtils.getJson().toJson(obj); + System.clearProperty("dubbo.json-framework.prefer"); + + // prefer use fastjson + JsonUtils.setJson(null); + System.setProperty("dubbo.json-framework.prefer", "fastjson"); + Assertions.assertInstanceOf(FastJsonImpl.class, JsonUtils.getJson()); + String fromFastjson1 = JsonUtils.getJson().toJson(obj); + System.clearProperty("dubbo.json-framework.prefer"); + + // prefer use gson + JsonUtils.setJson(null); + System.setProperty("dubbo.json-framework.prefer", "gson"); + Assertions.assertInstanceOf(GsonImpl.class, JsonUtils.getJson()); + String fromGson = JsonUtils.getJson().toJson(obj); + System.clearProperty("dubbo.json-framework.prefer"); + + JsonUtils.setJson(null); + + Assertions.assertEquals(fromFastjson1, fromFastjson2); + Assertions.assertEquals(fromFastjson1, fromGson); + Assertions.assertEquals(fromFastjson2, fromGson); + } + } + @Test - public void testGetJson2() { + void testGetJson2() { ClassLoader originClassLoader = Thread.currentThread().getContextClassLoader(); AtomicReference<List<String>> removedPackages = new AtomicReference<>(Collections.emptyList()); ClassLoader newClassLoader = new ClassLoader(originClassLoader) { diff --cc dubbo-common/src/test/java/org/apache/dubbo/metadata/definition/ServiceDefinitionBuilderTest.java index cc9c6f9c8b,8ef429eebf..1df9ebdcdf --- a/dubbo-common/src/test/java/org/apache/dubbo/metadata/definition/ServiceDefinitionBuilderTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/metadata/definition/ServiceDefinitionBuilderTest.java @@@ -35,24 -32,10 +35,24 @@@ import java.util.List /** * 2018/11/6 */ - public class ServiceDefinitionBuilderTest { + class ServiceDefinitionBuilderTest { + + private static FrameworkModel frameworkModel; + + @BeforeAll + public static void setup() { + frameworkModel = new FrameworkModel(); + TypeDefinitionBuilder.initBuilders(frameworkModel); + } + + @AfterAll + public static void clear() { + frameworkModel.destroy(); + } + @Test - public void testBuilderComplexObject() { + void testBuilderComplexObject() { TypeDefinitionBuilder.initBuilders(FrameworkModel.defaultModel()); FullServiceDefinition fullServiceDefinition = ServiceDefinitionBuilder.buildFullDefinition(DemoService.class); checkComplexObjectAsParam(fullServiceDefinition); diff --cc dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractConfigTest.java index b15ec1d850,167da99aa7..434c0689fc --- a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractConfigTest.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractConfigTest.java @@@ -993,8 -1003,36 +993,8 @@@ class AbstractConfigTest } } - protected static void setOsEnv(Map<String, String> newenv) throws Exception { - try { - Class<?> processEnvironmentClass = Class.forName("java.lang.ProcessEnvironment"); - Field theEnvironmentField = processEnvironmentClass.getDeclaredField("theEnvironment"); - theEnvironmentField.setAccessible(true); - Map<String, String> env = (Map<String, String>) theEnvironmentField.get(null); - env.putAll(newenv); - Field theCaseInsensitiveEnvironmentField = processEnvironmentClass.getDeclaredField("theCaseInsensitiveEnvironment"); - theCaseInsensitiveEnvironmentField.setAccessible(true); - Map<String, String> cienv = (Map<String, String>) theCaseInsensitiveEnvironmentField.get(null); - cienv.putAll(newenv); - } catch (NoSuchFieldException e) { - Class[] classes = Collections.class.getDeclaredClasses(); - Map<String, String> env = System.getenv(); - for (Class cl : classes) { - if ("java.util.Collections$UnmodifiableMap".equals(cl.getName())) { - Field field = cl.getDeclaredField("m"); - field.setAccessible(true); - Object obj = field.get(env); - Map<String, String> map = (Map<String, String>) obj; - map.clear(); - map.putAll(newenv); - } - } - } - } - - @Test - public void testMetaData() throws Exception { + void testMetaData() throws Exception { // Expect empty metadata for new instance // Check and set default value of field in checkDefault() method diff --cc dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/schema/DubboNamespaceHandlerTest.java index 73ae2cbddb,fdd8795028..9a0ec03c4d --- a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/schema/DubboNamespaceHandlerTest.java +++ b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/schema/DubboNamespaceHandlerTest.java @@@ -55,9 -55,8 +55,9 @@@ import static org.hamcrest.CoreMatchers import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; - public class DubboNamespaceHandlerTest { + class DubboNamespaceHandlerTest { private static String resourcePath = ConfigTest.class.getPackage().getName().replace('.', '/'); diff --cc dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/migration/model/MigrationRuleTest.java index 0194ec5bfb,82ae140f03..79b20de724 --- a/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/migration/model/MigrationRuleTest.java +++ b/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/migration/model/MigrationRuleTest.java @@@ -39,8 -39,8 +39,8 @@@ class MigrationRuleTest private static ServiceNameMapping mapping = mock(ServiceNameMapping.class); @Test - public void test_parse() { + void test_parse() { - when(mapping.getCachedMapping(any(URL.class))).thenReturn(Collections.emptySet()); + when(mapping.getMapping(any(URL.class))).thenReturn(Collections.emptySet()); String rule = "key: demo-consumer\n" + "step: APPLICATION_FIRST\n" + diff --cc dubbo-remoting/dubbo-remoting-netty4/src/test/java/org/apache/dubbo/remoting/transport/netty4/NettyChannelTest.java index 9a79ee2f2f,833dcf81c0..2d6c99deb7 --- a/dubbo-remoting/dubbo-remoting-netty4/src/test/java/org/apache/dubbo/remoting/transport/netty4/NettyChannelTest.java +++ b/dubbo-remoting/dubbo-remoting-netty4/src/test/java/org/apache/dubbo/remoting/transport/netty4/NettyChannelTest.java @@@ -78,11 -74,9 +78,11 @@@ class NettyChannelTest } @Test - public void testSend() throws Exception { + void testSend() throws Exception { + Mockito.when(channel.eventLoop()).thenReturn(Mockito.mock(EventLoop.class)); + Mockito.when(channel.alloc()).thenReturn(PooledByteBufAllocator.DEFAULT); NettyChannel nettyChannel = NettyChannel.getOrAddChannel(channel, url, channelHandler); - ChannelFuture future = Mockito.mock(ChannelFuture.class); + ChannelPromise future = Mockito.mock(ChannelPromise.class); Mockito.when(future.await(1000)).thenReturn(true); Mockito.when(future.cause()).thenReturn(null); Mockito.when(channel.writeAndFlush(Mockito.any())).thenReturn(future); diff --cc dubbo-remoting/dubbo-remoting-netty4/src/test/java/org/apache/dubbo/remoting/transport/netty4/PortUnificationExchangerTest.java index ab9e1f4628,aa12b9a96f..f06c018f3e --- a/dubbo-remoting/dubbo-remoting-netty4/src/test/java/org/apache/dubbo/remoting/transport/netty4/PortUnificationExchangerTest.java +++ b/dubbo-remoting/dubbo-remoting-netty4/src/test/java/org/apache/dubbo/remoting/transport/netty4/PortUnificationExchangerTest.java @@@ -24,21 -22,14 +24,21 @@@ import org.apache.dubbo.remoting.api.pu import org.apache.dubbo.remoting.exchange.PortUnificationExchanger; import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; - public class PortUnificationExchangerTest { + class PortUnificationExchangerTest { + private static URL url; + + @BeforeAll + public static void init() throws RemotingException { + int port = NetUtils.getAvailablePort(); + url = URL.valueOf("empty://127.0.0.1:" + port + "?foo=bar"); + } + @Test void test() { - int port = NetUtils.getAvailablePort(); - URL url = URL.valueOf("empty://127.0.0.1:" + port + "?foo=bar"); PortUnificationExchanger.bind(url, new DefaultPuHandler()); PortUnificationExchanger.bind(url, new DefaultPuHandler()); Assertions.assertEquals(PortUnificationExchanger.getServers().size(), 1); diff --cc dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/RpcContextTest.java index 0d2d22d0d0,43206084a6..b6ceac8342 --- a/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/RpcContextTest.java +++ b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/RpcContextTest.java @@@ -206,139 -202,9 +206,139 @@@ class RpcContextTest rpcContext.setObjectAttachments(map); Assertions.assertEquals(map, rpcContext.getObjectAttachments()); } + @Test + public void say() { + final String key = "user-attachment"; + final String value = "attachment-value"; + RpcContext.getServerContext().setObjectAttachment(key, value); + final String returned = (String) RpcContext.getServerContext().getObjectAttachment(key); + System.out.println(returned); + RpcContext.getServerContext().remove(key); + } @Test - public void testRestore() { + void testRestore() { } + + @Test + public void testRpcServerContextAttachment() { + RpcContextAttachment attachment = RpcContext.getServerContext(); + attachment.setAttachment("key_1","value_1"); + attachment.setAttachment("key_2","value_2"); + Assertions.assertEquals("value_1", attachment.getAttachment("key_1")); + Assertions.assertEquals(null, attachment.getAttachment("aaa")); + attachment.removeAttachment("key_1"); + Assertions.assertEquals(null, attachment.getAttachment("key_1")); + Assertions.assertEquals("value_2", attachment.getAttachment("key_2")); + Object obj = new Object(); + attachment.setObjectAttachment("key_3", obj); + Assertions.assertEquals(obj, attachment.getObjectAttachment("key_3")); + attachment.removeAttachment("key_3"); + Assertions.assertEquals(null, attachment.getObjectAttachment("key_3")); + + Assertions.assertThrows(RuntimeException.class, () -> attachment.copyOf(true)); + Assertions.assertThrows(RuntimeException.class, attachment::isValid); + + Map<String, String> map = new HashMap<>(); + map.put("key_4", "value_4"); + map.put("key_5", "value_5"); + attachment.setAttachments(map); + Assertions.assertEquals(attachment.getAttachments(), attachment.getObjectAttachments()); + Assertions.assertEquals(attachment.getAttachments(), attachment.get()); + Map<String, String> map1 = attachment.getAttachments(); + Assertions.assertEquals("value_4", map1.get("key_4")); + Assertions.assertEquals("value_5", map1.get("key_5")); + attachment.clearAttachments(); + Assertions.assertEquals(attachment, attachment.removeAttachment("key_4")); + Assertions.assertEquals(attachment, attachment.removeAttachment("key_5")); + + attachment.set("key_6", "value_6"); + Assertions.assertEquals("value_6", attachment.get("key_6")); + attachment.clearAttachments(); + + Map<String, Object> objectMap = new HashMap<>(); + objectMap.put("key_7", "value_7"); + objectMap.put("key_8", "value_8"); + attachment.setObjectAttachments(objectMap); + Map<String, String> objectMap1 = attachment.getAttachments(); + Assertions.assertEquals("value_7", objectMap1.get("key_7")); + Assertions.assertEquals("value_8", objectMap1.get("key_8")); + attachment.clearAttachments(); + + } + + @Test + public void testRpcServerContextClearAttachment() { + RpcServerContextAttachment attachment = new RpcServerContextAttachment(); + attachment.setAttachment("key_1","value_1"); + attachment.setAttachment("key_2","value_2"); + attachment.setAttachment("key_3","value_3"); + attachment.clearAttachments(); + Assertions.assertEquals(null, attachment.getAttachment("key_1")); + Assertions.assertEquals(null, attachment.getAttachment("key_2")); + Assertions.assertEquals(null, attachment.getAttachment("key_3")); + + attachment.setObjectAttachment("key_1","value_1"); + attachment.setObjectAttachment("key_2","value_2"); + attachment.setObjectAttachment("key_3","value_3"); + attachment.clearAttachments(); + Assertions.assertEquals(null, attachment.getAttachment("key_1")); + Assertions.assertEquals(null, attachment.getAttachment("key_2")); + Assertions.assertEquals(null, attachment.getAttachment("key_3")); + } + + @Test + public void testAsyncContext() { + RpcServerContextAttachment attachment = new RpcServerContextAttachment(); + AsyncContext asyncContext = new AsyncContextImpl(); + attachment.setAsyncContext(asyncContext); + asyncContext.start(); + Assertions.assertTrue(attachment.isAsyncStarted()); + Assertions.assertEquals(asyncContext, attachment.getAsyncContext()); + Assertions.assertTrue(attachment.stopAsync()); + } + + @Test + public void testObjectAttachmentMap() { + RpcServerContextAttachment attachment = new RpcServerContextAttachment(); + RpcServerContextAttachment.ObjectAttachmentMap objectAttachmentMap = new RpcServerContextAttachment.ObjectAttachmentMap(attachment); + objectAttachmentMap.put("key_1", "value_1"); + Set<String> keySet = objectAttachmentMap.keySet(); + Assertions.assertEquals(true, keySet.contains("key_1")); + Collection<Object> valueSet = objectAttachmentMap.values(); + Assertions.assertEquals(true, valueSet.contains("value_1")); + Set<Map.Entry<String, Object>> entrySet = objectAttachmentMap.entrySet(); + Map.Entry<String, Object> entry = entrySet.iterator().next(); + Assertions.assertEquals("key_1", entry.getKey()); + Assertions.assertEquals("value_1", entry.getValue()); + Assertions.assertEquals(true, objectAttachmentMap.containsKey("key_1")); + Assertions.assertEquals(true, objectAttachmentMap.containsValue("value_1")); + Assertions.assertEquals("value_1", objectAttachmentMap.get("key_1")); + Assertions.assertEquals(null, objectAttachmentMap.get("key_2")); + objectAttachmentMap.remove("key_1"); + Assertions.assertEquals(null, objectAttachmentMap.get("key_1")); + Map<String, String> map = new HashMap<>(); + map.put("key_3","value_3"); + map.put("key_4","value_4"); + objectAttachmentMap.putAll(map); + Assertions.assertEquals("value_3", objectAttachmentMap.get("key_3")); + Assertions.assertEquals("value_4", objectAttachmentMap.get("key_4")); + Assertions.assertEquals(null, objectAttachmentMap.remove(new Object())); + objectAttachmentMap.clear(); + } + + @Test + public void testClearAttachmentMap() { + RpcServerContextAttachment attachment = new RpcServerContextAttachment(); + RpcServerContextAttachment.ObjectAttachmentMap objectAttachmentMap = new RpcServerContextAttachment.ObjectAttachmentMap(attachment); + objectAttachmentMap.put("key_1", "value_1"); + objectAttachmentMap.put("key_2", "value_2"); + objectAttachmentMap.put("key_3", "value_3"); + Assertions.assertEquals(3, objectAttachmentMap.size()); + objectAttachmentMap.clear(); + Assertions.assertEquals(null, objectAttachmentMap.get(new Object())); + Assertions.assertEquals(0, objectAttachmentMap.size()); + Assertions.assertEquals(true, objectAttachmentMap.isEmpty()); + } } diff --cc dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/filter/ContextFilterTest.java index ae9549bfee,84e27514a1..6bab37aab6 --- a/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/filter/ContextFilterTest.java +++ b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/filter/ContextFilterTest.java @@@ -38,9 -37,9 +38,9 @@@ import static org.mockito.Mockito.mock * ContextFilterTest.java * TODO need to enhance assertion */ - public class ContextFilterTest { + class ContextFilterTest { - Filter contextFilter = new ContextFilter(); + Filter contextFilter = new ContextFilter(ApplicationModel.defaultModel()); Invoker<DemoService> invoker; Invocation invocation; diff --cc dubbo-rpc/dubbo-rpc-triple/src/test/java/org/apache/dubbo/rpc/protocol/tri/TripleInvokerTest.java index a0a9ac16f3,f46b0759a2..5b21e55c34 --- a/dubbo-rpc/dubbo-rpc-triple/src/test/java/org/apache/dubbo/rpc/protocol/tri/TripleInvokerTest.java +++ b/dubbo-rpc/dubbo-rpc-triple/src/test/java/org/apache/dubbo/rpc/protocol/tri/TripleInvokerTest.java @@@ -44,19 -42,19 +44,19 @@@ import static org.mockito.Mockito.when class TripleInvokerTest { @Test - public void testNewCall() throws NoSuchMethodException { + void testNewCall() throws NoSuchMethodException { + URL url = URL.valueOf("tri://127.0.0.1:9103/" + IGreeter.class.getName()); Channel channel = Mockito.mock(Channel.class); - Connection connection = Mockito.mock(Connection.class); + AbstractConnectionClient connectionClient = Mockito.mock(AbstractConnectionClient.class); ConnectionManager connectionManager = Mockito.mock(ConnectionManager.class); - when(connectionManager.connect(any(URL.class))) - .thenReturn(connection); - when(connection.getChannel()) - .thenReturn(channel); - URL url = URL.valueOf("tri://127.0.0.1:9103/" + IGreeter.class.getName()); - ExecutorService executorService = url.getOrDefaultApplicationModel() - .getExtensionLoader(ExecutorRepository.class) - .getDefaultExtension() - .createExecutorIfAbsent(url); + when(connectionManager.connect(any(URL.class), any(ChannelHandler.class))) + .thenReturn(connectionClient); + when(connectionClient.getChannel(true)) + .thenReturn(channel); + when(connectionClient.isAvailable()).thenReturn(true); + + ExecutorService executorService = ExecutorRepository.getInstance(url.getOrDefaultApplicationModel()) + .createExecutorIfAbsent(url); TripleClientCall call = Mockito.mock(TripleClientCall.class); StreamObserver streamObserver = Mockito.mock(StreamObserver.class); when(call.start(any(RequestMetadata.class), any(ClientCall.Listener.class))) diff --cc dubbo-rpc/dubbo-rpc-triple/src/test/java/org/apache/dubbo/rpc/protocol/tri/transport/WriteQueueTest.java index bd7b19f5bb,39df1c64c0..4912f3f438 --- a/dubbo-rpc/dubbo-rpc-triple/src/test/java/org/apache/dubbo/rpc/protocol/tri/transport/WriteQueueTest.java +++ b/dubbo-rpc/dubbo-rpc-triple/src/test/java/org/apache/dubbo/rpc/protocol/tri/transport/WriteQueueTest.java @@@ -72,11 -68,11 +72,11 @@@ class WriteQueueTest } @Test - public void test() throws Exception { + void test() throws Exception { - WriteQueue writeQueue = new WriteQueue(channel); - writeQueue.enqueue(HeaderQueueCommand.createHeaders(new DefaultHttp2Headers())); - writeQueue.enqueue(DataQueueCommand.createGrpcCommand(new byte[0], false, 0)); + WriteQueue writeQueue = new WriteQueue(); + writeQueue.enqueue(HeaderQueueCommand.createHeaders(new DefaultHttp2Headers()).channel(channel)); + writeQueue.enqueue(DataQueueCommand.createGrpcCommand(new byte[0], false, 0).channel(channel)); TriRpcStatus status = TriRpcStatus.UNKNOWN .withCause(new RpcException()) .withDescription("Encode Response data error"); @@@ -99,8 -95,8 +99,8 @@@ } @Test - public void testChunk() throws Exception { + void testChunk() throws Exception { - WriteQueue writeQueue = new WriteQueue(channel); + WriteQueue writeQueue = new WriteQueue(); // test deque chunk size writeMethodCalledTimes.set(0); for (int i = 0; i < DEQUE_CHUNK_SIZE; i++) {
