Commit c0904aeb authored by terrymanu's avatar terrymanu
Browse files

refactor router module for checkstyle

parent 87619c14

sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/router/PreparedSQLRouter.java

+0 −1
Original line number Diff line number Diff line
@@ -62,4 +62,3 @@ public final class PreparedSQLRouter { 
        return routeEngine.route(logicSQL, sqlContext, parameters);

    }

}

sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/router/RouteEngine.java

+3 −5
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ import com.dangdang.ddframe.rdb.sharding.router.single.SingleTableRouter; 
import com.google.common.base.Function;

import com.google.common.collect.Collections2;

import com.google.common.collect.Sets;

import lombok.Getter;

import lombok.RequiredArgsConstructor;

import lombok.extern.slf4j.Slf4j;
@@ -55,19 +54,18 @@ import java.util.Set; 
@Slf4j

public final class RouteEngine {

    

    @Getter

    private final ShardingRule shardingRule;

    

    private final DatabaseType databaseType;

    

    SQLContext parse(final String logicSQL, final List<Object> parameters) {

        SQLParsingEngine sqlParsingEngine = new SQLParsingEngine(databaseType, logicSQL, shardingRule);

        SQLParsingEngine parsingEngine = new SQLParsingEngine(databaseType, logicSQL, shardingRule);

        if (HintManagerHolder.isDatabaseShardingOnly()) {

            return sqlParsingEngine.prepareParse();

            return parsingEngine.prepareParse();

        }

        Context context = MetricsContext.start("Parse SQL");

        log.debug("Logic SQL: {}, {}", logicSQL, parameters);

        SQLContext result = sqlParsingEngine.parse();

        SQLContext result = parsingEngine.parse();

        MetricsContext.stop(context);

        if (result instanceof InsertSQLContext) {

            GenerateKeysUtils.appendGenerateKeys(shardingRule, parameters, (InsertSQLContext) result);

sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/router/database/DatabaseRouter.java

+1 −2
Original line number Diff line number Diff line
@@ -55,8 +55,7 @@ public class DatabaseRouter { 
        Optional<ShardingValue<?>> shardingValueOptional = HintManagerHolder.getDatabaseShardingValue(new ShardingKey(HintManagerHolder.DB_TABLE_NAME, HintManagerHolder.DB_COLUMN_NAME));

        Preconditions.checkState(shardingValueOptional.isPresent());

        log.debug("Before database sharding only db:{} sharding values: {}", dataSourceRule.getDataSourceNames(), shardingValueOptional.get());

        Collection<String> routedResult = databaseShardingStrategy

                .doStaticSharding(sqlType, dataSourceRule.getDataSourceNames(), Collections.<ShardingValue<?>>singleton(shardingValueOptional.get()));

        Collection<String> routedResult = databaseShardingStrategy.doStaticSharding(sqlType, dataSourceRule.getDataSourceNames(), Collections.<ShardingValue<?>>singleton(shardingValueOptional.get()));

        Preconditions.checkState(!routedResult.isEmpty(), "no database route info");

        log.debug("After database sharding only result: {}", routedResult);

        return new DatabaseRoutingResult(routedResult);