[shardingsphere] branch master updated (91ff35a -> dcc76b8)

[pa...@apache.org]

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 91ff35a  fix checkstyle for PR#6189 (#6440)
     add dcc76b8  Use reg center and additional config center to config orchestration module (#6446)

No new revisions were added by this update.

Summary of changes:
 .../sharding-proxy/sharding/conf/server.yaml       |  5 +-
 .../raw/jdbc/JavaConfigurationExampleMain.java     | 22 +++----
 .../OrchestrationRepositoryConfigurationUtil.java  | 43 +++++--------
 .../config/cloud/CloudEncryptConfiguration.java    | 10 ++-
 .../cloud/CloudMasterSlaveConfiguration.java       | 10 ++-
 .../config/cloud/CloudShadowConfiguration.java     | 12 ++--
 ...oudShardingDatabasesAndTablesConfiguration.java | 10 ++-
 .../config/local/LocalEncryptConfiguration.java    | 14 ++---
 .../local/LocalMasterSlaveConfiguration.java       | 10 ++-
 .../config/local/LocalShadowConfiguration.java     | 15 ++---
 ...calShardingDatabasesAndTablesConfiguration.java | 11 ++--
 .../local/LocalShardingDatabasesConfiguration.java | 11 ++--
 .../LocalShardingMasterSlaveConfiguration.java     | 10 ++-
 .../local/LocalShardingTablesConfiguration.java    | 11 ++--
 .../resources/META-INF/nacos/cloud/encrypt.yaml    | 22 ++++---
 .../META-INF/nacos/cloud/master-slave.yaml         | 20 +++---
 .../resources/META-INF/nacos/cloud/shadow.yaml     | 20 +++---
 .../nacos/cloud/sharding-databases-tables.yaml     | 20 +++---
 .../resources/META-INF/nacos/local/encrypt.yaml    | 20 +++---
 .../META-INF/nacos/local/master-slave.yaml         | 20 +++---
 .../resources/META-INF/nacos/local/shadow.yaml     | 20 +++---
 .../nacos/local/sharding-databases-tables.yaml     | 20 +++---
 .../META-INF/zookeeper/cloud/encrypt.yaml          |  3 +-
 .../META-INF/zookeeper/cloud/master-slave.yaml     |  3 +-
 .../resources/META-INF/zookeeper/cloud/shadow.yaml |  3 +-
 .../zookeeper/cloud/sharding-databases-tables.yaml |  3 +-
 .../META-INF/zookeeper/local/encrypt.yaml          |  3 +-
 .../META-INF/zookeeper/local/master-slave.yaml     | 19 +++---
 .../resources/META-INF/zookeeper/local/shadow.yaml |  3 +-
 .../zookeeper/local/sharding-databases-tables.yaml | 19 +++---
 .../src/main/resources/conf/server.yaml            |  3 +-
 .../src/main/resources/conf/server.yaml            |  3 +-
 .../core/facade/OrchestrationFacade.java           | 62 +++++++------------
 .../core/facade/OrchestrationFacadeTest.java       | 12 +---
 .../api/config/OrchestrationConfiguration.java     | 37 +++++++++--
 .../api/config/OrchestrationConfigurationTest.java | 35 -----------
 .../config/YamlOrchestrationConfiguration.java     | 16 ++---
 .../OrchestrationConfigurationYamlSwapper.java     | 31 +++++-----
 .../config/YamlOrchestrationConfigurationTest.java | 44 --------------
 ...mlOrchestrationRepositoryConfigurationTest.java | 68 ---------------------
 .../OrchestrationConfigurationYamlSwapperTest.java | 71 +++++++++-------------
 .../src/main/resources/conf/server.yaml            |  3 +-
 .../test/resources/docker/proxy/conf/server.yaml   |  3 +-
 ...chestrationShardingSphereDataSourceFactory.java | 24 ++++----
 ...chestrationShardingSphereDataSourceFactory.java | 14 ++---
 ...strationRepositoryConfigurationSwapperUtil.java | 20 +++---
 .../YamlOrchestrationRootRuleConfigurations.java   |  6 +-
 .../OrchestrationShardingSphereDataSourceTest.java | 11 ++--
 .../YamlInstanceConfigurationSwapperUtilTest.java  | 12 ++--
 .../configWithMasterSlaveDataSourceWithProps.yaml  | 18 ++----
 ...onfigWithMasterSlaveDataSourceWithoutProps.yaml | 18 ++----
 .../sharding/configWithDataSourceWithProps.yaml    | 18 ++----
 .../sharding/configWithDataSourceWithoutProps.yaml | 18 ++----
 .../sharding/configWithoutDataSourceWithProps.yaml | 18 ++----
 .../configWithoutDataSourceWithoutProps.yaml       | 18 ++----
 .../sharding_ms/configWithDataSourceWithProps.yaml | 18 ++----
 .../configWithDataSourceWithoutProps.yaml          | 18 ++----
 .../configWithDataSourceWithoutRules.yaml          | 18 ++----
 .../configWithoutDataSourceWithProps.yaml          | 18 ++----
 .../configWithoutDataSourceWithoutProps.yaml       | 18 ++----
 .../yaml/unit/encryptWithRegistryCenter.yaml       | 18 ++----
 .../src/test/resources/yaml/unit/noRule.yaml       | 18 ++----
 .../OrchestrationSpringBootConfiguration.java      | 21 +++++--
 .../parser/DataSourceBeanDefinitionParser.java     | 18 ++----
 .../src/main/resources/conf/server.yaml            |  3 +-
 .../config/yaml/YamlProxyServerConfiguration.java  |  7 +--
 .../config/ShardingConfigurationLoaderTest.java    |  8 +--
 .../src/test/resources/conf/server.yaml            |  5 +-
 .../OrchestrationConfigurationConverter.java       |  5 +-
 69 files changed, 458 insertions(+), 730 deletions(-)
 delete mode 100644 shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-api/src/test/java/org/apache/shardingsphere/orchestration/repository/api/config/OrchestrationConfigurationTest.java
 delete mode 100644 shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-common/src/test/java/org/apache/shardingsphere/orchestration/repository/common/configuration/config/YamlOrchestrationConfigurationTest.java
 delete mode 100644 shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-common/src/test/java/org/apache/shardingsphere/orchestration/repository/common/configuration/config/YamlOrchestrationRepositoryConfigurationTest.java