From a14fa812c9009c4248eef65de9378e8edafa86c3 Mon Sep 17 00:00:00 2001
From: komawei <komawei@126.com>
Date: Mon, 22 Jul 2019 15:13:17 +0800
Subject: [PATCH] fix class constructor & method signature bugs 1.
 KeyGeneratorConfiguration constructor 2. TableRuleConfiguration constructor
 3. ShardingDataSourceFactory.createDataSource parameter missing.

---
 .../configuration/config-java.cn.md           | 28 ++++++-------------
 .../configuration/config-java.en.md           | 28 ++++++-------------
 2 files changed, 18 insertions(+), 38 deletions(-)

diff --git a/document/current/content/manual/sharding-jdbc/configuration/config-java.cn.md b/document/current/content/manual/sharding-jdbc/configuration/config-java.cn.md
index 1e59db93c9..e2aea79cff 100644
--- a/document/current/content/manual/sharding-jdbc/configuration/config-java.cn.md
+++ b/document/current/content/manual/sharding-jdbc/configuration/config-java.cn.md
@@ -17,27 +17,22 @@ weight = 1
          shardingRuleConfig.getBroadcastTables().add("t_config");
          shardingRuleConfig.setDefaultDatabaseShardingStrategyConfig(new InlineShardingStrategyConfiguration("user_id", "ds${user_id % 2}"));
          shardingRuleConfig.setDefaultTableShardingStrategyConfig(new StandardShardingStrategyConfiguration("order_id", new ModuloShardingTableAlgorithm()));
-         return ShardingDataSourceFactory.createDataSource(createDataSourceMap(), shardingRuleConfig);
+         return ShardingDataSourceFactory.createDataSource(createDataSourceMap(), shardingRuleConfig, new Properties());
      }
      
      private static KeyGeneratorConfiguration getKeyGeneratorConfiguration() {
-             KeyGeneratorConfiguration result = new KeyGeneratorConfiguration();
-             result.setColumn("order_id");
-             return result;
+         KeyGeneratorConfiguration result = new KeyGeneratorConfiguration("SNOWFLAKE", "order_id");
+         return result;
      }
      
      TableRuleConfiguration getOrderTableRuleConfiguration() {
-         TableRuleConfiguration result = new TableRuleConfiguration();
-         result.setLogicTable("t_order");
-         result.setActualDataNodes("ds${0..1}.t_order${0..1}");
+         TableRuleConfiguration result = new TableRuleConfiguration("t_order", "ds${0..1}.t_order${0..1}");
          result.setKeyGeneratorConfig(getKeyGeneratorConfiguration());
          return result;
      }
      
      TableRuleConfiguration getOrderItemTableRuleConfiguration() {
-         TableRuleConfiguration result = new TableRuleConfiguration();
-         result.setLogicTable("t_order_item");
-         result.setActualDataNodes("ds${0..1}.t_order_item${0..1}");
+         TableRuleConfiguration result = new TableRuleConfiguration("t_order_item", "ds${0..1}.t_order_item${0..1}");
          return result;
      }
      
@@ -101,23 +96,18 @@ weight = 1
     }
     
     private static KeyGeneratorConfiguration getKeyGeneratorConfiguration() {
-                 KeyGeneratorConfiguration result = new KeyGeneratorConfiguration();
-                 result.setColumn("order_id");
-                 return result;
+        KeyGeneratorConfiguration result = new KeyGeneratorConfiguration("SNOWFLAKE", "order_id");
+        return result;
     }
     
     TableRuleConfiguration getOrderTableRuleConfiguration() {
-        TableRuleConfiguration result = new TableRuleConfiguration();
-        result.setLogicTable("t_order");
-        result.setActualDataNodes("ds_${0..1}.t_order_${[0, 1]}");
+        TableRuleConfiguration result = new TableRuleConfiguration("t_order", "ds_${0..1}.t_order_${[0, 1]}");
         result.setKeyGeneratorConfig(getKeyGeneratorConfiguration());
         return result;
     }
     
     TableRuleConfiguration getOrderItemTableRuleConfiguration() {
-        TableRuleConfiguration result = new TableRuleConfiguration();
-        result.setLogicTable("t_order_item");
-        result.setActualDataNodes("ds_${0..1}.t_order_item_${[0, 1]}");
+        TableRuleConfiguration result = new TableRuleConfiguration("t_order_item", "ds_${0..1}.t_order_item_${[0, 1]}");
         return result;
     }
     
diff --git a/document/current/content/manual/sharding-jdbc/configuration/config-java.en.md b/document/current/content/manual/sharding-jdbc/configuration/config-java.en.md
index fa745ccb23..68ff4c4a80 100644
--- a/document/current/content/manual/sharding-jdbc/configuration/config-java.en.md
+++ b/document/current/content/manual/sharding-jdbc/configuration/config-java.en.md
@@ -17,27 +17,22 @@ weight = 1
          shardingRuleConfig.getBroadcastTables().add("t_config");
          shardingRuleConfig.setDefaultDatabaseShardingStrategyConfig(new InlineShardingStrategyConfiguration("user_id", "ds${user_id % 2}"));
          shardingRuleConfig.setDefaultTableShardingStrategyConfig(new StandardShardingStrategyConfiguration("order_id", new ModuloShardingTableAlgorithm()));
-         return ShardingDataSourceFactory.createDataSource(createDataSourceMap(), shardingRuleConfig);
+         return ShardingDataSourceFactory.createDataSource(createDataSourceMap(), shardingRuleConfig, new Properties());
      }
      
      private static KeyGeneratorConfiguration getKeyGeneratorConfiguration() {
-                  KeyGeneratorConfiguration result = new KeyGeneratorConfiguration();
-                  result.setColumn("order_id");
-                  return result;
+         KeyGeneratorConfiguration result = new KeyGeneratorConfiguration("SNOWFLAKE", "order_id");
+         return result;
      }
      
      TableRuleConfiguration getOrderTableRuleConfiguration() {
-         TableRuleConfiguration result = new TableRuleConfiguration();
-         result.setLogicTable("t_order");
-         result.setActualDataNodes("ds${0..1}.t_order${0..1}");
+         TableRuleConfiguration result = new TableRuleConfiguration("t_order", "ds${0..1}.t_order${0..1}");
          result.setKeyGeneratorConfig(getKeyGeneratorConfiguration());
          return result;
      }
      
      TableRuleConfiguration getOrderItemTableRuleConfiguration() {
-         TableRuleConfiguration result = new TableRuleConfiguration();
-         result.setLogicTable("t_order_item");
-         result.setActualDataNodes("ds${0..1}.t_order_item${0..1}");
+         TableRuleConfiguration result = new TableRuleConfiguration("t_order_item", "ds${0..1}.t_order_item${0..1}");
          return result;
      }
      
@@ -101,23 +96,18 @@ weight = 1
     }
     
     private static KeyGeneratorConfiguration getKeyGeneratorConfiguration() {
-                 KeyGeneratorConfiguration result = new KeyGeneratorConfiguration();
-                 result.setColumn("order_id");
-                 return result;
+        KeyGeneratorConfiguration result = new KeyGeneratorConfiguration("SNOWFLAKE", "order_id");
+        return result;
     }
     
     TableRuleConfiguration getOrderTableRuleConfiguration() {
-        TableRuleConfiguration result = new TableRuleConfiguration();
-        result.setLogicTable("t_order");
-        result.setActualDataNodes("ds_${0..1}.t_order_${[0, 1]}");
+        TableRuleConfiguration result = new TableRuleConfiguration("t_order", "ds_${0..1}.t_order_${[0, 1]}");
         result.setKeyGeneratorConfig(getKeyGeneratorConfiguration());
         return result;
     }
     
     TableRuleConfiguration getOrderItemTableRuleConfiguration() {
-        TableRuleConfiguration result = new TableRuleConfiguration();
-        result.setLogicTable("t_order_item");
-        result.setActualDataNodes("ds_${0..1}.t_order_item_${[0, 1]}");
+        TableRuleConfiguration result = new TableRuleConfiguration("t_order_item", "ds_${0..1}.t_order_item_${[0, 1]}");
         return result;
     }
     
-- 
GitLab