This is an automated email from the ASF dual-hosted git repository.
liujun pushed a change to branch dev-metadata
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git.
from 59dd98a Merge pull request #2626, simplify registry data and add a
new service data store seperated from registry.
new 91fddde Improvements for dynamic config and router: 1. support route
in StaticDirectory, multi-registry & group merger 2. tolerance of abnormal
configs from configserver. 3. add check policy when failed to connect to
configserver
new 44fb07f Demo and ut changes
new ab2b736 Merge branch 'dev-metadata' of
https://github.com/apache/incubator-dubbo into dev-metadata
The 3 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:
.../java/org/apache/dubbo/rpc/cluster/Router.java | 4 +-
.../org/apache/dubbo/rpc/cluster/RouterChain.java | 14 +-
.../rpc/cluster/directory/AbstractDirectory.java | 11 +-
.../rpc/cluster/directory/StaticDirectory.java | 15 +-
.../dubbo/rpc/cluster/router/AbstractRouter.java | 5 +
.../condition/config/ConfigConditionRouter.java | 30 ++-
.../router/{ => mock}/MockInvokersSelector.java | 229 +++++++++------------
.../MockRouterFactory.java} | 11 +-
.../dubbo/rpc/cluster/router/tag/TagRouter.java | 13 +-
.../cluster/support/AbstractClusterInvoker.java | 6 +-
.../dubbo/rpc/cluster/support/ClusterUtils.java | 9 +-
.../cluster/support/MergeableClusterInvoker.java | 29 ++-
...dcastCluster.java => RegistryAwareCluster.java} | 71 +++----
...voker.java => RegistryAwareClusterInvoker.java} | 126 ++++++------
.../internal/org.apache.dubbo.rpc.cluster.Cluster | 3 +-
.../org.apache.dubbo.rpc.cluster.RouterFactory | 3 +-
.../cluster/router/ConfigConditionRouterTest.java | 7 +-
.../dubbo/rpc/cluster/router/TagRouterTest.java | 26 +--
.../java/org/apache/dubbo/common/Constants.java | 1 +
.../dubbo/common/extension/ExtensionLoader.java | 4 +
.../org/apache/dubbo/config/ReferenceConfig.java | 9 +-
dubbo-config/dubbo-config-dynamic/pom.xml | 2 +-
.../dynamic/AbstractDynamicConfiguration.java | 4 +-
.../support/apollo/ApolloDynamicConfiguration.java | 49 ++---
.../archaius/ArchaiusDynamicConfiguration.java | 3 +-
.../sources/ZooKeeperConfigurationSource.java | 16 +-
.../support/nop/NopDynamicConfiguration.java | 2 +-
.../org/apache/dubbo/demo/consumer/Consumer.java | 4 +-
.../dubbo/demo/consumer}/DemoServiceMock.java | 70 ++++---
.../META-INF/spring/dubbo-demo-consumer.xml | 2 +
.../META-INF/spring/dubbo-demo-provider.xml | 6 +-
.../registry/integration/RegistryDirectory.java | 86 +++++---
.../java/org/apache/dubbo/rpc/RpcException.java | 5 +
33 files changed, 458 insertions(+), 417 deletions(-)
rename dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/{ =>
mock}/MockInvokersSelector.java (76%)
copy
dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/{condition/config/ConfigConditionRouterFactory.java
=> mock/MockRouterFactory.java} (84%)
copy
dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/{BroadcastCluster.java
=> RegistryAwareCluster.java} (86%)
copy
dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/{BroadcastClusterInvoker.java
=> RegistryAwareClusterInvoker.java} (61%)
copy {dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/filter =>
dubbo-demo/dubbo-demo-consumer/src/main/java/org/apache/dubbo/demo/consumer}/DemoServiceMock.java
(77%)
