You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by li...@apache.org on 2019/07/17 06:41:38 UTC
[dubbo] branch master updated (d727461 -> 5c88dcb)
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git.
from d727461 fix bug about the generateReturnAndInvocation method of the class AdaptiveClassCodeGenerator (#4339)
add bfa52b2 [Dubbo-4355] Fix dubbo.jar do not contain "serialization-protobuf-json" module issue (#4356) (#4364)
add a2f0d9a fix qos configuration cannot work after added 'qos-enable' style support (#4378)
add a1e4757 Use empty protocol for nacos registry when address list is empty. (#4349)
add e3c35f2 Add TypeDefinitionBuilderName to TypeDefinition (#4372)
add 6b7d118 fix empty protocol in consul registry (#4354)
add 8534f48 Observation of performance degradation when running under JDK 8 (#4381)
add 64aea16 zipkin 2.6.x package compatible. (#4368)
add e1ce4bc AsyncRpcResult should handle exception when registering callback (#4379)
add acae8d9 Spring package scan compatibility, support both alibaba Service and apache Service. (#4375)
add 27789ce duplicate decrease for ExecuteLimitFilter onError (#4380)
add 792b487 fix #4406 (#4408)
add e0d3de3 add bom dependency for new module 'metadata-definition-protobuf' (#4417)
add b5408b7 support handle of exception from onResponse or onError (#4401)
add 9b7c697 spi配置多个tag解析错误问题 (#4346)
add 69a0483 check complete status of async-result before try to update (#4394)
add d66a2fa disable oraclejdk 11 task & fix ProtobufTypeBuilderTest (#4434)
add 60ca9f4 DubboComponentScan cannot backward support for alibaba @Service and @Reference. (#4415)
add cfba520 support method sync timeout (#4436)
add a229d87 Remove unused imports (#4443)
add 3d01797 Fix MulticastSocket setInterface choose an unreachable address (#4426)
add 8baf929 Add nacos dependencies to dubbo-demo (#4447)
add b30b015 fixes #4345, change zookeeper notification log level from info to debug
add 1bf5fce Nacos registry enhancement & register reference bean (#4454)
add 1c62678 remove unused imports
add c4e9495 unify config-center model (#4388)
add 6667a6f automatically append env parameters. (#4407)
add 2497dcf make metadata key contain : when version and group is empty (#4465)
add f456745 Fix url generated from ConfigCenterConfig missed 'config.' prefix (#4411)
add e3e5460 FutureAdapter depends on AsyncRpcResult (#4471)
add a97d378 add 2.7.3 change list (#4453)
add 208fafb polish 2.7.3 change list
add 0e381aa polish 2.7.3 change list
add 6466e97 update version to 2.7.3 to prepare for release
add 3be09d7 Update CHANGES.md
add 8658fee Update CHANGES.md
add 6e20848 RpcContext cannot getFuture after setFuture (#4502)
add 4365160 Fix #4498, @Reference can't inject the Dubbo service proxy when its attribute is empty (#4503)
add 0bd5a29 org.apache.dubbo.rpc.RpcContext.getFuture() cannot work in Filter. (#4504)
add 5bbc1df Upgrade nacos-client dependency version to 1.1.1 (#4534)
add 5d82371 Use special Configuration for Configs (#4522)
add 9632c40 Merge branch '2.7.3-release'
add 4676d22 fix RpcContext compatible problem (#4544)
add a5f6090 [Dubbo-4525] fix Clusterutils.mergeurl, make sure specific keys from provider side not override by that from consumer. (#4533)
add 1b4586a Merge branch '2.7.3-release'
new d20dc68 Merge branch 'master' of https://github.com/apache/incubator-dubbo
new 5c88dcb Merge branch 'master' of https://github.com/apache/incubator-dubbo
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CHANGES.md | 50 ++
dubbo-all/pom.xml | 4 +
dubbo-bom/pom.xml | 5 +
.../router/condition/config/ListenableRouter.java | 2 +-
.../router/condition/config/ServiceRouter.java | 2 +-
.../dubbo/rpc/cluster/router/tag/TagRouter.java | 4 +-
.../dubbo/rpc/cluster/support/ClusterUtils.java | 53 +--
.../rpc/cluster/support/ClusterUtilsTest.java | 74 ++-
.../src/main/java/org/apache/dubbo/common/URL.java | 33 +-
.../common/config/AbstractPrefixConfiguration.java | 16 +-
.../apache/dubbo/common/config/Environment.java | 1 +
.../common/config/EnvironmentConfiguration.java | 8 +-
.../dubbo/common/constants/CommonConstants.java | 13 +
.../dubbo/common/extension/ExtensionLoader.java | 2 +-
.../org/apache/dubbo/common/utils/NetUtils.java | 26 +-
.../org/apache/dubbo/common/utils/StringUtils.java | 32 ++
.../test/java/org/apache/dubbo/common/URLTest.java | 15 +
.../config/EnvironmentConfigurationTest.java | 86 ++--
.../common/extension/ExtensionLoaderTest.java | 12 +
.../ext10_multi_names/Ext10MultiNames.java | 7 +-
.../impl/Ext10MultiNamesImpl.java | 6 +-
.../apache/dubbo/common/utils/StringUtilsTest.java | 14 +
...mon.extension.ext10_multi_names.Ext10MultiNames | 1 +
.../spring/context/annotation/EnableDubbo.java | 12 +-
.../alibaba/dubbo/remoting/RemotingException.java | 4 +
.../{Exchanger.java => ResponseCallback.java} | 19 +-
.../dubbo/remoting/exchange/ResponseFuture.java | 41 +-
.../main/java/com/alibaba/dubbo/rpc/Result.java | 4 +-
.../java/com/alibaba/dubbo/rpc/RpcContext.java | 24 +-
.../dubbo/rpc/protocol/dubbo/FutureAdapter.java | 142 ++++++
...atibleReferenceAnnotationBeanPostProcessor.java | 508 --------------------
.../annotation/CompatibleReferenceBeanBuilder.java | 167 -------
...mpatibleServiceAnnotationBeanPostProcessor.java | 525 ---------------------
.../annotation/CompatibleDubboComponentScan.java | 66 ---
.../CompatibleDubboComponentScanRegistrar.java | 110 -----
.../CompatibleAnnotationBeanDefinitionParser.java | 93 ----
.../java/org/apache/dubbo/rpc/RpcContextTest.java | 37 +-
.../alibaba/dubbo/config/annotation/Reference.java | 0
.../alibaba/dubbo/config/annotation/Service.java | 0
.../org/apache/dubbo/config/AbstractConfig.java | 12 +-
.../dubbo/config/AbstractInterfaceConfig.java | 24 +-
.../org/apache/dubbo/config/ApplicationConfig.java | 48 ++
.../apache/dubbo/config/ConfigCenterConfig.java | 26 +-
.../apache/dubbo/config/annotation/Reference.java | 25 +-
.../config/context/ConfigConfigurationAdapter.java | 22 +-
.../apache/dubbo/config/AbstractConfigTest.java | 77 +++
.../apache/dubbo/config/ApplicationConfigTest.java | 34 ++
.../dubbo/config/ConfigCenterConfigTest.java | 14 +
dubbo-config/dubbo-config-spring/pom.xml | 1 +
.../AbstractAnnotationConfigBeanBuilder.java | 3 +
.../AnnotatedInterfaceConfigBeanBuilder.java | 215 +++++++++
.../AnnotationInjectedBeanPostProcessor.java | 135 +++---
.../AnnotationPropertyValuesAdapter.java | 39 +-
.../ReferenceAnnotationBeanPostProcessor.java | 122 ++++-
.../factory/annotation/ReferenceBeanBuilder.java | 84 ++--
.../ServiceAnnotationBeanPostProcessor.java | 124 ++---
.../factory/annotation/ServiceBeanNameBuilder.java | 43 +-
.../util/AnnotatedBeanDefinitionRegistryUtils.java | 62 ++-
.../dubbo/config/spring/util/AnnotationUtils.java | 179 ++++++-
.../dubbo/config/spring/util/BeanFactoryUtils.java | 6 +
.../spring/annotation/merged/MergedReference.java | 3 +-
.../spring/annotation/merged/MergedService.java | 3 +-
.../factory/annotation/MergedAnnotationTest.java | 2 +
.../ReferenceAnnotationBeanPostProcessorTest.java | 60 ++-
.../spring/context/annotation/EnableDubboTest.java | 5 +
.../annotation/consumer/ConsumerConfiguration.java | 22 +-
.../consumer/test/TestConsumerConfiguration.java | 18 +-
.../annotation/provider/HelloServiceImpl.java | 3 +-
.../DubboComponentScanRegistrarTest.java | 2 +
.../annotation/provider/DefaultHelloService.java | 4 +-
.../annotation/provider/ProviderConfiguration.java | 4 +-
.../AnnotatedBeanDefinitionRegistryUtilsTest.java | 74 +++
.../dubbo/configcenter/DynamicConfiguration.java | 44 +-
.../support/nop/NopDynamicConfiguration.java | 4 +-
.../mock/MockDynamicConfiguration.java | 4 +-
.../support/apollo/ApolloDynamicConfiguration.java | 10 +-
.../consul/ConsulDynamicConfiguration.java | 38 +-
.../support/etcd/EtcdDynamicConfiguration.java | 27 +-
.../support/etcd/EtcdDynamicConfigurationTest.java | 5 +-
.../support/nacos/NacosDynamicConfiguration.java | 56 +--
.../nacos/NacosDynamicConfigurationTest.java | 26 +-
.../support/zookeeper/CacheListener.java | 13 +-
.../zookeeper/ZookeeperDynamicConfiguration.java | 49 +-
.../ZookeeperDynamicConfigurationTest.java | 29 +-
.../dubbo-demo-annotation-consumer/pom.xml | 16 +
.../dubbo-demo-annotation-provider/pom.xml | 16 +
.../dubbo-demo-xml/dubbo-demo-xml-consumer/pom.xml | 16 +
.../dubbo-demo-xml/dubbo-demo-xml-provider/pom.xml | 16 +
dubbo-dependencies-bom/pom.xml | 2 +-
.../pom.xml | 12 +-
.../definition/protobuf}/ProtobufTypeBuilder.java | 2 +-
...e.dubbo.metadata.definition.builder.TypeBuilder | 1 +
.../protobuf}/ProtobufTypeBuilderTest.java | 12 +-
.../definition/protobuf}/model/GooglePB.java | 2 +-
.../protobuf}/model/ServiceInterface.java | 2 +-
.../metadata/definition/TypeDefinitionBuilder.java | 18 +-
.../definition/model/MethodDefinition.java | 19 +-
.../metadata/definition/model/TypeDefinition.java | 9 +
.../dubbo/metadata/definition/MetadataTest.java | 10 +-
.../metadata/identifier/MetadataIdentifier.java | 2 +-
.../identifier/MetadataIdentifierTest.java | 6 +-
dubbo-metadata-report/pom.xml | 1 +
.../dubbo/monitor/support/MonitorFilterTest.java | 20 +-
.../integration/AbstractConfiguratorListener.java | 3 +-
.../registry/integration/RegistryDirectory.java | 12 +-
.../registry/integration/RegistryProtocol.java | 38 +-
.../dubbo/registry/consul/ConsulRegistry.java | 30 +-
.../apache/dubbo/registry/nacos/NacosRegistry.java | 90 ++--
.../dubbo/registry/nacos/NacosServiceName.java | 239 ++++++++++
.../consumer/DemoServiceConsumerXmlBootstrap.java | 10 +-
.../dubbo/registry/nacos/NacosServiceNameTest.java | 123 +++++
.../META-INF/spring/dubbo-consumer-context.xml | 14 +-
.../META-INF/spring/dubbo-provider-context.xml | 3 +-
.../zookeeper/curator/CuratorZookeeperClient.java | 4 +-
.../java/org/apache/dubbo/rpc/AppResponse.java | 4 +-
.../java/org/apache/dubbo/rpc/AsyncRpcResult.java | 91 ++--
.../java/org/apache/dubbo/rpc/FutureContext.java | 64 ++-
.../src/main/java/org/apache/dubbo/rpc/Result.java | 6 +-
.../main/java/org/apache/dubbo/rpc/RpcContext.java | 7 +-
.../java/org/apache/dubbo/rpc/RpcException.java | 7 +
.../apache/dubbo/rpc/filter/ActiveLimitFilter.java | 14 +-
.../dubbo/rpc/filter/ExecuteLimitFilter.java | 13 +-
.../dubbo/rpc/protocol/AsyncToSyncInvoker.java | 6 +-
.../dubbo/rpc/protocol/ProtocolFilterWrapper.java | 17 +-
.../dubbo/rpc/protocol/dubbo/FutureAdapter.java | 3 +
.../org/apache/dubbo/rpc/FutureContextTest.java | 53 +++
.../rpc/filter/ConsumerContextFilterTest.java | 3 +-
.../dubbo/rpc/protocol/dubbo/DubboInvoker.java | 8 +-
.../dubbo/rpc/protocol/thrift/ThriftInvoker.java | 6 +-
...e.dubbo.metadata.definition.builder.TypeBuilder | 1 -
130 files changed, 2757 insertions(+), 2312 deletions(-)
copy dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/Merger.java => dubbo-common/src/test/java/org/apache/dubbo/common/extension/ext10_multi_names/Ext10MultiNames.java (89%)
copy dubbo-compatible/src/main/java/com/alibaba/dubbo/common/logger/LoggerAdapter.java => dubbo-common/src/test/java/org/apache/dubbo/common/extension/ext10_multi_names/impl/Ext10MultiNamesImpl.java (80%)
create mode 100644 dubbo-common/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.common.extension.ext10_multi_names.Ext10MultiNames
copy dubbo-compatible/src/main/java/com/alibaba/dubbo/remoting/exchange/{Exchanger.java => ResponseCallback.java} (76%)
copy dubbo-metadata-report/dubbo-metadata-definition/src/test/java/org/apache/dubbo/metadata/definition/common/TestService.java => dubbo-compatible/src/main/java/com/alibaba/dubbo/remoting/exchange/ResponseFuture.java (61%)
create mode 100644 dubbo-compatible/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/FutureAdapter.java
delete mode 100644 dubbo-compatible/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/CompatibleReferenceAnnotationBeanPostProcessor.java
delete mode 100644 dubbo-compatible/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/CompatibleReferenceBeanBuilder.java
delete mode 100644 dubbo-compatible/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/CompatibleServiceAnnotationBeanPostProcessor.java
delete mode 100644 dubbo-compatible/src/main/java/org/apache/dubbo/config/spring/context/annotation/CompatibleDubboComponentScan.java
delete mode 100644 dubbo-compatible/src/main/java/org/apache/dubbo/config/spring/context/annotation/CompatibleDubboComponentScanRegistrar.java
delete mode 100644 dubbo-compatible/src/main/java/org/apache/dubbo/config/spring/schema/CompatibleAnnotationBeanDefinitionParser.java
copy dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/filter/tps/StatItemTest.java => dubbo-compatible/src/test/java/org/apache/dubbo/rpc/RpcContextTest.java (54%)
rename {dubbo-compatible => dubbo-config/dubbo-config-api}/src/main/java/com/alibaba/dubbo/config/annotation/Reference.java (100%)
rename {dubbo-compatible => dubbo-config/dubbo-config-api}/src/main/java/com/alibaba/dubbo/config/annotation/Service.java (100%)
copy dubbo-common/src/main/java/org/apache/dubbo/common/config/SystemConfiguration.java => dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/context/ConfigConfigurationAdapter.java (63%)
create mode 100644 dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/AnnotatedInterfaceConfigBeanBuilder.java
create mode 100644 dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/util/AnnotatedBeanDefinitionRegistryUtilsTest.java
copy dubbo-metadata-report/{dubbo-metadata-definition => dubbo-metadata-definition-protobuf}/pom.xml (79%)
rename {dubbo-serialization/dubbo-serialization-protobuf-json/src/main/java/org/apache/dubbo/common/serialize/protobuf/support => dubbo-metadata-report/dubbo-metadata-definition-protobuf/src/main/java/org/apache/dubbo/metadata/definition/protobuf}/ProtobufTypeBuilder.java (99%)
create mode 100644 dubbo-metadata-report/dubbo-metadata-definition-protobuf/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.metadata.definition.builder.TypeBuilder
rename {dubbo-serialization/dubbo-serialization-test/src/test/java/org/apache/dubbo/common/serialize/protobuf/support => dubbo-metadata-report/dubbo-metadata-definition-protobuf/src/test/java/org/apache/dubbo/metadata/definition/protobuf}/ProtobufTypeBuilderTest.java (90%)
copy {dubbo-serialization/dubbo-serialization-test/src/test/java/org/apache/dubbo/common/serialize/protobuf/support => dubbo-metadata-report/dubbo-metadata-definition-protobuf/src/test/java/org/apache/dubbo/metadata/definition/protobuf}/model/GooglePB.java (99%)
copy {dubbo-serialization/dubbo-serialization-test/src/test/java/org/apache/dubbo/common/serialize/protobuf/support => dubbo-metadata-report/dubbo-metadata-definition-protobuf/src/test/java/org/apache/dubbo/metadata/definition/protobuf}/model/ServiceInterface.java (93%)
create mode 100644 dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosServiceName.java
create mode 100644 dubbo-registry/dubbo-registry-nacos/src/test/java/org/apache/dubbo/registry/nacos/NacosServiceNameTest.java
rename dubbo-rpc/{dubbo-rpc-dubbo => dubbo-rpc-api}/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/FutureAdapter.java (96%)
create mode 100644 dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/FutureContextTest.java
delete mode 100644 dubbo-serialization/dubbo-serialization-protobuf-json/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.metadata.definition.builder.TypeBuilder
[dubbo] 01/02: Merge branch 'master' of
https://github.com/apache/incubator-dubbo
Posted by li...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit d20dc68f4281f746ab24dcf39a47ad7728b4ac12
Merge: 1b4586a 68112e4
Author: ken.lj <ke...@gmail.com>
AuthorDate: Fri Jul 12 11:15:46 2019 +0800
Merge branch 'master' of https://github.com/apache/incubator-dubbo
.../src/main/java/org/apache/dubbo/config/AbstractConfig.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[dubbo] 02/02: Merge branch 'master' of
https://github.com/apache/incubator-dubbo
Posted by li...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit 5c88dcb229d3de614dc8b508168bbbff1e5ab7f6
Merge: d20dc68 d727461
Author: ken.lj <ke...@gmail.com>
AuthorDate: Wed Jul 17 14:40:28 2019 +0800
Merge branch 'master' of https://github.com/apache/incubator-dubbo
.../rpc/cluster/loadbalance/RandomLoadBalance.java | 15 +-
.../main/java/org/apache/dubbo/common/Version.java | 19 +-
.../extension/AdaptiveClassCodeGenerator.java | 765 ++++-----
.../dubbo/common/extension/ExtensionLoader.java | 15 +-
.../dubbo/common/utils/CompatibleTypeUtils.java | 2 +
.../org/apache/dubbo/common/utils/MethodUtils.java | 23 +
.../org/apache/dubbo/common/utils/PojoUtils.java | 1 +
.../apache/dubbo/common/utils/PojoUtilsTest.java | 1718 ++++++++++----------
.../apache/dubbo/common/version/VersionTest.java | 7 +
.../org/apache/dubbo/config/MethodConfigTest.java | 4 +-
.../org/apache/dubbo/config/AbstractConfig.java | 26 +-
.../dubbo/config/AbstractInterfaceConfig.java | 6 +-
.../org/apache/dubbo/config/ReferenceConfig.java | 2 +-
.../org/apache/dubbo/config/RegistryConfig.java | 20 +-
.../apache/dubbo/config/RegistryConfigTest.java | 12 +-
.../annotation/DubboConfigConfiguration.java | 7 +-
.../zookeeper/ZookeeperDynamicConfiguration.java | 8 +-
dubbo-dependencies-bom/pom.xml | 4 +-
.../dubbo-dependencies-zookeeper/pom.xml | 2 +-
.../registry/integration/RegistryProtocol.java | 2 +-
.../dubbo/remoting/etcd/jetcd/JEtcdClient.java | 13 +-
.../zookeeper/curator/CuratorZookeeperClient.java | 4 +-
.../apache/dubbo/rpc/filter/AccessLogFilter.java | 4 +-
.../dubbo/rpc/filter/AccessLogFilterTest.java | 20 +-
pom.xml | 2 +-
25 files changed, 1407 insertions(+), 1294 deletions(-)
diff --cc dubbo-configcenter/dubbo-configcenter-zookeeper/src/main/java/org/apache/dubbo/configcenter/support/zookeeper/ZookeeperDynamicConfiguration.java
index 6231e61,e52a24e..096b71c
--- a/dubbo-configcenter/dubbo-configcenter-zookeeper/src/main/java/org/apache/dubbo/configcenter/support/zookeeper/ZookeeperDynamicConfiguration.java
+++ b/dubbo-configcenter/dubbo-configcenter-zookeeper/src/main/java/org/apache/dubbo/configcenter/support/zookeeper/ZookeeperDynamicConfiguration.java
@@@ -30,8 -30,8 +30,9 @@@ import org.slf4j.LoggerFactory
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.Executor;
import java.util.concurrent.Executors;
+ import java.util.concurrent.TimeUnit;
+import static org.apache.dubbo.common.constants.CommonConstants.PATH_SEPARATOR;
import static org.apache.dubbo.configcenter.Constants.CONFIG_NAMESPACE_KEY;
/**