You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by me...@apache.org on 2020/07/24 17:44:33 UTC
[shardingsphere] branch master updated (f921c0f -> cf3b2ed)
This is an automated email from the ASF dual-hosted git repository.
menghaoran pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git.
from f921c0f Modify theme css styles on all pages by Cayman. (#6432)
new 631dd4a For code format
new a4357a5 Remove getter for OrchestrationFacade.isOverwrite
new cc4f417 Rename CenterRepository to OrchestrationRepository
new a13d9e2 remove useless import
new d401e0f remove useless import
new cf3b2ed Merge pull request #6433 from terrymanu/dev
The 25832 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../orchestration/core/common/CenterType.java | 2 +
... PostOrchestrationRepositoryEventListener.java} | 10 +-
...tOrchestrationRepositoryEventListenerTest.java} | 24 ++--
.../orchestration/core/config/ConfigCenter.java | 8 +-
.../listener/AuthenticationChangedListener.java | 10 +-
.../ClusterConfigurationChangedListener.java | 10 +-
.../ConfigurationChangedListenerManager.java | 14 +-
.../MetricsConfigurationChangedListener.java | 10 +-
.../config/listener/PropertiesChangedListener.java | 10 +-
.../config/listener/SchemaChangedListener.java | 12 +-
.../core/config/ConfigCenterTest.java | 156 ++++++++++-----------
....java => FirstTestConfigurationRepository.java} | 4 +-
.../AuthenticationChangedListenerTest.java | 6 +-
.../ClusterConfigurationChangedListenerTest.java | 6 +-
.../ConfigurationChangedListenerManagerTest.java | 6 +-
.../MetricsConfigurationChangedListenerTest.java | 6 +-
.../listener/PropertiesChangedListenerTest.java | 6 +-
.../config/listener/SchemaChangedListenerTest.java | 44 +++---
...tration.repository.api.ConfigurationRepository} | 2 +-
.../core/facade/OrchestrationFacade.java | 82 +++++------
.../listener/OrchestrationListenerManager.java | 18 +--
.../core/facade/OrchestrationFacadeTest.java | 12 +-
.../facade/OrchestrationListenerManagerTest.java | 12 +-
....java => FirstTestConfigurationRepository.java} | 4 +-
...tory.java => SecondTestRegistryRepository.java} | 4 +-
...tration.repository.api.ConfigurationRepository} | 2 +-
...rchestration.repository.api.RegistryRepository} | 2 +-
.../core/metadata/MetaDataCenter.java | 8 +-
.../metadata/listener/MetaDataChangedListener.java | 16 +--
.../metadata/listener/MetaDataListenerManager.java | 8 +-
.../core/metadata/MetaDataCenterTest.java | 6 +-
.../listener/MetaDataChangedListenerTest.java | 6 +-
.../listener/MetaDataListenerManagerTest.java | 6 +-
.../core/registry/RegistryCenter.java | 8 +-
.../listener/DataSourceStateChangedListener.java | 10 +-
.../listener/InstanceStateChangedListener.java | 10 +-
.../registry/listener/RegistryListenerManager.java | 8 +-
.../core/registry/RegistryCenterTest.java | 22 +--
...itory.java => FirstTestRegistryRepository.java} | 4 +-
...tory.java => SecondTestRegistryRepository.java} | 4 +-
.../DataSourceStateChangedListenerTest.java | 6 +-
.../listener/InstanceStateChangedListenerTest.java | 6 +-
.../listener/RegistryListenerManagerTest.java | 6 +-
...rchestration.repository.api.RegistryRepository} | 4 +-
...epository.java => ConfigurationRepository.java} | 4 +-
...epository.java => OrchestrationRepository.java} | 4 +-
...nterRepository.java => RegistryRepository.java} | 4 +-
...terRepository.java => FirstTestRepository.java} | 4 +-
.../api/listener/DataChangedEventListenerTest.java | 14 +-
.../config/YamlOrchestrationConfiguration.java | 6 +-
... YamlOrchestrationRepositoryConfiguration.java} | 4 +-
.../OrchestrationConfigurationYamlSwapper.java | 10 +-
...trationRepositoryConfigurationYamlSwapper.java} | 12 +-
.../config/YamlOrchestrationConfigurationTest.java | 10 +-
...lOrchestrationRepositoryConfigurationTest.java} | 12 +-
.../OrchestrationConfigurationYamlSwapperTest.java | 32 ++---
...ionRepositoryConfigurationYamlSwapperTest.java} | 14 +-
...CenterRepository.java => ApolloRepository.java} | 6 +-
...tration.repository.api.ConfigurationRepository} | 2 +-
...positoryTest.java => ApolloRepositoryTest.java} | 10 +-
...cdCenterRepository.java => EtcdRepository.java} | 8 +-
...tration.repository.api.ConfigurationRepository} | 2 +-
...rchestration.repository.api.RegistryRepository} | 2 +-
...RepositoryTest.java => EtcdRepositoryTest.java} | 40 +++---
...sCenterRepository.java => NacosRepository.java} | 6 +-
...tration.repository.api.ConfigurationRepository} | 2 +-
...epositoryTest.java => NacosRepositoryTest.java} | 8 +-
...sitory.java => CuratorZookeeperRepository.java} | 8 +-
...tration.repository.api.ConfigurationRepository} | 2 +-
...rchestration.repository.api.RegistryRepository} | 2 +-
...st.java => CuratorZookeeperRepositoryTest.java} | 93 ++++++------
...chestrationShardingSphereDataSourceFactory.java | 14 +-
...trationRepositoryConfigurationSwapperUtil.java} | 25 ++--
.../YamlOrchestrationRootRuleConfigurations.java | 4 +-
....java => FirstTestConfigurationRepository.java} | 4 +-
...itory.java => FirstTestMetaDataRepository.java} | 4 +-
...itory.java => FirstTestRegistryRepository.java} | 6 +-
...java => FourthTestConfigurationRepository.java} | 4 +-
...tory.java => FourthTestRegistryRepository.java} | 6 +-
...java => SecondTestConfigurationRepository.java} | 4 +-
...tory.java => SecondTestRegistryRepository.java} | 6 +-
....java => ThirdTestConfigurationRepository.java} | 4 +-
...itory.java => ThirdTestRegistryRepository.java} | 6 +-
.../YamlInstanceConfigurationSwapperUtilTest.java | 22 +--
...tration.repository.api.ConfigurationRepository} | 10 +-
...rchestration.repository.api.RegistryRepository} | 8 +-
.../OrchestrationSpringBootConfiguration.java | 16 +--
.../OrchestrationSpringBootRootConfiguration.java | 4 +-
.../additional-spring-configuration-metadata.json | 2 +-
...itory.java => TestOrchestrationRepository.java} | 6 +-
...OrchestrationSpringBootRegistryEncryptTest.java | 12 +-
...estrationSpringBootRegistryMasterSlaveTest.java | 12 +-
...rchestrationSpringBootRegistryShardingTest.java | 12 +-
...tration.repository.api.ConfigurationRepository} | 2 +-
...rchestration.repository.api.RegistryRepository} | 2 +-
...itory.java => TestOrchestrationRepository.java} | 6 +-
...tration.repository.api.ConfigurationRepository} | 2 +-
...rchestration.repository.api.RegistryRepository} | 2 +-
.../config/yaml/YamlProxyServerConfiguration.java | 4 +-
.../config/ShardingConfigurationLoaderTest.java | 6 +-
.../OrchestrationConfigurationConverter.java | 4 +-
101 files changed, 574 insertions(+), 586 deletions(-)
rename shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-common/src/main/java/org/apache/shardingsphere/orchestration/core/common/listener/{PostShardingCenterRepositoryEventListener.java => PostOrchestrationRepositoryEventListener.java} (85%)
rename shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-common/src/test/java/org/apache/shardingsphere/orchestration/core/common/listener/{PostShardingCenterRepositoryEventListenerTest.java => PostOrchestrationRepositoryEventListenerTest.java} (70%)
rename shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-config/src/test/java/org/apache/shardingsphere/orchestration/core/config/fixture/{FirstTestConfigCenterRepository.java => FirstTestConfigurationRepository.java} (94%)
rename shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-config/src/test/resources/META-INF/services/{org.apache.shardingsphere.orchestration.repository.api.ConfigCenterRepository => org.apache.shardingsphere.orchestration.repository.api.ConfigurationRepository} (96%)
rename shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-facade/src/test/java/org/apache/shardingsphere/orchestration/core/facade/fixture/{FirstTestConfigCenterRepository.java => FirstTestConfigurationRepository.java} (94%)
rename shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-facade/src/test/java/org/apache/shardingsphere/orchestration/core/facade/fixture/{SecondTestRegistryCenterRepository.java => SecondTestRegistryRepository.java} (94%)
rename shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-facade/src/test/resources/META-INF/services/{org.apache.shardingsphere.orchestration.repository.api.ConfigCenterRepository => org.apache.shardingsphere.orchestration.repository.api.ConfigurationRepository} (96%)
rename shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-facade/src/test/resources/META-INF/services/{org.apache.shardingsphere.orchestration.repository.api.RegistryCenterRepository => org.apache.shardingsphere.orchestration.repository.api.RegistryRepository} (96%)
rename shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-registry/src/test/java/org/apache/shardingsphere/orchestration/core/registry/fixture/{FirstTestRegistryCenterRepository.java => FirstTestRegistryRepository.java} (94%)
rename shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-registry/src/test/java/org/apache/shardingsphere/orchestration/core/registry/fixture/{SecondTestRegistryCenterRepository.java => SecondTestRegistryRepository.java} (94%)
rename shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-registry/src/test/resources/META-INF/services/{org.apache.shardingsphere.orchestration.repository.api.RegistryCenterRepository => org.apache.shardingsphere.orchestration.repository.api.RegistryRepository} (93%)
rename shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-api/src/main/java/org/apache/shardingsphere/orchestration/repository/api/{ConfigCenterRepository.java => ConfigurationRepository.java} (89%)
rename shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-api/src/main/java/org/apache/shardingsphere/orchestration/repository/api/{CenterRepository.java => OrchestrationRepository.java} (95%)
rename shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-api/src/main/java/org/apache/shardingsphere/orchestration/repository/api/{RegistryCenterRepository.java => RegistryRepository.java} (91%)
rename shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-api/src/test/java/org/apache/shardingsphere/orchestration/repository/api/fixture/{FirstTestCenterRepository.java => FirstTestRepository.java} (95%)
rename shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-common/src/main/java/org/apache/shardingsphere/orchestration/repository/common/configuration/config/{YamlCenterRepositoryConfiguration.java => YamlOrchestrationRepositoryConfiguration.java} (89%)
rename shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-common/src/main/java/org/apache/shardingsphere/orchestration/repository/common/configuration/swapper/{CenterRepositoryConfigurationYamlSwapper.java => OrchestrationRepositoryConfigurationYamlSwapper.java} (75%)
rename shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-common/src/test/java/org/apache/shardingsphere/orchestration/repository/common/configuration/config/{YamlCenterRepositoryConfigurationTest.java => YamlOrchestrationRepositoryConfigurationTest.java} (76%)
rename shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-common/src/test/java/org/apache/shardingsphere/orchestration/repository/common/configuration/swapper/{CenterRepositoryConfigurationYamlSwapperTest.java => OrchestrationRepositoryConfigurationYamlSwapperTest.java} (80%)
rename shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-provider/shardingsphere-orchestration-repository-apollo/src/main/java/org/apache/shardingsphere/orchestration/repository/apollo/{ApolloCenterRepository.java => ApolloRepository.java} (97%)
rename shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-provider/shardingsphere-orchestration-repository-apollo/src/main/resources/META-INF/services/{org.apache.shardingsphere.orchestration.repository.api.ConfigCenterRepository => org.apache.shardingsphere.orchestration.repository.api.ConfigurationRepository} (98%)
rename shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-provider/shardingsphere-orchestration-repository-apollo/src/test/java/org/apache/shardingsphere/orchestration/repository/apollo/{ApolloCenterRepositoryTest.java => ApolloRepositoryTest.java} (94%)
rename shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-provider/shardingsphere-orchestration-repository-etcd/src/main/java/org/apache/shardingsphere/orchestration/repository/etcd/{EtcdCenterRepository.java => EtcdRepository.java} (97%)
rename shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-provider/shardingsphere-orchestration-repository-etcd/src/main/resources/META-INF/services/{org.apache.shardingsphere.orchestration.repository.api.RegistryCenterRepository => org.apache.shardingsphere.orchestration.repository.api.ConfigurationRepository} (91%)
rename shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-provider/shardingsphere-orchestration-repository-etcd/src/main/resources/META-INF/services/{org.apache.shardingsphere.orchestration.repository.api.ConfigCenterRepository => org.apache.shardingsphere.orchestration.repository.api.RegistryRepository} (91%)
rename shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-provider/shardingsphere-orchestration-repository-etcd/src/test/java/org/apache/shardingsphere/orchestration/repository/etcd/{EtcdCenterRepositoryTest.java => EtcdRepositoryTest.java} (88%)
rename shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-provider/shardingsphere-orchestration-repository-nacos/src/main/java/org/apache/shardingsphere/orchestration/repository/nacos/{NacosCenterRepository.java => NacosRepository.java} (97%)
rename shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-provider/shardingsphere-orchestration-repository-nacos/src/main/resources/META-INF/services/{org.apache.shardingsphere.orchestration.repository.api.ConfigCenterRepository => org.apache.shardingsphere.orchestration.repository.api.ConfigurationRepository} (90%)
rename shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-provider/shardingsphere-orchestration-repository-nacos/src/test/java/org/apache/shardingsphere/orchestration/repository/nacos/{NacosCenterRepositoryTest.java => NacosRepositoryTest.java} (96%)
rename shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-provider/shardingsphere-orchestration-repository-zookeeper-curator/src/main/java/org/apache/shardingsphere/orchestration/repository/zookeeper/{CuratorZookeeperCenterRepository.java => CuratorZookeeperRepository.java} (98%)
rename shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-provider/shardingsphere-orchestration-repository-zookeeper-curator/src/main/resources/META-INF/services/{org.apache.shardingsphere.orchestration.repository.api.ConfigCenterRepository => org.apache.shardingsphere.orchestration.repository.api.ConfigurationRepository} (96%)
rename shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-provider/shardingsphere-orchestration-repository-zookeeper-curator/src/main/resources/META-INF/services/{org.apache.shardingsphere.orchestration.repository.api.RegistryCenterRepository => org.apache.shardingsphere.orchestration.repository.api.RegistryRepository} (96%)
rename shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-provider/shardingsphere-orchestration-repository-zookeeper-curator/src/test/java/org/apache/shardingsphere/orchestration/repository/zookeeper/{CuratorZookeeperCenterRepositoryTest.java => CuratorZookeeperRepositoryTest.java} (71%)
rename shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/main/java/org/apache/shardingsphere/driver/orchestration/internal/util/{YamlCenterRepositoryConfigurationSwapperUtil.java => YamlOrchestrationRepositoryConfigurationSwapperUtil.java} (60%)
rename shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/java/org/apache/shardingsphere/driver/orchestration/fixture/{FirstTestConfigCenterRepository.java => FirstTestConfigurationRepository.java} (95%)
rename shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/java/org/apache/shardingsphere/driver/orchestration/fixture/{FirstTestMetaDataCenterRepository.java => FirstTestMetaDataRepository.java} (95%)
rename shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/java/org/apache/shardingsphere/driver/orchestration/fixture/{FirstTestRegistryCenterRepository.java => FirstTestRegistryRepository.java} (93%)
rename shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/java/org/apache/shardingsphere/driver/orchestration/fixture/{FourthTestConfigCenterRepository.java => FourthTestConfigurationRepository.java} (95%)
rename shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/java/org/apache/shardingsphere/driver/orchestration/fixture/{FourthTestRegistryCenterRepository.java => FourthTestRegistryRepository.java} (93%)
rename shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/java/org/apache/shardingsphere/driver/orchestration/fixture/{SecondTestConfigCenterRepository.java => SecondTestConfigurationRepository.java} (95%)
rename shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/java/org/apache/shardingsphere/driver/orchestration/fixture/{SecondTestRegistryCenterRepository.java => SecondTestRegistryRepository.java} (93%)
rename shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/java/org/apache/shardingsphere/driver/orchestration/fixture/{ThirdTestConfigCenterRepository.java => ThirdTestConfigurationRepository.java} (95%)
rename shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/java/org/apache/shardingsphere/driver/orchestration/fixture/{ThirdTestRegistryCenterRepository.java => ThirdTestRegistryRepository.java} (93%)
rename shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/META-INF/services/{org.apache.shardingsphere.orchestration.repository.api.ConfigCenterRepository => org.apache.shardingsphere.orchestration.repository.api.ConfigurationRepository} (90%)
rename shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/META-INF/services/{org.apache.shardingsphere.orchestration.repository.api.RegistryCenterRepository => org.apache.shardingsphere.orchestration.repository.api.RegistryRepository} (91%)
rename shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-boot-starter/src/test/java/org/apache/shardingsphere/spring/boot/orchestration/registry/{TestCenterRepository.java => TestOrchestrationRepository.java} (94%)
rename shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-boot-starter/src/test/resources/META-INF/services/{org.apache.shardingsphere.orchestration.repository.api.ConfigCenterRepository => org.apache.shardingsphere.orchestration.repository.api.ConfigurationRepository} (97%)
rename shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-boot-starter/src/test/resources/META-INF/services/{org.apache.shardingsphere.orchestration.repository.api.RegistryCenterRepository => org.apache.shardingsphere.orchestration.repository.api.RegistryRepository} (97%)
rename shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/orchestration/registry/{TestRegistryCenterRepositoryRepository.java => TestOrchestrationRepository.java} (92%)
rename shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-namespace/src/test/resources/META-INF/services/{org.apache.shardingsphere.orchestration.repository.api.ConfigCenterRepository => org.apache.shardingsphere.orchestration.repository.api.ConfigurationRepository} (95%)
rename shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-namespace/src/test/resources/META-INF/services/{org.apache.shardingsphere.orchestration.repository.api.RegistryCenterRepository => org.apache.shardingsphere.orchestration.repository.api.RegistryRepository} (95%)