[dubbo] branch master updated (b24fe70 -> 2a36678)

[al...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

albumenj pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git.


    from b24fe70  Add InfraAdapterTest (#7984)
     add 2a36678  Keep the ProviderURLMergeProcessor API unchanged and change the configuration method. (#7998)

No new revisions were added by this update.

Summary of changes:
 .../main/java/org/apache/dubbo/rpc/cluster/Constants.java  |  4 ----
 ...lMergeProcessor.java => ProviderURLMergeProcessor.java} |  8 ++++++--
 .../org/apache/dubbo/rpc/cluster/support/ClusterUtils.java | 13 +++++++------
 .../DefaultProviderURLMergeProcessor.java}                 |  6 +++---
 .../org.apache.dubbo.rpc.cluster.ProviderURLMergeProcessor |  1 +
 .../org.apache.dubbo.rpc.cluster.UrlMergeProcessor         |  1 -
 .../src/main/java/org/apache/dubbo/config/Constants.java   |  5 +++++
 .../main/java/org/apache/dubbo/config/ConsumerConfig.java  | 14 +++++++++-----
 .../dubbo/config/bootstrap/builders/ConsumerBuilder.java   |  9 +++++----
 .../src/main/resources/META-INF/dubbo.xsd                  |  2 +-
 10 files changed, 37 insertions(+), 26 deletions(-)
 rename dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/{UrlMergeProcessor.java => ProviderURLMergeProcessor.java} (84%)
 rename dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/{DefaultUrlMergeProcessor.java => merger/DefaultProviderURLMergeProcessor.java} (96%)
 create mode 100644 dubbo-cluster/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.ProviderURLMergeProcessor
 delete mode 100644 dubbo-cluster/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.UrlMergeProcessor