Dubbo Cloud Native (#4764)

* Polish #4542 : [Enhancement] Adapt the Java standard Event/Listener mechanism * Polish #4541 : [Feature] Add local File System DynamicConfigurationFactory‘s extension * Polish #4541 : Bugfix * Polish #4541 : Optimization * Polish #4541 : Add the compatibility for PollingWatchService on the some platforms * Polish #4541 : Add delay publish without ThreadPoolExecutor * Polish #4541 : Refactor the extension name * Polish #4541 : Add remove ops * Polish #4541 : Add testable constructor * Polish #4541 : Add getConfigGroups method * Polish #4610 : [Refactor] Refactor the bootstrap module * Polish #4541 : Fix the nulling URL issue * Polish #4622 : [Refactor] Refactor ConfigManager * Polish #4622 : [Refactor] Refactor ConfigManager * Polish #4622 : Support multiple configcenters * Polish #4671 : ServiceNameMapping will not map the group, version and protocol * update referenceCount log (#4683) Add comments to support multiple shared connections * Polish /#4687 : Remove the duplicated test code in dubbo-config-spring (#4688) * #4685 修改代码if判断false问题 if (hasException == false)修改成if (!hasException) (#4695) * Fixed Service annotation method parameters are not in effect (#4598) * keep demo simple, and switch to use zookeeper as registry center (#4705) * keep demo simple, and switch to use zookeeper as registry center * remove comment * @reference auto-wires the instance of generic interface #4594 (#4677) * try to shorten maven output to make travis build pass (#4710) * use CountDownLatch to check zk registry if establish connection (#4589) * Minor change * Rename the extension name of WritableMetadataService * Polish #4759 : [Refactor] Change the signature of methods of MetadataService #4759 * Merge remote-tracking branch 'upstream/master' into dubbo-cloud-native # Conflicts: # dubbo-all/pom.xml # dubbo-bom/pom.xml # dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java # dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ApplicationConfig.java # dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ConfigCenterConfig.java # dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java # dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/RegistryConfig.java # dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java # dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ReferenceConfigTest.java # dubbo-configcenter/dubbo-configcenter-api/src/main/java/org/apache/dubbo/configcenter/DynamicConfiguration.java # dubbo-configcenter/dubbo-configcenter-api/src/test/java/org/apache/dubbo/configcenter/mock/MockDynamicConfiguration.java # dubbo-configcenter/dubbo-configcenter-consul/src/main/java/org/apache/dubbo/configcenter/consul/ConsulDynamicConfiguration.java # dubbo-configcenter/dubbo-configcenter-etcd/src/test/java/org/apache/dubbo/configcenter/support/etcd/EtcdDynamicConfigurationTest.java # dubbo-configcenter/dubbo-configcenter-nacos/src/main/java/org/apache/dubbo/configcenter/support/nacos/NacosDynamicConfiguration.java # dubbo-configcenter/dubbo-configcenter-nacos/src/test/java/org/apache/dubbo/configcenter/support/nacos/NacosDynamicConfigurationTest.java # dubbo-configcenter/dubbo-configcenter-zookeeper/src/main/java/org/apache/dubbo/configcenter/support/zookeeper/ZookeeperDynamicConfiguration.java # dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/definition/model/MethodDefinition.java # dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/report/identifier/MetadataIdentifier.java # dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/report/support/AbstractMetadataReport.java # dubbo-metadata/dubbo-metadata-api/src/test/java/org/apache/dubbo/metadata/report/identifier/MetadataIdentifierTest.java # dubbo-metadata/dubbo-metadata-definition-protobuf/src/main/java/org/apache/dubbo/metadata/definition/protobuf/ProtobufTypeBuilder.java # dubbo-metadata/dubbo-metadata-definition-protobuf/src/test/java/org/apache/dubbo/metadata/definition/protobuf/ProtobufTypeBuilderTest.java # dubbo-metadata/pom.xml # dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/AbstractConfiguratorListener.java # dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosRegistry.java # dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosRegistryFactory.java # dubbo-rpc/dubbo-rpc-xml/src/main/java/org/apache/dubbo/xml/rpc/protocol/xmlrpc/XmlRpcProtocol.java * Polish #3984 : Add the implementation of Page<ServiceInstance> getInstances(String serviceName, int offset, int pageSize, boolean healthyOnly) * Code merge
apache · Aug 8, 2019 · e7ce16d · e7ce16d
1 parent df34800
commit e7ce16d
Show file tree

Hide file tree

Showing 229 changed files with 1,527 additions and 1,914 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -12,7 +12,7 @@ cache:
 install: true
 
 script:
-  - travis_wait 30 ./mvnw clean install -DskipTests=false -Dcheckstyle.skip=false -Drat.skip=false -Dmaven.javadoc.skip=true
+  - travis_wait 30 ./mvnw --quiet clean install -DskipTests=false -Dcheckstyle.skip=false -Drat.skip=false -Dmaven.javadoc.skip=true
 
 after_success:
   - bash <(curl -s https://codecov.io/bash)

diff --git a/dubbo-bom/pom.xml b/dubbo-bom/pom.xml
@@ -23,6 +23,7 @@
         <groupId>org.apache.dubbo</groupId>
         <artifactId>dubbo-parent</artifactId>
         <version>${revision}</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>dubbo-bom</artifactId>

diff --git a/dubbo-bootstrap/pom.xml b/dubbo-bootstrap/pom.xml
@@ -26,14 +26,7 @@
 
         <!-- Test dependencies -->
 
-
-        <dependency>
-            <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo-configcenter-zookeeper</artifactId>
-            <version>${project.parent.version}</version>
-            <scope>test</scope>
-        </dependency>
-
+        <!-- Zookeeper dependencies for testing -->
         <dependency>
             <groupId>org.apache.dubbo</groupId>
             <artifactId>dubbo-registry-zookeeper</artifactId>
@@ -48,29 +41,13 @@
             <scope>test</scope>
         </dependency>
 
-        <!-- Zookeeper dependencies for testing -->
         <dependency>
             <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo-registry-etcd3</artifactId>
-            <version>${project.parent.version}</version>
-<!--            <scope>test</scope>-->
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo-metadata-report-etcd</artifactId>
-            <version>${project.parent.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo-configcenter-etcd</artifactId>
+            <artifactId>dubbo-configcenter-zookeeper</artifactId>
             <version>${project.parent.version}</version>
             <scope>test</scope>
         </dependency>
 
-
         <!-- Nacos dependencies for testing -->
         <dependency>
             <groupId>org.apache.dubbo</groupId>
@@ -113,17 +90,6 @@
             <scope>test</scope>
         </dependency>
 
-<!--        <dependency>-->
-<!--            <groupId>com.google.guava</groupId>-->
-<!--            <artifactId>guava</artifactId>-->
-<!--            <version>20.0</version>-->
-<!--        </dependency>-->
-        <dependency>
-            <groupId>org.apache.curator</groupId>
-            <artifactId>curator-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-
     </dependencies>
 
-</project>
+</project>
diff --git a/dubbo-bootstrap/src/main/java/org/apache/dubbo/bootstrap/DubboBootstrap.java b/dubbo-bootstrap/src/main/java/org/apache/dubbo/bootstrap/DubboBootstrap.java
@@ -57,7 +57,6 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -77,7 +76,6 @@
 import static org.apache.dubbo.common.utils.StringUtils.isNotEmpty;
 import static org.apache.dubbo.config.context.ConfigManager.getInstance;
 import static org.apache.dubbo.registry.support.AbstractRegistryFactory.getRegistries;
-import static org.apache.dubbo.remoting.Constants.CLIENT_KEY;
 
 /**
  * The bootstrap class of Dubbo
@@ -114,19 +112,14 @@ public class DubboBootstrap {
 
     private final ConfigManager configManager = getInstance();
 
-    /**
-     * Is provider or not
-     */
-    private boolean isProvider;
-
-    private boolean initialized = false;
+    private volatile boolean initialized = false;
 
-    private boolean started = false;
+    private volatile boolean started = false;
 
     /**
      * Only Provider Register
      */
-    private boolean onlyRegisterProvider = false;
+    private volatile boolean onlyRegisterProvider = false;
 
     private ServiceInstance serviceInstance;
 
@@ -155,6 +148,7 @@ public DubboBootstrap metadataReport(List<MetadataReportConfig> metadataReportCo
         return this;
     }
 
+
     // {@link ApplicationConfig} correlative methods
 
     /**
@@ -193,6 +187,7 @@ public DubboBootstrap application(ApplicationConfig applicationConfig) {
         return this;
     }
 
+
     // {@link RegistryConfig} correlative methods
 
     /**
@@ -240,8 +235,8 @@ public DubboBootstrap registries(Iterable<RegistryConfig> registryConfigs) {
         return this;
     }
 
-    // {@link ProtocolConfig} correlative methods
 
+    // {@link ProtocolConfig} correlative methods
     public DubboBootstrap protocol(Consumer<ProtocolBuilder> consumerBuilder) {
         return protocol(DEFAULT_PROTOCOL_ID, consumerBuilder);
     }
@@ -261,8 +256,8 @@ public DubboBootstrap protocols(List<ProtocolConfig> protocolConfigs) {
         return this;
     }
 
-    // {@link ServiceConfig} correlative methods
 
+    // {@link ServiceConfig} correlative methods
     public <S> DubboBootstrap service(Consumer<ServiceBuilder<S>> consumerBuilder) {
         return service(DEFAULT_SERVICE_ID, consumerBuilder);
     }
@@ -278,8 +273,8 @@ public DubboBootstrap service(ServiceConfig<?> serviceConfig) {
         return this;
     }
 
-    // {@link Reference} correlative methods
 
+    // {@link Reference} correlative methods
     public <S> DubboBootstrap reference(Consumer<ReferenceBuilder<S>> consumerBuilder) {
         return reference(DEFAULT_REFERENCE_ID, consumerBuilder);
     }
@@ -295,8 +290,8 @@ public DubboBootstrap reference(ReferenceConfig<?> referenceConfig) {
         return this;
     }
 
-    // {@link ProviderConfig} correlative methods
 
+    // {@link ProviderConfig} correlative methods
     public DubboBootstrap provider(Consumer<ProviderBuilder> builderConsumer) {
         return provider(DEFAULT_PROVIDER_ID, builderConsumer);
     }
@@ -316,8 +311,8 @@ public DubboBootstrap providers(List<ProviderConfig> providerConfigs) {
         return this;
     }
 
-    // {@link ConsumerConfig} correlative methods
 
+    // {@link ConsumerConfig} correlative methods
     public DubboBootstrap consumer(Consumer<ConsumerBuilder> builderConsumer) {
         return consumer(DEFAULT_CONSUMER_ID, builderConsumer);
     }
@@ -338,6 +333,7 @@ public DubboBootstrap consumers(List<ConsumerConfig> consumerConfigs) {
     }
 
     // {@link ConfigCenterConfig} correlative methods
+
     public DubboBootstrap configCenter(ConfigCenterConfig configCenterConfig) {
         return configCenter(asList(configCenterConfig));
     }
@@ -424,13 +420,8 @@ private void useRegistryAsConfigCenterIfNecessary() {
             String id = "config-center-" + protocol + "-" + registryConfig.getPort();
             ConfigCenterConfig cc = new ConfigCenterConfig();
             cc.setId(id);
-            cc.setParameters(registryConfig.getParameters() == null ?
-                    new HashMap<>() :
-                    new HashMap<>(registryConfig.getParameters()));
-            cc.getParameters().put(CLIENT_KEY,registryConfig.getClient());
-            cc.setProtocol(registryConfig.getProtocol());
+            cc.setProtocol(protocol);
             cc.setAddress(registryConfig.getAddress());
-            cc.setNamespace(registryConfig.getGroup());
             cc.setHighestPriority(false);
             configManager.addConfigCenter(cc);
         });
@@ -463,7 +454,6 @@ public DubboBootstrap start() {
                 /**
                  * export {@link MetadataService}
                  */
-                // TODO, only export to default registry?
                 List<URL> exportedURLs = exportMetadataService(
                         configManager.getApplication().orElseThrow(() -> new IllegalStateException("ApplicationConfig cannot be null")),
                         configManager.getRegistries(),
@@ -541,6 +531,7 @@ public boolean isStarted() {
 
 
     /* serve for builder apis, begin */
+
     private ApplicationBuilder createApplicationBuilder(String name) {
         return new ApplicationBuilder().name(name);
     }
@@ -569,8 +560,8 @@ private ConsumerBuilder createConsumerBuilder(String id) {
         return new ConsumerBuilder().id(id);
     }
 
-    /* serve for builder apis, end */
 
+    /* serve for builder apis, end */
     private void startMetadataReport() {
         ApplicationConfig applicationConfig = configManager.getApplication().orElseThrow(() -> new IllegalStateException("There's no ApplicationConfig specified."));
 
@@ -612,15 +603,14 @@ private DynamicConfiguration prepareEnvironment(ConfigCenterConfig configCenter)
                 return null;
             }
             DynamicConfiguration dynamicConfiguration = getDynamicConfiguration(configCenter.toUrl());
-            String configContent = dynamicConfiguration.getProperties(configCenter.getConfigFile(), configCenter.getGroup());
+            String configContent = dynamicConfiguration.getRule(configCenter.getConfigFile(), configCenter.getGroup());
 
             String appGroup = configManager.getApplication().orElse(new ApplicationConfig()).getName();
             String appConfigContent = null;
             if (isNotEmpty(appGroup)) {
-                appConfigContent = dynamicConfiguration.getProperties
-                        (isNotEmpty(configCenter.getAppConfigFile()) ? configCenter.getAppConfigFile() : configCenter.getConfigFile(),
-                                appGroup
-                        );
+                appConfigContent = dynamicConfiguration.getConfig(isNotEmpty(configCenter.getAppConfigFile()) ?
+                        configCenter.getAppConfigFile() : configCenter.getConfigFile(), appGroup
+                );
             }
             try {
                 Environment.getInstance().setConfigCenterFirst(configCenter.isHighestPriority());
@@ -663,6 +653,10 @@ public void exportServiceConfig(ServiceConfig<?> serviceConfig) {
         serviceConfig.export();
     }
 
+    public boolean isOnlyRegisterProvider() {
+        return onlyRegisterProvider;
+    }
+
     private void registerServiceInstance(List<URL> exportedURLs) {
 
         exportedURLs

diff --git a/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/DubboServiceConsumerBootstrap.java b/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/DubboServiceConsumerBootstrap.java
@@ -19,7 +19,6 @@
 import org.apache.dubbo.config.ReferenceConfig;
 import org.apache.dubbo.config.context.ConfigManager;
 
-
 /**
  * Dubbo Provider Bootstrap
  *

diff --git a/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/DubboServiceProviderBootstrap.java b/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/DubboServiceProviderBootstrap.java
@@ -30,7 +30,6 @@ public static void main(String[] args) {
                 .registry("zookeeper", builder -> builder.address("zookeeper://127.0.0.1:2181?registry-type=service"))
                 // Nacos
                 .registry("nacos", builder -> builder.address("nacos://127.0.0.1:8848?registry-type=service"))
-//                .registry(RegistryBuilder.newBuilder().address("etcd3://127.0.0.1:2379?registry-type=service").build())
                 .protocol(builder -> builder.port(-1).name("dubbo"))
                 .service(builder -> builder.id("test").interfaceClass(EchoService.class).ref(new EchoServiceImpl()))
                 .start()

diff --git a/dubbo-cluster/pom.xml b/dubbo-cluster/pom.xml
@@ -20,6 +20,7 @@
         <groupId>org.apache.dubbo</groupId>
         <artifactId>dubbo-parent</artifactId>
         <version>${revision}</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>dubbo-cluster</artifactId>
     <packaging>jar</packaging>

diff --git a/.../src/main/java/org/apache/dubbo/rpc/cluster/router/condition/config/ListenableRouter.java b/.../src/main/java/org/apache/dubbo/rpc/cluster/router/condition/config/ListenableRouter.java
@@ -119,7 +119,7 @@ private synchronized void init(String ruleKey) {
         }
         String routerKey = ruleKey + RULE_SUFFIX;
         configuration.addListener(routerKey, this);
-        String rule = configuration.getRule(routerKey, DynamicConfiguration.DEFAULT_GROUP);
+        String rule = configuration.getConfig(routerKey, DynamicConfiguration.DEFAULT_GROUP);
         if (StringUtils.isNotEmpty(rule)) {
             this.process(new ConfigChangeEvent(routerKey, rule));
         }

diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/tag/TagRouter.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/tag/TagRouter.java
@@ -249,7 +249,7 @@ public <T> void notify(List<Invoker<T>> invokers) {
                 String key = providerApplication + RULE_SUFFIX;
                 configuration.addListener(key, this);
                 application = providerApplication;
-                String rawRule = configuration.getRule(key, DynamicConfiguration.DEFAULT_GROUP);
+                String rawRule = configuration.getConfig(key, DynamicConfiguration.DEFAULT_GROUP);
                 if (StringUtils.isNotEmpty(rawRule)) {
                     this.process(new ConfigChangeEvent(key, rawRule));
                 }

diff --git a/...luster/src/main/java/org/apache/dubbo/rpc/cluster/support/wrapper/MockClusterInvoker.java b/...luster/src/main/java/org/apache/dubbo/rpc/cluster/support/wrapper/MockClusterInvoker.java
@@ -32,8 +32,8 @@
 
 import java.util.List;
 
-import static org.apache.dubbo.rpc.cluster.Constants.INVOCATION_NEED_MOCK;
 import static org.apache.dubbo.rpc.Constants.MOCK_KEY;
+import static org.apache.dubbo.rpc.cluster.Constants.INVOCATION_NEED_MOCK;
 
 public class MockClusterInvoker<T> implements Invoker<T> {
 

diff --git a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/TagRouterTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/TagRouterTest.java
@@ -16,11 +16,12 @@
  */
 package org.apache.dubbo.rpc.cluster.router;
 
+import org.apache.dubbo.rpc.cluster.router.tag.model.TagRouterRule;
+import org.apache.dubbo.rpc.cluster.router.tag.model.TagRuleParser;
+
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.curator.framework.CuratorFrameworkFactory;
 import org.apache.curator.retry.ExponentialBackoffRetry;
-import org.apache.dubbo.rpc.cluster.router.tag.model.TagRouterRule;
-import org.apache.dubbo.rpc.cluster.router.tag.model.TagRuleParser;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;

diff --git a/...luster/src/test/java/org/apache/dubbo/rpc/cluster/support/AbstractClusterInvokerTest.java b/...luster/src/test/java/org/apache/dubbo/rpc/cluster/support/AbstractClusterInvokerTest.java
@@ -47,10 +47,10 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicLong;
 
+import static org.apache.dubbo.common.constants.CommonConstants.MONITOR_KEY;
 import static org.apache.dubbo.rpc.cluster.Constants.CLUSTER_AVAILABLE_CHECK_KEY;
 import static org.apache.dubbo.rpc.cluster.Constants.INVOCATION_NEED_MOCK;
 import static org.apache.dubbo.rpc.cluster.Constants.REFER_KEY;
-import static org.apache.dubbo.common.constants.CommonConstants.MONITOR_KEY;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;
 

diff --git a/dubbo-common/pom.xml b/dubbo-common/pom.xml
@@ -21,6 +21,7 @@
         <groupId>org.apache.dubbo</groupId>
         <artifactId>dubbo-parent</artifactId>
         <version>${revision}</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>dubbo-common</artifactId>
     <packaging>jar</packaging>

diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/config/Configuration.java b/dubbo-common/src/main/java/org/apache/dubbo/common/config/Configuration.java
@@ -127,6 +127,4 @@ default <T> T convert(Class<T> cls, String key, T defaultValue) {
 
         return cls.cast(obj);
     }
-
-
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,7 +19,6 @@ @@
     import org.apache.dubbo.config.ReferenceConfig;
     import org.apache.dubbo.config.context.ConfigManager;
     /**
      * Dubbo Provider Bootstrap
      *
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -127,6 +127,4 @@ default <T> T convert(Class<T> cls, String key, T defaultValue) {

		return cls.cast(obj);
		}


		}