refactor ShardingStrategy: auto merge in, split range strategy 17th version

sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/api/strategy/database/NoneDatabaseShardingAlgorithmTest.java

@@ -20,6 +20,8 @@ package com.dangdang.ddframe.rdb.sharding.api.strategy.database;
 import com.dangdang.ddframe.rdb.sharding.api.PreciseShardingValue;
 import com.dangdang.ddframe.rdb.sharding.api.RangeShardingValue;
 import com.dangdang.ddframe.rdb.sharding.api.ShardingValue;
+import com.google.common.collect.BoundType;
+import com.google.common.collect.Range;
 import org.junit.Test;
 
 import java.util.Collection;
@@ -42,19 +44,16 @@ public final class NoneDatabaseShardingAlgorithmTest {
     
     @Test
     public void assertDoEqualShardingForTargetsEmpty() {
-        PreciseShardingValue<String> shardingValue = null;
-        assertNull(noneDatabaseShardingAlgorithm.doSharding(Collections.<String>emptyList(), shardingValue));
+        assertNull(noneDatabaseShardingAlgorithm.doSharding(Collections.<String>emptyList(), new PreciseShardingValue<>("tbl", "col", "1")));
     }
     
     @Test
     public void assertDoEqualSharding() {
-        PreciseShardingValue<String> shardingValue = null;
-        assertThat(noneDatabaseShardingAlgorithm.doSharding(targets, shardingValue), is("ds"));
+        assertThat(noneDatabaseShardingAlgorithm.doSharding(targets, new PreciseShardingValue<>("tbl", "col", "1")), is("ds"));
     }
     
     @Test
     public void assertDoBetweenSharding() {
-        RangeShardingValue<String> shardingValue = null;
-        assertThat(noneDatabaseShardingAlgorithm.doSharding(targets, shardingValue), is(targets));
+        assertThat(noneDatabaseShardingAlgorithm.doSharding(targets, new RangeShardingValue<>("tbl", "col", Range.range("1", BoundType.CLOSED, "2", BoundType.OPEN))), is(targets));
     }
 }

sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/api/strategy/table/NoneTableShardingAlgorithmTest.java

@@ -20,6 +20,8 @@ package com.dangdang.ddframe.rdb.sharding.api.strategy.table;
 import com.dangdang.ddframe.rdb.sharding.api.PreciseShardingValue;
 import com.dangdang.ddframe.rdb.sharding.api.RangeShardingValue;
 import com.dangdang.ddframe.rdb.sharding.api.ShardingValue;
+import com.google.common.collect.BoundType;
+import com.google.common.collect.Range;
 import org.junit.Test;
 
 import java.util.Collection;
@@ -37,8 +39,7 @@ public final class NoneTableShardingAlgorithmTest {
     
     @Test
     public void assertDoEqualShardingForTargetsEmpty() {
-        PreciseShardingValue shardingValue = null;
-        assertNull(noneTableShardingAlgorithm.doSharding(Collections.<String>emptyList(), shardingValue));
+        assertNull(noneTableShardingAlgorithm.doSharding(Collections.<String>emptyList(), new PreciseShardingValue<>("tbl", "col", "1")));
     }
     
     @Test
@@ -48,13 +49,11 @@ public final class NoneTableShardingAlgorithmTest {
     
     @Test
     public void assertDoEqualSharding() {
-        PreciseShardingValue shardingValue = null;
-        assertThat(noneTableShardingAlgorithm.doSharding(targets, shardingValue), is("tbl"));
+        assertThat(noneTableShardingAlgorithm.doSharding(targets, new PreciseShardingValue<>("tbl", "col", "1")), is("tbl"));
     }
     
     @Test
     public void assertDoBetweenSharding() {
-        RangeShardingValue shardingValue = null;
-        assertThat(noneTableShardingAlgorithm.doSharding(targets, shardingValue), is(targets));
+        assertThat(noneTableShardingAlgorithm.doSharding(targets, new RangeShardingValue<>("tbl", "col", Range.range("1", BoundType.CLOSED, "2", BoundType.OPEN))), is(targets));
     }
 }