Author: ggregory Date: Tue May 31 05:05:09 2016 New Revision: 1746219 URL: http://svn.apache.org/viewvc?rev=1746219&view=rev Log: Convert for loops to enhanced for loops.
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BaseDynaBeanMapDecorator.java commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BasicDynaClass.java commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BeanMap.java commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BeanUtilsBean.java commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ConstructorUtils.java commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/DefaultIntrospectionContext.java commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/JDBCDynaClass.java commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/LazyDynaList.java commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/LazyDynaMap.java commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/MappedPropertyDescriptor.java commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/MethodUtils.java commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/PropertyUtilsBean.java commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/RowSetDynaClass.java commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/ArrayConverter.java commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/BooleanConverter.java commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/DateTimeConverter.java commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/BasicDynaBeanTestCase.java commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/BeanMapTestCase.java commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/BeanUtilsTestCase.java commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/DynaBeanUtilsTestCase.java commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/DynaPropertyUtilsTestCase.java commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/LazyDynaListTestCase.java commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/PropertyUtilsTestCase.java commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira357TestCase.java commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/ArrayConverterTestCase.java commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/BooleanConverterTestCase.java Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BaseDynaBeanMapDecorator.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BaseDynaBeanMapDecorator.java?rev=1746219&r1=1746218&r2=1746219&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BaseDynaBeanMapDecorator.java (original) +++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BaseDynaBeanMapDecorator.java Tue May 31 05:05:09 2016 @@ -134,8 +134,8 @@ public abstract class BaseDynaBeanMapDec */ public boolean containsValue(final Object value) { final DynaProperty[] properties = getDynaProperties(); - for (int i = 0; i < properties.length; i++) { - final String key = properties[i].getName(); + for (DynaProperty propertie : properties) { + final String key = propertie.getName(); final Object prop = getDynaBean().get(key); if (value == null) { if (prop == null) { @@ -163,9 +163,9 @@ public abstract class BaseDynaBeanMapDec public Set<Map.Entry<K, Object>> entrySet() { final DynaProperty[] properties = getDynaProperties(); final Set<Map.Entry<K, Object>> set = new HashSet<Map.Entry<K, Object>>(properties.length); - for (int i = 0; i < properties.length; i++) { - final K key = convertKey(properties[i].getName()); - final Object value = getDynaBean().get(properties[i].getName()); + for (DynaProperty propertie : properties) { + final K key = convertKey(propertie.getName()); + final Object value = getDynaBean().get(propertie.getName()); set.add(new MapEntry<K>(key, value)); } return Collections.unmodifiableSet(set); @@ -212,8 +212,8 @@ public abstract class BaseDynaBeanMapDec // Create a Set of the keys final DynaProperty[] properties = getDynaProperties(); Set<K> set = new HashSet<K>(properties.length); - for (int i = 0; i < properties.length; i++) { - set.add(convertKey(properties[i].getName())); + for (DynaProperty propertie : properties) { + set.add(convertKey(propertie.getName())); } set = Collections.unmodifiableSet(set); @@ -292,8 +292,8 @@ public abstract class BaseDynaBeanMapDec public Collection<Object> values() { final DynaProperty[] properties = getDynaProperties(); final List<Object> values = new ArrayList<Object>(properties.length); - for (int i = 0; i < properties.length; i++) { - final String key = properties[i].getName(); + for (DynaProperty propertie : properties) { + final String key = propertie.getName(); final Object value = getDynaBean().get(key); values.add(value); } Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BasicDynaClass.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BasicDynaClass.java?rev=1746219&r1=1746218&r2=1746219&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BasicDynaClass.java (original) +++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BasicDynaClass.java Tue May 31 05:05:09 2016 @@ -293,8 +293,8 @@ public class BasicDynaClass implements D this.properties = properties; propertiesMap.clear(); - for (int i = 0; i < properties.length; i++) { - propertiesMap.put(properties[i].getName(), properties[i]); + for (DynaProperty propertie : properties) { + propertiesMap.put(propertie.getName(), propertie); } } Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BeanMap.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BeanMap.java?rev=1746219&r1=1746218&r2=1746219&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BeanMap.java (original) +++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BeanMap.java Tue May 31 05:05:09 2016 @@ -712,8 +712,7 @@ public class BeanMap extends AbstractMap final BeanInfo beanInfo = Introspector.getBeanInfo( beanClass ); final PropertyDescriptor[] propertyDescriptors = beanInfo.getPropertyDescriptors(); if ( propertyDescriptors != null ) { - for ( int i = 0; i < propertyDescriptors.length; i++ ) { - final PropertyDescriptor propertyDescriptor = propertyDescriptors[i]; + for (final PropertyDescriptor propertyDescriptor : propertyDescriptors) { if ( propertyDescriptor != null ) { final String name = propertyDescriptor.getName(); final Method readMethod = propertyDescriptor.getReadMethod(); Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BeanUtilsBean.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BeanUtilsBean.java?rev=1746219&r1=1746218&r2=1746219&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BeanUtilsBean.java (original) +++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BeanUtilsBean.java Tue May 31 05:05:09 2016 @@ -247,8 +247,8 @@ public class BeanUtilsBean { if (orig instanceof DynaBean) { final DynaProperty[] origDescriptors = ((DynaBean) orig).getDynaClass().getDynaProperties(); - for (int i = 0; i < origDescriptors.length; i++) { - final String name = origDescriptors[i].getName(); + for (DynaProperty origDescriptor : origDescriptors) { + final String name = origDescriptor.getName(); // Need to check isReadable() for WrapDynaBean // (see Jira issue# BEANUTILS-61) if (getPropertyUtils().isReadable(orig, name) && @@ -271,8 +271,8 @@ public class BeanUtilsBean { } else /* if (orig is a standard JavaBean) */ { final PropertyDescriptor[] origDescriptors = getPropertyUtils().getPropertyDescriptors(orig); - for (int i = 0; i < origDescriptors.length; i++) { - final String name = origDescriptors[i].getName(); + for (PropertyDescriptor origDescriptor : origDescriptors) { + final String name = origDescriptor.getName(); if ("class".equals(name)) { continue; // No point in trying to set an object's class } @@ -498,17 +498,17 @@ public class BeanUtilsBean { if (bean instanceof DynaBean) { final DynaProperty[] descriptors = ((DynaBean) bean).getDynaClass().getDynaProperties(); - for (int i = 0; i < descriptors.length; i++) { - final String name = descriptors[i].getName(); + for (DynaProperty descriptor : descriptors) { + final String name = descriptor.getName(); description.put(name, getProperty(bean, name)); } } else { final PropertyDescriptor[] descriptors = getPropertyUtils().getPropertyDescriptors(bean); final Class<?> clazz = bean.getClass(); - for (int i = 0; i < descriptors.length; i++) { - final String name = descriptors[i].getName(); - if (getPropertyUtils().getReadMethod(clazz, descriptors[i]) != null) { + for (PropertyDescriptor descriptor : descriptors) { + final String name = descriptor.getName(); + if (getPropertyUtils().getReadMethod(clazz, descriptor) != null) { description.put(name, getProperty(bean, name)); } } Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ConstructorUtils.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ConstructorUtils.java?rev=1746219&r1=1746218&r2=1746219&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ConstructorUtils.java (original) +++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ConstructorUtils.java Tue May 31 05:05:09 2016 @@ -400,9 +400,9 @@ public class ConstructorUtils { // search through all methods final int paramSize = parameterTypes.length; final Constructor<?>[] ctors = clazz.getConstructors(); - for (int i = 0, size = ctors.length; i < size; i++) { + for (Constructor<?> ctor2 : ctors) { // compare parameters - final Class<?>[] ctorParams = ctors[i].getParameterTypes(); + final Class<?>[] ctorParams = ctor2.getParameterTypes(); final int ctorParamSize = ctorParams.length; if (ctorParamSize == paramSize) { boolean match = true; @@ -418,7 +418,7 @@ public class ConstructorUtils { if (match) { // get accessible version of method - final Constructor<?> ctor = getAccessibleConstructor(ctors[i]); + final Constructor<?> ctor = getAccessibleConstructor(ctor2); if (ctor != null) { try { ctor.setAccessible(true); Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/DefaultIntrospectionContext.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/DefaultIntrospectionContext.java?rev=1746219&r1=1746218&r2=1746219&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/DefaultIntrospectionContext.java (original) +++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/DefaultIntrospectionContext.java Tue May 31 05:05:09 2016 @@ -75,8 +75,8 @@ class DefaultIntrospectionContext implem "Array with descriptors must not be null!"); } - for (int i = 0; i < descs.length; i++) { - addPropertyDescriptor(descs[i]); + for (PropertyDescriptor desc : descs) { + addPropertyDescriptor(desc); } } Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/JDBCDynaClass.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/JDBCDynaClass.java?rev=1746219&r1=1746218&r2=1746219&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/JDBCDynaClass.java (original) +++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/JDBCDynaClass.java Tue May 31 05:05:09 2016 @@ -249,8 +249,8 @@ abstract class JDBCDynaClass implements // Convert this list into the internal data structures we need properties = list.toArray(new DynaProperty[list.size()]); - for (int i = 0; i < properties.length; i++) { - propertiesMap.put(properties[i].getName(), properties[i]); + for (DynaProperty propertie : properties) { + propertiesMap.put(propertie.getName(), propertie); } } Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/LazyDynaList.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/LazyDynaList.java?rev=1746219&r1=1746218&r2=1746219&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/LazyDynaList.java (original) +++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/LazyDynaList.java Tue May 31 05:05:09 2016 @@ -247,8 +247,8 @@ public class LazyDynaList extends ArrayL */ public LazyDynaList(final Object[] array) { super(array.length); - for (int i = 0; i < array.length; i++) { - add(array[i]); + for (Object element : array) { + add(element); } } Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/LazyDynaMap.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/LazyDynaMap.java?rev=1746219&r1=1746218&r2=1746219&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/LazyDynaMap.java (original) +++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/LazyDynaMap.java Tue May 31 05:05:09 2016 @@ -124,8 +124,8 @@ public class LazyDynaMap extends LazyDyn public LazyDynaMap(final String name, final DynaProperty[] properties) { this(name, (Map<String, Object>)null); if (properties != null) { - for (int i = 0; i < properties.length; i++) { - add(properties[i]); + for (DynaProperty propertie : properties) { + add(propertie); } } } @@ -285,8 +285,8 @@ public class LazyDynaMap extends LazyDyn final LazyDynaMap lazyMap = new LazyDynaMap(newMap); final DynaProperty[] properties = this.getDynaProperties(); if (properties != null) { - for (int i = 0; i < properties.length; i++) { - lazyMap.add(properties[i]); + for (DynaProperty propertie : properties) { + lazyMap.add(propertie); } } return lazyMap; Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/MappedPropertyDescriptor.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/MappedPropertyDescriptor.java?rev=1746219&r1=1746218&r2=1746219&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/MappedPropertyDescriptor.java (original) +++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/MappedPropertyDescriptor.java Tue May 31 05:05:09 2016 @@ -342,8 +342,7 @@ public class MappedPropertyDescriptor ex // So we start with the given class and walk up the superclass chain. for (Class<?> clazz = initial; clazz != null; clazz = clazz.getSuperclass()) { final Method[] methods = clazz.getDeclaredMethods(); - for (int i = 0; i < methods.length; i++) { - final Method method = methods[i]; + for (final Method method : methods) { if (method == null) { continue; } @@ -364,8 +363,8 @@ public class MappedPropertyDescriptor ex // the argument class is itself an interface, and when the argument // class is an abstract class. final Class<?>[] interfaces = initial.getInterfaces(); - for (int i = 0; i < interfaces.length; i++) { - final Method method = internalGetMethod(interfaces[i], methodName, parameterCount); + for (Class<?> interface1 : interfaces) { + final Method method = internalGetMethod(interface1, methodName, parameterCount); if (method != null) { return method; } Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/MethodUtils.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/MethodUtils.java?rev=1746219&r1=1746218&r2=1746219&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/MethodUtils.java (original) +++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/MethodUtils.java Tue May 31 05:05:09 2016 @@ -973,16 +973,16 @@ public class MethodUtils { final Method[] methods = clazz.getMethods(); float bestMatchCost = Float.MAX_VALUE; float myCost = Float.MAX_VALUE; - for (int i = 0, size = methods.length; i < size ; i++) { - if (methods[i].getName().equals(methodName)) { + for (Method method2 : methods) { + if (method2.getName().equals(methodName)) { // log some trace information if (log.isTraceEnabled()) { log.trace("Found matching name:"); - log.trace(methods[i]); + log.trace(method2); } // compare parameters - final Class<?>[] methodsParams = methods[i].getParameterTypes(); + final Class<?>[] methodsParams = method2.getParameterTypes(); final int methodParamSize = methodsParams.length; if (methodParamSize == paramSize) { boolean match = true; @@ -1003,11 +1003,11 @@ public class MethodUtils { if (match) { // get accessible version of method - final Method method = getAccessibleMethod(clazz, methods[i]); + final Method method = getAccessibleMethod(clazz, method2); if (method != null) { if (log.isTraceEnabled()) { log.trace(method + " accessible version of " - + methods[i]); + + method2); } setMethodAccessible(method); // Default access superclass workaround myCost = getTotalTransformationCost(parameterTypes,method.getParameterTypes()); Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/PropertyUtilsBean.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/PropertyUtilsBean.java?rev=1746219&r1=1746218&r2=1746219&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/PropertyUtilsBean.java (original) +++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/PropertyUtilsBean.java Tue May 31 05:05:09 2016 @@ -279,8 +279,8 @@ public class PropertyUtilsBean { if (orig instanceof DynaBean) { final DynaProperty[] origDescriptors = ((DynaBean) orig).getDynaClass().getDynaProperties(); - for (int i = 0; i < origDescriptors.length; i++) { - final String name = origDescriptors[i].getName(); + for (DynaProperty origDescriptor : origDescriptors) { + final String name = origDescriptor.getName(); if (isReadable(orig, name) && isWriteable(dest, name)) { try { final Object value = ((DynaBean) orig).get(name); @@ -318,8 +318,8 @@ public class PropertyUtilsBean { } else /* if (orig is a standard JavaBean) */ { final PropertyDescriptor[] origDescriptors = getPropertyDescriptors(orig); - for (int i = 0; i < origDescriptors.length; i++) { - final String name = origDescriptors[i].getName(); + for (PropertyDescriptor origDescriptor : origDescriptors) { + final String name = origDescriptor.getName(); if (isReadable(orig, name) && isWriteable(dest, name)) { try { final Object value = getSimpleProperty(orig, name); @@ -370,16 +370,16 @@ public class PropertyUtilsBean { if (bean instanceof DynaBean) { final DynaProperty[] descriptors = ((DynaBean) bean).getDynaClass().getDynaProperties(); - for (int i = 0; i < descriptors.length; i++) { - final String name = descriptors[i].getName(); + for (DynaProperty descriptor : descriptors) { + final String name = descriptor.getName(); description.put(name, getProperty(bean, name)); } } else { final PropertyDescriptor[] descriptors = getPropertyDescriptors(bean); - for (int i = 0; i < descriptors.length; i++) { - final String name = descriptors[i].getName(); - if (descriptors[i].getReadMethod() != null) { + for (PropertyDescriptor descriptor : descriptors) { + final String name = descriptor.getName(); + if (descriptor.getReadMethod() != null) { description.put(name, getProperty(bean, name)); } } Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/RowSetDynaClass.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/RowSetDynaClass.java?rev=1746219&r1=1746218&r2=1746219&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/RowSetDynaClass.java (original) +++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/RowSetDynaClass.java Tue May 31 05:05:09 2016 @@ -287,8 +287,8 @@ public class RowSetDynaClass extends JDB int cnt = 0; while (resultSet.next() && (limit < 0 || cnt++ < limit) ) { final DynaBean bean = createDynaBean(); - for (int i = 0; i < properties.length; i++) { - final String name = properties[i].getName(); + for (DynaProperty propertie : properties) { + final String name = propertie.getName(); final Object value = getObject(resultSet, name); bean.set(name, value); } Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/ArrayConverter.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/ArrayConverter.java?rev=1746219&r1=1746218&r2=1746219&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/ArrayConverter.java (original) +++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/ArrayConverter.java Tue May 31 05:05:09 2016 @@ -451,9 +451,9 @@ public class ArrayConverter extends Abst st.whitespaceChars(delimiter , delimiter); // Set the delimiters st.ordinaryChars('0', '9'); // Needed to turn off numeric flag st.wordChars('0', '9'); // Needed to make part of tokens - for (int i = 0; i < allowedChars.length; i++) { - st.ordinaryChars(allowedChars[i], allowedChars[i]); - st.wordChars(allowedChars[i], allowedChars[i]); + for (char allowedChar : allowedChars) { + st.ordinaryChars(allowedChar, allowedChar); + st.wordChars(allowedChar, allowedChar); } // Split comma-delimited tokens into a List Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/BooleanConverter.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/BooleanConverter.java?rev=1746219&r1=1746218&r2=1746219&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/BooleanConverter.java (original) +++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/BooleanConverter.java Tue May 31 05:05:09 2016 @@ -212,14 +212,14 @@ public final class BooleanConverter exte // instead of the less-efficient String.equalsIgnoreCase method. final String stringValue = value.toString().toLowerCase(); - for (int i = 0; i < trueStrings.length; ++i) { - if (trueStrings[i].equals(stringValue)) { + for (String trueString : trueStrings) { + if (trueString.equals(stringValue)) { return type.cast(Boolean.TRUE); } } - for (int i = 0; i < falseStrings.length; ++i) { - if (falseStrings[i].equals(stringValue)) { + for (String falseString : falseStrings) { + if (falseString.equals(stringValue)) { return type.cast(Boolean.FALSE); } } Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/DateTimeConverter.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/DateTimeConverter.java?rev=1746219&r1=1746218&r2=1746219&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/DateTimeConverter.java (original) +++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/DateTimeConverter.java Tue May 31 05:05:09 2016 @@ -520,9 +520,9 @@ public abstract class DateTimeConverter */ private Calendar parse(final Class<?> sourceType, final Class<?> targetType, final String value) throws Exception { Exception firstEx = null; - for (int i = 0; i < patterns.length; i++) { + for (String pattern : patterns) { try { - final DateFormat format = getFormat(patterns[i]); + final DateFormat format = getFormat(pattern); final Calendar calendar = parse(sourceType, targetType, value, format); return calendar; } catch (final Exception ex) { Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/BasicDynaBeanTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/BasicDynaBeanTestCase.java?rev=1746219&r1=1746218&r2=1746219&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/BasicDynaBeanTestCase.java (original) +++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/BasicDynaBeanTestCase.java Tue May 31 05:05:09 2016 @@ -287,8 +287,8 @@ public class BasicDynaBeanTestCase exten final DynaProperty pd[] = bean.getDynaClass().getDynaProperties(); assertNotNull("Got descriptors", pd); final int count[] = new int[properties.length]; - for (int i = 0; i < pd.length; i++) { - final String name = pd[i].getName(); + for (DynaProperty element : pd) { + final String name = element.getName(); for (int j = 0; j < properties.length; j++) { if (name.equals(properties[j])) { count[j]++; Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/BeanMapTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/BeanMapTestCase.java?rev=1746219&r1=1746218&r2=1746219&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/BeanMapTestCase.java (original) +++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/BeanMapTestCase.java Tue May 31 05:05:09 2016 @@ -342,9 +342,9 @@ public class BeanMapTestCase extends Abs // make sure containsKey is working to verify the bean was cloned // ok, and the read methods were properly initialized final Object[] keys = getSampleKeys(); - for(int i = 0; i < keys.length; i++) { + for (Object key : keys) { assertTrue("Cloned BeanMap should contain the same keys", - map2.containsKey(keys[i])); + map2.containsKey(key)); } } catch (final CloneNotSupportedException exception) { fail("BeanMap.clone() should not throw a " + Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/BeanUtilsTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/BeanUtilsTestCase.java?rev=1746219&r1=1746218&r2=1746219&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/BeanUtilsTestCase.java (original) +++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/BeanUtilsTestCase.java Tue May 31 05:05:09 2016 @@ -394,9 +394,9 @@ public class BeanUtilsTestCase extends T } // Verify existence of all the properties that should be present - for (int i = 0; i < describes.length; i++) { - assertTrue("Property '" + describes[i] + "' is present", - map.containsKey(describes[i])); + for (String describe : describes) { + assertTrue("Property '" + describe + "' is present", + map.containsKey(describe)); } assertTrue("Property 'writeOnlyProperty' is not present", !map.containsKey("writeOnlyProperty")); Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/DynaBeanUtilsTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/DynaBeanUtilsTestCase.java?rev=1746219&r1=1746218&r2=1746219&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/DynaBeanUtilsTestCase.java (original) +++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/DynaBeanUtilsTestCase.java Tue May 31 05:05:09 2016 @@ -483,9 +483,9 @@ public class DynaBeanUtilsTestCase exten } // Verify existence of all the properties that should be present - for (int i = 0; i < describes.length; i++) { - assertTrue("Property '" + describes[i] + "' is present", - map.containsKey(describes[i])); + for (String describe : describes) { + assertTrue("Property '" + describe + "' is present", + map.containsKey(describe)); } assertTrue("Property 'writeOnlyProperty' is not present", !map.containsKey("writeOnlyProperty")); Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/DynaPropertyUtilsTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/DynaPropertyUtilsTestCase.java?rev=1746219&r1=1746218&r2=1746219&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/DynaPropertyUtilsTestCase.java (original) +++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/DynaPropertyUtilsTestCase.java Tue May 31 05:05:09 2016 @@ -253,9 +253,9 @@ public class DynaPropertyUtilsTestCase e } // Verify existence of all the properties that should be present - for (int i = 0; i < describes.length; i++) { - assertTrue("Property '" + describes[i] + "' is present", - map.containsKey(describes[i])); + for (String describe : describes) { + assertTrue("Property '" + describe + "' is present", + map.containsKey(describe)); } assertTrue("Property 'writeOnlyProperty' is not present", !map.containsKey("writeOnlyProperty")); Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/LazyDynaListTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/LazyDynaListTestCase.java?rev=1746219&r1=1746218&r2=1746219&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/LazyDynaListTestCase.java (original) +++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/LazyDynaListTestCase.java Tue May 31 05:05:09 2016 @@ -328,9 +328,9 @@ public class LazyDynaListTestCase extend */ private String findStringProperty(final DynaClass dynaClass) { final DynaProperty[] properties = dynaClass.getDynaProperties(); - for (int i = 0; i < properties.length; i++) { - if (properties[i].getType() == String.class) { - return properties[i].getName(); + for (DynaProperty propertie : properties) { + if (propertie.getType() == String.class) { + return propertie.getName(); } } return null; Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/PropertyUtilsTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/PropertyUtilsTestCase.java?rev=1746219&r1=1746218&r2=1746219&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/PropertyUtilsTestCase.java (original) +++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/PropertyUtilsTestCase.java Tue May 31 05:05:09 2016 @@ -321,9 +321,9 @@ public class PropertyUtilsTestCase exten } // Verify existence of all the properties that should be present - for (int i = 0; i < describes.length; i++) { - assertTrue("Property '" + describes[i] + "' is present", - map.containsKey(describes[i])); + for (String describe : describes) { + assertTrue("Property '" + describe + "' is present", + map.containsKey(describe)); } assertTrue("Property 'writeOnlyProperty' is not present", !map.containsKey("writeOnlyProperty")); @@ -573,8 +573,8 @@ public class PropertyUtilsTestCase exten PropertyUtils.getPropertyDescriptors(bean); assertNotNull("Got descriptors", pd); final int count[] = new int[properties.length]; - for (int i = 0; i < pd.length; i++) { - final String name = pd[i].getName(); + for (PropertyDescriptor element : pd) { + final String name = element.getName(); for (int j = 0; j < properties.length; j++) { if (name.equals(properties[j])) { count[j]++; @@ -3992,36 +3992,36 @@ public class PropertyUtilsTestCase exten final PropertyDescriptor pd[] = PropertyUtils.getPropertyDescriptors(bean); - for (int i = 0; i < properties.length; i++) { + for (String propertie : properties) { // Identify the property descriptor for this property - if (properties[i].equals("intIndexed")) { + if (propertie.equals("intIndexed")) { continue; } - if (properties[i].equals("stringIndexed")) { + if (propertie.equals("stringIndexed")) { continue; } - if (properties[i].equals("writeOnlyProperty")) { + if (propertie.equals("writeOnlyProperty")) { continue; } int n = -1; for (int j = 0; j < pd.length; j++) { - if (properties[i].equals(pd[j].getName())) { + if (propertie.equals(pd[j].getName())) { n = j; break; } } - assertTrue("PropertyDescriptor for " + properties[i], + assertTrue("PropertyDescriptor for " + propertie, n >= 0); // Locate an accessible property reader method for it final Method reader = PropertyUtils.getReadMethod(pd[n]); - assertNotNull("Reader for " + properties[i], + assertNotNull("Reader for " + propertie, reader); final Class<?> clazz = reader.getDeclaringClass(); - assertNotNull("Declaring class for " + properties[i], + assertNotNull("Declaring class for " + propertie, clazz); - assertEquals("Correct declaring class for " + properties[i], + assertEquals("Correct declaring class for " + propertie, clazz.getName(), className); @@ -4029,7 +4029,7 @@ public class PropertyUtilsTestCase exten try { reader.invoke(bean, (Object[]) new Class<?>[0]); } catch (final Throwable t) { - fail("Call for " + properties[i] + ": " + t); + fail("Call for " + propertie + ": " + t); } } @@ -4050,43 +4050,43 @@ public class PropertyUtilsTestCase exten final PropertyDescriptor pd[] = PropertyUtils.getPropertyDescriptors(bean); - for (int i = 0; i < properties.length; i++) { + for (String propertie : properties) { // Identify the property descriptor for this property - if (properties[i].equals("intIndexed")) { + if (propertie.equals("intIndexed")) { continue; } - if (properties[i].equals("listIndexed")) { + if (propertie.equals("listIndexed")) { continue; } - if (properties[i].equals("nested")) + if (propertie.equals("nested")) { continue; // This property is read only } - if (properties[i].equals("readOnlyProperty")) { + if (propertie.equals("readOnlyProperty")) { continue; } - if (properties[i].equals("stringIndexed")) { + if (propertie.equals("stringIndexed")) { continue; } int n = -1; for (int j = 0; j < pd.length; j++) { - if (properties[i].equals(pd[j].getName())) { + if (propertie.equals(pd[j].getName())) { n = j; break; } } - assertTrue("PropertyDescriptor for " + properties[i], + assertTrue("PropertyDescriptor for " + propertie, n >= 0); // Locate an accessible property reader method for it final Method writer = PropertyUtils.getWriteMethod(pd[n]); - assertNotNull("Writer for " + properties[i], + assertNotNull("Writer for " + propertie, writer); final Class<?> clazz = writer.getDeclaringClass(); - assertNotNull("Declaring class for " + properties[i], + assertNotNull("Declaring class for " + propertie, clazz); - assertEquals("Correct declaring class for " + properties[i], + assertEquals("Correct declaring class for " + propertie, clazz.getName(), className); @@ -4503,9 +4503,9 @@ public class PropertyUtilsTestCase exten */ private static PropertyDescriptor findNameDescriptor( final PropertyDescriptor[] desc) { - for (int i = 0; i < desc.length; i++) { - if (desc[i].getName().equals("name")) { - return desc[i]; + for (PropertyDescriptor element : desc) { + if (element.getName().equals("name")) { + return element; } } return null; Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira357TestCase.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira357TestCase.java?rev=1746219&r1=1746218&r2=1746219&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira357TestCase.java (original) +++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira357TestCase.java Tue May 31 05:05:09 2016 @@ -126,9 +126,9 @@ public class Jira357TestCase extends Tes */ private PropertyDescriptor findDescriptor(final String propertyName, final PropertyDescriptor[] descriptors) { if (descriptors != null) { - for (int i = 0; i < descriptors.length; i++) { - if (propertyName.equals(descriptors[i].getName())) { - return descriptors[i]; + for (PropertyDescriptor descriptor : descriptors) { + if (propertyName.equals(descriptor.getName())) { + return descriptor; } } } Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/ArrayConverterTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/ArrayConverterTestCase.java?rev=1746219&r1=1746218&r2=1746219&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/ArrayConverterTestCase.java (original) +++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/ArrayConverterTestCase.java Tue May 31 05:05:09 2016 @@ -217,8 +217,8 @@ public class ArrayConverterTestCase exte // Test Data final String[] array = new String[] {"10", " 11", "12 ", " 13 "}; final ArrayList<String> list = new ArrayList<String>(); - for (int i = 0; i < array.length; i++) { - list.add(array[i]); + for (String element : array) { + list.add(element); } // Expected results Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/BooleanConverterTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/BooleanConverterTestCase.java?rev=1746219&r1=1746218&r2=1746219&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/BooleanConverterTestCase.java (original) +++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/converters/BooleanConverterTestCase.java Tue May 31 05:05:09 2016 @@ -119,11 +119,11 @@ public class BooleanConverterTestCase ex protected void testConversionValues(final BooleanConverter converter, final String[] trueValues, final String[] falseValues) { - for (int i = 0; i < trueValues.length; i++) { - assertEquals(Boolean.TRUE, converter.convert(Boolean.class, trueValues[i])); + for (String trueValue : trueValues) { + assertEquals(Boolean.TRUE, converter.convert(Boolean.class, trueValue)); } - for (int i = 0; i < falseValues.length; i++) { - assertEquals(Boolean.FALSE, converter.convert(Boolean.class, falseValues[i])); + for (String falseValue : falseValues) { + assertEquals(Boolean.FALSE, converter.convert(Boolean.class, falseValue)); } }