Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Spring cleaning: avoid use of Iterator for Iterable

Browse Source
This commit is contained in:
Sam Brannen
2024-02-23 11:56:14 +01:00
parent c98bebd6d3
commit eb8492d597
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterUtils.java
View File

@@ -18,7 +18,6 @@ package org.springframework.jdbc.core.namedparam;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -304,14 +303,12 @@ public abstract class NamedParameterUtils {
value = sqlParameterValue.getValue();
}
if (value instanceof Iterable<?> iterable) {
Iterator<?> entryIter = iterable.iterator();
int k = 0;
while (entryIter.hasNext()) {
for (Object entryItem : iterable) {
if (k > 0) {
actualSql.append(", ");
}
k++;
Object entryItem = entryIter.next();
if (entryItem instanceof Object[] expressionList) {
actualSql.append('(');
for (int m = 0; m < expressionList.length; m++) {

4
spring-r2dbc/src/main/java/org/springframework/r2dbc/core/NamedParameterUtils.java
View File

@@ -308,15 +308,13 @@ abstract class NamedParameterUtils {
if (paramSource.hasValue(paramName)) {
Parameter parameter = paramSource.getValue(paramName);
if (parameter.getValue() instanceof Collection<?> collection) {
Iterator<?> entryIter = collection.iterator();
int k = 0;
int counter = 0;
while (entryIter.hasNext()) {
for (Object entryItem : collection) {
if (k > 0) {
actualSql.append(", ");
}
k++;
Object entryItem = entryIter.next();
if (entryItem instanceof Object[] expressionList) {
actualSql.append('(');
for (int m = 0; m < expressionList.length; m++) {