This is an automated email from the ASF dual-hosted git repository.

wangxin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git

commit 7ea1efeeae78d0c952e0a1182b3dbdfb12077d67
Merge: 58d9f1ad31 6f4011fff9
Author: Xin Wang <xin.victorw...@gmail.com>
AuthorDate: Sun Jan 1 23:36:59 2023 +0800

    Merge remote-tracking branch 'dubbo_rem/master'

 .gitignore                                         |   3 +
 README.md                                          |   8 +-
 compiler/pom.xml                                   |   4 +-
 .../org/apache/dubbo/rpc/cluster/Constants.java    |   2 +
 .../cluster/loadbalance/AbstractLoadBalance.java   |   9 +-
 .../loadbalance/ConsistentHashLoadBalance.java     |  88 ++++++++-
 .../cluster/support/FailbackClusterInvoker.java    |  25 ++-
 .../rpc/cluster/support/ForkingClusterInvoker.java |   5 +-
 .../cluster/support/migration/MigrationRule.java   |   3 +-
 .../support/wrapper/MockClusterInvoker.java        |   7 +-
 .../loadbalance/AbstractLoadBalanceTest.java       |  11 +-
 .../loadbalance/ConsistentHashLoadBalanceTest.java |  38 ++--
 .../cluster/loadbalance/LoadBalanceBaseTest.java   |  25 ++-
 .../support/AbstractClusterInvokerTest.java        |   2 +-
 .../support/AvailableClusterInvokerTest.java       | 114 +++++++++++
 .../support/FailbackClusterInvokerTest.java        |  96 +++++++++
 .../cluster/support/ForkingClusterInvokerTest.java |  41 +++-
 .../java/org/apache/dubbo/common/URLStrParser.java |  12 +-
 .../dubbo/common/compiler/support/JdkCompiler.java |  13 +-
 .../apache/dubbo/common/config/Environment.java    |  10 +-
 .../dubbo/common/extension/DisableInject.java      |   3 +-
 .../dubbo/common/extension/ExtensionLoader.java    |  46 +++--
 .../extension/{DisableInject.java => Inject.java}  |  14 +-
 .../extension/support/WrapperComparator.java       |  26 +--
 .../dubbo/common/timer/HashedWheelTimer.java       |  12 +-
 .../dubbo/common/utils/CompatibleTypeUtils.java    |  13 +-
 .../org/apache/dubbo/common/utils/LFUCache.java    | 214 ++++-----------------
 .../org/apache/dubbo/common/utils/NetUtils.java    |  41 +++-
 .../org/apache/dubbo/common/utils/PojoUtils.java   |   7 +
 .../dubbo/common/utils/SerializeClassChecker.java  |  10 +-
 .../org/apache/dubbo/common/utils/UrlUtils.java    |  47 ++---
 .../dubbo/config/AbstractReferenceConfig.java      |  21 +-
 .../apache/dubbo/config/MetadataReportConfig.java  |  10 +-
 .../dubbo/config/annotation/DubboReference.java    |   6 +
 .../apache/dubbo/config/annotation/Reference.java  |   6 +
 .../apache/dubbo/config/context/ConfigManager.java |  12 +-
 .../apache/dubbo/rpc/model/ApplicationModel.java   |   9 +
 .../org/apache/dubbo/rpc/model/ProviderModel.java  |   3 +-
 .../test/java/org/apache/dubbo/common/URLTest.java |  39 +++-
 .../common/compiler/support/JavaCodeTest.java      |  25 ++-
 .../common/compiler/support/JdkCompilerTest.java   |  17 ++
 .../extension/injection/impl/InjectExtImpl.java    |   4 +-
 .../apache/dubbo/common/utils/LFUCacheTest.java    |  30 ---
 ...sInterfaceDisplayNameHasMetaCharactersTest.java | 113 +++++++++++
 .../apache/dubbo/common/utils/NetUtilsTest.java    |   7 +-
 .../apache/dubbo/common/utils/PojoUtilsTest.java   |  23 ++-
 .../apache/dubbo/common/utils/UrlUtilsTest.java    |  18 +-
 .../org/apache/dubbo/config/MetricsConfigTest.java |  27 ++-
 .../dubbo/config/context/ConfigManagerTest.java    |   4 +-
 .../java/com/alibaba/dubbo/rpc/RpcContext.java     |   2 +-
 .../org/apache/dubbo/config/ReferenceConfig.java   |   2 +-
 .../org/apache/dubbo/config/ServiceConfig.java     |  51 +----
 .../dubbo/config/bootstrap/DubboBootstrap.java     |  27 +--
 .../builders/AbstractReferenceBuilder.java         |  13 ++
 .../annotation/ServiceClassPostProcessor.java      |  25 +--
 ...onfigDefaultPropertyValueBeanPostProcessor.java |   2 +-
 ...ubboConfigEarlyInitializationPostProcessor.java | 127 ------------
 .../DubboConfigEarlyRegistrationPostProcessor.java | 145 ++++++++++++++
 .../dubbo/config/spring/util/DubboBeanUtils.java   |  11 +-
 .../src/main/resources/META-INF/compat/dubbo.xsd   |   5 +
 .../src/main/resources/META-INF/dubbo.xsd          |   5 +
 .../annotation/ReferenceBeanBuilderTest.java       |  19 +-
 .../config/DubboConfigEarlyInitializationTest.java |  63 ++++++
 .../spring/dubbo-config-early-initialization.xml   |  24 +--
 .../support/nacos/NacosDynamicConfiguration.java   |   8 +
 .../support/zookeeper/CacheListener.java           |   4 +-
 .../zookeeper/ZookeeperDynamicConfiguration.java   |   4 +-
 .../ZookeeperDynamicConfigurationFactory.java      |   4 +-
 .../src/main/resources/spring/dubbo-consumer.xml   |   2 +-
 dubbo-dependencies-bom/pom.xml                     |  21 +-
 .../dubbo-dependencies-zookeeper/pom.xml           |   2 +-
 .../org/apache/dubbo/metadata/MetadataInfo.java    |  14 +-
 .../definition/builder/MapTypeBuilder.java         |   8 -
 .../zookeeper/ZookeeperMetadataReportFactory.java  |   4 +-
 .../apache/dubbo/monitor/dubbo/MetricsFilter.java  |  25 ++-
 .../dubbo/qos/command/DefaultCommandExecutor.java  |   2 +-
 .../dubbo/qos/command/util/ServiceCheckUtils.java  |  20 ++
 .../dubbo/qos/legacy/InvokeTelnetHandler.java      |  50 +++--
 .../client/EventPublishingServiceDiscovery.java    |   7 -
 .../client/ServiceDiscoveryRegistryDirectory.java  |   4 +-
 .../listener/ServiceInstancesChangedListener.java  |  21 +-
 .../integration/AbstractConfiguratorListener.java  |  10 +-
 .../registry/integration/DynamicDirectory.java     |  14 +-
 .../registry/integration/RegistryDirectory.java    |  11 +-
 .../registry/integration/RegistryProtocol.java     |  15 +-
 .../registry/support/AbstractRegistryFactory.java  |   4 +-
 .../registry/support/FailbackRegistryTest.java     |  20 +-
 .../dubbo/registry/dubbo/RegistryProtocolTest.java |   2 +-
 dubbo-registry/dubbo-registry-eureka/pom.xml       |   4 +-
 .../dubbo/registry/multiple/MultipleRegistry.java  |   5 +-
 .../registry/nacos/NacosNamingServiceWrapper.java  |   4 +
 .../apache/dubbo/registry/nacos/NacosRegistry.java |  77 ++++++--
 .../nacos/util/NacosNamingServiceUtils.java        |   9 +-
 .../registry/zookeeper/ZookeeperRegistry.java      |  31 +--
 .../zookeeper/ZookeeperRegistryFactory.java        |   4 +-
 .../zookeeper/ZookeeperServiceDiscoveryTest.java   |  15 +-
 .../dubbo/remoting/exchange/ExchangeClient.java    |   4 +
 .../apache/dubbo/remoting/exchange/Request.java    |   9 +
 .../remoting/exchange/codec/ExchangeCodec.java     |   2 -
 .../remoting/exchange/support/DefaultFuture.java   |   9 +-
 .../support/header/HeaderExchangeChannel.java      |   2 +-
 .../dubbo/remoting/transport/AbstractClient.java   |  28 ++-
 .../remoting/transport/MultiMessageHandler.java    |  11 +-
 .../dubbo/remoting/codec/ExchangeCodecTest.java    |  34 ++--
 .../dubbo/remoting/codec/TelnetCodecTest.java      |  46 ++---
 .../remoting/http/tomcat/TomcatHttpServer.java     |   2 +
 .../remoting/http/tomcat/TomcatHttpBinderTest.java |   1 +
 .../support/header/HeartbeatHandlerTest.java       |   3 +
 .../remoting/transport/netty/ThreadNameTest.java   |   8 +-
 .../remoting/transport/netty4/NettyClient.java     |  18 +-
 .../remoting/transport/netty4/NettyServer.java     |  54 +++++-
 .../remoting/transport/netty4/SslContexts.java     |  50 ++++-
 .../curator5/Curator5ZookeeperClient.java          |   3 +
 .../zookeeper/curator/CuratorZookeeperClient.java  |  27 ++-
 .../main/java/org/apache/dubbo/rpc/Invoker.java    |   7 +
 .../main/java/org/apache/dubbo/rpc/RpcContext.java |   2 +-
 .../java/org/apache/dubbo/rpc/RpcInvocation.java   |   3 +-
 .../apache/dubbo/rpc/filter/AccessLogFilter.java   |  18 +-
 .../org/apache/dubbo/rpc/filter/TimeoutFilter.java |   7 +-
 .../apache/dubbo/rpc/protocol/AbstractInvoker.java |   3 +
 .../dubbo/rpc/protocol/AsyncToSyncInvoker.java     |   1 +
 .../java/org/apache/dubbo/rpc/AppResponseTest.java |   3 +
 .../java/org/apache/dubbo/rpc/RpcContextTest.java  |   5 +
 .../org/apache/dubbo/rpc/RpcInvocationTest.java    |   4 +
 .../rpc/protocol/dubbo/CallbackServiceCodec.java   |  10 +-
 .../rpc/protocol/dubbo/ChannelWrappedInvoker.java  |   6 +-
 .../apache/dubbo/rpc/protocol/dubbo/Constants.java |   7 +
 .../protocol/dubbo/DecodeableRpcInvocation.java    |   2 +-
 .../dubbo/rpc/protocol/dubbo/DubboInvoker.java     |  20 +-
 .../dubbo/rpc/protocol/dubbo/DubboProtocol.java    |   7 +-
 .../protocol/dubbo/LazyConnectExchangeClient.java  |  14 +-
 .../dubbo/ReferenceCountExchangeClient.java        |  35 +++-
 .../dubbo/ReferenceCountExchangeClientTest.java    |  28 ++-
 .../dubbo/rpc/protocol/grpc/GrpcOptionsUtils.java  |  48 ++++-
 .../apache/dubbo/rpc/protocol/rmi/RmiProtocol.java |  15 +-
 .../dubbo/rpc/protocol/rmi/RemoteService2Impl.java |  20 +-
 .../dubbo/rpc/protocol/rmi/RmiProtocolTest.java    |  24 +++
 .../serialize/hessian2/Hessian2ObjectInput.java    |  12 +-
 .../serialize/hessian2/Hessian2ObjectOutput.java   |  12 +-
 .../dubbo/DefaultHessian2FactoryInitializer.java   |   5 +-
 .../dubbo-spring-boot-actuator/README.md           |   2 +-
 .../dubbo-spring-boot-actuator/pom.xml             |  14 ++
 .../DubboEndpointAnnotationAutoConfiguration.java  |   7 +
 .../CompatibleOnEnabledEndpointCondition.java      |  51 +++--
 .../dubbo-spring-boot-autoconfigure/pom.xml        |  14 ++
 .../dubbo-spring-boot-starter/pom.xml              |  14 ++
 dubbo-spring-boot/pom.xml                          |   4 +-
 pom.xml                                            |  29 ++-
 148 files changed, 2033 insertions(+), 1000 deletions(-)

Reply via email to