This is an automated email from the ASF dual-hosted git repository.
panjuan pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git.
from ce3bb93 Add SchemaMetaDataRegistrySubscriber (#11373)
add 219a11e Move schema metadata yaml handler to infra module (#11374)
No new revisions were added by this update.
Summary of changes:
.../proxy/hint/config/DatasourceConfiguration.java | 2 +-
.../config/YamlDatabaseDiscoveryRuleConfiguration.java | 4 ++--
...mlDatabaseDiscoveryDataSourceRuleConfiguration.java | 2 +-
...yRuleAlgorithmProviderConfigurationYamlSwapper.java | 2 +-
.../DatabaseDiscoveryRuleConfigurationYamlSwapper.java | 4 ++--
...a.yaml.config.swapper.YamlRuleConfigurationSwapper} | 0
...abaseDiscoveryRuleConfigurationYamlSwapperTest.java | 2 +-
...sForYamlDatabaseDiscoveryRuleConfigurationTest.java | 2 +-
.../yaml/config/YamlEncryptRuleConfiguration.java | 4 ++--
.../rule/YamlEncryptColumnRuleConfiguration.java | 2 +-
.../config/rule/YamlEncryptTableRuleConfiguration.java | 2 +-
...tRuleAlgorithmProviderConfigurationYamlSwapper.java | 4 ++--
.../swapper/EncryptRuleConfigurationYamlSwapper.java | 6 +++---
.../EncryptColumnRuleConfigurationYamlSwapper.java | 2 +-
.../rule/EncryptTableRuleConfigurationYamlSwapper.java | 2 +-
...a.yaml.config.swapper.YamlRuleConfigurationSwapper} | 0
...eAlgorithmProviderConfigurationYamlSwapperTest.java | 4 ++--
.../EncryptRuleConfigurationYamlSwapperTest.java | 4 ++--
.../YamlReadwriteSplittingRuleConfiguration.java | 4 ++--
...lReadwriteSplittingDataSourceRuleConfiguration.java | 2 +-
...gRuleAlgorithmProviderConfigurationYamlSwapper.java | 4 ++--
...ReadwriteSplittingRuleConfigurationYamlSwapper.java | 4 ++--
...a.yaml.config.swapper.YamlRuleConfigurationSwapper} | 0
...writeSplittingRuleConfigurationYamlSwapperTest.java | 2 +-
...ForYamlReadwriteSplittingRuleConfigurationTest.java | 2 +-
.../yaml/config/YamlShadowRuleConfiguration.java | 2 +-
.../swapper/ShadowRuleConfigurationYamlSwapper.java | 2 +-
...a.yaml.config.swapper.YamlRuleConfigurationSwapper} | 0
...nfigurationsForYamlShadowRuleConfigurationTest.java | 2 +-
.../yaml/config/YamlShardingRuleConfiguration.java | 4 ++--
.../rule/YamlShardingAutoTableRuleConfiguration.java | 2 +-
.../yaml/config/rule/YamlTableRuleConfiguration.java | 2 +-
.../keygen/YamlKeyGenerateStrategyConfiguration.java | 2 +-
.../YamlBaseShardingStrategyConfiguration.java | 2 +-
.../sharding/YamlShardingStrategyConfiguration.java | 2 +-
...gRuleAlgorithmProviderConfigurationYamlSwapper.java | 4 ++--
.../swapper/ShardingRuleConfigurationYamlSwapper.java | 4 ++--
.../ShardingAutoTableRuleConfigurationYamlSwapper.java | 2 +-
.../ShardingTableRuleConfigurationYamlSwapper.java | 2 +-
.../KeyGenerateStrategyConfigurationYamlSwapper.java | 2 +-
.../ShardingStrategyConfigurationYamlSwapper.java | 2 +-
...a.yaml.config.swapper.YamlRuleConfigurationSwapper} | 0
.../ShardingRuleConfigurationYamlSwapperTest.java | 2 +-
...igurationsForYamlShardingRuleConfigurationTest.java | 2 +-
...rdingAutoTableRuleConfigurationYamlSwapperTest.java | 2 +-
.../rule/TableRuleConfigurationYamlSwapperTest.java | 2 +-
.../cache/subscriber/ScalingRegistrySubscriber.java | 2 +-
.../config/watcher/GlobalRuleChangedWatcher.java | 4 ++--
.../metadata/service/SchemaMetaDataPersistService.java | 4 ++--
.../metadata/watcher/MetaDataChangedWatcher.java | 10 +++++-----
.../{config => }/pojo/YamlGovernanceConfiguration.java | 4 ++--
.../pojo/YamlRegistryCenterConfiguration.java | 4 ++--
.../pojo/scaling/YamlScalingConfiguration.java | 4 ++--
.../swapper/GovernanceConfigurationYamlSwapper.java | 6 +++---
.../RegistryCenterConfigurationYamlSwapper.java | 6 +++---
.../registry/fixture/YamlRuleConfigurationFixture.java | 2 +-
.../fixture/YamlRuleConfigurationSwapperFixture.java | 2 +-
.../service/SchemaMetaDataPersistServiceTest.java | 4 ++--
.../GovernanceConfigurationYamlSwapperTest.java | 6 +++---
.../RegistryCenterConfigurationYamlSwapperTest.java | 4 ++--
...a.yaml.config.swapper.YamlRuleConfigurationSwapper} | 0
.../yaml/config/YamlAuthorityRuleConfiguration.java | 4 ++--
.../swapper/AuthorityRuleConfigurationYamlSwapper.java | 4 ++--
...a.yaml.config.swapper.YamlRuleConfigurationSwapper} | 0
.../persist/service/impl/DataSourcePersistService.java | 2 +-
.../persist/service/impl/GlobalRulePersistService.java | 2 +-
.../persist/service/impl/SchemaRulePersistService.java | 4 ++--
.../user/yaml/config/YamlUserConfiguration.java | 2 +-
.../metadata/user/yaml/swapper/UserYamlSwapper.java | 2 +-
.../yaml/config/{ => pojo}/YamlConfiguration.java | 2 +-
.../config/{ => pojo}/YamlRootRuleConfigurations.java | 2 +-
.../yaml/config/{ => pojo}/YamlRuleConfiguration.java | 2 +-
.../YamlShardingSphereAlgorithmConfiguration.java | 4 ++--
.../{ => config}/swapper/YamlConfigurationSwapper.java | 4 ++--
.../swapper/YamlDataSourceConfigurationSwapper.java | 2 +-
.../swapper/YamlRuleConfigurationSwapper.java | 4 ++--
.../swapper/YamlRuleConfigurationSwapperEngine.java | 4 ++--
...hardingSphereAlgorithmConfigurationYamlSwapper.java | 6 +++---
.../shardingsphere/infra/yaml/engine/YamlEngine.java | 2 +-
.../constructor/ShardingSphereYamlConstructor.java | 2 +-
.../representer/ShardingSphereYamlRepresenter.java | 2 +-
.../infra}/yaml/schema/pojo/YamlColumnMetaData.java | 4 ++--
.../infra}/yaml/schema/pojo/YamlIndexMetaData.java | 4 ++--
.../infra}/yaml/schema/pojo/YamlSchema.java | 4 ++--
.../infra}/yaml/schema/pojo/YamlTableMetaData.java | 4 ++--
.../infra}/yaml/schema/swapper/SchemaYamlSwapper.java | 12 ++++++------
.../infra/config/persist/ConfigCenterTest.java | 2 +-
.../YamlDataSourceConfigurationSwapperTest.java | 2 +-
.../YamlRuleConfigurationSwapperEngineTest.java | 8 ++++----
...ingSphereAlgorithmConfigurationYamlSwapperTest.java | 4 ++--
.../swapper/fixture/RuleConfigurationFixture.java | 2 +-
.../swapper/fixture/YamlRuleConfigurationFixture.java | 4 ++--
.../fixture/YamlRuleConfigurationSwapperFixture.java | 4 ++--
.../infra/yaml/engine/YamlEngineTest.java | 4 ++--
.../yaml/schema/swapper/SchemaYamlSwapperTest.java | 8 ++++----
...ra.yaml.config.swapper.YamlRuleConfigurationSwapper | 2 +-
...ere.infra.yaml.swapper.YamlRuleConfigurationSwapper | 18 ------------------
.../resources/yaml/schema}/schema-without-table.yaml | 0
.../src/test/resources/yaml/schema}/schema.yaml | 0
.../api/yaml/YamlShardingSphereDataSourceFactory.java | 6 +++---
.../YamlGovernanceShardingSphereDataSourceFactory.java | 6 +++---
.../util/YamlGovernanceConfigurationSwapperUtil.java | 4 ++--
.../yaml/YamlGovernanceRootRuleConfigurations.java | 4 ++--
.../YamlGovernanceConfigurationSwapperUtilTest.java | 4 ++--
.../ShardingSphereGovernanceAutoConfiguration.java | 2 +-
.../common/GovernanceSpringBootRootConfiguration.java | 2 +-
.../additional-spring-configuration-metadata.json | 2 +-
.../AbstractAlgorithmProvidedBeanRegistry.java | 2 +-
.../impl/GovernanceBootstrapInitializer.java | 6 +++---
.../proxy/fixture/YamlRuleConfigurationFixture.java | 2 +-
.../fixture/YamlRuleConfigurationSwapperFixture.java | 2 +-
.../impl/StandardBootstrapInitializerTest.java | 6 +++---
...a.yaml.config.swapper.YamlRuleConfigurationSwapper} | 0
.../proxy/config/ProxyConfigurationLoader.java | 2 +-
.../proxy/config/yaml/YamlDataSourceParameter.java | 2 +-
.../proxy/config/yaml/YamlProxyRuleConfiguration.java | 4 ++--
.../config/yaml/YamlProxyServerConfiguration.java | 8 ++++----
.../yaml/swapper/YamlProxyConfigurationSwapper.java | 2 +-
.../proxy/config/ProxyConfigurationLoaderTest.java | 2 +-
.../swapper/YamlProxyConfigurationSwapperTest.java | 8 ++++----
.../ShardingSphereJDBCDataSourceConfiguration.java | 4 ++--
.../config/yaml/ServerConfigurationYamlSwapper.java | 4 ++--
.../config/yaml/ShardingRuleConfigurationSwapper.java | 2 +-
.../core/config/yaml/YamlServerConfiguration.java | 4 ++--
.../scaling/core/util/JobConfigurationUtil.java | 4 ++--
.../yaml/ServerConfigurationYamlSwapperTest.java | 4 ++--
.../shardingsphere/scaling/core/util/JDBCUtilTest.java | 2 +-
.../test/mysql/env/config/SourceConfiguration.java | 6 +++---
.../adapter/ShardingSphereAdapterContainer.java | 2 +-
.../scenario/EncryptSQLRewriterParameterizedTest.java | 6 +++---
.../scenario/MixSQLRewriterParameterizedTest.java | 6 +++---
.../scenario/ShardingSQLRewriterParameterizedTest.java | 6 +++---
132 files changed, 211 insertions(+), 229 deletions(-)
rename
shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-core/src/main/resources/META-INF/services/{org.apache.shardingsphere.infra.yaml.swapper.YamlRuleConfigurationSwapper
=>
org.apache.shardingsphere.infra.yaml.config.swapper.YamlRuleConfigurationSwapper}
(100%)
rename
shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/resources/META-INF/services/{org.apache.shardingsphere.infra.yaml.swapper.YamlRuleConfigurationSwapper
=>
org.apache.shardingsphere.infra.yaml.config.swapper.YamlRuleConfigurationSwapper}
(100%)
rename
shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/resources/META-INF/services/{org.apache.shardingsphere.infra.yaml.swapper.YamlRuleConfigurationSwapper
=>
org.apache.shardingsphere.infra.yaml.config.swapper.YamlRuleConfigurationSwapper}
(100%)
rename
shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/main/resources/META-INF/services/{org.apache.shardingsphere.infra.yaml.swapper.YamlRuleConfigurationSwapper
=>
org.apache.shardingsphere.infra.yaml.config.swapper.YamlRuleConfigurationSwapper}
(100%)
rename
shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/resources/META-INF/services/{org.apache.shardingsphere.infra.yaml.swapper.YamlRuleConfigurationSwapper
=>
org.apache.shardingsphere.infra.yaml.config.swapper.YamlRuleConfigurationSwapper}
(100%)
rename
shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/yaml/{config
=> }/pojo/YamlGovernanceConfiguration.java (89%)
rename
shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/yaml/{config
=> }/pojo/YamlRegistryCenterConfiguration.java (89%)
rename
shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/yaml/{config
=> }/pojo/scaling/YamlScalingConfiguration.java (87%)
rename
shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/yaml/{config
=> }/swapper/GovernanceConfigurationYamlSwapper.java (89%)
rename
shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/yaml/{config
=> }/swapper/RegistryCenterConfigurationYamlSwapper.java (87%)
rename
shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/yaml/{config
=> }/swapper/GovernanceConfigurationYamlSwapperTest.java (95%)
rename
shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/yaml/{config
=> }/swapper/RegistryCenterConfigurationYamlSwapperTest.java (93%)
copy
shardingsphere-governance/shardingsphere-governance-core/src/test/resources/META-INF/services/{org.apache.shardingsphere.infra.yaml.swapper.YamlRuleConfigurationSwapper
=>
org.apache.shardingsphere.infra.yaml.config.swapper.YamlRuleConfigurationSwapper}
(100%)
rename
shardingsphere-infra/shardingsphere-infra-authority/shardingsphere-infra-authority-common/src/main/resources/META-INF/services/{org.apache.shardingsphere.infra.yaml.swapper.YamlRuleConfigurationSwapper
=>
org.apache.shardingsphere.infra.yaml.config.swapper.YamlRuleConfigurationSwapper}
(100%)
rename
shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/config/{
=> pojo}/YamlConfiguration.java (93%)
rename
shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/config/{
=> pojo}/YamlRootRuleConfigurations.java (95%)
rename
shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/config/{
=> pojo}/YamlRuleConfiguration.java (95%)
rename
shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/config/{
=> pojo}/algorithm/YamlShardingSphereAlgorithmConfiguration.java (89%)
rename
shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/{
=> config}/swapper/YamlConfigurationSwapper.java (90%)
rename
shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/{
=> config}/swapper/YamlDataSourceConfigurationSwapper.java (98%)
rename
shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/{
=> config}/swapper/YamlRuleConfigurationSwapper.java (90%)
rename
shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/{
=> config}/swapper/YamlRuleConfigurationSwapperEngine.java (96%)
rename
shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/{
=>
config}/swapper/algorithm/ShardingSphereAlgorithmConfigurationYamlSwapper.java
(86%)
rename
{shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core
=>
shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra}/yaml/schema/pojo/YamlColumnMetaData.java
(89%)
rename
{shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core
=>
shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra}/yaml/schema/pojo/YamlIndexMetaData.java
(87%)
rename
{shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core
=>
shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra}/yaml/schema/pojo/YamlSchema.java
(88%)
rename
{shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core
=>
shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra}/yaml/schema/pojo/YamlTableMetaData.java
(88%)
rename
{shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core
=>
shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra}/yaml/schema/swapper/SchemaYamlSwapper.java
(91%)
rename
shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/yaml/{
=> config}/swapper/YamlDataSourceConfigurationSwapperTest.java (98%)
rename
shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/yaml/{
=> config}/swapper/YamlRuleConfigurationSwapperEngineTest.java (87%)
rename
shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/yaml/{
=>
config}/swapper/algorithm/ShardingSphereAlgorithmConfigurationYamlSwapperTest.java
(92%)
rename
shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/yaml/{
=> config}/swapper/fixture/RuleConfigurationFixture.java (93%)
rename
shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/yaml/{
=> config}/swapper/fixture/YamlRuleConfigurationFixture.java (88%)
rename
shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/yaml/{
=> config}/swapper/fixture/YamlRuleConfigurationSwapperFixture.java (91%)
rename
{shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core
=>
shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra}/yaml/schema/swapper/SchemaYamlSwapperTest.java
(94%)
rename
shardingsphere-governance/shardingsphere-governance-core/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.yaml.swapper.YamlRuleConfigurationSwapper
=>
shardingsphere-infra/shardingsphere-infra-common/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.yaml.config.swapper.YamlRuleConfigurationSwapper
(89%)
delete mode 100644
shardingsphere-infra/shardingsphere-infra-common/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.yaml.swapper.YamlRuleConfigurationSwapper
rename
{shardingsphere-governance/shardingsphere-governance-core/src/test/resources/yaml
=>
shardingsphere-infra/shardingsphere-infra-common/src/test/resources/yaml/schema}/schema-without-table.yaml
(100%)
copy
{shardingsphere-governance/shardingsphere-governance-core/src/test/resources/yaml
=>
shardingsphere-infra/shardingsphere-infra-common/src/test/resources/yaml/schema}/schema.yaml
(100%)
rename
shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/resources/META-INF/services/{org.apache.shardingsphere.infra.yaml.swapper.YamlRuleConfigurationSwapper
=>
org.apache.shardingsphere.infra.yaml.config.swapper.YamlRuleConfigurationSwapper}
(100%)
