refactor api 17th version

SoyeeDst · Sep 8, 2017 · 1ee6d1a · 1ee6d1a
1 parent 9252aa9
commit 1ee6d1a
Show file tree

Hide file tree

Showing 25 changed files with 45 additions and 265 deletions.
diff --git a/...gdang/ddframe/rdb/sharding/config/common/internal/algorithm/ClosureShardingAlgorithm.java b/...gdang/ddframe/rdb/sharding/config/common/internal/algorithm/ClosureShardingAlgorithm.java
@@ -78,7 +78,7 @@ private Closure<?> cloneClosure(final List<String> columnNames, final List<Compa
         result.setResolveStrategy(Closure.DELEGATE_ONLY);
         result.setProperty("log", closureTemplate.getProperty("log"));
         for (int i = 0; i < values.size(); i++) {
-            result.setProperty(columnNames.get(i), new ShardingValueWrapper(values.get(i)));
+            result.setProperty(columnNames.get(i), values.get(i));
         }
         return result;
     }

diff --git a/.../dangdang/ddframe/rdb/sharding/config/common/internal/algorithm/ShardingValueWrapper.java b/.../dangdang/ddframe/rdb/sharding/config/common/internal/algorithm/ShardingValueWrapper.java
diff --git a/...config-common/src/test/java/com/dangdang/ddframe/rdb/sharding/config/common/AllTests.java b/...config-common/src/test/java/com/dangdang/ddframe/rdb/sharding/config/common/AllTests.java
@@ -19,7 +19,6 @@
 
 import com.dangdang.ddframe.rdb.sharding.config.common.api.ShardingRuleBuilderTest;
 import com.dangdang.ddframe.rdb.sharding.config.common.internal.algorithm.ClosureShardingAlgorithmTest;
-import com.dangdang.ddframe.rdb.sharding.config.common.internal.algorithm.ShardingValueWrapperTest;
 import com.dangdang.ddframe.rdb.sharding.config.common.internal.parser.InlineParserTest;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
@@ -28,7 +27,6 @@
 @Suite.SuiteClasses({
         ShardingRuleBuilderTest.class, 
         ClosureShardingAlgorithmTest.class, 
-        ShardingValueWrapperTest.class, 
         InlineParserTest.class
     })
 public class AllTests {

diff --git a/...est/java/com/dangdang/ddframe/rdb/sharding/config/common/api/ShardingRuleBuilderTest.java b/...est/java/com/dangdang/ddframe/rdb/sharding/config/common/api/ShardingRuleBuilderTest.java
@@ -184,7 +184,7 @@ private StrategyConfig getDatabaseStrategyConfig(final String algorithmClassName
     private StrategyConfig getTableStrategyConfigForExpression() {
         StrategyConfig result = new StrategyConfig();
         result.setShardingColumns("oid");
-        result.setAlgorithmExpression("${oid.longValue() % 2}");
+        result.setAlgorithmExpression("${oid % 2}");
         return result;
     }
 

diff --git a/...g/ddframe/rdb/sharding/config/common/internal/algorithm/ClosureShardingAlgorithmTest.java b/...g/ddframe/rdb/sharding/config/common/internal/algorithm/ClosureShardingAlgorithmTest.java
@@ -35,7 +35,7 @@
 
 public final class ClosureShardingAlgorithmTest {
 
-    private static final String EXPRESSION = "target_${log.info(id.toString()); id.longValue() % 2}";
+    private static final String EXPRESSION = "target_${log.info(id.toString()); id % 2}";
 
     private static final String WRONG_EXPRESSION = "target_${log.info(id.error());}";
 

diff --git a/...gdang/ddframe/rdb/sharding/config/common/internal/algorithm/ShardingValueWrapperTest.java b/...gdang/ddframe/rdb/sharding/config/common/internal/algorithm/ShardingValueWrapperTest.java
diff --git a/...fig-spring/src/test/resources/META-INF/rdb/namespace/withNamespaceAlgorithmExpression.xml b/...fig-spring/src/test/resources/META-INF/rdb/namespace/withNamespaceAlgorithmExpression.xml
@@ -9,11 +9,11 @@
                         ">
     <import resource="../datasource/dataSource.xml" />
 
-    <rdb:strategy id="databaseStrategy" sharding-columns="user_id" algorithm-expression="dbtbl_${user_id.longValue() % 2}"/>
+    <rdb:strategy id="databaseStrategy" sharding-columns="user_id" algorithm-expression="dbtbl_${user_id % 2}"/>
 
-    <rdb:strategy id="orderTableStrategy" sharding-columns="order_id" algorithm-expression="t_order_${order_id.longValue() % 4}"/>
+    <rdb:strategy id="orderTableStrategy" sharding-columns="order_id" algorithm-expression="t_order_${order_id % 4}"/>
 
-    <rdb:strategy id="orderItemTableStrategy" sharding-columns="order_id" algorithm-expression="t_order_item_${order_id.longValue() % 4}"/>
+    <rdb:strategy id="orderItemTableStrategy" sharding-columns="order_id" algorithm-expression="t_order_item_${order_id % 4}"/>
 
     <rdb:data-source id="shardingDataSource">
         <rdb:sharding-rule data-sources="dbtbl_0,dbtbl_1" default-data-source="dbtbl_0">

diff --git a/.../src/test/resources/META-INF/rdb/namespace/withNamespaceAlgorithmExpressionForDynamic.xml b/.../src/test/resources/META-INF/rdb/namespace/withNamespaceAlgorithmExpressionForDynamic.xml
@@ -9,11 +9,11 @@
                         ">
     <import resource="../datasource/dataSource.xml" />
 
-    <rdb:strategy id="databaseStrategy" sharding-columns="user_id" algorithm-expression="dbtbl_${user_id.longValue() % 2}"/>
+    <rdb:strategy id="databaseStrategy" sharding-columns="user_id" algorithm-expression="dbtbl_${user_id % 2}"/>
 
-    <rdb:strategy id="orderTableStrategy" sharding-columns="order_id" algorithm-expression="t_order_${order_id.longValue() % 4}"/>
+    <rdb:strategy id="orderTableStrategy" sharding-columns="order_id" algorithm-expression="t_order_${order_id % 4}"/>
 
-    <rdb:strategy id="orderItemTableStrategy" sharding-columns="order_id" algorithm-expression="t_order_item_${order_id.longValue() % 4}"/>
+    <rdb:strategy id="orderItemTableStrategy" sharding-columns="order_id" algorithm-expression="t_order_item_${order_id % 4}"/>
 
     <rdb:data-source id="shardingDataSource">
         <rdb:sharding-rule data-sources="dbtbl_0,dbtbl_1" default-data-source="dbtbl_0">

diff --git a/...-config-spring/src/test/resources/META-INF/rdb/namespace/withNamespaceDifferentTables.xml b/...-config-spring/src/test/resources/META-INF/rdb/namespace/withNamespaceDifferentTables.xml
@@ -9,11 +9,11 @@
                         ">
     <import resource="../datasource/dataSource.xml" />
 
-    <rdb:strategy id="databaseStrategy" sharding-columns="user_id" algorithm-expression="dbtbl_${user_id.longValue() % 2}"/>
+    <rdb:strategy id="databaseStrategy" sharding-columns="user_id" algorithm-expression="dbtbl_${user_id % 2}"/>
 
-    <rdb:strategy id="orderTableStrategy" sharding-columns="order_id" algorithm-expression="t_order_${order_id.longValue() % 4}"/>
+    <rdb:strategy id="orderTableStrategy" sharding-columns="order_id" algorithm-expression="t_order_${order_id % 4}"/>
 
-    <rdb:strategy id="orderItemTableStrategy" sharding-columns="order_id" algorithm-expression="t_order_item_${order_id.longValue() % 4}"/>
+    <rdb:strategy id="orderItemTableStrategy" sharding-columns="order_id" algorithm-expression="t_order_item_${order_id % 4}"/>
 
     <rdb:data-source id="shardingDataSource">
         <rdb:sharding-rule data-sources="dbtbl_0,dbtbl_1" default-data-source="dbtbl_0">

diff --git a/...ng/src/test/resources/META-INF/rdb/namespace/withNamespaceForIndicatedDataSourceNames.xml b/...ng/src/test/resources/META-INF/rdb/namespace/withNamespaceForIndicatedDataSourceNames.xml
@@ -9,11 +9,11 @@
                         ">
     <import resource="../datasource/dataSource.xml" />
 
-    <rdb:strategy id="databaseStrategy" sharding-columns="user_id" algorithm-expression="dbtbl_${user_id.longValue() % 2}"/>
+    <rdb:strategy id="databaseStrategy" sharding-columns="user_id" algorithm-expression="dbtbl_${user_id % 2}"/>
 
-    <rdb:strategy id="orderTableStrategy" sharding-columns="order_id" algorithm-expression="t_order_${order_id.longValue() % 4}"/>
+    <rdb:strategy id="orderTableStrategy" sharding-columns="order_id" algorithm-expression="t_order_${order_id % 4}"/>
 
-    <rdb:strategy id="orderItemTableStrategy" sharding-columns="order_id" algorithm-expression="t_order_item_${order_id.longValue() % 4}"/>
+    <rdb:strategy id="orderItemTableStrategy" sharding-columns="order_id" algorithm-expression="t_order_item_${order_id % 4}"/>
 
     <rdb:data-source id="shardingDataSource">
         <rdb:sharding-rule data-sources="dbtbl_0,dbtbl_1" default-data-source="dbtbl_0">

diff --git a/.../test/resources/META-INF/rdb/namespace/withNamespaceForMasterSlaveWithDefaultStrategy.xml b/.../test/resources/META-INF/rdb/namespace/withNamespaceForMasterSlaveWithDefaultStrategy.xml
@@ -12,11 +12,11 @@
     <rdb:master-slave-data-source id="dbtbl_0" master-data-source-ref="dbtbl_0_master" slave-data-sources-ref="dbtbl_0_slave_0, dbtbl_0_slave_1" />
     <rdb:master-slave-data-source id="dbtbl_1" master-data-source-ref="dbtbl_1_master" slave-data-sources-ref="dbtbl_1_slave_0, dbtbl_1_slave_1" />
 
-    <rdb:strategy id="databaseStrategy" sharding-columns="user_id" algorithm-expression="dbtbl_${user_id.longValue() % 2}"/>
+    <rdb:strategy id="databaseStrategy" sharding-columns="user_id" algorithm-expression="dbtbl_${user_id % 2}"/>
 
-    <rdb:strategy id="orderTableStrategy" sharding-columns="order_id" algorithm-expression="t_order_${order_id.longValue() % 4}"/>
+    <rdb:strategy id="orderTableStrategy" sharding-columns="order_id" algorithm-expression="t_order_${order_id % 4}"/>
 
-    <rdb:strategy id="orderItemTableStrategy" sharding-columns="order_id" algorithm-expression="t_order_item_${order_id.longValue() % 4}"/>
+    <rdb:strategy id="orderItemTableStrategy" sharding-columns="order_id" algorithm-expression="t_order_item_${order_id % 4}"/>
 
     <rdb:data-source id="shardingDataSource">
         <rdb:sharding-rule data-sources="dbtbl_0,dbtbl_1" default-data-source="dbtbl_0">

diff --git a/.../src/test/resources/META-INF/rdb/namespace/withNamespaceForMasterSlaveWithStrategyRef.xml b/.../src/test/resources/META-INF/rdb/namespace/withNamespaceForMasterSlaveWithStrategyRef.xml
@@ -14,11 +14,11 @@
     <rdb:master-slave-data-source id="dbtbl_0" master-data-source-ref="dbtbl_0_master" slave-data-sources-ref="dbtbl_0_slave_0, dbtbl_0_slave_1" strategy-ref="randomStrategy" />
     <rdb:master-slave-data-source id="dbtbl_1" master-data-source-ref="dbtbl_1_master" slave-data-sources-ref="dbtbl_1_slave_0, dbtbl_1_slave_1" strategy-ref="randomStrategy" />
 
-    <rdb:strategy id="databaseStrategy" sharding-columns="user_id" algorithm-expression="dbtbl_${user_id.longValue() % 2}"/>
+    <rdb:strategy id="databaseStrategy" sharding-columns="user_id" algorithm-expression="dbtbl_${user_id % 2}"/>
 
-    <rdb:strategy id="orderTableStrategy" sharding-columns="order_id" algorithm-expression="t_order_${order_id.longValue() % 4}"/>
+    <rdb:strategy id="orderTableStrategy" sharding-columns="order_id" algorithm-expression="t_order_${order_id % 4}"/>
 
-    <rdb:strategy id="orderItemTableStrategy" sharding-columns="order_id" algorithm-expression="t_order_item_${order_id.longValue() % 4}"/>
+    <rdb:strategy id="orderItemTableStrategy" sharding-columns="order_id" algorithm-expression="t_order_item_${order_id % 4}"/>
 
     <rdb:data-source id="shardingDataSource">
         <rdb:sharding-rule data-sources="dbtbl_0,dbtbl_1" default-data-source="dbtbl_0">

diff --git a/...src/test/resources/META-INF/rdb/namespace/withNamespaceForMasterSlaveWithStrategyType.xml b/...src/test/resources/META-INF/rdb/namespace/withNamespaceForMasterSlaveWithStrategyType.xml
@@ -12,11 +12,11 @@
     <rdb:master-slave-data-source id="dbtbl_0" master-data-source-ref="dbtbl_0_master" slave-data-sources-ref="dbtbl_0_slave_0, dbtbl_0_slave_1" strategy-type="RANDOM" />
     <rdb:master-slave-data-source id="dbtbl_1" master-data-source-ref="dbtbl_1_master" slave-data-sources-ref="dbtbl_1_slave_0, dbtbl_1_slave_1" strategy-type="RANDOM" />
 
-    <rdb:strategy id="databaseStrategy" sharding-columns="user_id" algorithm-expression="dbtbl_${user_id.longValue() % 2}"/>
+    <rdb:strategy id="databaseStrategy" sharding-columns="user_id" algorithm-expression="dbtbl_${user_id % 2}"/>
 
-    <rdb:strategy id="orderTableStrategy" sharding-columns="order_id" algorithm-expression="t_order_${order_id.longValue() % 4}"/>
+    <rdb:strategy id="orderTableStrategy" sharding-columns="order_id" algorithm-expression="t_order_${order_id % 4}"/>
 
-    <rdb:strategy id="orderItemTableStrategy" sharding-columns="order_id" algorithm-expression="t_order_item_${order_id.longValue() % 4}"/>
+    <rdb:strategy id="orderItemTableStrategy" sharding-columns="order_id" algorithm-expression="t_order_item_${order_id % 4}"/>
 
     <rdb:data-source id="shardingDataSource">
         <rdb:sharding-rule data-sources="dbtbl_0,dbtbl_1" default-data-source="dbtbl_0">

diff --git a/...ng-jdbc-config-parent/sharding-jdbc-config-yaml/src/test/resources/config/config-all.yaml b/...ng-jdbc-config-parent/sharding-jdbc-config-yaml/src/test/resources/config/config-all.yaml
@@ -30,7 +30,7 @@ tables:
       algorithmClassName: com.dangdang.ddframe.rdb.sharding.config.yaml.algorithm.SingleAlgorithm
     tableStrategy: &table001
       shardingColumns: id
-      algorithmExpression: t_order_${id.longValue() % 2}
+      algorithmExpression: t_order_${id % 2}
 
   t_order_item:
     actualTables: t_order_item_${0..1}
@@ -46,7 +46,7 @@ bindingTables:
 #默认数据库分片策略
 defaultDatabaseStrategy:
   shardingColumns: order_id, user_id
-  algorithmExpression: t_order_${id.longValue() % 2}
+  algorithmExpression: t_order_${id % 2}
 defaultTableStrategy:
   shardingColumns: id, order_id
   algorithmClassName: com.dangdang.ddframe.rdb.sharding.config.yaml.algorithm.MultiAlgorithm
diff --git a/...onfig-parent/sharding-jdbc-config-yaml/src/test/resources/config/config-bindingError.yaml b/...onfig-parent/sharding-jdbc-config-yaml/src/test/resources/config/config-bindingError.yaml
@@ -6,7 +6,7 @@ tables:
       algorithmClassName: com.dangdang.ddframe.rdb.sharding.config.yaml.algorithm.SingleAlgorithm
     tableStrategy: &table001
       shardingColumns: id
-      algorithmExpression: t_order_${id.longValue() % 2}
+      algorithmExpression: t_order_${id % 2}
 
   t_order_item:
     actualTables: t_order_item_${0..1}