From 97bfe08d688ba62d203e70ebe78c359653b02029 Mon Sep 17 00:00:00 2001 From: Yuri Orlov Date: Sat, 27 Oct 2018 17:41:27 +0300 Subject: [PATCH] Replace 'while' and 'for' loop to 'foreach' --- .../src/main/java/com/querydsl/core/util/BeanMap.java | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/querydsl-core/src/main/java/com/querydsl/core/util/BeanMap.java b/querydsl-core/src/main/java/com/querydsl/core/util/BeanMap.java index 21df5383d..8f117b318 100644 --- a/querydsl-core/src/main/java/com/querydsl/core/util/BeanMap.java +++ b/querydsl-core/src/main/java/com/querydsl/core/util/BeanMap.java @@ -194,9 +194,7 @@ public class BeanMap extends AbstractMap implements Cloneable { // copy only properties that are readable and writable. If its // not readable, we can't get the value from the old map. If // its not writable, we can't write a value into the new map. - Iterator readableKeys = readMethods.keySet().iterator(); - while (readableKeys.hasNext()) { - String key = readableKeys.next(); + for (String key : readMethods.keySet()) { if (getWriteMethod(key) != null) { newMap.put(key, get(key)); } @@ -215,9 +213,7 @@ public class BeanMap extends AbstractMap implements Cloneable { * @param map the BeanMap whose properties to put */ public void putAllWriteable(BeanMap map) { - Iterator readableKeys = map.readMethods.keySet().iterator(); - while (readableKeys.hasNext()) { - String key = readableKeys.next(); + for (String key : map.readMethods.keySet()) { if (getWriteMethod(key) != null) { this.put(key, map.get(key)); } @@ -542,8 +538,7 @@ public class BeanMap extends AbstractMap implements Cloneable { BeanInfo beanInfo = Introspector.getBeanInfo(beanClass); PropertyDescriptor[] propertyDescriptors = beanInfo.getPropertyDescriptors(); if (propertyDescriptors != null) { - for (int i = 0; i < propertyDescriptors.length; i++) { - PropertyDescriptor propertyDescriptor = propertyDescriptors[i]; + for (PropertyDescriptor propertyDescriptor : propertyDescriptors) { if (propertyDescriptor != null) { String name = propertyDescriptor.getName(); Method readMethod = propertyDescriptor.getReadMethod();