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 6b3e7b7 remove UnusedImports (#7255)
add c0a95db Fix service discovery impls and UTs after backported some 3.0
features (#7236)
No new revisions were added by this update.
Summary of changes:
.../dubbo-demo-service-consumer/pom.xml | 108 ------------------
.../dubbo/demo/consumer/ApplicationConsumer.java | 72 ------------
.../consumer/RandomMigrationAddressComparator.java | 52 ---------
.../dubbo/demo/consumer/TestFailoverCondition.java | 37 -------
...dubbo.metadata.store.failover.FailoverCondition | 1 -
...er.support.migration.MigrationClusterComparator | 1 -
.../src/main/resources/dubbo.properties | 2 -
.../src/main/resources/log4j.properties | 7 --
.../resources/spring/dubbo-consumer-multiple.xml | 82 --------------
.../spring/dubbo-consumer-sofaregistry.xml | 38 -------
.../resources/spring/dubbo-consumer-zk-apollo.xml | 44 --------
.../spring/dubbo-consumer-zk-sofaregistry.xml | 39 -------
.../main/resources/spring/dubbo-consumer-zk.xml | 38 -------
.../dubbo-demo-service-provider/pom.xml | 123 ---------------------
.../dubbo/demo/provider/ApplicationProvider.java | 31 ------
.../dubbo/demo/provider/DemoServiceImpl.java | 53 ---------
.../dubbo/demo/provider/GreetingServiceImpl.java | 29 -----
.../provider/ServiceDemoMetadataParamsFilter.java | 34 ------
.../dubbo/demo/provider/TestFailoverCondition.java | 37 -------
.../org.apache.dubbo.metadata.MetadataParamsFilter | 1 -
...dubbo.metadata.store.failover.FailoverCondition | 1 -
.../src/main/resources/dubbo.properties | 1 -
.../src/main/resources/log4j.properties | 7 --
.../resources/spring/dubbo-provider-multiple.xml | 70 ------------
.../spring/dubbo-provider-sofaregistry.xml | 41 -------
.../resources/spring/dubbo-provider-zk-apollo.xml | 49 --------
.../spring/dubbo-provider-zk-sofaregistry.xml | 42 -------
.../main/resources/spring/dubbo-provider-zk.xml | 47 --------
.../dubbo-demo-service-provider2/pom.xml | 115 -------------------
.../dubbo/demo/provider/ApplicationProvider2.java | 27 -----
.../dubbo/demo/provider/GreetingServiceImpl.java | 29 -----
.../src/main/resources/dubbo.properties | 1 -
.../src/main/resources/log4j.properties | 7 --
.../main/resources/spring/dubbo-provider-zk.xml | 37 -------
dubbo-demo/dubbo-demo-service/pom.xml | 69 ------------
.../src/main/resources/spring/dubbo-consumer.xml | 6 +-
dubbo-demo/pom.xml | 1 -
dubbo-metadata/pom.xml | 12 +-
.../registry/client/AbstractServiceDiscovery.java | 1 +
.../registry/integration/DynamicDirectory.java | 2 +-
.../registry/consul/ConsulServiceDiscovery.java | 33 +++---
.../consul/ConsulServiceDiscoveryTest.java | 2 +
.../registry/dubbo/RegistryDirectoryTest.java | 11 +-
.../dubbo/registry/dubbo/RegistryProtocolTest.java | 18 ++-
.../registry/dubbo/RegistryStatusCheckerTest.java | 4 +-
.../dubbo/registry/etcd/EtcdServiceDiscovery.java | 6 +-
.../registry/nacos/NacosServiceDiscovery.java | 27 +++--
.../zookeeper/ZookeeperServiceDiscovery.java | 15 +--
dubbo-registry/pom.xml | 14 +--
.../rpc/protocol/dubbo/DubboProtocolTest.java | 2 +
50 files changed, 93 insertions(+), 1433 deletions(-)
delete mode 100644
dubbo-demo/dubbo-demo-service/dubbo-demo-service-consumer/pom.xml
delete mode 100644
dubbo-demo/dubbo-demo-service/dubbo-demo-service-consumer/src/main/java/org/apache/dubbo/demo/consumer/ApplicationConsumer.java
delete mode 100644
dubbo-demo/dubbo-demo-service/dubbo-demo-service-consumer/src/main/java/org/apache/dubbo/demo/consumer/RandomMigrationAddressComparator.java
delete mode 100644
dubbo-demo/dubbo-demo-service/dubbo-demo-service-consumer/src/main/java/org/apache/dubbo/demo/consumer/TestFailoverCondition.java
delete mode 100644
dubbo-demo/dubbo-demo-service/dubbo-demo-service-consumer/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.metadata.store.failover.FailoverCondition
delete mode 100644
dubbo-demo/dubbo-demo-service/dubbo-demo-service-consumer/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.support.migration.MigrationClusterComparator
delete mode 100644
dubbo-demo/dubbo-demo-service/dubbo-demo-service-consumer/src/main/resources/dubbo.properties
delete mode 100644
dubbo-demo/dubbo-demo-service/dubbo-demo-service-consumer/src/main/resources/log4j.properties
delete mode 100644
dubbo-demo/dubbo-demo-service/dubbo-demo-service-consumer/src/main/resources/spring/dubbo-consumer-multiple.xml
delete mode 100644
dubbo-demo/dubbo-demo-service/dubbo-demo-service-consumer/src/main/resources/spring/dubbo-consumer-sofaregistry.xml
delete mode 100644
dubbo-demo/dubbo-demo-service/dubbo-demo-service-consumer/src/main/resources/spring/dubbo-consumer-zk-apollo.xml
delete mode 100644
dubbo-demo/dubbo-demo-service/dubbo-demo-service-consumer/src/main/resources/spring/dubbo-consumer-zk-sofaregistry.xml
delete mode 100644
dubbo-demo/dubbo-demo-service/dubbo-demo-service-consumer/src/main/resources/spring/dubbo-consumer-zk.xml
delete mode 100644
dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider/pom.xml
delete mode 100644
dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider/src/main/java/org/apache/dubbo/demo/provider/ApplicationProvider.java
delete mode 100644
dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider/src/main/java/org/apache/dubbo/demo/provider/DemoServiceImpl.java
delete mode 100644
dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider/src/main/java/org/apache/dubbo/demo/provider/GreetingServiceImpl.java
delete mode 100644
dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider/src/main/java/org/apache/dubbo/demo/provider/ServiceDemoMetadataParamsFilter.java
delete mode 100644
dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider/src/main/java/org/apache/dubbo/demo/provider/TestFailoverCondition.java
delete mode 100644
dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.metadata.MetadataParamsFilter
delete mode 100644
dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.metadata.store.failover.FailoverCondition
delete mode 100644
dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider/src/main/resources/dubbo.properties
delete mode 100644
dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider/src/main/resources/log4j.properties
delete mode 100644
dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider/src/main/resources/spring/dubbo-provider-multiple.xml
delete mode 100644
dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider/src/main/resources/spring/dubbo-provider-sofaregistry.xml
delete mode 100644
dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider/src/main/resources/spring/dubbo-provider-zk-apollo.xml
delete mode 100644
dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider/src/main/resources/spring/dubbo-provider-zk-sofaregistry.xml
delete mode 100644
dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider/src/main/resources/spring/dubbo-provider-zk.xml
delete mode 100644
dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider2/pom.xml
delete mode 100644
dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider2/src/main/java/org/apache/dubbo/demo/provider/ApplicationProvider2.java
delete mode 100644
dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider2/src/main/java/org/apache/dubbo/demo/provider/GreetingServiceImpl.java
delete mode 100644
dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider2/src/main/resources/dubbo.properties
delete mode 100644
dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider2/src/main/resources/log4j.properties
delete mode 100644
dubbo-demo/dubbo-demo-service/dubbo-demo-service-provider2/src/main/resources/spring/dubbo-provider-zk.xml
delete mode 100644 dubbo-demo/dubbo-demo-service/pom.xml
