Skip to content

Commit 4cc7b9b

Browse files
stsypanovjhoeller
authored andcommitted
tiny simplifications regarding usage of Iterator
1 parent 8f972a5 commit 4cc7b9b

File tree

2 files changed

+8
-11
lines changed

2 files changed

+8
-11
lines changed

spring-jdbc/src/main/java/org/springframework/jdbc/object/BatchSqlUpdate.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import java.util.ArrayDeque;
2222
import java.util.ArrayList;
2323
import java.util.Deque;
24-
import java.util.Iterator;
2524
import java.util.List;
2625
import javax.sql.DataSource;
2726

@@ -230,9 +229,8 @@ public int getExecutionCount() {
230229
*/
231230
public int[] getRowsAffected() {
232231
int[] result = new int[this.rowsAffected.size()];
233-
int i = 0;
234-
for (Iterator<Integer> it = this.rowsAffected.iterator(); it.hasNext(); i++) {
235-
result[i] = it.next();
232+
for (int i = 0; i < this.rowsAffected.size(); i++) {
233+
result[i] = this.rowsAffected.get(i);
236234
}
237235
return result;
238236
}

spring-webmvc/src/main/java/org/springframework/web/servlet/view/RedirectView.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@ protected StringBuilder replaceUriTemplateVariables(
390390
result.append(UriUtils.encodePathSegment(value.toString(), encodingScheme));
391391
endLastMatch = matcher.end();
392392
}
393-
result.append(targetUrl.substring(endLastMatch, targetUrl.length()));
393+
result.append(targetUrl.substring(endLastMatch));
394394
return result;
395395
}
396396

@@ -456,18 +456,17 @@ protected void appendQueryProperties(StringBuilder targetUrl, Map<String, Object
456456
boolean first = (targetUrl.toString().indexOf('?') < 0);
457457
for (Map.Entry<String, Object> entry : queryProperties(model).entrySet()) {
458458
Object rawValue = entry.getValue();
459-
Iterator<Object> valueIter;
459+
Collection<Object> values;
460460
if (rawValue != null && rawValue.getClass().isArray()) {
461-
valueIter = Arrays.asList(ObjectUtils.toObjectArray(rawValue)).iterator();
461+
values = Arrays.asList(ObjectUtils.toObjectArray(rawValue));
462462
}
463463
else if (rawValue instanceof Collection) {
464-
valueIter = ((Collection<Object>) rawValue).iterator();
464+
values = ((Collection<Object>) rawValue);
465465
}
466466
else {
467-
valueIter = Collections.singleton(rawValue).iterator();
467+
values = Collections.singleton(rawValue);
468468
}
469-
while (valueIter.hasNext()) {
470-
Object value = valueIter.next();
469+
for (Object value : values) {
471470
if (first) {
472471
targetUrl.append('?');
473472
first = false;

0 commit comments

Comments
 (0)