Merge pull request #747 from ma-xiao-guang-64/dev

For checkstyle

sharding-core/src/main/java/io/shardingjdbc/core/parsing/parser/clause/WhereClauseParser.java

@@ -92,7 +92,7 @@ public class WhereClauseParser implements SQLClauseParser {
     
     private void parseWhere(final ShardingRule shardingRule, final SQLStatement sqlStatement, final List<SelectItem> items) {
         OrCondition orCondition = parseOr(shardingRule, sqlStatement, items).optimize();
-        if (1 != orCondition.getAndConditions().size() || !(orCondition.getAndConditions().iterator().next().getConditions().iterator().next() instanceof NullCondition)) {
+        if (1 != orCondition.getAndConditions().size() || !(orCondition.getAndConditions().get(0).getConditions().get(0) instanceof NullCondition)) {
             sqlStatement.getConditions().getOrCondition().getAndConditions().addAll(orCondition.getAndConditions());
         }
     }

sharding-core/src/main/java/io/shardingjdbc/core/parsing/parser/context/condition/OrCondition.java

@@ -61,7 +61,7 @@ public final class OrCondition {
      */
     public OrCondition optimize() {
         for (AndCondition each : andConditions) {
-            if (each.getConditions().iterator().next() instanceof NullCondition) {
+            if (each.getConditions().get(0) instanceof NullCondition) {
                 OrCondition result = new OrCondition();
                 result.add(new NullCondition());
                 return result;

sharding-core/src/main/java/io/shardingjdbc/core/routing/type/standard/StandardRoutingEngine.java

@@ -66,9 +66,9 @@ public final class StandardRoutingEngine implements RoutingEngine {
             if (shardingConditions.getShardingConditions().isEmpty()) {
                 routedDataNodes.addAll(route(tableRule, Collections.<ShardingValue>emptyList(), Collections.<ShardingValue>emptyList()));
             } else {
-                for (ShardingCondition shardingCondition : shardingConditions.getShardingConditions()) {
-                    List<ShardingValue> databaseShardingValues = getShardingValues(databaseShardingColumns, shardingCondition);
-                    List<ShardingValue> tableShardingValues = getShardingValues(tableShardingColumns, shardingCondition);
+                for (ShardingCondition each : shardingConditions.getShardingConditions()) {
+                    List<ShardingValue> databaseShardingValues = getShardingValues(databaseShardingColumns, each);
+                    List<ShardingValue> tableShardingValues = getShardingValues(tableShardingColumns, each);
                     routedDataNodes.addAll(route(tableRule, databaseShardingValues, tableShardingValues));
                 }
             }