Refactor sharding-jdbc-spring examples 6th.

pom.xml

@@ -6,10 +6,10 @@
     <packaging>pom</packaging>
     
     <modules>
-        <module>sharding-jdbc-example-jdbc-transaction</module>
         <module>sharding-jdbc-raw-jdbc-example</module>
         <module>sharding-jdbc-spring-namespace-example</module>
-        <module>sharding-jdbc-example-orchestration</module>
+        <module>sharding-jdbc-orchestration-example</module>
+        <module>sharding-jdbc-transaction-example</module>
     </modules>
     
     <properties>

sharding-jdbc-example-orchestration/pom.xml → sharding-jdbc-orchestration-example/pom.xml

@@ -6,5 +6,5 @@
         <version>2.0.0.M1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>sharding-jdbc-example-orchestration</artifactId>
+    <artifactId>sharding-jdbc-orchestration-example</artifactId>
 </project>

sharding-jdbc-example-orchestration/src/main/java/io/shardingjdbc/example/orchestration/Main.java → sharding-jdbc-orchestration-example/src/main/java/io/shardingjdbc/example/orchestration/Main.java

@@ -93,14 +93,8 @@ public final class Main {
         orderItemTableRuleConfig.setActualTables("t_order_item_${[0, 1]}");
         result.getTableRuleConfigs().add(orderItemTableRuleConfig);
         result.getBindingTableGroups().add("t_order, t_order_item");
-        InlineShardingStrategyConfiguration databaseShardingStrategyConfig = new InlineShardingStrategyConfiguration();
-        databaseShardingStrategyConfig.setShardingColumn("user_id");
-        databaseShardingStrategyConfig.setAlgorithmInlineExpression("ds_jdbc_${user_id % 2}");
-        result.setDefaultDatabaseShardingStrategyConfig(databaseShardingStrategyConfig);
-        StandardShardingStrategyConfiguration tableShardingStrategyConfig = new StandardShardingStrategyConfiguration();
-        tableShardingStrategyConfig.setShardingColumn("order_id");
-        tableShardingStrategyConfig.setPreciseAlgorithmClassName(ModuloTableShardingAlgorithm.class.getName());
-        result.setDefaultTableShardingStrategyConfig(tableShardingStrategyConfig);
+        result.setDefaultDatabaseShardingStrategyConfig(new InlineShardingStrategyConfiguration("user_id", "ds_jdbc_${user_id % 2}"));
+        result.setDefaultTableShardingStrategyConfig(new StandardShardingStrategyConfiguration("order_id", ModuloTableShardingAlgorithm.class.getName()));
         return result;
     }
     

sharding-jdbc-example-jdbc-transaction/pom.xml → sharding-jdbc-transaction-example/pom.xml

@@ -5,5 +5,5 @@
         <artifactId>sharding-jdbc-example</artifactId>
         <version>2.0.0.M1-SNAPSHOT</version>
     </parent>
-    <artifactId>sharding-jdbc-example-jdbc-transaction</artifactId>
+    <artifactId>sharding-jdbc-transaction-example</artifactId>
 </project>

sharding-jdbc-example-jdbc-transaction/src/main/java/io/shardingjdbc/example/transaction/Main.java → sharding-jdbc-transaction-example/src/main/java/io/shardingjdbc/example/transaction/Main.java

@@ -88,16 +88,8 @@ public final class Main {
         
         shardingRuleConfig.getBindingTableGroups().add("t_order, t_order_item");
         
-        StandardShardingStrategyConfiguration databaseShardingStrategyConfig = new StandardShardingStrategyConfiguration();
-        databaseShardingStrategyConfig.setShardingColumn("user_id");
-        databaseShardingStrategyConfig.setPreciseAlgorithmClassName(ModuloShardingAlgorithm.class.getName());
-        shardingRuleConfig.setDefaultDatabaseShardingStrategyConfig(databaseShardingStrategyConfig);
-        
-        StandardShardingStrategyConfiguration tableShardingStrategyConfig = new StandardShardingStrategyConfiguration();
-        tableShardingStrategyConfig.setShardingColumn("order_id");
-        tableShardingStrategyConfig.setPreciseAlgorithmClassName(ModuloShardingAlgorithm.class.getName());
-        shardingRuleConfig.setDefaultTableShardingStrategyConfig(tableShardingStrategyConfig);
-        
+        shardingRuleConfig.setDefaultDatabaseShardingStrategyConfig(new StandardShardingStrategyConfiguration("user_id", ModuloShardingAlgorithm.class.getName()));
+        shardingRuleConfig.setDefaultTableShardingStrategyConfig(new StandardShardingStrategyConfiguration("order_id", ModuloShardingAlgorithm.class.getName()));
         return new ShardingDataSource(shardingRuleConfig.build(createDataSourceMap()));
     }