For checkstyle

maxiaoguang64 · maxiaoguang64 · commit 339960fd73e6 · 2018-04-19T22:07:40.000+08:00
diff --git a/sharding-core/src/main/java/io/shardingjdbc/core/parsing/parser/clause/WhereClauseParser.java b/sharding-core/src/main/java/io/shardingjdbc/core/parsing/parser/clause/WhereClauseParser.java
@@ -92,7 +92,7 @@ public void parse(final ShardingRule shardingRule, final SQLStatement sqlStateme
     
     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());
         }
     }
diff --git a/sharding-core/src/main/java/io/shardingjdbc/core/parsing/parser/context/condition/OrCondition.java b/sharding-core/src/main/java/io/shardingjdbc/core/parsing/parser/context/condition/OrCondition.java
@@ -61,7 +61,7 @@ public void add(final Condition condition) {
      */
     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;
diff --git a/sharding-core/src/main/java/io/shardingjdbc/core/routing/type/standard/StandardRoutingEngine.java b/sharding-core/src/main/java/io/shardingjdbc/core/routing/type/standard/StandardRoutingEngine.java
@@ -66,9 +66,9 @@ public RoutingResult route() {
             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));
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ public void parse(final ShardingRule shardingRule, final SQLStatement sqlStateme`
`92`	`92`
`93`	`93`	`private void parseWhere(final ShardingRule shardingRule, final SQLStatement sqlStatement, final List<SelectItem> items) {`
`94`	`94`	`OrCondition orCondition = parseOr(shardingRule, sqlStatement, items).optimize();`
`95`		`- if (1 != orCondition.getAndConditions().size() \|\| !(orCondition.getAndConditions().iterator().next().getConditions().iterator().next() instanceof NullCondition)) {`
	`95`	`+ if (1 != orCondition.getAndConditions().size() \|\| !(orCondition.getAndConditions().get(0).getConditions().get(0) instanceof NullCondition)) {`
`96`	`96`	`sqlStatement.getConditions().getOrCondition().getAndConditions().addAll(orCondition.getAndConditions());`
`97`	`97`	`}`
`98`	`98`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,9 +66,9 @@ public RoutingResult route() {`
`66`	`66`	`if (shardingConditions.getShardingConditions().isEmpty()) {`
`67`	`67`	`routedDataNodes.addAll(route(tableRule, Collections.<ShardingValue>emptyList(), Collections.<ShardingValue>emptyList()));`
`68`	`68`	`} else {`
`69`		`- for (ShardingCondition shardingCondition : shardingConditions.getShardingConditions()) {`
`70`		`- List<ShardingValue> databaseShardingValues = getShardingValues(databaseShardingColumns, shardingCondition);`
`71`		`- List<ShardingValue> tableShardingValues = getShardingValues(tableShardingColumns, shardingCondition);`
	`69`	`+ for (ShardingCondition each : shardingConditions.getShardingConditions()) {`
	`70`	`+ List<ShardingValue> databaseShardingValues = getShardingValues(databaseShardingColumns, each);`
	`71`	`+ List<ShardingValue> tableShardingValues = getShardingValues(tableShardingColumns, each);`
`72`	`72`	`routedDataNodes.addAll(route(tableRule, databaseShardingValues, tableShardingValues));`
`73`	`73`	`}`
`74`	`74`	`}`