You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by al...@apache.org on 2023/06/08 08:17:06 UTC
[dubbo] 01/01: Merge branch 'apache-3.2' into apache-3.3
This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch 3.3
in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit 642f741dba4e8731c0fe8a1d73f35638936c6ad7
Merge: 85bc6ea472 f35ac09353
Author: Albumen Kevin <jh...@gmail.com>
AuthorDate: Thu Jun 8 16:16:15 2023 +0800
Merge branch 'apache-3.2' into apache-3.3
# Conflicts:
# dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/ReferenceBean.java
# dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/ServiceAnnotationPostProcessor.java
# dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/reference/ReferenceBeanSupport.java
.../rpc/cluster/filter/FilterChainBuilder.java | 9 +
.../cluster/support/AbstractClusterInvoker.java | 31 +-
.../apache/dubbo/common/config/ReferenceCache.java | 12 +-
.../common/convert/StringToDurationConverter.java | 243 +++++
.../dubbo/common/deploy/ApplicationDeployer.java | 5 +
.../org/apache/dubbo/common/utils/ClassUtils.java | 4 +-
.../apache/dubbo/common/utils/ToStringUtils.java | 26 +-
.../dubbo/config/AbstractInterfaceConfig.java | 10 +-
.../org/apache/dubbo/config/MetricsConfig.java | 9 +
.../apache/dubbo/config/ReferenceConfigBase.java | 10 +-
.../org/apache/dubbo/config/ServiceConfigBase.java | 7 +-
.../apache/dubbo/config/context/ConfigManager.java | 1 +
.../org.apache.dubbo.common.convert.Converter | 3 +-
.../convert/StringToDurationConverterTest.java | 62 ++
.../java/com/alibaba/dubbo/cache/CacheFactory.java | 3 +-
.../dubbo/cache/support/AbstractCacheFactory.java | 3 +-
.../java/com/alibaba/dubbo/common/DelegateURL.java | 1054 ++++++++++++++++++++
.../main/java/com/alibaba/dubbo/common/URL.java | 2 +-
.../dubbo/common/serialize/Serialization.java | 5 +-
.../dubbo/common/threadpool/ThreadPool.java | 2 +-
.../com/alibaba/dubbo/common/utils/UrlUtils.java | 7 +-
.../java/com/alibaba/dubbo/monitor/Monitor.java | 4 +-
.../com/alibaba/dubbo/monitor/MonitorFactory.java | 2 +-
.../com/alibaba/dubbo/registry/NotifyListener.java | 3 +-
.../java/com/alibaba/dubbo/registry/Registry.java | 10 +-
.../alibaba/dubbo/registry/RegistryFactory.java | 2 +-
.../dubbo/registry/support/AbstractRegistry.java | 22 +-
.../registry/support/AbstractRegistryFactory.java | 2 +-
.../dubbo/registry/support/FailbackRegistry.java | 21 +-
.../com/alibaba/dubbo/remoting/Transporter.java | 3 +-
.../main/java/com/alibaba/dubbo/rpc/Exporter.java | 7 +
.../main/java/com/alibaba/dubbo/rpc/Filter.java | 11 +-
.../main/java/com/alibaba/dubbo/rpc/Invoker.java | 3 +-
.../main/java/com/alibaba/dubbo/rpc/Protocol.java | 3 +-
.../java/com/alibaba/dubbo/rpc/ProxyFactory.java | 2 +-
.../main/java/com/alibaba/dubbo/rpc/Result.java | 10 +
.../java/com/alibaba/dubbo/rpc/RpcContext.java | 5 +-
.../alibaba/dubbo/rpc/cluster/Configurator.java | 2 +-
.../dubbo/rpc/cluster/ConfiguratorFactory.java | 2 +-
.../com/alibaba/dubbo/rpc/cluster/LoadBalance.java | 8 +-
.../java/com/alibaba/dubbo/rpc/cluster/Router.java | 5 +-
.../alibaba/dubbo/rpc/cluster/RouterFactory.java | 2 +-
.../alibaba/dubbo/rpc/cluster/RuleConverter.java | 2 +-
dubbo-config/dubbo-config-api/pom.xml | 2 +-
.../org/apache/dubbo/config/ReferenceConfig.java | 107 +-
.../org/apache/dubbo/config/ServiceConfig.java | 59 +-
.../config/deploy/DefaultApplicationDeployer.java | 11 +
.../deploy/DefaultMetricsServiceExporter.java | 5 +-
.../dubbo/config/deploy/DefaultModuleDeployer.java | 66 +-
.../config/utils/CompositeReferenceCache.java | 18 +-
.../dubbo/config/utils/SimpleReferenceCache.java | 27 +-
...egistryCenterExportProviderIntegrationTest.java | 4 +-
.../dubbo/config/utils/MockReferenceConfig.java | 4 +-
.../dubbo/config/utils/XxxMockReferenceConfig.java | 4 +-
.../apache/dubbo/config/spring/ReferenceBean.java | 80 +-
.../AbstractAnnotationBeanPostProcessor.java | 7 +-
.../AnnotationPropertyValuesAdapter.java | 8 +-
.../annotation/DubboConfigAliasPostProcessor.java | 4 +-
.../ReferenceAnnotationBeanPostProcessor.java | 5 +-
.../annotation/ServiceAnnotationPostProcessor.java | 7 +-
.../factory/annotation/ServiceBeanNameBuilder.java | 6 +-
...onfigDefaultPropertyValueBeanPostProcessor.java | 6 +-
.../context/DubboDeployApplicationListener.java | 61 +-
...pertyDefaultValueDubboConfigBeanCustomizer.java | 4 +-
.../context/event/DubboModuleStateEvent.java | 55 +
.../properties/DefaultDubboConfigBinder.java | 5 +-
.../spring/reference/ReferenceBeanSupport.java | 3 +-
.../config/spring/reference/ReferenceCreator.java | 14 +-
.../spring/schema/DubboBeanDefinitionParser.java | 15 +-
.../dubbo/config/spring/util/AnnotationUtils.java | 437 ++++++++
.../dubbo/config/spring/util/BeanRegistrar.java | 41 +-
.../config/spring/util/DubboAnnotationUtils.java | 5 +-
.../util/GenericBeanPostProcessorAdapter.java | 125 +++
.../spring/util/LazyTargetInvocationHandler.java | 69 ++
.../dubbo/config/spring/util/LazyTargetSource.java | 18 +-
.../dubbo/config/spring/util/ObjectUtils.java | 30 +-
.../config/spring/util/PropertySourcesUtils.java | 148 +++
.../src/main/resources/META-INF/dubbo.xsd | 6 +
.../javaconfig/JavaConfigReferenceBeanTest.java | 112 ++-
.../spring/schema/DubboNamespaceHandlerTest.java | 5 +-
dubbo-dependencies-bom/pom.xml | 14 +-
.../apache/dubbo/metrics/data/RtStatComposite.java | 2 +-
.../apache/dubbo/metrics/model/key/MetricsKey.java | 2 +-
.../aggregate/TimeWindowAggregatorTest.java | 9 +-
.../collector/HistogramMetricsCollector.java | 10 +-
.../apache/dubbo/metrics/filter/MetricsFilter.java | 19 +-
.../dubbo/metrics/filter/MetricsFilterTest.java | 1 -
dubbo-plugin/dubbo-security/pom.xml | 2 +-
.../registry/integration/RegistryProtocol.java | 102 +-
.../apache/dubbo/remoting/exchange/Response.java | 5 +
.../remoting/exchange/codec/ExchangeCodec.java | 1 +
.../remoting/exchange/support/DefaultFuture.java | 5 +-
.../remoting/codec/DeprecatedExchangeCodec.java | 6 +-
.../dubbo/remoting/codec/ExchangeCodecTest.java | 2 +-
.../remoting/transport/netty4/NettyChannel.java | 12 +-
.../main/java/org/apache/dubbo/rpc/Exporter.java | 5 +
.../rpc/listener/ListenerExporterWrapper.java | 5 +
.../dubbo/rpc/protocol/AbstractExporter.java | 5 +
.../apache/dubbo/rpc/protocol/AbstractInvoker.java | 6 +-
.../apache/dubbo/rpc/support/AccessLogData.java | 4 +-
.../dubbo/rpc/protocol/dubbo/DubboInvoker.java | 9 +-
.../dubbo/rpc/protocol/injvm/InjvmProtocol.java | 10 +-
.../tri/call/BiStreamServerCallListener.java | 2 +-
.../protocol/tri/stream/TripleClientStream.java | 3 +-
.../transport/TripleServerConnectionHandler.java | 13 +
.../protocol/tri/transport/TripleWriteQueue.java | 18 +-
.../DefaultSerializationExceptionWrapper.java | 363 +++++++
.../common/serialize/SerializationException.java | 22 +-
...org.apache.dubbo.common.serialize.Serialization | 1 +
.../fastjson2/FastJson2SerializationTest.java | 34 +-
.../hessian2/Hessian2SerializationTest.java | 16 +-
.../boot/actuate/mertics/DubboMetricsBinder.java | 2 +
.../DubboRelaxedBinding2AutoConfiguration.java | 5 +-
.../resources/META-INF/spring/dubbo-context.xml | 4 +-
.../ConditionalOnDubboTracingEnable.java | 2 +-
.../exporter/zipkin/ZipkinAutoConfiguration.java | 2 -
...bboMicrometerTracingAutoConfigurationTests.java | 3 +-
.../pom.xml | 7 +-
118 files changed, 3544 insertions(+), 411 deletions(-)
diff --cc dubbo-config/dubbo-config-api/pom.xml
index dd24abf9ec,fec3459350..e6d279081c
--- a/dubbo-config/dubbo-config-api/pom.xml
+++ b/dubbo-config/dubbo-config-api/pom.xml
@@@ -229,8 -229,10 +229,8 @@@
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
- <version>1.18.1</version>
+ <version>1.18.3</version>
<scope>test</scope>
</dependency>
-
-
</dependencies>
</project>
diff --cc dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/ReferenceBean.java
index 4f0f775803,975df8a2b2..6352ca1ec1
--- a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/ReferenceBean.java
+++ b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/ReferenceBean.java
@@@ -98,8 -105,8 +105,8 @@@ import static org.apache.dubbo.common.c
* @see org.apache.dubbo.config.spring.reference.ReferenceBeanBuilder
*/
public class ReferenceBean<T> implements FactoryBean<T>,
- ApplicationContextAware, BeanClassLoaderAware, BeanNameAware, InitializingBean, DisposableBean {
+ ApplicationContextAware, BeanClassLoaderAware, BeanNameAware, InitializingBean, DisposableBean {
-
+ private final ErrorTypeAwareLogger logger = LoggerFactory.getErrorTypeAwareLogger(getClass());
private transient ApplicationContext applicationContext;
private ClassLoader beanClassLoader;
@@@ -350,32 -390,19 +396,26 @@@
throw new IllegalStateException("ReferenceBean is not ready yet, please make sure to call reference interface method after dubbo is started.");
}
//get reference proxy
- //Subclasses should synchronize on the given Object if they perform any sort of extended singleton creation phase.
+ //Subclasses should synchronize on the given Object if they perform any sort of extended singleton creation phase.
// In particular, subclasses should not have their own mutexes involved in singleton creation, to avoid the potential for deadlocks in lazy-init situations.
//The redundant type cast is to be compatible with earlier than spring-4.2
- synchronized (((DefaultSingletonBeanRegistry)getBeanFactory()).getSingletonMutex()) {
+ synchronized (((DefaultSingletonBeanRegistry) getBeanFactory()).getSingletonMutex()) {
return referenceConfig.get();
}
}
- private class DubboReferenceLazyInitTargetSource extends AbstractLazyCreationTargetSource {
-
+ private class DubboReferenceLazyInitTargetSource implements LazyTargetSource {
@Override
- protected Object createObject() throws Exception {
+ public Object getTarget() throws Exception {
return getCallProxy();
}
-
- @Override
- public synchronized Class<?> getTargetClass() {
- return getInterfaceClass();
- }
}
+ public void setInterfaceClass(Class<?> interfaceClass) {
+ this.interfaceClass = interfaceClass;
+ }
+
+ public void setInterfaceName(String interfaceName) {
+ this.interfaceName = interfaceName;
+ }
}
diff --cc dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/ServiceAnnotationPostProcessor.java
index 8d0c3cd117,4ce2c0caef..a74173dbec
--- a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/ServiceAnnotationPostProcessor.java
+++ b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/ServiceAnnotationPostProcessor.java
@@@ -78,9 -79,7 +80,8 @@@ import java.util.List
import java.util.Map;
import java.util.Objects;
import java.util.Set;
+import java.util.stream.Collectors;
- import static com.alibaba.spring.util.ObjectUtils.of;
import static java.util.Arrays.asList;
import static org.apache.dubbo.common.constants.LoggerCodeConstants.CONFIG_DUPLICATED_BEAN_DEFINITION;
import static org.apache.dubbo.common.constants.LoggerCodeConstants.CONFIG_NO_ANNOTATIONS_FOUND;
diff --cc dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/reference/ReferenceBeanSupport.java
index dcc740e82e,97df3b5b78..fb3dbe0a6c
--- a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/reference/ReferenceBeanSupport.java
+++ b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/reference/ReferenceBeanSupport.java
@@@ -22,9 -21,10 +21,11 @@@ import org.apache.dubbo.common.utils.St
import org.apache.dubbo.config.annotation.ProvidedBy;
import org.apache.dubbo.config.spring.Constants;
import org.apache.dubbo.config.spring.ReferenceBean;
+import org.apache.dubbo.config.spring.aot.AotWithSpringDetector;
+ import org.apache.dubbo.config.spring.util.AnnotationUtils;
import org.apache.dubbo.config.spring.util.DubboAnnotationUtils;
import org.apache.dubbo.rpc.service.GenericService;
+
import org.springframework.beans.MutablePropertyValues;
import org.springframework.beans.PropertyValue;
import org.springframework.beans.factory.config.BeanDefinition;