You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by vi...@apache.org on 2019/07/26 02:26:19 UTC
[dubbo] 05/05: merge and reinit
This is an automated email from the ASF dual-hosted git repository.
victory pushed a commit to branch cloud-native
in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit 758b49f1e83cc71c732cb683b623153f57ce1112
Merge: 1aae695 2691784
Author: cvictory <sh...@gmail.com>
AuthorDate: Fri Jul 26 10:25:45 2019 +0800
merge and reinit
dubbo-bootstrap/pom.xml | 11 +-
.../dubbo/bootstrap/ApplicationSettings.java | 127 -----
.../org/apache/dubbo/bootstrap/DubboBootstrap.java | 394 +++++++------
.../apache/dubbo/bootstrap/ProtocolSettings.java | 215 -------
.../apache/dubbo/bootstrap/ReferenceSettings.java | 334 -----------
.../apache/dubbo/bootstrap/RegistrySettings.java | 164 ------
.../apache/dubbo/bootstrap/ServiceSettings.java | 384 -------------
.../apache/dubbo/bootstrap/DubboBootstrapTest.java | 14 -
.../bootstrap/DubboServiceConsumerBootstrap.java | 24 +-
.../bootstrap/DubboServiceProviderBootstrap.java | 25 +-
dubbo-common/pom.xml | 4 +
.../config/configcenter/ConfigChangeEvent.java | 6 +-
.../config/configcenter/ConfigurationListener.java | 4 +-
.../config/configcenter/DynamicConfiguration.java | 105 +++-
.../configcenter/DynamicConfigurationFactory.java | 20 +-
.../file/FileSystemDynamicConfiguration.java | 628 +++++++++++++++++++++
.../FileSystemDynamicConfigurationFactory.java | 21 +-
.../configcenter/nop/NopDynamicConfiguration.java | 1 +
.../nop/NopDynamicConfigurationFactory.java | 1 +
.../wrapper/CompositeDynamicConfiguration.java | 3 -
.../apache/dubbo/common/utils/ReflectUtils.java | 30 +-
...config.configcenter.DynamicConfigurationFactory | 3 +-
.../DynamicConfigurationFactoryTest.java | 25 +-
.../file/FileSystemDynamicConfigurationTest.java | 169 ++++++
dubbo-common/src/test/resources/log4j.xml | 4 +-
.../dubbo/config/AbstractInterfaceConfig.java | 23 +-
.../org/apache/dubbo/config/RegistryConfig.java | 12 +-
.../org/apache/dubbo/config/ServiceConfig.java | 17 +-
.../dubbo/config/builders/AbstractBuilder.java | 2 +-
.../apache/dubbo/config/context/ConfigManager.java | 433 +++++++-------
.../metadata/ServiceInstancePortCustomizer.java | 1 -
.../dubbo/config/context/ConfigManagerTest.java | 71 +++
.../ConfigurableMetadataServiceExporterTest.java | 4 +-
.../resources/META-INF/spring/dubbo-provider.xml | 16 +-
.../support/nacos/NacosDynamicConfiguration.java | 13 +-
dubbo-dependencies-bom/pom.xml | 11 +-
.../client/FileSystemServiceDiscovery.java | 114 ++++
37 files changed, 1701 insertions(+), 1732 deletions(-)
diff --cc dubbo-bootstrap/pom.xml
index 9426264,e38e05d..77af3e2
--- a/dubbo-bootstrap/pom.xml
+++ b/dubbo-bootstrap/pom.xml
@@@ -113,10 -90,10 +113,15 @@@
<scope>test</scope>
</dependency>
++<!-- <dependency>-->
++<!-- <groupId>com.google.guava</groupId>-->
++<!-- <artifactId>guava</artifactId>-->
++<!-- <version>20.0</version>-->
++<!-- </dependency>-->
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>20.0</version>
+ <groupId>org.apache.curator</groupId>
+ <artifactId>curator-test</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
diff --cc dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/DubboServiceConsumerBootstrap.java
index 48ac788,191b233..d88dcc3
--- a/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/DubboServiceConsumerBootstrap.java
+++ b/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/DubboServiceConsumerBootstrap.java
@@@ -17,11 -17,8 +17,9 @@@
package org.apache.dubbo.bootstrap;
import org.apache.dubbo.config.ReferenceConfig;
- import org.apache.dubbo.config.builders.ApplicationBuilder;
- import org.apache.dubbo.config.builders.ReferenceBuilder;
- import org.apache.dubbo.config.builders.RegistryBuilder;
- import org.apache.dubbo.config.utils.ReferenceConfigCache;
+ import org.apache.dubbo.config.context.ConfigManager;
+
+
/**
* Dubbo Provider Bootstrap
*
diff --cc dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/DubboServiceProviderBootstrap.java
index 4e46a67,1ed573f..019a61a
--- a/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/DubboServiceProviderBootstrap.java
+++ b/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/DubboServiceProviderBootstrap.java
@@@ -31,17 -23,15 +23,16 @@@ package org.apache.dubbo.bootstrap
*/
public class DubboServiceProviderBootstrap {
- public static void main(String[] args) throws IOException {
-
+ public static void main(String[] args) {
new DubboBootstrap()
- .application(ApplicationBuilder.newBuilder().name("dubbo-provider-demo").metadata("remote").build())
- // .metadataReport(MetadataReportBuilder.newBuilder().address("zookeeper://127.0.0.1:2181").build())
- .metadataReport(MetadataReportBuilder.newBuilder().address("zookeeper://127.0.0.1:2181").build())
- // .application(ApplicationBuilder.newBuilder().name("dubbo-provider-demo").build())
- .registry(RegistryBuilder.newBuilder().address("zookeeper://127.0.0.1:2181?registry-type=service").build())
+ .application("dubbo-provider-demo")
+ // Zookeeper in service registry type
+ .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(ProtocolBuilder.newBuilder().port(-1).name("dubbo").build())
- .service(ServiceBuilder.newBuilder().id("test").interfaceClass(EchoService.class).ref(new EchoServiceImpl()).build())
+ .protocol(builder -> builder.port(-1).name("dubbo"))
+ .service(builder -> builder.id("test").interfaceClass(EchoService.class).ref(new EchoServiceImpl()))
.start()
.await();
}