Merge pull request #1335 from tristaZero/dev

Simply the configuration for orchestration

RELEASE-NOTES.md

@@ -50,6 +50,7 @@
 1. [ISSUE #1289](https://github.com/sharding-sphere/sharding-sphere/issues/1289) Adjust Hint API
 1. [ISSUE #1302](https://github.com/sharding-sphere/sharding-sphere/issues/1302) Refine package structure
 1. [ISSUE #1305](https://github.com/sharding-sphere/sharding-sphere/issues/1305) Deprecated and remove sharding-jdbc-transaction-parent module
+1. [ISSUE #1382](https://github.com/sharding-sphere/sharding-sphere/issues/1328) Remove type configuration in Orchestration module
 
 ### Bug Fixes
 

RELEASE-NOTES_ZH.md

@@ -50,7 +50,7 @@
 1. [ISSUE #1289](https://github.com/sharding-sphere/sharding-sphere/issues/1289) 调整Hint API
 1. [ISSUE #1302](https://github.com/sharding-sphere/sharding-sphere/issues/1302) 调整包结构
 1. [ISSUE #1305](https://github.com/sharding-sphere/sharding-sphere/issues/1305) 废弃并删除sharding-jdbc-transaction-parent模块
-
+1. [ISSUE #1382](https://github.com/sharding-sphere/sharding-sphere/issues/1328) 去除Orchestration模块中type的配置
 
 ### 缺陷修正
 

sharding-jdbc/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/main/java/io/shardingsphere/shardingjdbc/orchestration/spring/boot/OrchestrationSpringBootConfiguration.java

@@ -19,9 +19,11 @@
 
 import com.google.common.base.Preconditions;
 import com.google.common.base.Strings;
+import io.shardingsphere.api.config.ShardingRuleConfiguration;
 import io.shardingsphere.core.exception.ShardingException;
 import io.shardingsphere.core.rule.ShardingRule;
 import io.shardingsphere.orchestration.config.OrchestrationType;
+import io.shardingsphere.orchestration.internal.OrchestrationFacade;
 import io.shardingsphere.shardingjdbc.jdbc.core.datasource.MasterSlaveDataSource;
 import io.shardingsphere.shardingjdbc.jdbc.core.datasource.ShardingDataSource;
 import io.shardingsphere.shardingjdbc.orchestration.internal.datasource.OrchestrationMasterSlaveDataSource;
@@ -74,9 +76,42 @@ public class OrchestrationSpringBootConfiguration implements EnvironmentAware {
      */
     @Bean
     public DataSource dataSource() throws SQLException {
-        OrchestrationType type = orchestrationProperties.getType();
-        Preconditions.checkState(null != type, "Missing the type of datasource configuration in orchestration configuration");
-        return OrchestrationType.SHARDING == type ? createShardingDataSource() : createMasterSlaveDataSource();
+        Preconditions.checkState(isValidConfiguration(), "The orchestration configuration is invalid, please choose one from Sharding rule and Master-slave rule.");
+        return OrchestrationType.SHARDING == getOrchestrationType() ? createShardingDataSource() : createMasterSlaveDataSource();
+    }
+
+    private boolean isValidConfiguration() {
+        return isValidRuleConfiguration() || isValidOrchestrationConfiguration();
+    }
+
+    private boolean isValidRuleConfiguration() {
+        return (shardingProperties.getTables().isEmpty() && !Strings.isNullOrEmpty(masterSlaveProperties.getMasterDataSourceName()))
+                || (!shardingProperties.getTables().isEmpty() && Strings.isNullOrEmpty(masterSlaveProperties.getMasterDataSourceName()));
+    }
+
+    private boolean isValidOrchestrationConfiguration() {
+        return !Strings.isNullOrEmpty(orchestrationProperties.getName());
+    }
+
+    private OrchestrationType getOrchestrationType() {
+        if (isValidRuleConfiguration()) {
+            return getOrchestrationTypeByLocal();
+        }
+        return getOrchestrationTypeByRegistry();
+    }
+
+    private OrchestrationType getOrchestrationTypeByLocal() {
+        return shardingProperties.getTables().isEmpty() ? OrchestrationType.MASTER_SLAVE : OrchestrationType.SHARDING;
+    }
+
+    private OrchestrationType getOrchestrationTypeByRegistry() {
+        OrchestrationFacade orchestrationFacade = new OrchestrationFacade(orchestrationProperties.getOrchestrationConfiguration());
+        ShardingRuleConfiguration shardingRuleConfiguration = orchestrationFacade.getConfigService().loadShardingRuleConfiguration();
+        orchestrationFacade.close();
+        if (null != shardingRuleConfiguration && !shardingRuleConfiguration.getTableRuleConfigs().isEmpty()) {
+            return OrchestrationType.SHARDING;
+        }
+        return OrchestrationType.MASTER_SLAVE;
     }
 
     private DataSource createShardingDataSource() throws SQLException {

sharding-jdbc/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/test/resources/application-masterslave.properties

@@ -26,7 +26,6 @@ sharding.jdbc.config.masterslave.master-data-source-name=ds_master
 sharding.jdbc.config.masterslave.slave-data-source-names=ds_slave_0,ds_slave_1
 
 sharding.jdbc.config.orchestration.name=demo_spring_boot_ds_ms
-sharding.jdbc.config.orchestration.type=master_slave
 sharding.jdbc.config.orchestration.overwrite=true
 sharding.jdbc.config.orchestration.zookeeper.namespace=orchestration-spring-boot-master-slave-test
 sharding.jdbc.config.orchestration.zookeeper.server-lists=localhost:3181

sharding-jdbc/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/test/resources/application-sharding.properties

@@ -36,9 +36,8 @@ sharding.jdbc.config.sharding.props.sql.show=true
 sharding.jdbc.config.sharding.props.executor.size=100
 
 sharding.jdbc.config.orchestration.name=demo_spring_boot_ds_sharding
-sharding.jdbc.config.orchestration.type=sharding
 sharding.jdbc.config.orchestration.overwrite=true
 sharding.jdbc.config.orchestration.zookeeper.namespace=orchestration-spring-boot-sharding-test
 sharding.jdbc.config.orchestration.zookeeper.server-lists=localhost:3181
 
-sharding.jdbc.config.sharding.config-map.key1=value1
+sharding.jdbc.config.sharding.config-map.key1=value1

sharding-jdbc/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingsphere/shardingjdbc/orchestration/spring/namespace/parser/DataSourceBeanDefinitionParser.java

@@ -65,7 +65,6 @@ private BeanDefinition getOrchestrationConfiguration(final Element element) {
         factory.addConstructorArgValue(element.getAttribute(ID_ATTRIBUTE));
         factory.addConstructorArgReference(element.getAttribute(ShardingDataSourceBeanDefinitionParserTag.REG_REF_TAG));
         factory.addConstructorArgValue(element.getAttribute(ShardingDataSourceBeanDefinitionParserTag.OVERWRITE_TAG));
-        factory.addConstructorArgValue(orchestrationType);
         return factory.getBeanDefinition();
     }
 }

sharding-jdbc/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/shardingjdbc/orchestration/internal/datasource/OrchestrationMasterSlaveDataSource.java

@@ -18,6 +18,7 @@
 package io.shardingsphere.shardingjdbc.orchestration.internal.datasource;
 
 import com.google.common.base.Preconditions;
+import com.google.common.base.Strings;
 import com.google.common.eventbus.Subscribe;
 import io.shardingsphere.api.ConfigMapContext;
 import io.shardingsphere.api.config.MasterSlaveRuleConfiguration;
@@ -55,7 +56,7 @@ public OrchestrationMasterSlaveDataSource(final OrchestrationConfiguration orche
         super(new OrchestrationFacade(orchestrationConfig));
         ConfigurationService configService = getOrchestrationFacade().getConfigService();
         MasterSlaveRuleConfiguration masterSlaveRuleConfig = configService.loadMasterSlaveRuleConfiguration();
-        Preconditions.checkNotNull(masterSlaveRuleConfig, "Missing the master-slave rule configuration on register center");
+        Preconditions.checkState(null != masterSlaveRuleConfig && !Strings.isNullOrEmpty(masterSlaveRuleConfig.getMasterDataSourceName()), "No available master slave rule configuration to load.");
         dataSource = new MasterSlaveDataSource(
                 configService.loadDataSourceMap(), masterSlaveRuleConfig, configService.loadMasterSlaveConfigMap(), configService.loadMasterSlaveProperties());
         initOrchestrationFacade(dataSource);

sharding-jdbc/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/shardingjdbc/orchestration/internal/datasource/OrchestrationShardingDataSource.java

@@ -55,7 +55,7 @@ public OrchestrationShardingDataSource(final OrchestrationConfiguration orchestr
         super(new OrchestrationFacade(orchestrationConfig));
         ConfigurationService configService = getOrchestrationFacade().getConfigService();
         ShardingRuleConfiguration shardingRuleConfig = configService.loadShardingRuleConfiguration();
-        Preconditions.checkNotNull(shardingRuleConfig, "Missing the sharding rule configuration on register center");
+        Preconditions.checkState(null != shardingRuleConfig && !shardingRuleConfig.getTableRuleConfigs().isEmpty(), "Missing the sharding rule configuration on register center");
         dataSource = new ShardingDataSource(configService.loadDataSourceMap(),
                 new ShardingRule(shardingRuleConfig, configService.loadDataSourceMap().keySet()), configService.loadShardingConfigMap(), configService.loadShardingProperties());
         initOrchestrationFacade(dataSource);

sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/config/OrchestrationConfiguration.java

@@ -25,6 +25,7 @@
  * Orchestration configuration.
  *
  * @author zhangliang
+ * @author panjuan
  */
 @RequiredArgsConstructor
 @Getter
@@ -35,6 +36,4 @@ public final class OrchestrationConfiguration {
     private final RegistryCenterConfiguration regCenterConfig;
 
     private final boolean overwrite;
-
-    private final OrchestrationType type;
 }

sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/config/ConfigurationService.java

@@ -259,13 +259,11 @@ public Map<String, Map<String, DataSourceParameter>> loadProxyDataSources() {
      */
     public ShardingRuleConfiguration loadShardingRuleConfiguration() {
         try {
-            ShardingRuleConfiguration result = ShardingConfigurationConverter.shardingRuleConfigFromYaml(regCenter.getDirectly(configNode.getFullPath(ConfigurationNode.SHARDING_RULE_NODE_PATH)));
-            Preconditions.checkState(null != result && !result.getTableRuleConfigs().isEmpty(), "No available sharding rule configuration to load.");
-            return result;
+            return ShardingConfigurationConverter.shardingRuleConfigFromYaml(regCenter.getDirectly(configNode.getFullPath(ConfigurationNode.SHARDING_RULE_NODE_PATH)));
             // CHECKSTYLE:OFF
         } catch (final Exception ex) {
             // CHECKSTYLE:ON
-            throw new ShardingConfigurationException("No available sharding rule configuration to load.");
+            return new ShardingRuleConfiguration();
         }
     }
 
@@ -297,14 +295,12 @@ public Properties loadShardingProperties() {
      */
     public MasterSlaveRuleConfiguration loadMasterSlaveRuleConfiguration() {
         try {
-            MasterSlaveRuleConfiguration result = MasterSlaveConfigurationConverter.masterSlaveRuleConfigFromYaml(
+            return MasterSlaveConfigurationConverter.masterSlaveRuleConfigFromYaml(
                     regCenter.getDirectly(configNode.getFullPath(ConfigurationNode.MASTER_SLAVE_RULE_NODE_PATH)));
-            Preconditions.checkState(null != result && !Strings.isNullOrEmpty(result.getMasterDataSourceName()), "No available master slave rule configuration to load.");
-            return result;
             // CHECKSTYLE:OFF
         } catch (final Exception ex) {
             // CHECKSTYLE:ON
-            throw new ShardingConfigurationException("No available master slave rule configuration to load.");
+            return new MasterSlaveRuleConfiguration();
         }
     }
 

sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/state/datasource/DataSourceService.java

@@ -17,6 +17,8 @@
 
 package io.shardingsphere.orchestration.internal.state.datasource;
 
+import com.google.common.base.Preconditions;
+import com.google.common.base.Strings;
 import io.shardingsphere.api.config.MasterSlaveRuleConfiguration;
 import io.shardingsphere.api.config.ShardingRuleConfiguration;
 import io.shardingsphere.core.rule.DataSourceParameter;
@@ -100,6 +102,7 @@ public Map<String, Map<String, DataSourceParameter>> getProxyAvailableDataSource
      */
     public ShardingRuleConfiguration getAvailableShardingRuleConfiguration() {
         ShardingRuleConfiguration result = configService.loadShardingRuleConfiguration();
+        Preconditions.checkState(null != result && !result.getTableRuleConfigs().isEmpty(), "Missing the sharding rule configuration on register center");
         Collection<String> disabledDataSourceNames = getDisabledDataSourceNames();
         for (String each : disabledDataSourceNames) {
             for (MasterSlaveRuleConfiguration masterSlaveRuleConfig : result.getMasterSlaveRuleConfigs()) {
@@ -116,6 +119,7 @@ public ShardingRuleConfiguration getAvailableShardingRuleConfiguration() {
      */
     public MasterSlaveRuleConfiguration getAvailableMasterSlaveRuleConfiguration() {
         MasterSlaveRuleConfiguration result = configService.loadMasterSlaveRuleConfiguration();
+        Preconditions.checkState(null != result && !Strings.isNullOrEmpty(result.getMasterDataSourceName()), "No available master slave rule configuration to load.");
         Collection<String> disabledDataSourceNames = getDisabledDataSourceNames();
         for (String each : disabledDataSourceNames) {
             result.getSlaveDataSourceNames().remove(each);

sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/yaml/YamlOrchestrationConfiguration.java

@@ -19,7 +19,6 @@
 
 import com.google.common.base.Preconditions;
 import io.shardingsphere.orchestration.config.OrchestrationConfiguration;
-import io.shardingsphere.orchestration.config.OrchestrationType;
 import io.shardingsphere.orchestration.reg.etcd.EtcdConfiguration;
 import io.shardingsphere.orchestration.reg.zookeeper.ZookeeperConfiguration;
 import lombok.Getter;
@@ -29,6 +28,7 @@
  * Orchestration configuration for yaml.
  *
  * @author caohao
+ * @author panjuan
  */
 @Getter
 @Setter
@@ -42,15 +42,13 @@ public class YamlOrchestrationConfiguration {
 
     private boolean overwrite;
 
-    private OrchestrationType type;
-
     /**
      * Get orchestration master-slave rule configuration from yaml.
      *
      * @return orchestration master-slave rule configuration from yaml
      */
     public OrchestrationConfiguration getOrchestrationConfiguration() {
         Preconditions.checkState(null == etcd || null == zookeeper, "Can't config both zookeeper and etcd as registry center!");
-        return new OrchestrationConfiguration(getName(), null != etcd ? etcd : zookeeper, overwrite, type);
+        return new OrchestrationConfiguration(getName(), null != etcd ? etcd : zookeeper, overwrite);
     }
 }