Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactor ConfigManager #4804

Merged
merged 43 commits into from
Aug 13, 2019
Merged

Refactor ConfigManager #4804

merged 43 commits into from
Aug 13, 2019

Conversation

mercyblitz
Copy link
Contributor

No description provided.

mercyblitz and others added 30 commits July 11, 2019 15:13
@mercyblitz
Polish apache#4542 : [Enhancement] Adapt the Java standard Event/List…
f51b394 
…ener mechanism
@mercyblitz
Polish apache#4541 : [Feature] Add local File System DynamicConfigura…
9e58caa 
…tionFactory‘s extension
@mercyblitz
Polish apache#4541 : Bugfix
9252be1
@mercyblitz
Polish apache#4541 : Optimization
08089b6
@mercyblitz
Polish apache#4541 : Add the compatibility for PollingWatchService on…
cdd9338 
… the some platforms
@mercyblitz
Polish apache#4541 : Add delay publish without ThreadPoolExecutor
f0408f7
@mercyblitz
Polish apache#4541 : Refactor the extension name
5f354a0
@mercyblitz
Polish apache#4541 : Add remove ops
8152a75
@mercyblitz
Polish apache#4541 : Add testable constructor
df1a258
@mercyblitz
Polish apache#4541 : Add getConfigGroups method
52c0205
@mercyblitz
Polish apache#4610 : [Refactor] Refactor the bootstrap module
293a70d
@mercyblitz
Polish apache#4541 : Fix the nulling URL issue
3218a1f
@mercyblitz
Polish apache#4622 : [Refactor] Refactor ConfigManager
d5c78ac
@mercyblitz
Polish apache#4622 : [Refactor] Refactor ConfigManager
1d54a1d
@mercyblitz
Polish apache#4622 : Support multiple configcenters
5071a04
@mercyblitz
Polish apache#4671 : ServiceNameMapping will not map the group, versi…
ccf614c 
…on and protocol
@haiyang1985
update referenceCount log (apache#4683)
87e88e2 
Add comments to support multiple shared connections
@mercyblitz @beiwei30
Polish /apache#4687 : Remove the duplicated test code in dubbo-config…
5d299af 
…-spring (apache#4688)
@smipo @CrazyHZM
apache#4685 修改代码if判断false问题 if (hasException == false)修改成if (!hasExce…
25ec31e 
…ption) (apache#4695)
@Leishunyu @cvictory
Fixed Service annotation method parameters are not in effect (apache#…
c3132b8 
…4598)
@beiwei30
keep demo simple, and switch to use zookeeper as registry center (apa…
f490df8 
…che#4705)

* keep demo simple, and switch to use zookeeper as registry center

* remove comment
@CodingSinger @beiwei30
@reference auto-wires the instance of generic interface apache#4594 (a…
c8dbd7d 
…pache#4677)
@beiwei30
try to shorten maven output to make travis build pass (apache#4710)
65a0140
@tswstarplanet @beiwei30
use CountDownLatch to check zk registry if establish connection (apac…
5b38331 
…he#4589)
@mercyblitz
Minor change
a646874
@mercyblitz
Merge remote-tracking branch 'upstream/master' into dubbo-cloud-native
b8e601a 
# 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
@mercyblitz
Rename the extension name of WritableMetadataService
0644fe1
@mercyblitz
Polish apache#4759 : [Refactor] Change the signature of methods of Me…
9f405d7 
…tadataService apache#4759
@mercyblitz
Merge remote-tracking branch 'upstream/master' into dubbo-cloud-native
a344121 
# 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
@mercyblitz
Polish apache#3984 : Add the implementation of Page<ServiceInstance> …
8c7f37a 
…getInstances(String serviceName, int offset, int pageSize, boolean healthyOnly)
@mercyblitz
Code merge
2a88323
@mercyblitz
Code merge
240c456
@mercyblitz
Fix the cases
391d053
@mercyblitz
Merge remote-tracking branch 'upstream/cloud-native' into dubbo-cloud…
3e57a0a 
…-native

# Conflicts:
#	dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/DubboServiceProviderBootstrap.java
#	dubbo-metadata/dubbo-metadata-definition-protobuf/pom.xml
#	dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/support/ServiceOrientedRegistryTest.java
#	dubbo-registry/dubbo-registry-consul/src/main/java/org/apache/dubbo/registry/consul/ConsulServiceDiscoveryFactory.java
#	dubbo-registry/dubbo-registry-etcd3/src/main/java/org/apache/dubbo/registry/etcd/EtcdServiceDiscovery.java
@mercyblitz
Merge remote-tracking branch 'upstream/cloud-native' into dubbo-cloud…
83fc425 
…-native

# Conflicts:
#	dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/DubboServiceProviderBootstrap.java
#	dubbo-metadata/dubbo-metadata-definition-protobuf/pom.xml
#	dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/support/ServiceOrientedRegistryTest.java
#	dubbo-registry/dubbo-registry-consul/src/main/java/org/apache/dubbo/registry/consul/ConsulServiceDiscoveryFactory.java
#	dubbo-registry/dubbo-registry-etcd3/src/main/java/org/apache/dubbo/registry/etcd/EtcdServiceDiscovery.java
@mercyblitz
Refactor ConfigManager
a147829
@mercyblitz
Merge remote-tracking branch 'upstream/cloud-native' into dubbo-cloud…
eea35ce 
…-native

# Conflicts:
#	dubbo-common/src/main/java/org/apache/dubbo/common/config/configcenter/file/FileSystemDynamicConfiguration.java
@mercyblitz
Refactor ConfigManager
e307e98
@mercyblitz
Merge remote-tracking branch 'upstream/cloud-native' into dubbo-cloud…
f84a33d 
…-native
@mercyblitz
Resolve the issues on ConfigManager
ad3e638
@mercyblitz
Resolve conflict
19f1474
@mercyblitz
Refactor and add test-cases for ConfigManager
07cf7b1
@mercyblitz
Merge branch 'cloud-native' into dubbo-cloud-native
b4bf6ba
@mercyblitz mercyblitz merged commit ade0caf into apache:cloud-native Aug 13, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@mercyblitz @haiyang1985 @smipo @Leishunyu @beiwei30 @CodingSinger @tswstarplanet