diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/object/BatchSqlUpdate.java b/spring-jdbc/src/main/java/org/springframework/jdbc/object/BatchSqlUpdate.java index 5a6df69add..2d4c064709 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/object/BatchSqlUpdate.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/object/BatchSqlUpdate.java @@ -21,7 +21,6 @@ import java.sql.SQLException; import java.util.ArrayDeque; import java.util.ArrayList; import java.util.Deque; -import java.util.Iterator; import java.util.List; import javax.sql.DataSource; @@ -230,9 +229,8 @@ public class BatchSqlUpdate extends SqlUpdate { */ public int[] getRowsAffected() { int[] result = new int[this.rowsAffected.size()]; - int i = 0; - for (Iterator it = this.rowsAffected.iterator(); it.hasNext(); i++) { - result[i] = it.next(); + for (int i = 0; i < this.rowsAffected.size(); i++) { + result[i] = this.rowsAffected.get(i); } return result; } diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/RedirectView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/RedirectView.java index 77313e7cee..217f7202d7 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/RedirectView.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/RedirectView.java @@ -390,7 +390,7 @@ public class RedirectView extends AbstractUrlBasedView implements SmartView { result.append(UriUtils.encodePathSegment(value.toString(), encodingScheme)); endLastMatch = matcher.end(); } - result.append(targetUrl.substring(endLastMatch, targetUrl.length())); + result.append(targetUrl.substring(endLastMatch)); return result; } @@ -456,18 +456,17 @@ public class RedirectView extends AbstractUrlBasedView implements SmartView { boolean first = (targetUrl.toString().indexOf('?') < 0); for (Map.Entry entry : queryProperties(model).entrySet()) { Object rawValue = entry.getValue(); - Iterator valueIter; + Collection values; if (rawValue != null && rawValue.getClass().isArray()) { - valueIter = Arrays.asList(ObjectUtils.toObjectArray(rawValue)).iterator(); + values = Arrays.asList(ObjectUtils.toObjectArray(rawValue)); } else if (rawValue instanceof Collection) { - valueIter = ((Collection) rawValue).iterator(); + values = ((Collection) rawValue); } else { - valueIter = Collections.singleton(rawValue).iterator(); + values = Collections.singleton(rawValue); } - while (valueIter.hasNext()) { - Object value = valueIter.next(); + for (Object value : values) { if (first) { targetUrl.append('?'); first = false;