From eb8492d5975d421905676f35b6117ef6255427f6 Mon Sep 17 00:00:00 2001
From: Sam Brannen <104798+sbrannen@users.noreply.github.com>
Date: Fri, 23 Feb 2024 11:56:14 +0100
Subject: [PATCH] Spring cleaning: avoid use of Iterator for Iterable

---
 .../jdbc/core/namedparam/NamedParameterUtils.java            | 5 +----
 .../org/springframework/r2dbc/core/NamedParameterUtils.java  | 4 +---
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterUtils.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterUtils.java
index 8677dc1dc4..ad74063dab 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterUtils.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterUtils.java
@@ -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++) {
diff --git a/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/NamedParameterUtils.java b/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/NamedParameterUtils.java
index c915d081be..940d7bc8b3 100644
--- a/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/NamedParameterUtils.java
+++ b/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/NamedParameterUtils.java
@@ -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++) {