Add configuration map support 8th.

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

@@ -67,9 +67,9 @@ public class OrchestrationSpringBootConfiguration implements EnvironmentAware {
     public DataSource dataSource() throws SQLException {
         return null == masterSlaveProperties.getMasterDataSourceName() 
                 ? OrchestrationShardingDataSourceFactory.createDataSource(dataSourceMap, 
-                        shardingProperties.getShardingRuleConfiguration(), orchestrationProperties.getOrchestrationConfiguration(), shardingProperties.getData(), shardingProperties.getProps())
+                        shardingProperties.getShardingRuleConfiguration(), orchestrationProperties.getOrchestrationConfiguration(), shardingProperties.getConfigMap(), shardingProperties.getProps())
                 : OrchestrationMasterSlaveDataSourceFactory.createDataSource(dataSourceMap, 
-                        masterSlaveProperties.getMasterSlaveRuleConfiguration(), orchestrationProperties.getOrchestrationConfiguration(), masterSlaveProperties.getData());
+                        masterSlaveProperties.getMasterSlaveRuleConfiguration(), orchestrationProperties.getOrchestrationConfiguration(), masterSlaveProperties.getConfigMap());
     }
     
     @Override

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

@@ -30,4 +30,4 @@ sharding.jdbc.config.orchestration.overwrite=true
 sharding.jdbc.config.orchestration.registryCenter.namespace=orchestration-spring-boot-master-slave-test
 sharding.jdbc.config.orchestration.registryCenter.server-lists=localhost:3181
 
-sharding.jdbc.config.masterslave.data.key1=value1
+sharding.jdbc.config.masterslave.config-map.key1=value1

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

@@ -40,4 +40,4 @@ sharding.jdbc.config.orchestration.overwrite=true
 sharding.jdbc.config.orchestration.registryCenter.namespace=orchestration-spring-boot-sharding-test
 sharding.jdbc.config.orchestration.registryCenter.server-lists=localhost:3181
 
-sharding.jdbc.config.sharding.data.key1=value1
+sharding.jdbc.config.sharding.config-map.key1=value1

sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingjdbc/orchestration/spring/namespace/constants/ShardingDataSourceBeanDefinitionParserTag.java

@@ -32,7 +32,7 @@ public final class ShardingDataSourceBeanDefinitionParserTag {
     
     public static final String SHARDING_RULE_CONFIG_TAG = "sharding-rule";
     
-    public static final String DATA_TAG = "data";
+    public static final String CONFIG_MAP_TAG = "config-map";
     
     public static final String PROPS_TAG = "props";
     

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

@@ -147,7 +147,7 @@ public class OrchestrationMasterSlaveDataSourceBeanDefinitionParser extends Abst
     }
     
     private Map parseConfigMap(final Element element, final ParserContext parserContext, final BeanDefinition beanDefinition) {
-        Element dataElement = DomUtils.getChildElementByTagName(element, ShardingDataSourceBeanDefinitionParserTag.DATA_TAG);
+        Element dataElement = DomUtils.getChildElementByTagName(element, ShardingDataSourceBeanDefinitionParserTag.CONFIG_MAP_TAG);
         return null == dataElement ? Collections.<String, Class<?>>emptyMap() : parserContext.getDelegate().parseMapElement(dataElement, beanDefinition);
     }
 }

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

@@ -163,7 +163,7 @@ public class OrchestrationShardingDataSourceBeanDefinitionParser extends Abstrac
     }
     
     private Map parseConfigMap(final Element element, final ParserContext parserContext, final BeanDefinition beanDefinition) {
-        Element dataElement = DomUtils.getChildElementByTagName(element, ShardingDataSourceBeanDefinitionParserTag.DATA_TAG);
+        Element dataElement = DomUtils.getChildElementByTagName(element, ShardingDataSourceBeanDefinitionParserTag.CONFIG_MAP_TAG);
         return null == dataElement ? Collections.<String, Class<?>>emptyMap() : parserContext.getDelegate().parseMapElement(dataElement, beanDefinition);
     }
     

sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/resources/META-INF/namespace/master-slave.xsd

@@ -9,7 +9,7 @@
     <xsd:element name="data-source">
         <xsd:complexType>
             <xsd:all>
-                <xsd:element ref="data" minOccurs="0" maxOccurs="1" />
+                <xsd:element ref="config-map" minOccurs="0" maxOccurs="1" />
             </xsd:all>
             <xsd:attribute name="id" type="xsd:string" use="required" />
             <xsd:attribute name="master-data-source-name" type="xsd:string" use="required" />
@@ -19,7 +19,7 @@
             <xsd:attribute name="strategy-type" type="xsd:string" use="optional" />
         </xsd:complexType>
     </xsd:element>
-    <xsd:element name="data">
+    <xsd:element name="config-map">
         <xsd:complexType>
             <xsd:complexContent>
                 <xsd:extension base="beans:mapType" />

sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/resources/META-INF/namespace/sharding.xsd

@@ -10,7 +10,7 @@
         <xsd:complexType>
             <xsd:all>
                 <xsd:element ref="sharding-rule" minOccurs="1" maxOccurs="1" />
-                <xsd:element ref="data" minOccurs="0" maxOccurs="1" />
+                <xsd:element ref="config-map" minOccurs="0" maxOccurs="1" />
                 <xsd:element ref="props" minOccurs="0" maxOccurs="1" />
             </xsd:all>
             <xsd:attribute name="id" type="xsd:string" use="required" />
@@ -93,7 +93,7 @@
             <xsd:attribute name="id" type="xsd:string" use="required" />
         </xsd:complexType>
     </xsd:element>
-    <xsd:element name="data">
+    <xsd:element name="config-map">
         <xsd:complexType>
             <xsd:complexContent>
                 <xsd:extension base="beans:mapType" />

sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/resources/META-INF/rdb/masterSlaveNamespace.xml

@@ -21,8 +21,8 @@
     <master-slave:data-source id="refMasterSlaveDataSource" master-data-source-name="dbtbl_1_master" slave-data-source-names="dbtbl_1_slave_0, dbtbl_1_slave_1" strategy-ref="randomStrategy" registry-center-ref="regCenter" />
     
     <master-slave:data-source id="configMapDataSource" master-data-source-name="dbtbl_1_master" slave-data-source-names="dbtbl_1_slave_0, dbtbl_1_slave_1" strategy-ref="randomStrategy" registry-center-ref="regCenter">
-        <master-slave:data>
+        <master-slave:config-map>
             <entry key="key1" value="value1" />
-        </master-slave:data>
+        </master-slave:config-map>
     </master-slave:data-source>
 </beans>

sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/resources/META-INF/rdb/shardingNamespace.xml

@@ -97,9 +97,9 @@
                 <sharding:table-rule logic-table="t_order" />
             </sharding:table-rules>
         </sharding:sharding-rule>
-        <sharding:data>
+        <sharding:config-map>
             <entry key="key1" value="value1" />
-        </sharding:data>
+        </sharding:config-map>
         <sharding:props>
             <prop key="sql.show">${sql_show}</prop>
             <prop key="executor.size">10</prop>

sharding-jdbc-orchestration/src/main/java/io/shardingjdbc/orchestration/api/OrchestrationMasterSlaveDataSourceFactory.java

@@ -78,7 +78,7 @@ public final class OrchestrationMasterSlaveDataSourceFactory {
     public static DataSource createDataSource(final File yamlFile) throws SQLException, IOException {
         YamlOrchestrationMasterSlaveRuleConfiguration config = unmarshal(yamlFile);
         return createDataSource(config.getDataSources(), config.getMasterSlaveRule().getMasterSlaveRuleConfiguration(), 
-                config.getOrchestration().getOrchestrationConfiguration(), config.getMasterSlaveRule().getData());
+                config.getOrchestration().getOrchestrationConfiguration(), config.getMasterSlaveRule().getConfigMap());
     }
     
     /**
@@ -95,7 +95,7 @@ public final class OrchestrationMasterSlaveDataSourceFactory {
     public static DataSource createDataSource(final Map<String, DataSource> dataSourceMap, final File yamlFile) throws SQLException, IOException {
         YamlOrchestrationMasterSlaveRuleConfiguration config = unmarshal(yamlFile);
         return createDataSource(dataSourceMap, config.getMasterSlaveRule().getMasterSlaveRuleConfiguration(), 
-                config.getOrchestration().getOrchestrationConfiguration(), config.getMasterSlaveRule().getData());
+                config.getOrchestration().getOrchestrationConfiguration(), config.getMasterSlaveRule().getConfigMap());
     }
     
     /**
@@ -111,7 +111,7 @@ public final class OrchestrationMasterSlaveDataSourceFactory {
     public static DataSource createDataSource(final byte[] yamlByteArray) throws SQLException, IOException {
         YamlOrchestrationMasterSlaveRuleConfiguration config = unmarshal(yamlByteArray);
         return createDataSource(config.getDataSources(), config.getMasterSlaveRule().getMasterSlaveRuleConfiguration(), 
-                config.getOrchestration().getOrchestrationConfiguration(), config.getMasterSlaveRule().getData());
+                config.getOrchestration().getOrchestrationConfiguration(), config.getMasterSlaveRule().getConfigMap());
     }
     
     /**
@@ -128,7 +128,7 @@ public final class OrchestrationMasterSlaveDataSourceFactory {
     public static DataSource createDataSource(final Map<String, DataSource> dataSourceMap, final byte[] yamlByteArray) throws SQLException, IOException {
         YamlOrchestrationMasterSlaveRuleConfiguration config = unmarshal(yamlByteArray);
         return createDataSource(dataSourceMap, config.getMasterSlaveRule().getMasterSlaveRuleConfiguration(), 
-                config.getOrchestration().getOrchestrationConfiguration(), config.getMasterSlaveRule().getData());
+                config.getOrchestration().getOrchestrationConfiguration(), config.getMasterSlaveRule().getConfigMap());
     }
     
     private static YamlOrchestrationMasterSlaveRuleConfiguration unmarshal(final File yamlFile) throws IOException {

sharding-jdbc-orchestration/src/main/java/io/shardingjdbc/orchestration/api/OrchestrationShardingDataSourceFactory.java

@@ -80,7 +80,7 @@ public final class OrchestrationShardingDataSourceFactory {
         YamlOrchestrationShardingRuleConfiguration config = unmarshal(yamlFile);
         YamlShardingRuleConfiguration shardingRuleConfig = config.getShardingRule();
         return createDataSource(config.getDataSources(), shardingRuleConfig.getShardingRuleConfiguration(), config.getOrchestration().getOrchestrationConfiguration(), 
-                shardingRuleConfig.getData(), shardingRuleConfig.getProps());
+                shardingRuleConfig.getConfigMap(), shardingRuleConfig.getProps());
     }
     
     /**
@@ -96,7 +96,7 @@ public final class OrchestrationShardingDataSourceFactory {
         YamlOrchestrationShardingRuleConfiguration config = unmarshal(yamlFile);
         YamlShardingRuleConfiguration shardingRuleConfig = config.getShardingRule();
         return createDataSource(dataSourceMap, shardingRuleConfig.getShardingRuleConfiguration(), config.getOrchestration().getOrchestrationConfiguration(), 
-                shardingRuleConfig.getData(), shardingRuleConfig.getProps());
+                shardingRuleConfig.getConfigMap(), shardingRuleConfig.getProps());
     }
     
     /**
@@ -111,7 +111,7 @@ public final class OrchestrationShardingDataSourceFactory {
         YamlOrchestrationShardingRuleConfiguration config = unmarshal(yamlByteArray);
         YamlShardingRuleConfiguration shardingRuleConfig = config.getShardingRule();
         return createDataSource(config.getDataSources(), shardingRuleConfig.getShardingRuleConfiguration(), config.getOrchestration().getOrchestrationConfiguration(), 
-                shardingRuleConfig.getData(), shardingRuleConfig.getProps());
+                shardingRuleConfig.getConfigMap(), shardingRuleConfig.getProps());
     }
     
     /**
@@ -127,7 +127,7 @@ public final class OrchestrationShardingDataSourceFactory {
         YamlOrchestrationShardingRuleConfiguration config = unmarshal(yamlByteArray);
         YamlShardingRuleConfiguration shardingRuleConfig = config.getShardingRule();
         return createDataSource(dataSourceMap, shardingRuleConfig.getShardingRuleConfiguration(), config.getOrchestration().getOrchestrationConfiguration(), 
-                shardingRuleConfig.getData(), shardingRuleConfig.getProps());
+                shardingRuleConfig.getConfigMap(), shardingRuleConfig.getProps());
     }
     
     private static YamlOrchestrationShardingRuleConfiguration unmarshal(final File yamlFile) throws IOException {

sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/main/java/io/shardingjdbc/spring/boot/SpringBootConfiguration.java

@@ -45,8 +45,8 @@ public class SpringBootConfiguration implements EnvironmentAware {
     @Bean
     public DataSource dataSource() throws SQLException {
         return null == masterSlaveProperties.getMasterDataSourceName() 
-                ? ShardingDataSourceFactory.createDataSource(dataSourceMap, shardingProperties.getShardingRuleConfiguration(), shardingProperties.getData(), props)
-                : MasterSlaveDataSourceFactory.createDataSource(dataSourceMap, masterSlaveProperties.getMasterSlaveRuleConfiguration(), masterSlaveProperties.getData());
+                ? ShardingDataSourceFactory.createDataSource(dataSourceMap, shardingProperties.getShardingRuleConfiguration(), shardingProperties.getConfigMap(), props)
+                : MasterSlaveDataSourceFactory.createDataSource(dataSourceMap, masterSlaveProperties.getMasterSlaveRuleConfiguration(), masterSlaveProperties.getConfigMap());
     }
     
     @Override

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

@@ -25,4 +25,4 @@ sharding.jdbc.config.masterslave.name=ds_ms
 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.masterslave.data.key1=value1
+sharding.jdbc.config.masterslave.config-map.key1=value1

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

@@ -35,4 +35,4 @@ sharding.jdbc.config.sharding.tables.t_order_item.key-generator-column-name=orde
 sharding.jdbc.config.sharding.props.sql.show=true
 sharding.jdbc.config.sharding.props.executor.size=100
 
-sharding.jdbc.config.sharding.data.key1=value1
+sharding.jdbc.config.sharding.config-map.key1=value1

sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingjdbc/spring/namespace/constants/ShardingDataSourceBeanDefinitionParserTag.java

@@ -32,7 +32,7 @@ public final class ShardingDataSourceBeanDefinitionParserTag {
     
     public static final String SHARDING_RULE_CONFIG_TAG = "sharding-rule";
     
-    public static final String DATA_TAG = "data";
+    public static final String CONFIG_MAP_TAG = "config-map";
     
     public static final String PROPS_TAG = "props";
     

sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingjdbc/spring/namespace/parser/MasterSlaveDataSourceBeanDefinitionParser.java

@@ -90,7 +90,7 @@ public class MasterSlaveDataSourceBeanDefinitionParser extends AbstractBeanDefin
     }
     
     private Map parseConfigMap(final Element element, final ParserContext parserContext, final BeanDefinition beanDefinition) {
-        Element dataElement = DomUtils.getChildElementByTagName(element, ShardingDataSourceBeanDefinitionParserTag.DATA_TAG);
+        Element dataElement = DomUtils.getChildElementByTagName(element, ShardingDataSourceBeanDefinitionParserTag.CONFIG_MAP_TAG);
         return null == dataElement ? Collections.<String, Class<?>>emptyMap() : parserContext.getDelegate().parseMapElement(dataElement, beanDefinition);
     }
 }

sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingjdbc/spring/namespace/parser/ShardingDataSourceBeanDefinitionParser.java

@@ -159,7 +159,7 @@ public class ShardingDataSourceBeanDefinitionParser extends AbstractBeanDefiniti
     }
     
     private Map parseConfigMap(final Element element, final ParserContext parserContext, final BeanDefinition beanDefinition) {
-        Element dataElement = DomUtils.getChildElementByTagName(element, ShardingDataSourceBeanDefinitionParserTag.DATA_TAG);
+        Element dataElement = DomUtils.getChildElementByTagName(element, ShardingDataSourceBeanDefinitionParserTag.CONFIG_MAP_TAG);
         return null == dataElement ? Collections.<String, Class<?>>emptyMap() : parserContext.getDelegate().parseMapElement(dataElement, beanDefinition);
     }
     

sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/resources/META-INF/namespace/master-slave.xsd

@@ -9,7 +9,7 @@
     <xsd:element name="data-source">
         <xsd:complexType>
             <xsd:all>
-                <xsd:element ref="data" minOccurs="0" maxOccurs="1" />
+                <xsd:element ref="config-map" minOccurs="0" maxOccurs="1" />
             </xsd:all>
             <xsd:attribute name="id" type="xsd:string" use="required" />
             <xsd:attribute name="master-data-source-name" type="xsd:string" use="required" />
@@ -18,7 +18,7 @@
             <xsd:attribute name="strategy-type" type="xsd:string" use="optional" />
         </xsd:complexType>
     </xsd:element>
-    <xsd:element name="data">
+    <xsd:element name="config-map">
         <xsd:complexType>
             <xsd:complexContent>
                 <xsd:extension base="beans:mapType" />

sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/resources/META-INF/namespace/sharding.xsd

@@ -10,7 +10,7 @@
         <xsd:complexType>
             <xsd:all>
                 <xsd:element ref="sharding-rule" minOccurs="1" maxOccurs="1" />
-                <xsd:element ref="data" minOccurs="0" maxOccurs="1" />
+                <xsd:element ref="config-map" minOccurs="0" maxOccurs="1" />
                 <xsd:element ref="props" minOccurs="0" maxOccurs="1" />
             </xsd:all>
             <xsd:attribute name="id" type="xsd:string" use="required" />
@@ -91,7 +91,7 @@
             <xsd:attribute name="id" type="xsd:string" use="required" />
         </xsd:complexType>
     </xsd:element>
-    <xsd:element name="data">
+    <xsd:element name="config-map">
         <xsd:complexType>
             <xsd:complexContent>
                 <xsd:extension base="beans:mapType" />

sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/resources/META-INF/rdb/masterSlaveNamespace.xml

@@ -23,9 +23,9 @@
     <master-slave:data-source id="refMasterSlaveDataSource" master-data-source-name="dbtbl_1_master" slave-data-source-names="dbtbl_1_slave_0, dbtbl_1_slave_1" strategy-ref="randomStrategy" />
     
     <master-slave:data-source id="configMapDataSource" master-data-source-name="dbtbl_1_master" slave-data-source-names="dbtbl_1_slave_0, dbtbl_1_slave_1" strategy-ref="randomStrategy">
-        <master-slave:data>
+        <master-slave:config-map>
             <entry key="key1" value="value1" />
-        </master-slave:data>
+        </master-slave:config-map>
     </master-slave:data-source>
     
     <sharding:data-source id="defaultShardingDataSource">

sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/resources/META-INF/rdb/shardingNamespace.xml

@@ -96,9 +96,9 @@
                 <sharding:table-rule logic-table="t_order" />
             </sharding:table-rules>
         </sharding:sharding-rule>
-        <sharding:data>
+        <sharding:config-map>
             <entry key="key1" value="value1" />
-        </sharding:data>
+        </sharding:config-map>
         <sharding:props>
             <prop key="sql.show">${sql_show}</prop>
             <prop key="executor.size">10</prop>