Author: ggregory Date: Tue Jan 22 19:22:39 2013 New Revision: 1437110 URL: http://svn.apache.org/viewvc?rev=1437110&view=rev Log: Add final modifier to private fields.
Modified: 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/ContextClassLoaderLocal.java commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ConvertUtilsBean.java commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/DynaBeanMapDecorator.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/WeakFastHashMap.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/NumberConverter.java commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/BaseLocaleConverter.java commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/LocaleBeanUtilsBean.java commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/LocaleConvertUtilsBean.java commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/DateLocaleConverter.java commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/DecimalLocaleConverter.java commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/StringLocaleConverter.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/BeanWithInnerBean.java commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/BeanificationTestCase.java commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/DynaBeanMapDecoratorTestCase.java commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/DynaRowSetTestCase.java commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/MappedPropertyTestBean.java commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/TestBean.java commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira157TestCase.java commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira18TestCase.java commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira273TestCase.java commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira298TestCase.java commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira339TestCase.java commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira349TestCase.java commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira61TestCase.java commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira87TestCase.java commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira92TestCase.java commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/other/Jira18BeanFactory.java commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/other/Jira61BeanFactory.java commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/expression/DefaultResolverTestCase.java commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/LocaleBeanificationTestCase.java commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/converters/DateLocaleConverterTestCase.java commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/priv/PrivateBean.java 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=1437110&r1=1437109&r2=1437110&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 Jan 22 19:22:39 2013 @@ -724,7 +724,7 @@ public class BeanMap extends AbstractMap * Map entry used by {@link BeanMap}. */ protected static class Entry extends AbstractMapEntry { - private BeanMap owner; + private final BeanMap owner; /** * Constructs a new <code>Entry</code>. 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=1437110&r1=1437109&r2=1437110&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 Jan 22 19:22:39 2013 @@ -96,13 +96,13 @@ public class BeanUtilsBean { /** * Logging for this instance */ - private Log log = LogFactory.getLog(BeanUtils.class); + private final Log log = LogFactory.getLog(BeanUtils.class); /** Used to perform conversions between object types when setting properties */ - private ConvertUtilsBean convertUtilsBean; + private final ConvertUtilsBean convertUtilsBean; /** Used to access properties*/ - private PropertyUtilsBean propertyUtilsBean; + private final PropertyUtilsBean propertyUtilsBean; /** A reference to Throwable's initCause method, or null if it's not there in this JVM */ private static final Method INIT_CAUSE_METHOD = getInitCauseMethod(); Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ContextClassLoaderLocal.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ContextClassLoaderLocal.java?rev=1437110&r1=1437109&r2=1437110&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ContextClassLoaderLocal.java (original) +++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ContextClassLoaderLocal.java Tue Jan 22 19:22:39 2013 @@ -101,7 +101,7 @@ import java.util.WeakHashMap; * @author Eric Pabst */ public class ContextClassLoaderLocal { - private Map valueByClassLoader = new WeakHashMap(); + private final Map valueByClassLoader = new WeakHashMap(); private boolean globalValueInitialized = false; private Object globalValue; Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ConvertUtilsBean.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ConvertUtilsBean.java?rev=1437110&r1=1437109&r2=1437110&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ConvertUtilsBean.java (original) +++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ConvertUtilsBean.java Tue Jan 22 19:22:39 2013 @@ -149,12 +149,12 @@ public class ConvertUtilsBean { * The set of {@link Converter}s that can be used to convert Strings * into objects of a specified Class, keyed by the destination Class. */ - private WeakFastHashMap converters = new WeakFastHashMap(); + private final WeakFastHashMap converters = new WeakFastHashMap(); /** * The <code>Log</code> instance for this class. */ - private Log log = LogFactory.getLog(ConvertUtils.class); + private final Log log = LogFactory.getLog(ConvertUtils.class); // ------------------------------------------------------- Constructors Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/DynaBeanMapDecorator.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/DynaBeanMapDecorator.java?rev=1437110&r1=1437109&r2=1437110&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/DynaBeanMapDecorator.java (original) +++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/DynaBeanMapDecorator.java Tue Jan 22 19:22:39 2013 @@ -72,8 +72,8 @@ import java.util.Collections; */ public class DynaBeanMapDecorator implements Map { - private DynaBean dynaBean; - private boolean readOnly; + private final DynaBean dynaBean; + private final boolean readOnly; private transient Set keySet; // ------------------- Constructors ---------------------------------- @@ -362,8 +362,8 @@ public class DynaBeanMapDecorator implem * Map.Entry implementation. */ private static class MapEntry implements Map.Entry { - private Object key; - private Object value; + private final Object key; + private final Object value; MapEntry(Object key, Object value) { this.key = key; this.value = value; 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=1437110&r1=1437109&r2=1437110&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 Jan 22 19:22:39 2013 @@ -1305,11 +1305,11 @@ public class MethodUtils { * Represents the key to looking up a Method by reflection. */ private static class MethodDescriptor { - private Class cls; - private String methodName; - private Class[] paramTypes; - private boolean exact; - private int hashCode; + private final Class cls; + private final String methodName; + private final Class[] paramTypes; + private final boolean exact; + private final int hashCode; /** * The sole constructor. 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=1437110&r1=1437109&r2=1437110&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 Jan 22 19:22:39 2013 @@ -129,7 +129,7 @@ public class PropertyUtilsBean { private static final Object[] EMPTY_OBJECT_ARRAY = new Object[0]; /** Log instance */ - private Log log = LogFactory.getLog(PropertyUtils.class); + private final Log log = LogFactory.getLog(PropertyUtils.class); // ---------------------------------------------------------- Constructors Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/WeakFastHashMap.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/WeakFastHashMap.java?rev=1437110&r1=1437109&r2=1437110&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/WeakFastHashMap.java (original) +++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/WeakFastHashMap.java Tue Jan 22 19:22:39 2013 @@ -654,7 +654,7 @@ class WeakFastHashMap extends HashMap { private Map expected; private Map.Entry lastReturned = null; - private Iterator iterator; + private final Iterator iterator; public CollectionViewIterator() { this.expected = map; 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=1437110&r1=1437109&r2=1437110&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 Jan 22 19:22:39 2013 @@ -126,8 +126,8 @@ import org.apache.commons.beanutils.Conv */ public class ArrayConverter extends AbstractConverter { - private Object defaultTypeInstance; - private Converter elementConverter; + private final Object defaultTypeInstance; + private final Converter elementConverter; private int defaultSize; private char delimiter = ','; private char[] allowedChars = new char[] {'.', '-'}; Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/NumberConverter.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/NumberConverter.java?rev=1437110&r1=1437109&r2=1437110&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/NumberConverter.java (original) +++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/NumberConverter.java Tue Jan 22 19:22:39 2013 @@ -88,7 +88,7 @@ public abstract class NumberConverter ex private static final Integer ONE = new Integer(1); private String pattern; - private boolean allowDecimals; + private final boolean allowDecimals; private boolean useLocaleFormat; private Locale locale; Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/BaseLocaleConverter.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/BaseLocaleConverter.java?rev=1437110&r1=1437109&r2=1437110&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/BaseLocaleConverter.java (original) +++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/BaseLocaleConverter.java Tue Jan 22 19:22:39 2013 @@ -40,7 +40,7 @@ public abstract class BaseLocaleConverte // ----------------------------------------------------- Instance Variables /** All logging goes through this logger */ - private Log log = LogFactory.getLog(BaseLocaleConverter.class); + private final Log log = LogFactory.getLog(BaseLocaleConverter.class); /** The default value specified to our Constructor, if any. */ private Object defaultValue = null; Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/LocaleBeanUtilsBean.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/LocaleBeanUtilsBean.java?rev=1437110&r1=1437109&r2=1437110&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/LocaleBeanUtilsBean.java (original) +++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/LocaleBeanUtilsBean.java Tue Jan 22 19:22:39 2013 @@ -84,12 +84,12 @@ public class LocaleBeanUtilsBean extends } /** All logging goes through this logger */ - private Log log = LogFactory.getLog(LocaleBeanUtilsBean.class); + private final Log log = LogFactory.getLog(LocaleBeanUtilsBean.class); // ----------------------------------------------------- Instance Variables /** Convertor used by this class */ - private LocaleConvertUtilsBean localeConvertUtils; + private final LocaleConvertUtilsBean localeConvertUtils; // --------------------------------------------------------- Constructors Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/LocaleConvertUtilsBean.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/LocaleConvertUtilsBean.java?rev=1437110&r1=1437109&r2=1437110&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/LocaleConvertUtilsBean.java (original) +++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/LocaleConvertUtilsBean.java Tue Jan 22 19:22:39 2013 @@ -103,13 +103,13 @@ public class LocaleConvertUtilsBean { private boolean applyLocalized = false; /** The <code>Log</code> instance for this class. */ - private Log log = LogFactory.getLog(LocaleConvertUtils.class); + private final Log log = LogFactory.getLog(LocaleConvertUtils.class); /** Every entry of the mapConverters is: * key = locale * value = FastHashMap of converters for the certain locale. */ - private FastHashMap mapConverters = new DelegateFastHashMap(BeanUtils.createCache()); + private final FastHashMap mapConverters = new DelegateFastHashMap(BeanUtils.createCache()); // --------------------------------------------------------- Constructors Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/DateLocaleConverter.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/DateLocaleConverter.java?rev=1437110&r1=1437109&r2=1437110&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/DateLocaleConverter.java (original) +++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/DateLocaleConverter.java Tue Jan 22 19:22:39 2013 @@ -47,7 +47,7 @@ public class DateLocaleConverter extends // ----------------------------------------------------- Instance Variables /** All logging goes through this logger */ - private Log log = LogFactory.getLog(DateLocaleConverter.class); + private final Log log = LogFactory.getLog(DateLocaleConverter.class); /** Should the date conversion be lenient? */ boolean isLenient = false; Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/DecimalLocaleConverter.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/DecimalLocaleConverter.java?rev=1437110&r1=1437109&r2=1437110&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/DecimalLocaleConverter.java (original) +++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/DecimalLocaleConverter.java Tue Jan 22 19:22:39 2013 @@ -45,7 +45,7 @@ public class DecimalLocaleConverter exte // ----------------------------------------------------- Instance Variables /** All logging goes through this logger */ - private Log log = LogFactory.getLog(DecimalLocaleConverter.class); + private final Log log = LogFactory.getLog(DecimalLocaleConverter.class); // ----------------------------------------------------------- Constructors Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/StringLocaleConverter.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/StringLocaleConverter.java?rev=1437110&r1=1437109&r2=1437110&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/StringLocaleConverter.java (original) +++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/StringLocaleConverter.java Tue Jan 22 19:22:39 2013 @@ -47,7 +47,7 @@ public class StringLocaleConverter exten // ----------------------------------------------------- Instance Variables /** All logging goes through this logger */ - private Log log = LogFactory.getLog(StringLocaleConverter.class); //msz fix + private final Log log = LogFactory.getLog(StringLocaleConverter.class); //msz fix // ----------------------------------------------------------- Constructors 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=1437110&r1=1437109&r2=1437110&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 Jan 22 19:22:39 2013 @@ -204,7 +204,7 @@ public class BeanMapTestCase extends Abs * are equivalent since getSampleValues() would otherwise construct a new * and different Object each time. **/ - private Object objectInFullMap = new Object(); + private final Object objectInFullMap = new Object(); // note to self: the sample values were created manually public Object[] getSampleValues() { Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/BeanWithInnerBean.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/BeanWithInnerBean.java?rev=1437110&r1=1437109&r2=1437110&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/BeanWithInnerBean.java (original) +++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/BeanWithInnerBean.java Tue Jan 22 19:22:39 2013 @@ -26,7 +26,7 @@ import java.util.Properties; * @author Robert Burrell Donkin */ public class BeanWithInnerBean { - private InnerBean innerBean = new InnerBean(); + private final InnerBean innerBean = new InnerBean(); public BeanWithInnerBean() {} public InnerBean getInnerBean(){ @@ -34,7 +34,7 @@ public class BeanWithInnerBean { } public class InnerBean { - private Properties fish = new Properties(); + private final Properties fish = new Properties(); public String getFish(String key){ return fish.getProperty(key); Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/BeanificationTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/BeanificationTestCase.java?rev=1437110&r1=1437109&r2=1437110&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/BeanificationTestCase.java (original) +++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/BeanificationTestCase.java Tue Jan 22 19:22:39 2013 @@ -261,7 +261,7 @@ public class BeanificationTestCase exten class GetBeanUtilsBeanThread extends Thread { - private Signal signal; + private final Signal signal; GetBeanUtilsBeanThread(Signal signal) { this.signal = signal; @@ -309,8 +309,8 @@ public class BeanificationTestCase exten class CCLLTesterThread extends Thread { - private Signal signal; - private ContextClassLoaderLocal ccll; + private final Signal signal; + private final ContextClassLoaderLocal ccll; CCLLTesterThread(Signal signal, ContextClassLoaderLocal ccll) { this.signal = signal; @@ -350,8 +350,8 @@ public class BeanificationTestCase exten public void testContextClassloaderIndependence() throws Exception { class TestIndependenceThread extends Thread { - private Signal signal; - private PrimitiveBean bean; + private final Signal signal; + private final PrimitiveBean bean; TestIndependenceThread(Signal signal, PrimitiveBean bean) { this.signal = signal; @@ -409,8 +409,8 @@ public class BeanificationTestCase exten class SetInstanceTesterThread extends Thread { - private Signal signal; - private BeanUtilsBean bean; + private final Signal signal; + private final BeanUtilsBean bean; SetInstanceTesterThread(Signal signal, BeanUtilsBean bean) { this.signal = signal; Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/DynaBeanMapDecoratorTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/DynaBeanMapDecoratorTestCase.java?rev=1437110&r1=1437109&r2=1437110&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/DynaBeanMapDecoratorTestCase.java (original) +++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/DynaBeanMapDecoratorTestCase.java Tue Jan 22 19:22:39 2013 @@ -46,9 +46,9 @@ public class DynaBeanMapDecoratorTestCas private static String stringVal = "somevalue"; private static Integer intVal = new Integer(5); private static Date dateVal = new Date(); - private Map mapVal = new HashMap(); + private final Map mapVal = new HashMap(); - private Object[] values = new Object[] {stringVal, null, intVal, dateVal, mapVal}; + private final Object[] values = new Object[] {stringVal, null, intVal, dateVal, mapVal}; private BasicDynaBean dynaBean; private Map decoratedMap; Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/DynaRowSetTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/DynaRowSetTestCase.java?rev=1437110&r1=1437109&r2=1437110&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/DynaRowSetTestCase.java (original) +++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/DynaRowSetTestCase.java Tue Jan 22 19:22:39 2013 @@ -399,7 +399,7 @@ public class DynaRowSetTestCase extends } } private static class CustomTimestamp { - private long timestamp = new java.util.Date().getTime(); + private final long timestamp = new java.util.Date().getTime(); public String toString() { return "CustomTimestamp[" + timestamp + "]"; } Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/MappedPropertyTestBean.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/MappedPropertyTestBean.java?rev=1437110&r1=1437109&r2=1437110&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/MappedPropertyTestBean.java (original) +++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/MappedPropertyTestBean.java Tue Jan 22 19:22:39 2013 @@ -30,8 +30,8 @@ import java.util.Map; public class MappedPropertyTestBean { - private Map map = new HashMap(); - private Map myMap = new HashMap(); + private final Map map = new HashMap(); + private final Map myMap = new HashMap(); // -------------------------------------------------------------- Properties Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/TestBean.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/TestBean.java?rev=1437110&r1=1437109&r2=1437110&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/TestBean.java (original) +++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/TestBean.java Tue Jan 22 19:22:39 2013 @@ -243,7 +243,7 @@ public class TestBean implements Seriali /** * An integer array property accessed as an indexed property. */ - private int intIndexed[] = { 0, 10, 20, 30, 40 }; + private final int intIndexed[] = { 0, 10, 20, 30, 40 }; public int getIntIndexed(int index) { return (intIndexed[index]); @@ -463,7 +463,7 @@ public class TestBean implements Seriali /** * A read-only String property. */ - private String readOnlyProperty = "Read Only String Property"; + private final String readOnlyProperty = "Read Only String Property"; public String getReadOnlyProperty() { return (this.readOnlyProperty); @@ -502,7 +502,7 @@ public class TestBean implements Seriali /** * A String array property accessed as an indexed property. */ - private String[] stringIndexed = + private final String[] stringIndexed = { "String 0", "String 1", "String 2", "String 3", "String 4" }; public String getStringIndexed(int index) { Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira157TestCase.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira157TestCase.java?rev=1437110&r1=1437109&r2=1437110&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira157TestCase.java (original) +++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira157TestCase.java Tue Jan 22 19:22:39 2013 @@ -38,7 +38,7 @@ import org.apache.commons.logging.LogFac */ public class Jira157TestCase extends TestCase { - private Log log = LogFactory.getLog(Jira157TestCase.class); + private final Log log = LogFactory.getLog(Jira157TestCase.class); /** * Create a test case with the specified name. Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira18TestCase.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira18TestCase.java?rev=1437110&r1=1437109&r2=1437110&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira18TestCase.java (original) +++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira18TestCase.java Tue Jan 22 19:22:39 2013 @@ -39,7 +39,7 @@ import org.apache.commons.logging.LogFac */ public class Jira18TestCase extends TestCase { - private Log log = LogFactory.getLog(Jira18TestCase.class); + private final Log log = LogFactory.getLog(Jira18TestCase.class); private Object bean; /** Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira273TestCase.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira273TestCase.java?rev=1437110&r1=1437109&r2=1437110&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira273TestCase.java (original) +++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira273TestCase.java Tue Jan 22 19:22:39 2013 @@ -36,7 +36,7 @@ import org.apache.commons.logging.LogFac */ public class Jira273TestCase extends TestCase { - private Log log = LogFactory.getLog(Jira273TestCase.class); + private final Log log = LogFactory.getLog(Jira273TestCase.class); /** * Create a test case with the specified name. Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira298TestCase.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira298TestCase.java?rev=1437110&r1=1437109&r2=1437110&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira298TestCase.java (original) +++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira298TestCase.java Tue Jan 22 19:22:39 2013 @@ -37,7 +37,7 @@ import org.apache.commons.logging.LogFac */ public class Jira298TestCase extends TestCase { - private Log log = LogFactory.getLog(Jira298TestCase.class); + private final Log log = LogFactory.getLog(Jira298TestCase.class); /** * Create a test case with the specified name. Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira339TestCase.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira339TestCase.java?rev=1437110&r1=1437109&r2=1437110&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira339TestCase.java (original) +++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira339TestCase.java Tue Jan 22 19:22:39 2013 @@ -37,7 +37,7 @@ import org.apache.commons.logging.LogFac */ public class Jira339TestCase extends TestCase { - private Log log = LogFactory.getLog(Jira339TestCase.class); + private final Log log = LogFactory.getLog(Jira339TestCase.class); /** * Create a test case with the specified name. Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira349TestCase.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira349TestCase.java?rev=1437110&r1=1437109&r2=1437110&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira349TestCase.java (original) +++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira349TestCase.java Tue Jan 22 19:22:39 2013 @@ -32,7 +32,7 @@ import org.apache.commons.logging.LogFac */ public class Jira349TestCase extends TestCase { - private Log log = LogFactory.getLog(Jira349TestCase .class); + private final Log log = LogFactory.getLog(Jira349TestCase .class); /** * Create a test case with the specified name. Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira61TestCase.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira61TestCase.java?rev=1437110&r1=1437109&r2=1437110&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira61TestCase.java (original) +++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira61TestCase.java Tue Jan 22 19:22:39 2013 @@ -46,7 +46,7 @@ import org.apache.commons.logging.LogFac */ public class Jira61TestCase extends TestCase { - private Log log = LogFactory.getLog(Jira61TestCase.class); + private final Log log = LogFactory.getLog(Jira61TestCase.class); private Jira61BeanFactory.TestBean testBean; private WrapDynaBean wrapDynaBean; Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira87TestCase.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira87TestCase.java?rev=1437110&r1=1437109&r2=1437110&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira87TestCase.java (original) +++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira87TestCase.java Tue Jan 22 19:22:39 2013 @@ -40,7 +40,7 @@ import junit.framework.TestSuite; */ public class Jira87TestCase extends TestCase { - private Log log = LogFactory.getLog(Jira87TestCase.class); + private final Log log = LogFactory.getLog(Jira87TestCase.class); /** * Create a test case with the specified name. Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira92TestCase.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira92TestCase.java?rev=1437110&r1=1437109&r2=1437110&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira92TestCase.java (original) +++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/Jira92TestCase.java Tue Jan 22 19:22:39 2013 @@ -43,7 +43,7 @@ public class Jira92TestCase extends Test */ public static class Jira92TestBean { - private java.util.Date[] dateArrayProperty = new java.util.Date[10]; + private final java.util.Date[] dateArrayProperty = new java.util.Date[10]; /** * Indexed Setter. Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/other/Jira18BeanFactory.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/other/Jira18BeanFactory.java?rev=1437110&r1=1437109&r2=1437110&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/other/Jira18BeanFactory.java (original) +++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/other/Jira18BeanFactory.java Tue Jan 22 19:22:39 2013 @@ -41,9 +41,9 @@ public class Jira18BeanFactory { /* =============== Package Friendly Bean =============== */ static class PackageFriendlyBean { - private String[] indexed = new String[] {"one", "two", "three"}; + private final String[] indexed = new String[] {"one", "two", "three"}; private String simple = "FOO"; - private Map mapped = new HashMap(); + private final Map mapped = new HashMap(); /** Default Constructor */ public PackageFriendlyBean() { Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/other/Jira61BeanFactory.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/other/Jira61BeanFactory.java?rev=1437110&r1=1437109&r2=1437110&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/other/Jira61BeanFactory.java (original) +++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/bugs/other/Jira61BeanFactory.java Tue Jan 22 19:22:39 2013 @@ -42,9 +42,9 @@ public class Jira61BeanFactory { */ public static class TestBean { - private String[] indexed = new String[] {"one", "two", "three"}; + private final String[] indexed = new String[] {"one", "two", "three"}; private String simple = "FOO"; - private Map mapped = new HashMap(); + private final Map mapped = new HashMap(); /** Default Constructor */ public TestBean() { Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/expression/DefaultResolverTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/expression/DefaultResolverTestCase.java?rev=1437110&r1=1437109&r2=1437110&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/expression/DefaultResolverTestCase.java (original) +++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/expression/DefaultResolverTestCase.java Tue Jan 22 19:22:39 2013 @@ -24,25 +24,25 @@ import junit.framework.TestSuite; */ public class DefaultResolverTestCase extends TestCase { - private DefaultResolver resolver = new DefaultResolver(); + private final DefaultResolver resolver = new DefaultResolver(); // Simple Properties Test Data - private String[] validProperties = new String[] {null, "", "a", "bc", "def", "g.h", "ij.k", "lm.no", "pqr.stu"}; - private String[] validNames = new String[] {null, "", "a", "bc", "def", "g", "ij", "lm", "pqr"}; + private final String[] validProperties = new String[] {null, "", "a", "bc", "def", "g.h", "ij.k", "lm.no", "pqr.stu"}; + private final String[] validNames = new String[] {null, "", "a", "bc", "def", "g", "ij", "lm", "pqr"}; // Indexed Properties Test Data - private String[] validIndexProperties = new String[] {"a[1]", "b[12]", "cd[3]", "ef[45]", "ghi[6]", "jkl[789]", }; - private String[] validIndexNames = new String[] {"a", "b", "cd", "ef", "ghi", "jkl"}; - private int[] validIndexValues = new int[] {1, 12, 3, 45, 6, 789}; + private final String[] validIndexProperties = new String[] {"a[1]", "b[12]", "cd[3]", "ef[45]", "ghi[6]", "jkl[789]", }; + private final String[] validIndexNames = new String[] {"a", "b", "cd", "ef", "ghi", "jkl"}; + private final int[] validIndexValues = new int[] {1, 12, 3, 45, 6, 789}; // Mapped Properties Test Data - private String[] validMapProperties = new String[] {"a(b)", "c(de)", "fg(h)", "ij(kl)", "mno(pqr.s)", "tuv(wx).yz[1]"}; - private String[] validMapNames = new String[] {"a", "c", "fg", "ij", "mno", "tuv"}; - private String[] validMapKeys = new String[] {"b", "de", "h", "kl", "pqr.s", "wx"}; - - private String[] nextExpressions = new String[] {"a", "bc", "d.e", "fg.h", "ij.kl", "m(12)", "no(3.4)", "pq(r).s", "t[12]", "uv[34].wx"}; - private String[] nextProperties = new String[] {"a", "bc", "d", "fg", "ij", "m(12)", "no(3.4)", "pq(r)", "t[12]", "uv[34]"}; - private String[] removeProperties = new String[] {null, null, "e", "h", "kl", null, null, "s", null, "wx"}; + private final String[] validMapProperties = new String[] {"a(b)", "c(de)", "fg(h)", "ij(kl)", "mno(pqr.s)", "tuv(wx).yz[1]"}; + private final String[] validMapNames = new String[] {"a", "c", "fg", "ij", "mno", "tuv"}; + private final String[] validMapKeys = new String[] {"b", "de", "h", "kl", "pqr.s", "wx"}; + + private final String[] nextExpressions = new String[] {"a", "bc", "d.e", "fg.h", "ij.kl", "m(12)", "no(3.4)", "pq(r).s", "t[12]", "uv[34].wx"}; + private final String[] nextProperties = new String[] {"a", "bc", "d", "fg", "ij", "m(12)", "no(3.4)", "pq(r)", "t[12]", "uv[34]"}; + private final String[] removeProperties = new String[] {null, null, "e", "h", "kl", null, null, "s", null, "wx"}; /** * Construct a DefaultResolver Test Case. Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/LocaleBeanificationTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/LocaleBeanificationTestCase.java?rev=1437110&r1=1437109&r2=1437110&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/LocaleBeanificationTestCase.java (original) +++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/LocaleBeanificationTestCase.java Tue Jan 22 19:22:39 2013 @@ -266,7 +266,7 @@ public class LocaleBeanificationTestCase class GetBeanUtilsBeanThread extends Thread { - private Signal signal; + private final Signal signal; GetBeanUtilsBeanThread(Signal signal) { this.signal = signal; @@ -310,8 +310,8 @@ public class LocaleBeanificationTestCase class CCLLTesterThread extends Thread { - private Signal signal; - private ContextClassLoaderLocal ccll; + private final Signal signal; + private final ContextClassLoaderLocal ccll; CCLLTesterThread(Signal signal, ContextClassLoaderLocal ccll) { this.signal = signal; @@ -351,8 +351,8 @@ public class LocaleBeanificationTestCase public void testContextClassloaderIndependence() throws Exception { class TestIndependenceThread extends Thread { - private Signal signal; - private PrimitiveBean bean; + private final Signal signal; + private final PrimitiveBean bean; TestIndependenceThread(Signal signal, PrimitiveBean bean) { this.signal = signal; @@ -416,8 +416,8 @@ public class LocaleBeanificationTestCase class SetInstanceTesterThread extends Thread { - private Signal signal; - private LocaleBeanUtilsBean bean; + private final Signal signal; + private final LocaleBeanUtilsBean bean; SetInstanceTesterThread(Signal signal, LocaleBeanUtilsBean bean) { this.signal = signal; Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/converters/DateLocaleConverterTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/converters/DateLocaleConverterTestCase.java?rev=1437110&r1=1437109&r2=1437110&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/converters/DateLocaleConverterTestCase.java (original) +++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/locale/converters/DateLocaleConverterTestCase.java Tue Jan 22 19:22:39 2013 @@ -37,7 +37,7 @@ import org.apache.commons.logging.Log; public class DateLocaleConverterTestCase extends BaseLocaleConverterTestCase { /** All logging goes through this logger */ - private Log log = LogFactory.getLog(DateLocaleConverterTestCase.class); + private final Log log = LogFactory.getLog(DateLocaleConverterTestCase.class); protected String localizedDatePattern; protected String localizedDateValue; Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/priv/PrivateBean.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/priv/PrivateBean.java?rev=1437110&r1=1437109&r2=1437110&view=diff ============================================================================== --- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/priv/PrivateBean.java (original) +++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/priv/PrivateBean.java Tue Jan 22 19:22:39 2013 @@ -55,7 +55,7 @@ class PrivateBean implements PrivateDire /** * A directly implemented property. */ - private String foo = "This is foo"; + private final String foo = "This is foo"; public String getFoo() { @@ -67,7 +67,7 @@ class PrivateBean implements PrivateDire /** * A property accessible via a directly implemented interface. */ - private String bar = "This is bar"; + private final String bar = "This is bar"; public String getBar() { @@ -89,7 +89,7 @@ class PrivateBean implements PrivateDire /** * A property accessible via an indirectly implemented interface. */ - private String baz = "This is baz"; + private final String baz = "This is baz"; public String getBaz() {