This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch 3.1 in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit 766d0cfa894f95f0bddc5bfb397ec6656c517069 Merge: 6095d71062 edd245e595 Author: Albumen Kevin <[email protected]> AuthorDate: Thu Jul 14 10:06:54 2022 +0800 Merge branch 'apache-3.0' into apache-3.1 .../src/main/java/org/apache/dubbo/common/URL.java | 4 +- .../common/beans/ScopeBeanExtensionInjector.java | 8 +- .../common/extension/ExtensionAccessorAware.java | 2 +- .../dubbo/common/extension/ExtensionFactory.java | 1 - .../dubbo/common/extension/ExtensionInjector.java | 4 +- .../inject/AdaptiveExtensionInjector.java | 11 +- .../extension/inject/SpiExtensionInjector.java | 25 ++-- .../inject/AdaptiveExtensionInjectorTest.java | 4 +- .../dubbo/common/extension/ExtensionFactory.java | 1 - .../dubbo/common/extension/MyExtensionFactory.java | 8 +- .../org/apache/dubbo/config/ReferenceConfig.java | 2 +- .../apache/dubbo/config/spring/ReferenceBean.java | 3 - .../AbstractAnnotationBeanPostProcessor.java | 157 +++++---------------- .../ReferenceAnnotationBeanPostProcessor.java | 44 ++---- .../annotation/ServiceAnnotationPostProcessor.java | 18 +-- ...onfigDefaultPropertyValueBeanPostProcessor.java | 2 +- .../spring/context/DubboConfigBeanInitializer.java | 2 +- .../DubboInfraBeanRegisterPostProcessor.java | 2 +- .../spring/context/DubboSpringInitializer.java | 2 +- .../DubboConfigConfigurationRegistrar.java | 15 -- .../context/event/DubboApplicationStateEvent.java | 2 +- .../spring/extension/SpringExtensionInjector.java | 63 +++------ .../spring/reference/ReferenceAttributes.java | 2 - .../spring/reference/ReferenceBeanManager.java | 8 +- .../spring/reference/ReferenceBeanSupport.java | 13 +- .../config/spring/reference/ReferenceCreator.java | 17 +-- .../config/spring/util/DubboAnnotationUtils.java | 2 +- .../dubbo/config/spring/util/DubboBeanUtils.java | 6 - .../dubbo/config/spring/util/EnvironmentUtils.java | 12 +- .../DubboConfigAliasPostProcessorTest.java | 58 ++++++++ .../ReferenceAnnotationBeanPostProcessorTest.java | 52 +++---- ...gDefaultPropertyValueBeanPostProcessorTest.java | 44 ++++++ .../consumer/test/TestConsumerConfiguration.java | 2 +- .../extension/SpringExtensionInjectorTest.java | 21 ++- .../reference/DubboConfigBeanInitializerTest.java | 2 +- .../apache/dubbo/auth/AccessKeyAuthenticator.java | 27 ++-- .../apache/dubbo/auth/utils/SignatureUtils.java | 91 ++++++------ .../dubbo/auth/AccessKeyAuthenticatorTest.java | 1 - .../dubbo/auth/utils/SignatureUtilsTest.java | 36 ++--- .../dubbo/registry/client/InstanceAddressURL.java | 46 +++++- .../client/ServiceDiscoveryRegistryDirectory.java | 11 +- .../buffer/ByteBufferBackedChannelBuffer.java | 8 +- .../remoting/buffer/DynamicChannelBuffer.java | 9 +- .../dubbo/remoting/transport/AbstractClient.java | 14 +- .../transport/ChannelHandlerDispatcher.java | 2 +- .../dubbo/remoting/transport/DecodeHandler.java | 27 ++-- .../ConnectionOrderedChannelHandler.java | 2 +- .../remoting/transport/netty4/NettyClient.java | 8 +- .../remoting/transport/netty4/NettyServer.java | 2 +- .../transport/netty4/NettyServerHandler.java | 2 +- .../transport/netty4/NettyClientHandlerTest.java | 2 +- .../apache/dubbo/rpc/protocol/AbstractInvoker.java | 1 + .../rpc/protocol/tri/call/AbstractServerCall.java | 10 +- 53 files changed, 411 insertions(+), 507 deletions(-)
