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 92e8825 Merge branch 'dev-metadata' of
https://github.com/apache/incubator-dubbo into dev-metadata
new 3de0ec0 Restore the previous behaviour
new 6999c6a refactor override rule
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:
.../cluster/configurator/AbstractConfigurator.java | 84 +++++++++++++++-------
.../java/org/apache/dubbo/common/Constants.java | 4 ++
.../dubbo/common/extension/ExtensionLoader.java | 9 +--
.../registry/integration/parser/ConfigParser.java | 45 +++++-------
.../integration/parser/model/ConfigItem.java | 20 ++++--
.../parser/model/ConfiguratorConfig.java | 10 +++
.../integration/parser/model/ConfiguratorRule.java | 54 --------------
.../apache/dubbo/registry/ConfigParserTest.java | 33 +++++----
.../src/test/resources/AppAnyServices.yml | 9 +--
.../src/test/resources/AppMultiServices.yml | 19 +++--
.../src/test/resources/AppNoService.yml | 8 +--
.../test/resources/ConsumerSpecificProviders.yml | 15 ++++
.../src/test/resources/ServiceGroupVersion.yml | 13 ++--
.../src/test/resources/ServiceMultiApps.yml | 9 +--
.../src/test/resources/ServiceNoApp.yml | 13 ++--
.../src/test/resources/ServiceNoRule.yml | 2 +-
16 files changed, 165 insertions(+), 182 deletions(-)
delete mode 100644
dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/parser/model/ConfiguratorRule.java
create mode 100644
dubbo-registry/dubbo-registry-api/src/test/resources/ConsumerSpecificProviders.yml
