Merge pull request #5 from shardingjdbc/dev

合并最新的代码

Author: qiankunshe

pom.xml

@@ -13,6 +13,7 @@
         <module>sharding-jdbc-transaction-parent</module>
         <module>sharding-jdbc-orchestration</module>
         <module>sharding-jdbc-orchestration-spring</module>
+        <module>sharding-opentracing</module>
         <module>sharding-proxy</module>
         <module>sharding-sql-test</module>
     </modules>
@@ -50,6 +51,8 @@
         <protobuf.version>3.4.0</protobuf.version>
         <guava-retrying.version>2.0.0</guava-retrying.version>
         <quartz.version>2.3.0</quartz.version>
+        <opentracing.version>0.30.0</opentracing.version>
+        <powermock.version>1.7.1</powermock.version>
 
         <maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
         <maven-assembly-plugin.version>3.1.0</maven-assembly-plugin.version>
@@ -74,6 +77,7 @@
         <maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
         <protobuf-maven-plugin.version>0.5.0</protobuf-maven-plugin.version>
         <os-maven-plugin.version>1.5.0.Final</os-maven-plugin.version>
+        <coveralls-maven-plugin.version>4.1.0</coveralls-maven-plugin.version>
 
         <javadocExecutable>${java.home}/../bin/javadoc</javadocExecutable>
     </properties>
@@ -96,6 +100,11 @@
                 <artifactId>slf4j-api</artifactId>
                 <version>${slf4j.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>jcl-over-slf4j</artifactId>
+                <version>${slf4j.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.codehaus.groovy</groupId>
                 <artifactId>groovy</artifactId>
@@ -158,6 +167,11 @@
                 <artifactId>guava-retrying</artifactId>
                 <version>${guava-retrying.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.opentracing</groupId>
+                <artifactId>opentracing-util</artifactId>
+                <version>${opentracing.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.apache.curator</groupId>
                 <artifactId>curator-test</artifactId>
@@ -295,6 +309,24 @@
                 <version>${spring-boot.version}</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>org.powermock</groupId>
+                <artifactId>powermock-module-junit4</artifactId>
+                <version>${powermock.version}</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.powermock</groupId>
+                <artifactId>powermock-api-mockito2</artifactId>
+                <version>${powermock.version}</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>io.opentracing</groupId>
+                <artifactId>opentracing-mock</artifactId>
+                <version>${opentracing.version}</version>
+                <scope>test</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

sharding-core/src/main/java/io/shardingjdbc/core/api/config/MasterSlaveRuleConfiguration.java

@@ -17,75 +17,28 @@
 
 package io.shardingjdbc.core.api.config;
 
-import com.google.common.base.Preconditions;
-import com.google.common.base.Strings;
 import io.shardingjdbc.core.api.algorithm.masterslave.MasterSlaveLoadBalanceAlgorithm;
-import io.shardingjdbc.core.api.algorithm.masterslave.MasterSlaveLoadBalanceAlgorithmType;
-import io.shardingjdbc.core.exception.ShardingJdbcException;
-import io.shardingjdbc.core.rule.MasterSlaveRule;
+import lombok.AllArgsConstructor;
 import lombok.Getter;
-import lombok.Setter;
+import lombok.RequiredArgsConstructor;
 
 import java.util.Collection;
-import java.util.LinkedList;
 
 /**
  * Master-slave rule configuration.
  * 
  * @author zhangliang
  */
+@AllArgsConstructor
+@RequiredArgsConstructor
 @Getter
-@Setter
-public class MasterSlaveRuleConfiguration {
+public final class MasterSlaveRuleConfiguration {
 
-    private String name;
+    private final String name;
 
-    private String masterDataSourceName;
+    private final String masterDataSourceName;
 
-    private Collection<String> slaveDataSourceNames = new LinkedList<>();
+    private final Collection<String> slaveDataSourceNames;
 
-    private MasterSlaveLoadBalanceAlgorithmType loadBalanceAlgorithmType;
-    
-    private String loadBalanceAlgorithmClassName;
-    
-    /**
-     * Build master-slave rule.
-     *
-     * @return sharding rule
-     */
-    public MasterSlaveRule build() {
-        Preconditions.checkNotNull(name, "name cannot be null.");
-        Preconditions.checkNotNull(masterDataSourceName, "masterDataSourceName cannot be null.");
-        Preconditions.checkNotNull(slaveDataSourceNames, "slaveDataSourceNames cannot be null.");
-        Preconditions.checkArgument(!slaveDataSourceNames.isEmpty(), "slaveDataSourceNames cannot be empty.");
-        return new MasterSlaveRule(name, masterDataSourceName, slaveDataSourceNames, getLoadBalanceAlgorithm());
-    }
-    
-    private MasterSlaveLoadBalanceAlgorithm getLoadBalanceAlgorithm() {
-        MasterSlaveLoadBalanceAlgorithm result;
-        if (null != loadBalanceAlgorithmType) {
-            result = loadBalanceAlgorithmType.getAlgorithm();
-        } else {
-            result = Strings.isNullOrEmpty(loadBalanceAlgorithmClassName) ? null : newInstance(loadBalanceAlgorithmClassName);
-        }
-        return result;
-    }
-    
-    /**
-     * New instance.
-     * 
-     * @param masterSlaveLoadBalanceAlgorithmClassName master-slave load balance algorithm class name
-     * @return master-slave load balance algorithm
-     */
-    public MasterSlaveLoadBalanceAlgorithm newInstance(final String masterSlaveLoadBalanceAlgorithmClassName) {
-        try {
-            Class<?> result = Class.forName(masterSlaveLoadBalanceAlgorithmClassName);
-            if (!MasterSlaveLoadBalanceAlgorithm.class.isAssignableFrom(result)) {
-                throw new ShardingJdbcException("Class %s should be implement %s", masterSlaveLoadBalanceAlgorithmClassName, MasterSlaveLoadBalanceAlgorithm.class.getName());
-            }
-            return (MasterSlaveLoadBalanceAlgorithm) result.newInstance();
-        } catch (final ReflectiveOperationException ex) {
-            throw new ShardingJdbcException("Class %s should have public privilege and no argument constructor", masterSlaveLoadBalanceAlgorithmClassName);
-        }
-    }
+    private MasterSlaveLoadBalanceAlgorithm loadBalanceAlgorithm;
 }

sharding-core/src/main/java/io/shardingjdbc/core/api/config/ShardingRuleConfiguration.java

@@ -17,21 +17,13 @@
 
 package io.shardingjdbc.core.api.config;
 
-import com.google.common.base.Preconditions;
 import io.shardingjdbc.core.api.config.strategy.ShardingStrategyConfiguration;
-import io.shardingjdbc.core.keygen.DefaultKeyGenerator;
 import io.shardingjdbc.core.keygen.KeyGenerator;
-import io.shardingjdbc.core.keygen.KeyGeneratorFactory;
-import io.shardingjdbc.core.routing.strategy.ShardingStrategy;
-import io.shardingjdbc.core.rule.ShardingRule;
-import io.shardingjdbc.core.rule.TableRule;
 import lombok.Getter;
 import lombok.Setter;
 
 import java.util.Collection;
-import java.util.LinkedHashSet;
 import java.util.LinkedList;
-import java.util.Set;
 
 /**
  * Sharding rule configuration.
@@ -40,7 +32,7 @@
  */
 @Getter
 @Setter
-public class ShardingRuleConfiguration {
+public final class ShardingRuleConfiguration {
 
     private String defaultDataSourceName;
 
@@ -52,27 +44,7 @@ public class ShardingRuleConfiguration {
 
     private ShardingStrategyConfiguration defaultTableShardingStrategyConfig;
 
-    private String defaultKeyGeneratorClass;
+    private KeyGenerator defaultKeyGenerator;
 
     private Collection<MasterSlaveRuleConfiguration> masterSlaveRuleConfigs = new LinkedList<>();
-    
-    /**
-     * Build sharding rule.
-     *
-     * @param dataSourceNames data source names
-     * @return sharding rule
-     */
-    public ShardingRule build(final Collection<String> dataSourceNames) {
-        Preconditions.checkNotNull(dataSourceNames, "dataSources cannot be null.");
-        Preconditions.checkArgument(!dataSourceNames.isEmpty(), "dataSources cannot be null.");
-        Set<String> dataSourceNameSet = new LinkedHashSet<>(dataSourceNames);
-        Collection<TableRule> tableRules = new LinkedList<>();
-        for (TableRuleConfiguration each : tableRuleConfigs) {
-            tableRules.add(each.build(dataSourceNameSet));
-        }
-        ShardingStrategy defaultDatabaseShardingStrategy = null == defaultDatabaseShardingStrategyConfig ? null : defaultDatabaseShardingStrategyConfig.build();
-        ShardingStrategy defaultTableShardingStrategy = null == defaultTableShardingStrategyConfig ? null : defaultTableShardingStrategyConfig.build();
-        KeyGenerator keyGenerator = KeyGeneratorFactory.newInstance(null == defaultKeyGeneratorClass ? DefaultKeyGenerator.class.getName() : defaultKeyGeneratorClass);
-        return new ShardingRule(dataSourceNameSet, defaultDataSourceName, tableRules, bindingTableGroups, defaultDatabaseShardingStrategy, defaultTableShardingStrategy, keyGenerator);
-    }
 }

sharding-core/src/main/java/io/shardingjdbc/core/api/config/TableRuleConfiguration.java

@@ -17,28 +17,19 @@
 
 package io.shardingjdbc.core.api.config;
 
-import com.google.common.base.Preconditions;
-import com.google.common.base.Strings;
 import io.shardingjdbc.core.api.config.strategy.ShardingStrategyConfiguration;
 import io.shardingjdbc.core.keygen.KeyGenerator;
-import io.shardingjdbc.core.keygen.KeyGeneratorFactory;
-import io.shardingjdbc.core.routing.strategy.ShardingStrategy;
-import io.shardingjdbc.core.rule.TableRule;
-import io.shardingjdbc.core.util.InlineExpressionParser;
 import lombok.Getter;
 import lombok.Setter;
 
-import java.util.Collection;
-import java.util.List;
-
 /**
  * Table rule configuration.
  * 
  * @author zhangiang
  */
 @Getter
 @Setter
-public class TableRuleConfiguration {
+public final class TableRuleConfiguration {
 
     private String logicTable;
 
@@ -50,22 +41,7 @@ public class TableRuleConfiguration {
 
     private String keyGeneratorColumnName;
 
-    private String keyGeneratorClass;
+    private KeyGenerator keyGenerator;
 
     private String logicIndex;
-    
-    /**
-     * Build table rule.
-     *
-     * @param dataSourceNames data source names
-     * @return table rule
-     */
-    public TableRule build(final Collection<String> dataSourceNames) {
-        Preconditions.checkNotNull(logicTable, "Logic table cannot be null.");
-        List<String> actualDataNodes = new InlineExpressionParser(this.actualDataNodes).evaluate();
-        ShardingStrategy databaseShardingStrategy = null == databaseShardingStrategyConfig ? null : databaseShardingStrategyConfig.build();
-        ShardingStrategy tableShardingStrategy = null == tableShardingStrategyConfig ? null : tableShardingStrategyConfig.build();
-        KeyGenerator keyGenerator = !Strings.isNullOrEmpty(keyGeneratorColumnName) && !Strings.isNullOrEmpty(keyGeneratorClass) ? KeyGeneratorFactory.newInstance(keyGeneratorClass) : null;
-        return new TableRule(logicTable, actualDataNodes, dataSourceNames, databaseShardingStrategy, tableShardingStrategy, keyGeneratorColumnName, keyGenerator, logicIndex);
-    }
 }

sharding-core/src/main/java/io/shardingjdbc/core/api/config/strategy/ComplexShardingStrategyConfiguration.java

@@ -17,12 +17,7 @@
 
 package io.shardingjdbc.core.api.config.strategy;
 
-import com.google.common.base.Preconditions;
 import io.shardingjdbc.core.api.algorithm.sharding.complex.ComplexKeysShardingAlgorithm;
-import io.shardingjdbc.core.routing.strategy.ShardingAlgorithmFactory;
-import io.shardingjdbc.core.routing.strategy.ShardingStrategy;
-import io.shardingjdbc.core.routing.strategy.complex.ComplexShardingStrategy;
-import io.shardingjdbc.core.util.StringUtil;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
@@ -37,12 +32,5 @@ public final class ComplexShardingStrategyConfiguration implements ShardingStrat
 
     private final String shardingColumns;
 
-    private final String algorithmClassName;
-    
-    @Override
-    public ShardingStrategy build() {
-        Preconditions.checkNotNull(shardingColumns, "Sharding columns cannot be null.");
-        Preconditions.checkNotNull(algorithmClassName, "Algorithm class cannot be null.");
-        return new ComplexShardingStrategy(StringUtil.splitWithComma(shardingColumns), ShardingAlgorithmFactory.newInstance(algorithmClassName, ComplexKeysShardingAlgorithm.class));
-    }
+    private final ComplexKeysShardingAlgorithm shardingAlgorithm;
 }

sharding-core/src/main/java/io/shardingjdbc/core/api/config/strategy/HintShardingStrategyConfiguration.java

@@ -17,11 +17,7 @@
 
 package io.shardingjdbc.core.api.config.strategy;
 
-import com.google.common.base.Preconditions;
 import io.shardingjdbc.core.api.algorithm.sharding.hint.HintShardingAlgorithm;
-import io.shardingjdbc.core.routing.strategy.ShardingAlgorithmFactory;
-import io.shardingjdbc.core.routing.strategy.ShardingStrategy;
-import io.shardingjdbc.core.routing.strategy.hint.HintShardingStrategy;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
@@ -34,11 +30,5 @@
 @Getter
 public final class HintShardingStrategyConfiguration implements ShardingStrategyConfiguration {
 
-    private final String algorithmClassName;
-    
-    @Override
-    public ShardingStrategy build() {
-        Preconditions.checkNotNull(algorithmClassName, "Algorithm class cannot be null.");
-        return new HintShardingStrategy(ShardingAlgorithmFactory.newInstance(algorithmClassName, HintShardingAlgorithm.class));
-    }
+    private final HintShardingAlgorithm shardingAlgorithm;
 }

sharding-core/src/main/java/io/shardingjdbc/core/api/config/strategy/InlineShardingStrategyConfiguration.java

@@ -17,9 +17,6 @@
 
 package io.shardingjdbc.core.api.config.strategy;
 
-import com.google.common.base.Preconditions;
-import io.shardingjdbc.core.routing.strategy.ShardingStrategy;
-import io.shardingjdbc.core.routing.strategy.inline.InlineShardingStrategy;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
@@ -35,11 +32,4 @@ public final class InlineShardingStrategyConfiguration implements ShardingStrate
     private final String shardingColumn;
 
     private final String algorithmExpression;
-    
-    @Override
-    public ShardingStrategy build() {
-        Preconditions.checkNotNull(shardingColumn, "Sharding column cannot be null.");
-        Preconditions.checkNotNull(algorithmExpression, "Algorithm inline expression cannot be null.");
-        return new InlineShardingStrategy(shardingColumn, algorithmExpression);
-    }
 }

sharding-core/src/main/java/io/shardingjdbc/core/api/config/strategy/NoneShardingStrategyConfiguration.java

@@ -17,18 +17,10 @@
 
 package io.shardingjdbc.core.api.config.strategy;
 
-import io.shardingjdbc.core.routing.strategy.ShardingStrategy;
-import io.shardingjdbc.core.routing.strategy.none.NoneShardingStrategy;
-
 /**
  * None sharding strategy configuration.
  * 
  * @author zhangliang
  */
 public final class NoneShardingStrategyConfiguration implements ShardingStrategyConfiguration {
-    
-    @Override
-    public ShardingStrategy build() {
-        return new NoneShardingStrategy();
-    }
 }

sharding-core/src/main/java/io/shardingjdbc/core/api/config/strategy/ShardingStrategyConfiguration.java

@@ -17,19 +17,10 @@
 
 package io.shardingjdbc.core.api.config.strategy;
 
-import io.shardingjdbc.core.routing.strategy.ShardingStrategy;
-
 /**
  * Sharding strategy configuration.
  * 
  * @author zhangliang
  */
 public interface ShardingStrategyConfiguration {
-    
-    /**
-     * Build sharding strategy.
-     * 
-     * @return sharding strategy
-     */
-    ShardingStrategy build();
 }