root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Use enhanced for loop where feasible 

See gh-31916
This commit is contained in:
Yanming Zhou 2023-12-28 15:15:07 +08:00 committed by Stéphane Nicoll
parent ed1bfb8177
commit 4a450c6fab
6 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spring-aop/src/main/java/org/springframework/aop/config/ConfigBeanDefinitionParser.java
View File

@ -201,9 +201,8 @@ class ConfigBeanDefinitionParser implements BeanDefinitionParser {
List<BeanReference> beanReferences = new ArrayList<>(); List<BeanReference> beanReferences = new ArrayList<>();
List<Element> declareParents = DomUtils.getChildElementsByTagName(aspectElement, DECLARE_PARENTS); List<Element> declareParents = DomUtils.getChildElementsByTagName(aspectElement, DECLARE_PARENTS);
for (int i = METHOD_INDEX; i < declareParents.size(); i++) { for (Element declareParent : declareParents) {
Element declareParentsElement = declareParents.get(i); beanDefinitions.add(parseDeclareParents(declareParent, parserContext));
beanDefinitions.add(parseDeclareParents(declareParentsElement, parserContext));
} }
// We have to parse "advice" and all the advice kinds in one loop, to get the // We have to parse "advice" and all the advice kinds in one loop, to get the

5
spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/GenericBean.java
View File

@ -23,7 +23,6 @@ import java.util.EnumMap;
import java.util.EnumSet; import java.util.EnumSet;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
@ -268,8 +267,8 @@ public class GenericBean<T> {
public void setCustomEnumSetMismatch(Set<String> customEnumSet) { public void setCustomEnumSetMismatch(Set<String> customEnumSet) {
this.customEnumSet = new HashSet<>(customEnumSet.size()); this.customEnumSet = new HashSet<>(customEnumSet.size());
for (Iterator<String> iterator = customEnumSet.iterator(); iterator.hasNext(); ) { for (String customEnumName : customEnumSet) {
this.customEnumSet.add(CustomEnum.valueOf(iterator.next())); this.customEnumSet.add(CustomEnum.valueOf(customEnumName));
} }
} }

4
spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java
View File

@ -24,7 +24,6 @@ import java.rmi.MarshalException;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -1224,8 +1223,7 @@ public abstract class AbstractAopProxyTests {
@Override @Override
public Object invoke(MethodInvocation invocation) throws Throwable { public Object invoke(MethodInvocation invocation) throws Throwable {
ReflectiveMethodInvocation rmi = (ReflectiveMethodInvocation) invocation; ReflectiveMethodInvocation rmi = (ReflectiveMethodInvocation) invocation;
for (Iterator<String> it = rmi.getUserAttributes().keySet().iterator(); it.hasNext(); ){ for (Object key : rmi.getUserAttributes().keySet()) {
Object key = it.next();
assertThat(rmi.getUserAttributes().get(key)).isEqualTo(expectedValues.get(key)); assertThat(rmi.getUserAttributes().get(key)).isEqualTo(expectedValues.get(key));
} }
rmi.getUserAttributes().putAll(valuesToAdd); rmi.getUserAttributes().putAll(valuesToAdd);

4
spring-context/src/test/java/org/springframework/aop/target/CommonsPool2TargetSourceTests.java
View File

@ -186,8 +186,8 @@ class CommonsPool2TargetSourceTests {
pooledInstances[9] = targetSource.getTarget(); pooledInstances[9] = targetSource.getTarget();
// release all objects // release all objects
for (int i = 0; i < pooledInstances.length; i++) { for (Object pooledInstance : pooledInstances) {
targetSource.releaseTarget(pooledInstances[i]); targetSource.releaseTarget(pooledInstance);
} }
} }

4
spring-core/src/main/java/org/springframework/util/ConcurrentReferenceHashMap.java
View File

@ -607,8 +607,8 @@ public class ConcurrentReferenceHashMap<K, V> extends AbstractMap<K, V> implemen
// Restructure the resized reference array // Restructure the resized reference array
if (resizing) { if (resizing) {
Reference<K, V>[] restructured = createReferenceArray(restructureSize); Reference<K, V>[] restructured = createReferenceArray(restructureSize);
for (int i = 0; i < this.references.length; i++) { for (Reference<K, V> reference : this.references) {
ref = this.references[i]; ref = reference;
while (ref != null) { while (ref != null) {
if (!toPurge.contains(ref)) { if (!toPurge.contains(ref)) {
Entry<K, V> entry = ref.get(); Entry<K, V> entry = ref.get();

5
spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/JettyXhrTransport.java
View File

@ -20,7 +20,6 @@ import java.io.ByteArrayOutputStream;
import java.net.URI; import java.net.URI;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.Enumeration; import java.util.Enumeration;
import java.util.Iterator;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
import org.eclipse.jetty.client.ContentResponse; import org.eclipse.jetty.client.ContentResponse;
@ -172,9 +171,7 @@ public class JettyXhrTransport extends AbstractXhrTransport implements Lifecycle
private static HttpHeaders toHttpHeaders(HttpFields httpFields) { private static HttpHeaders toHttpHeaders(HttpFields httpFields) {
HttpHeaders responseHeaders = new HttpHeaders(); HttpHeaders responseHeaders = new HttpHeaders();
Iterator<String> names = httpFields.getFieldNamesCollection().iterator(); for (String name : httpFields.getFieldNamesCollection()) {
while (names.hasNext()) {
String name = names.next();
Enumeration<String> values = httpFields.getValues(name); Enumeration<String> values = httpFields.getValues(name);
while (values.hasMoreElements()) { while (values.hasMoreElements()) {
String value = values.nextElement(); String value = values.nextElement();