You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2014/10/15 22:15:22 UTC
svn commit: r1632171 [5/20] - in /commons/proper/beanutils/trunk/src:
main/java/org/apache/commons/beanutils/
main/java/org/apache/commons/beanutils/converters/
main/java/org/apache/commons/beanutils/expression/
main/java/org/apache/commons/beanutils/l...
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ResultSetDynaClass.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ResultSetDynaClass.java?rev=1632171&r1=1632170&r2=1632171&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ResultSetDynaClass.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ResultSetDynaClass.java Wed Oct 15 20:15:17 2014
@@ -98,7 +98,7 @@ public class ResultSetDynaClass extends
* @exception SQLException if the metadata for this result set
* cannot be introspected
*/
- public ResultSetDynaClass(ResultSet resultSet) throws SQLException {
+ public ResultSetDynaClass(final ResultSet resultSet) throws SQLException {
this(resultSet, true);
@@ -126,7 +126,7 @@ public class ResultSetDynaClass extends
* @exception SQLException if the metadata for this result set
* cannot be introspected
*/
- public ResultSetDynaClass(ResultSet resultSet, boolean lowerCase)
+ public ResultSetDynaClass(final ResultSet resultSet, final boolean lowerCase)
throws SQLException {
this(resultSet, lowerCase, false);
@@ -157,7 +157,7 @@ public class ResultSetDynaClass extends
* cannot be introspected
* @since 1.8.3
*/
- public ResultSetDynaClass(ResultSet resultSet, boolean lowerCase, boolean useColumnLabel)
+ public ResultSetDynaClass(final ResultSet resultSet, final boolean lowerCase, final boolean useColumnLabel)
throws SQLException {
if (resultSet == null) {
@@ -206,7 +206,7 @@ public class ResultSetDynaClass extends
* @throws SQLException if an error occurs
* @since 1.8.0
*/
- public Object getObjectFromResultSet(String name) throws SQLException {
+ public Object getObjectFromResultSet(final String name) throws SQLException {
return getObject(getResultSet(), name);
}
@@ -236,12 +236,12 @@ public class ResultSetDynaClass extends
* @throws SQLException if the class cannot be loaded
*/
@Override
- protected Class<?> loadClass(String className) throws SQLException {
+ protected Class<?> loadClass(final String className) throws SQLException {
try {
return getClass().getClassLoader().loadClass(className);
}
- catch (Exception e) {
+ catch (final Exception e) {
throw new SQLException("Cannot load column class '" +
className + "': " + e);
}
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ResultSetIterator.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ResultSetIterator.java?rev=1632171&r1=1632170&r2=1632171&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ResultSetIterator.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ResultSetIterator.java Wed Oct 15 20:15:17 2014
@@ -46,7 +46,7 @@ public class ResultSetIterator implement
* @param dynaClass The {@link ResultSetDynaClass} wrapping the
* result set we will iterate over
*/
- ResultSetIterator(ResultSetDynaClass dynaClass) {
+ ResultSetIterator(final ResultSetDynaClass dynaClass) {
this.dynaClass = dynaClass;
@@ -92,7 +92,7 @@ public class ResultSetIterator implement
* @exception IllegalArgumentException if there is no property
* of the specified name
*/
- public boolean contains(String name, String key) {
+ public boolean contains(final String name, final String key) {
throw new UnsupportedOperationException
("FIXME - mapped properties not currently supported");
@@ -109,14 +109,14 @@ public class ResultSetIterator implement
* @exception IllegalArgumentException if there is no property
* of the specified name
*/
- public Object get(String name) {
+ public Object get(final String name) {
if (dynaClass.getDynaProperty(name) == null) {
throw new IllegalArgumentException(name);
}
try {
return dynaClass.getObjectFromResultSet(name);
- } catch (SQLException e) {
+ } catch (final SQLException e) {
throw new RuntimeException
("get(" + name + "): SQLException: " + e);
}
@@ -140,7 +140,7 @@ public class ResultSetIterator implement
* @exception NullPointerException if no array or List has been
* initialized for this property
*/
- public Object get(String name, int index) {
+ public Object get(final String name, final int index) {
throw new UnsupportedOperationException
("FIXME - indexed properties not currently supported");
@@ -161,7 +161,7 @@ public class ResultSetIterator implement
* @exception IllegalArgumentException if the specified property
* exists, but is not mapped
*/
- public Object get(String name, String key) {
+ public Object get(final String name, final String key) {
throw new UnsupportedOperationException
("FIXME - mapped properties not currently supported");
@@ -193,7 +193,7 @@ public class ResultSetIterator implement
* @exception IllegalArgumentException if there is no property
* of the specified name
*/
- public void remove(String name, String key) {
+ public void remove(final String name, final String key) {
throw new UnsupportedOperationException
("FIXME - mapped operations not currently supported");
@@ -214,14 +214,14 @@ public class ResultSetIterator implement
* @exception NullPointerException if an attempt is made to set a
* primitive property to null
*/
- public void set(String name, Object value) {
+ public void set(final String name, final Object value) {
if (dynaClass.getDynaProperty(name) == null) {
throw new IllegalArgumentException(name);
}
try {
dynaClass.getResultSet().updateObject(name, value);
- } catch (SQLException e) {
+ } catch (final SQLException e) {
throw new RuntimeException
("set(" + name + "): SQLException: " + e);
}
@@ -245,7 +245,7 @@ public class ResultSetIterator implement
* @exception IndexOutOfBoundsException if the specified index
* is outside the range of the underlying property
*/
- public void set(String name, int index, Object value) {
+ public void set(final String name, final int index, final Object value) {
throw new UnsupportedOperationException
("FIXME - indexed properties not currently supported");
@@ -267,7 +267,7 @@ public class ResultSetIterator implement
* @exception IllegalArgumentException if the specified property
* exists, but is not mapped
*/
- public void set(String name, String key, Object value) {
+ public void set(final String name, final String key, final Object value) {
throw new UnsupportedOperationException
("FIXME - mapped properties not currently supported");
@@ -289,7 +289,7 @@ public class ResultSetIterator implement
try {
advance();
return (!eof);
- } catch (SQLException e) {
+ } catch (final SQLException e) {
throw new RuntimeException("hasNext(): SQLException: " + e);
}
@@ -310,7 +310,7 @@ public class ResultSetIterator implement
}
current = false;
return (this);
- } catch (SQLException e) {
+ } catch (final SQLException e) {
throw new RuntimeException("next(): SQLException: " + e);
}
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=1632171&r1=1632170&r2=1632171&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 Wed Oct 15 20:15:17 2014
@@ -99,7 +99,7 @@ public class RowSetDynaClass extends JDB
* @exception SQLException if the metadata for this result set
* cannot be introspected
*/
- public RowSetDynaClass(ResultSet resultSet) throws SQLException {
+ public RowSetDynaClass(final ResultSet resultSet) throws SQLException {
this(resultSet, true, -1);
@@ -121,7 +121,7 @@ public class RowSetDynaClass extends JDB
* @exception SQLException if the metadata for this result set
* cannot be introspected
*/
- public RowSetDynaClass(ResultSet resultSet, int limit) throws SQLException {
+ public RowSetDynaClass(final ResultSet resultSet, final int limit) throws SQLException {
this(resultSet, true, limit);
@@ -146,7 +146,7 @@ public class RowSetDynaClass extends JDB
* @exception SQLException if the metadata for this result set
* cannot be introspected
*/
- public RowSetDynaClass(ResultSet resultSet, boolean lowerCase)
+ public RowSetDynaClass(final ResultSet resultSet, final boolean lowerCase)
throws SQLException {
this(resultSet, lowerCase, -1);
@@ -174,7 +174,7 @@ public class RowSetDynaClass extends JDB
* @exception SQLException if the metadata for this result set
* cannot be introspected
*/
- public RowSetDynaClass(ResultSet resultSet, boolean lowerCase, int limit)
+ public RowSetDynaClass(final ResultSet resultSet, final boolean lowerCase, final int limit)
throws SQLException {
this(resultSet, lowerCase, limit, false);
@@ -204,7 +204,7 @@ public class RowSetDynaClass extends JDB
* cannot be introspected
* @since 1.8.3
*/
- public RowSetDynaClass(ResultSet resultSet, boolean lowerCase, boolean useColumnLabel)
+ public RowSetDynaClass(final ResultSet resultSet, final boolean lowerCase, final boolean useColumnLabel)
throws SQLException {
this(resultSet, lowerCase, -1, useColumnLabel);
@@ -234,7 +234,7 @@ public class RowSetDynaClass extends JDB
* cannot be introspected
* @since 1.8.3
*/
- public RowSetDynaClass(ResultSet resultSet, boolean lowerCase, int limit, boolean useColumnLabel)
+ public RowSetDynaClass(final ResultSet resultSet, final boolean lowerCase, final int limit, final boolean useColumnLabel)
throws SQLException {
if (resultSet == null) {
@@ -282,14 +282,14 @@ public class RowSetDynaClass extends JDB
*
* @exception SQLException if an error is encountered copying the data
*/
- protected void copy(ResultSet resultSet) throws SQLException {
+ protected void copy(final ResultSet resultSet) throws SQLException {
int cnt = 0;
while (resultSet.next() && (limit < 0 || cnt++ < limit) ) {
- DynaBean bean = createDynaBean();
+ final DynaBean bean = createDynaBean();
for (int i = 0; i < properties.length; i++) {
- String name = properties[i].getName();
- Object value = getObject(resultSet, name);
+ final String name = properties[i].getName();
+ final Object value = getObject(resultSet, name);
bean.set(name, value);
}
rows.add(bean);
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/SuppressPropertiesBeanIntrospector.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/SuppressPropertiesBeanIntrospector.java?rev=1632171&r1=1632170&r2=1632171&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/SuppressPropertiesBeanIntrospector.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/SuppressPropertiesBeanIntrospector.java Wed Oct 15 20:15:17 2014
@@ -60,7 +60,7 @@ public class SuppressPropertiesBeanIntro
* @throws IllegalArgumentException if the collection with property names is
* <b>null</b>
*/
- public SuppressPropertiesBeanIntrospector(Collection<String> propertiesToSuppress) {
+ public SuppressPropertiesBeanIntrospector(final Collection<String> propertiesToSuppress) {
if (propertiesToSuppress == null) {
throw new IllegalArgumentException("Property names must not be null!");
}
@@ -83,8 +83,8 @@ public class SuppressPropertiesBeanIntro
* {@inheritDoc} This implementation removes all properties from the given context it
* is configured for.
*/
- public void introspect(IntrospectionContext icontext) throws IntrospectionException {
- for (String property : getSuppressedProperties()) {
+ public void introspect(final IntrospectionContext icontext) throws IntrospectionException {
+ for (final String property : getSuppressedProperties()) {
icontext.removePropertyDescriptor(property);
}
}
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=1632171&r1=1632170&r2=1632171&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 Wed Oct 15 20:15:17 2014
@@ -89,7 +89,7 @@ class WeakFastHashMap<K, V> extends Hash
*
* @param capacity the initial capacity of the empty map
*/
- public WeakFastHashMap(int capacity) {
+ public WeakFastHashMap(final int capacity) {
super();
this.map = createMap(capacity);
}
@@ -100,7 +100,7 @@ class WeakFastHashMap<K, V> extends Hash
* @param capacity the initial capacity of the empty map
* @param factor the load factor of the new map
*/
- public WeakFastHashMap(int capacity, float factor) {
+ public WeakFastHashMap(final int capacity, final float factor) {
super();
this.map = createMap(capacity, factor);
}
@@ -110,7 +110,7 @@ class WeakFastHashMap<K, V> extends Hash
*
* @param map the map whose mappings are to be copied
*/
- public WeakFastHashMap(Map<? extends K, ? extends V> map) {
+ public WeakFastHashMap(final Map<? extends K, ? extends V> map) {
super();
this.map = createMap(map);
}
@@ -133,7 +133,7 @@ class WeakFastHashMap<K, V> extends Hash
*
* @param fast true if this map should operate in fast mode
*/
- public void setFast(boolean fast) {
+ public void setFast(final boolean fast) {
this.fast = fast;
}
@@ -153,7 +153,7 @@ class WeakFastHashMap<K, V> extends Hash
* @return the value mapped to that key, or null
*/
@Override
- public V get(Object key) {
+ public V get(final Object key) {
if (fast) {
return (map.get(key));
} else {
@@ -203,7 +203,7 @@ class WeakFastHashMap<K, V> extends Hash
* @return true if the map contains the key
*/
@Override
- public boolean containsKey(Object key) {
+ public boolean containsKey(final Object key) {
if (fast) {
return (map.containsKey(key));
} else {
@@ -221,7 +221,7 @@ class WeakFastHashMap<K, V> extends Hash
* @return true if the map contains the value
*/
@Override
- public boolean containsValue(Object value) {
+ public boolean containsValue(final Object value) {
if (fast) {
return (map.containsValue(value));
} else {
@@ -247,11 +247,11 @@ class WeakFastHashMap<K, V> extends Hash
* @return the value previously mapped to the key, or null
*/
@Override
- public V put(K key, V value) {
+ public V put(final K key, final V value) {
if (fast) {
synchronized (this) {
- Map<K, V> temp = cloneMap(map);
- V result = temp.put(key, value);
+ final Map<K, V> temp = cloneMap(map);
+ final V result = temp.put(key, value);
map = temp;
return (result);
}
@@ -269,10 +269,10 @@ class WeakFastHashMap<K, V> extends Hash
* @param in the map whose mappings are to be copied
*/
@Override
- public void putAll(Map<? extends K, ? extends V> in) {
+ public void putAll(final Map<? extends K, ? extends V> in) {
if (fast) {
synchronized (this) {
- Map<K, V> temp = cloneMap(map);
+ final Map<K, V> temp = cloneMap(map);
temp.putAll(in);
map = temp;
}
@@ -291,11 +291,11 @@ class WeakFastHashMap<K, V> extends Hash
* @return the value removed, or null
*/
@Override
- public V remove(Object key) {
+ public V remove(final Object key) {
if (fast) {
synchronized (this) {
- Map<K, V> temp = cloneMap(map);
- V result = temp.remove(key);
+ final Map<K, V> temp = cloneMap(map);
+ final V result = temp.remove(key);
map = temp;
return (result);
}
@@ -335,23 +335,23 @@ class WeakFastHashMap<K, V> extends Hash
* @return true if the two maps are equal
*/
@Override
- public boolean equals(Object o) {
+ public boolean equals(final Object o) {
// Simple tests that require no synchronization
if (o == this) {
return (true);
} else if (!(o instanceof Map)) {
return (false);
}
- Map<?, ?> mo = (Map<?, ?>) o;
+ final Map<?, ?> mo = (Map<?, ?>) o;
// Compare the two maps for equality
if (fast) {
if (mo.size() != map.size()) {
return (false);
}
- for (Map.Entry<K, V> e : map.entrySet()) {
- K key = e.getKey();
- V value = e.getValue();
+ for (final Map.Entry<K, V> e : map.entrySet()) {
+ final K key = e.getKey();
+ final V value = e.getValue();
if (value == null) {
if (!(mo.get(key) == null && mo.containsKey(key))) {
return (false);
@@ -369,9 +369,9 @@ class WeakFastHashMap<K, V> extends Hash
if (mo.size() != map.size()) {
return (false);
}
- for (Map.Entry<K, V> e : map.entrySet()) {
- K key = e.getKey();
- V value = e.getValue();
+ for (final Map.Entry<K, V> e : map.entrySet()) {
+ final K key = e.getKey();
+ final V value = e.getValue();
if (value == null) {
if (!(mo.get(key) == null && mo.containsKey(key))) {
return (false);
@@ -398,14 +398,14 @@ class WeakFastHashMap<K, V> extends Hash
public int hashCode() {
if (fast) {
int h = 0;
- for (Map.Entry<K, V> e : map.entrySet()) {
+ for (final Map.Entry<K, V> e : map.entrySet()) {
h += e.hashCode();
}
return (h);
} else {
synchronized (map) {
int h = 0;
- for (Map.Entry<K, V> e : map.entrySet()) {
+ for (final Map.Entry<K, V> e : map.entrySet()) {
h += e.hashCode();
}
return (h);
@@ -471,19 +471,19 @@ class WeakFastHashMap<K, V> extends Hash
return new WeakHashMap<K, V>();
}
- protected Map<K, V> createMap(int capacity) {
+ protected Map<K, V> createMap(final int capacity) {
return new WeakHashMap<K, V>(capacity);
}
- protected Map<K, V> createMap(int capacity, float factor) {
+ protected Map<K, V> createMap(final int capacity, final float factor) {
return new WeakHashMap<K, V>(capacity, factor);
}
- protected Map<K, V> createMap(Map<? extends K, ? extends V> map) {
+ protected Map<K, V> createMap(final Map<? extends K, ? extends V> map) {
return new WeakHashMap<K, V>(map);
}
- protected Map<K, V> cloneMap(Map<? extends K, ? extends V> map) {
+ protected Map<K, V> cloneMap(final Map<? extends K, ? extends V> map) {
return createMap(map);
}
@@ -516,11 +516,11 @@ class WeakFastHashMap<K, V> extends Hash
}
}
- public boolean remove(Object o) {
+ public boolean remove(final Object o) {
if (fast) {
synchronized (WeakFastHashMap.this) {
- Map<K, V> temp = cloneMap(map);
- boolean r = get(temp).remove(o);
+ final Map<K, V> temp = cloneMap(map);
+ final boolean r = get(temp).remove(o);
map = temp;
return r;
}
@@ -531,11 +531,11 @@ class WeakFastHashMap<K, V> extends Hash
}
}
- public boolean removeAll(Collection<?> o) {
+ public boolean removeAll(final Collection<?> o) {
if (fast) {
synchronized (WeakFastHashMap.this) {
- Map<K, V> temp = cloneMap(map);
- boolean r = get(temp).removeAll(o);
+ final Map<K, V> temp = cloneMap(map);
+ final boolean r = get(temp).removeAll(o);
map = temp;
return r;
}
@@ -546,11 +546,11 @@ class WeakFastHashMap<K, V> extends Hash
}
}
- public boolean retainAll(Collection<?> o) {
+ public boolean retainAll(final Collection<?> o) {
if (fast) {
synchronized (WeakFastHashMap.this) {
- Map<K, V> temp = cloneMap(map);
- boolean r = get(temp).retainAll(o);
+ final Map<K, V> temp = cloneMap(map);
+ final boolean r = get(temp).retainAll(o);
map = temp;
return r;
}
@@ -582,7 +582,7 @@ class WeakFastHashMap<K, V> extends Hash
}
}
- public boolean contains(Object o) {
+ public boolean contains(final Object o) {
if (fast) {
return get(map).contains(o);
} else {
@@ -592,7 +592,7 @@ class WeakFastHashMap<K, V> extends Hash
}
}
- public boolean containsAll(Collection<?> o) {
+ public boolean containsAll(final Collection<?> o) {
if (fast) {
return get(map).containsAll(o);
} else {
@@ -602,7 +602,7 @@ class WeakFastHashMap<K, V> extends Hash
}
}
- public <T> T[] toArray(T[] o) {
+ public <T> T[] toArray(final T[] o) {
if (fast) {
return get(map).toArray(o);
} else {
@@ -624,7 +624,7 @@ class WeakFastHashMap<K, V> extends Hash
@Override
- public boolean equals(Object o) {
+ public boolean equals(final Object o) {
if (o == this) {
return true;
}
@@ -648,11 +648,11 @@ class WeakFastHashMap<K, V> extends Hash
}
}
- public boolean add(E o) {
+ public boolean add(final E o) {
throw new UnsupportedOperationException();
}
- public boolean addAll(Collection<? extends E> c) {
+ public boolean addAll(final Collection<? extends E> c) {
throw new UnsupportedOperationException();
}
@@ -713,12 +713,12 @@ class WeakFastHashMap<K, V> extends Hash
private class KeySet extends CollectionView<K> implements Set<K> {
@Override
- protected Collection<K> get(Map<K, V> map) {
+ protected Collection<K> get(final Map<K, V> map) {
return map.keySet();
}
@Override
- protected K iteratorNext(Map.Entry<K, V> entry) {
+ protected K iteratorNext(final Map.Entry<K, V> entry) {
return entry.getKey();
}
@@ -730,12 +730,12 @@ class WeakFastHashMap<K, V> extends Hash
private class Values extends CollectionView<V> {
@Override
- protected Collection<V> get(Map<K, V> map) {
+ protected Collection<V> get(final Map<K, V> map) {
return map.values();
}
@Override
- protected V iteratorNext(Map.Entry<K, V> entry) {
+ protected V iteratorNext(final Map.Entry<K, V> entry) {
return entry.getValue();
}
}
@@ -746,12 +746,12 @@ class WeakFastHashMap<K, V> extends Hash
private class EntrySet extends CollectionView<Map.Entry<K, V>> implements Set<Map.Entry<K, V>> {
@Override
- protected Collection<Map.Entry<K, V>> get(Map<K, V> map) {
+ protected Collection<Map.Entry<K, V>> get(final Map<K, V> map) {
return map.entrySet();
}
@Override
- protected Map.Entry<K, V> iteratorNext(Map.Entry<K, V> entry) {
+ protected Map.Entry<K, V> iteratorNext(final Map.Entry<K, V> entry) {
return entry;
}
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/WrapDynaBean.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/WrapDynaBean.java?rev=1632171&r1=1632170&r2=1632171&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/WrapDynaBean.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/WrapDynaBean.java Wed Oct 15 20:15:17 2014
@@ -56,7 +56,7 @@ public class WrapDynaBean implements Dyn
*
* @param instance JavaBean instance to be wrapped
*/
- public WrapDynaBean(Object instance) {
+ public WrapDynaBean(final Object instance) {
this(instance, null);
@@ -73,7 +73,7 @@ public class WrapDynaBean implements Dyn
* @param cls the optional {@code WrapDynaClass} to be used for this bean
* @since 1.9
*/
- public WrapDynaBean(Object instance, WrapDynaClass cls) {
+ public WrapDynaBean(final Object instance, final WrapDynaClass cls) {
this.instance = instance;
this.dynaClass = (cls != null) ? cls : (WrapDynaClass) getDynaClass();
@@ -111,7 +111,7 @@ public class WrapDynaBean implements Dyn
* @exception IllegalArgumentException if there is no property
* of the specified name
*/
- public boolean contains(String name, String key) {
+ public boolean contains(final String name, final String key) {
throw new UnsupportedOperationException
("WrapDynaBean does not support contains()");
@@ -128,17 +128,17 @@ public class WrapDynaBean implements Dyn
* @exception IllegalArgumentException if there is no property
* of the specified name
*/
- public Object get(String name) {
+ public Object get(final String name) {
Object value = null;
try {
value = getPropertyUtils().getSimpleProperty(instance, name);
- } catch (InvocationTargetException ite) {
- Throwable cause = ite.getTargetException();
+ } catch (final InvocationTargetException ite) {
+ final Throwable cause = ite.getTargetException();
throw new IllegalArgumentException
("Error reading property '" + name +
"' nested exception - " + cause);
- } catch (Throwable t) {
+ } catch (final Throwable t) {
throw new IllegalArgumentException
("Error reading property '" + name +
"', exception - " + t);
@@ -164,19 +164,19 @@ public class WrapDynaBean implements Dyn
* @exception NullPointerException if no array or List has been
* initialized for this property
*/
- public Object get(String name, int index) {
+ public Object get(final String name, final int index) {
Object value = null;
try {
value = getPropertyUtils().getIndexedProperty(instance, name, index);
- } catch (IndexOutOfBoundsException e) {
+ } catch (final IndexOutOfBoundsException e) {
throw e;
- } catch (InvocationTargetException ite) {
- Throwable cause = ite.getTargetException();
+ } catch (final InvocationTargetException ite) {
+ final Throwable cause = ite.getTargetException();
throw new IllegalArgumentException
("Error reading indexed property '" + name +
"' nested exception - " + cause);
- } catch (Throwable t) {
+ } catch (final Throwable t) {
throw new IllegalArgumentException
("Error reading indexed property '" + name +
"', exception - " + t);
@@ -199,17 +199,17 @@ public class WrapDynaBean implements Dyn
* @exception IllegalArgumentException if the specified property
* exists, but is not mapped
*/
- public Object get(String name, String key) {
+ public Object get(final String name, final String key) {
Object value = null;
try {
value = getPropertyUtils().getMappedProperty(instance, name, key);
- } catch (InvocationTargetException ite) {
- Throwable cause = ite.getTargetException();
+ } catch (final InvocationTargetException ite) {
+ final Throwable cause = ite.getTargetException();
throw new IllegalArgumentException
("Error reading mapped property '" + name +
"' nested exception - " + cause);
- } catch (Throwable t) {
+ } catch (final Throwable t) {
throw new IllegalArgumentException
("Error reading mapped property '" + name +
"', exception - " + t);
@@ -246,7 +246,7 @@ public class WrapDynaBean implements Dyn
* @exception IllegalArgumentException if there is no property
* of the specified name
*/
- public void remove(String name, String key) {
+ public void remove(final String name, final String key) {
throw new UnsupportedOperationException
@@ -268,16 +268,16 @@ public class WrapDynaBean implements Dyn
* @exception NullPointerException if an attempt is made to set a
* primitive property to null
*/
- public void set(String name, Object value) {
+ public void set(final String name, final Object value) {
try {
getPropertyUtils().setSimpleProperty(instance, name, value);
- } catch (InvocationTargetException ite) {
- Throwable cause = ite.getTargetException();
+ } catch (final InvocationTargetException ite) {
+ final Throwable cause = ite.getTargetException();
throw new IllegalArgumentException
("Error setting property '" + name +
"' nested exception -" + cause);
- } catch (Throwable t) {
+ } catch (final Throwable t) {
throw new IllegalArgumentException
("Error setting property '" + name +
"', exception - " + t);
@@ -302,18 +302,18 @@ public class WrapDynaBean implements Dyn
* @exception IndexOutOfBoundsException if the specified index
* is outside the range of the underlying property
*/
- public void set(String name, int index, Object value) {
+ public void set(final String name, final int index, final Object value) {
try {
getPropertyUtils().setIndexedProperty(instance, name, index, value);
- } catch (IndexOutOfBoundsException e) {
+ } catch (final IndexOutOfBoundsException e) {
throw e;
- } catch (InvocationTargetException ite) {
- Throwable cause = ite.getTargetException();
+ } catch (final InvocationTargetException ite) {
+ final Throwable cause = ite.getTargetException();
throw new IllegalArgumentException
("Error setting indexed property '" + name +
"' nested exception - " + cause);
- } catch (Throwable t) {
+ } catch (final Throwable t) {
throw new IllegalArgumentException
("Error setting indexed property '" + name +
"', exception - " + t);
@@ -336,16 +336,16 @@ public class WrapDynaBean implements Dyn
* @exception IllegalArgumentException if the specified property
* exists, but is not mapped
*/
- public void set(String name, String key, Object value) {
+ public void set(final String name, final String key, final Object value) {
try {
getPropertyUtils().setMappedProperty(instance, name, key, value);
- } catch (InvocationTargetException ite) {
- Throwable cause = ite.getTargetException();
+ } catch (final InvocationTargetException ite) {
+ final Throwable cause = ite.getTargetException();
throw new IllegalArgumentException
("Error setting mapped property '" + name +
"' nested exception - " + cause);
- } catch (Throwable t) {
+ } catch (final Throwable t) {
throw new IllegalArgumentException
("Error setting mapped property '" + name +
"', exception - " + t);
@@ -380,9 +380,9 @@ public class WrapDynaBean implements Dyn
* @exception IllegalArgumentException if this is not a valid property
* name for our DynaClass
*/
- protected DynaProperty getDynaProperty(String name) {
+ protected DynaProperty getDynaProperty(final String name) {
- DynaProperty descriptor = getDynaClass().getDynaProperty(name);
+ final DynaProperty descriptor = getDynaClass().getDynaProperty(name);
if (descriptor == null) {
throw new IllegalArgumentException
("Invalid property name '" + name + "'");
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/WrapDynaClass.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/WrapDynaClass.java?rev=1632171&r1=1632170&r2=1632171&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/WrapDynaClass.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/WrapDynaClass.java Wed Oct 15 20:15:17 2014
@@ -62,7 +62,7 @@ public class WrapDynaClass implements Dy
* @param beanClass JavaBean class to be introspected around
* @param propUtils the {@code PropertyUtilsBean} associated with this class
*/
- private WrapDynaClass(Class<?> beanClass, PropertyUtilsBean propUtils) {
+ private WrapDynaClass(final Class<?> beanClass, final PropertyUtilsBean propUtils) {
this.beanClassRef = new SoftReference<Class<?>>(beanClass);
this.beanClassName = beanClass.getName();
@@ -143,6 +143,7 @@ public class WrapDynaClass implements Dy
@SuppressWarnings("unchecked")
private static Map<Object, Object> getDynaClassesMap() {
@SuppressWarnings("rawtypes")
+ final
Map cache = CLASSLOADER_CACHE.get();
return cache;
}
@@ -200,11 +201,11 @@ public class WrapDynaClass implements Dy
getDynaClassesMap().clear();
}
@Override
- public boolean containsKey(Object key) {
+ public boolean containsKey(final Object key) {
return getDynaClassesMap().containsKey(key);
}
@Override
- public boolean containsValue(Object value) {
+ public boolean containsValue(final Object value) {
return getDynaClassesMap().containsValue(value);
}
@Override
@@ -212,11 +213,11 @@ public class WrapDynaClass implements Dy
return getDynaClassesMap().entrySet();
}
@Override
- public boolean equals(Object o) {
+ public boolean equals(final Object o) {
return getDynaClassesMap().equals(o);
}
@Override
- public Object get(Object key) {
+ public Object get(final Object key) {
return getDynaClassesMap().get(key);
}
@Override
@@ -230,26 +231,26 @@ public class WrapDynaClass implements Dy
@Override
public Set<Object> keySet() {
// extract the classes from the key to stay backwards compatible
- Set<Object> result = new HashSet<Object>();
- for (CacheKey k : getClassesCache().keySet()) {
+ final Set<Object> result = new HashSet<Object>();
+ for (final CacheKey k : getClassesCache().keySet()) {
result.add(k.beanClass);
}
return result;
}
@Override
- public Object put(Object key, Object value) {
+ public Object put(final Object key, final Object value) {
return getClassesCache().put(
new CacheKey((Class<?>) key, PropertyUtilsBean.getInstance()),
(WrapDynaClass) value);
}
@Override
- public void putAll(Map<? extends Object, ? extends Object> m) {
- for (Map.Entry<? extends Object, ? extends Object> e : m.entrySet()) {
+ public void putAll(final Map<? extends Object, ? extends Object> m) {
+ for (final Map.Entry<? extends Object, ? extends Object> e : m.entrySet()) {
put(e.getKey(), e.getValue());
}
}
@Override
- public Object remove(Object key) {
+ public Object remove(final Object key) {
return getDynaClassesMap().remove(key);
}
@Override
@@ -300,7 +301,7 @@ public class WrapDynaClass implements Dy
*
* @exception IllegalArgumentException if no property name is specified
*/
- public DynaProperty getDynaProperty(String name) {
+ public DynaProperty getDynaProperty(final String name) {
if (name == null) {
throw new IllegalArgumentException
@@ -372,7 +373,7 @@ public class WrapDynaClass implements Dy
* @param name Name of the property to be retrieved
* @return The descriptor for the specified property
*/
- public PropertyDescriptor getPropertyDescriptor(String name) {
+ public PropertyDescriptor getPropertyDescriptor(final String name) {
return (descriptorsMap.get(name));
@@ -399,7 +400,7 @@ public class WrapDynaClass implements Dy
* @param beanClass Bean class for which a WrapDynaClass is requested
* @return A new <i>Wrap</i> {@link DynaClass}
*/
- public static WrapDynaClass createDynaClass(Class<?> beanClass) {
+ public static WrapDynaClass createDynaClass(final Class<?> beanClass) {
return createDynaClass(beanClass, null);
@@ -418,10 +419,10 @@ public class WrapDynaClass implements Dy
* @return A new <i>Wrap</i> {@link DynaClass}
* @since 1.9
*/
- public static WrapDynaClass createDynaClass(Class<?> beanClass, PropertyUtilsBean pu) {
+ public static WrapDynaClass createDynaClass(final Class<?> beanClass, final PropertyUtilsBean pu) {
- PropertyUtilsBean propUtils = (pu != null) ? pu : PropertyUtilsBean.getInstance();
- CacheKey key = new CacheKey(beanClass, propUtils);
+ final PropertyUtilsBean propUtils = (pu != null) ? pu : PropertyUtilsBean.getInstance();
+ final CacheKey key = new CacheKey(beanClass, propUtils);
WrapDynaClass dynaClass = getClassesCache().get(key);
if (dynaClass == null) {
dynaClass = new WrapDynaClass(beanClass, propUtils);
@@ -451,7 +452,7 @@ public class WrapDynaClass implements Dy
protected void introspect() {
// Look up the property descriptors for this bean class
- Class<?> beanClass = getBeanClass();
+ final Class<?> beanClass = getBeanClass();
PropertyDescriptor[] regulars =
getPropertyUtilsBean().getPropertyDescriptors(beanClass);
if (regulars == null) {
@@ -475,10 +476,10 @@ public class WrapDynaClass implements Dy
properties[i]);
}
int j = regulars.length;
- Iterator<?> names = mappeds.keySet().iterator();
+ final Iterator<?> names = mappeds.keySet().iterator();
while (names.hasNext()) {
- String name = (String) names.next();
- PropertyDescriptor descriptor =
+ final String name = (String) names.next();
+ final PropertyDescriptor descriptor =
(PropertyDescriptor) mappeds.get(name);
properties[j] =
new DynaProperty(descriptor.getName(),
@@ -508,14 +509,14 @@ public class WrapDynaClass implements Dy
* @param beanCls the bean class
* @param pu the instance of {@code PropertyUtilsBean}
*/
- public CacheKey(Class<?> beanCls, PropertyUtilsBean pu) {
+ public CacheKey(final Class<?> beanCls, final PropertyUtilsBean pu) {
beanClass = beanCls;
propUtils = pu;
}
@Override
public int hashCode() {
- int factor = 31;
+ final int factor = 31;
int result = 17;
result = factor * beanClass.hashCode() + result;
result = factor * propUtils.hashCode() + result;
@@ -523,7 +524,7 @@ public class WrapDynaClass implements Dy
}
@Override
- public boolean equals(Object obj) {
+ public boolean equals(final Object obj) {
if (this == obj) {
return true;
}
@@ -531,7 +532,7 @@ public class WrapDynaClass implements Dy
return false;
}
- CacheKey c = (CacheKey) obj;
+ final CacheKey c = (CacheKey) obj;
return beanClass.equals(c.beanClass) && propUtils.equals(c.propUtils);
}
}
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/AbstractArrayConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/AbstractArrayConverter.java?rev=1632171&r1=1632170&r2=1632171&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/AbstractArrayConverter.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/AbstractArrayConverter.java Wed Oct 15 20:15:17 2014
@@ -73,7 +73,7 @@ public abstract class AbstractArrayConve
* @param defaultValue The default value to be returned
* @since 1.8.0
*/
- public AbstractArrayConverter(Object defaultValue) {
+ public AbstractArrayConverter(final Object defaultValue) {
if (defaultValue == NO_DEFAULT) {
this.useDefault = false;
@@ -174,7 +174,7 @@ public abstract class AbstractArrayConve
try {
// Set up a StreamTokenizer on the characters in this String
- StreamTokenizer st =
+ final StreamTokenizer st =
new StreamTokenizer(new StringReader(svalue));
st.whitespaceChars(',',','); // Commas are delimiters
st.ordinaryChars('0', '9'); // Needed to turn off numeric flag
@@ -185,9 +185,9 @@ public abstract class AbstractArrayConve
st.wordChars('-', '-');
// Split comma-delimited tokens into a List
- ArrayList list = new ArrayList();
+ final ArrayList list = new ArrayList();
while (true) {
- int ttype = st.nextToken();
+ final int ttype = st.nextToken();
if ((ttype == StreamTokenizer.TT_WORD) ||
(ttype > 0)) {
list.add(st.sval);
@@ -202,7 +202,7 @@ public abstract class AbstractArrayConve
// Return the completed list
return (list);
- } catch (IOException e) {
+ } catch (final IOException e) {
throw new ConversionException(e);
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/AbstractConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/AbstractConverter.java?rev=1632171&r1=1632170&r2=1632171&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/AbstractConverter.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/AbstractConverter.java Wed Oct 15 20:15:17 2014
@@ -98,7 +98,7 @@ public abstract class AbstractConverter
* if the value to be converted is missing or an error
* occurs converting the value.
*/
- public AbstractConverter(Object defaultValue) {
+ public AbstractConverter(final Object defaultValue) {
setDefaultValue(defaultValue);
}
@@ -127,14 +127,14 @@ public abstract class AbstractConverter
* @throws ConversionException if conversion cannot be performed
* successfully and no default is specified.
*/
- public <T> T convert(Class<T> type, Object value) {
+ public <T> T convert(final Class<T> type, Object value) {
if (type == null) {
return convertToDefaultType(type, value);
}
Class<?> sourceType = value == null ? null : value.getClass();
- Class<T> targetType = ConvertUtils.primitiveToWrapper(type);
+ final Class<T> targetType = ConvertUtils.primitiveToWrapper(type);
if (log().isDebugEnabled()) {
log().debug("Converting"
@@ -166,14 +166,14 @@ public abstract class AbstractConverter
// Convert --> Type
} else {
- Object result = convertToType(targetType, value);
+ final Object result = convertToType(targetType, value);
if (log().isDebugEnabled()) {
log().debug(" Converted to " + toString(targetType) +
" value '" + result + "'");
}
return targetType.cast(result);
}
- } catch (Throwable t) {
+ } catch (final Throwable t) {
return handleError(targetType, value, t);
}
@@ -191,7 +191,7 @@ public abstract class AbstractConverter
* @return the converted String value.
* @throws Throwable if an error occurs converting to a String
*/
- protected String convertToString(Object value) throws Throwable {
+ protected String convertToString(final Object value) throws Throwable {
return value.toString();
}
@@ -220,7 +220,7 @@ public abstract class AbstractConverter
* @return The first element in an Array (or Collection)
* or the value unchanged if not an Array (or Collection)
*/
- protected Object convertArray(Object value) {
+ protected Object convertArray(final Object value) {
if (value == null) {
return null;
}
@@ -232,7 +232,7 @@ public abstract class AbstractConverter
}
}
if (value instanceof Collection) {
- Collection<?> collection = (Collection<?>)value;
+ final Collection<?> collection = (Collection<?>)value;
if (collection.size() > 0) {
return collection.iterator().next();
} else {
@@ -256,7 +256,7 @@ public abstract class AbstractConverter
* @throws ConversionException if no default value has been
* specified for this {@link Converter}.
*/
- protected <T> T handleError(Class<T> type, Object value, Throwable cause) {
+ protected <T> T handleError(final Class<T> type, final Object value, final Throwable cause) {
if (log().isDebugEnabled()) {
if (cause instanceof ConversionException) {
log().debug(" Conversion threw ConversionException: " + cause.getMessage());
@@ -277,7 +277,7 @@ public abstract class AbstractConverter
log().debug(" " + DEFAULT_CONFIG_MSG);
}
} else {
- String msg = "Error converting from '" + toString(value.getClass()) +
+ final String msg = "Error converting from '" + toString(value.getClass()) +
"' to '" + toString(type) + "' " + cause.getMessage();
cex = new ConversionException(msg, cause);
if (log().isDebugEnabled()) {
@@ -303,14 +303,14 @@ public abstract class AbstractConverter
* @throws ConversionException if no default value has been
* specified for this {@link Converter}.
*/
- protected <T> T handleMissing(Class<T> type) {
+ protected <T> T handleMissing(final Class<T> type) {
if (useDefault || type.equals(String.class)) {
Object value = getDefault(type);
if (useDefault && value != null && !(type.equals(value.getClass()))) {
try {
value = convertToType(type, defaultValue);
- } catch (Throwable t) {
+ } catch (final Throwable t) {
throw new ConversionException("Default conversion to " + toString(type)
+ " failed.", t);
}
@@ -324,7 +324,7 @@ public abstract class AbstractConverter
return type.cast(value);
}
- ConversionException cex = new ConversionException("No value specified for '" +
+ final ConversionException cex = new ConversionException("No value specified for '" +
toString(type) + "'");
if (log().isDebugEnabled()) {
log().debug(" Throwing ConversionException: " + cex.getMessage());
@@ -347,7 +347,7 @@ public abstract class AbstractConverter
* @throws ConversionException if an error occurs converting
* the default value
*/
- protected void setDefaultValue(Object defaultValue) {
+ protected void setDefaultValue(final Object defaultValue) {
useDefault = false;
if (log().isDebugEnabled()) {
log().debug("Setting default value: " + defaultValue);
@@ -373,7 +373,7 @@ public abstract class AbstractConverter
* @param type Data type to which this value should be converted.
* @return The default value for the specified type.
*/
- protected Object getDefault(Class<?> type) {
+ protected Object getDefault(final Class<?> type) {
if (type.equals(String.class)) {
return null;
} else {
@@ -415,7 +415,7 @@ public abstract class AbstractConverter
* @param type The <code>java.lang.Class</code>.
* @return The String representation.
*/
- String toString(Class<?> type) {
+ String toString(final Class<?> type) {
String typeName = null;
if (type == null) {
typeName = "null";
@@ -454,8 +454,9 @@ public abstract class AbstractConverter
* @param value the value to be converted
* @return the converted value
*/
- private <T> T convertToDefaultType(Class<T> targetClass, Object value) {
+ private <T> T convertToDefaultType(final Class<T> targetClass, final Object value) {
@SuppressWarnings("unchecked")
+ final
T result = (T) convert(getDefaultType(), value);
return result;
}
@@ -469,7 +470,7 @@ public abstract class AbstractConverter
* @return a {@code ConversionException} with a standard message
* @since 1.9
*/
- protected ConversionException conversionException(Class<?> type, Object value) {
+ protected ConversionException conversionException(final Class<?> type, final Object value) {
return new ConversionException("Can't convert value '" + value
+ "' to type " + type);
}
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=1632171&r1=1632170&r2=1632171&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 Wed Oct 15 20:15:17 2014
@@ -146,7 +146,7 @@ public class ArrayConverter extends Abst
* @param elementConverter Converter used to convert
* individual array elements.
*/
- public ArrayConverter(Class<?> defaultType, Converter elementConverter) {
+ public ArrayConverter(final Class<?> defaultType, final Converter elementConverter) {
super();
if (defaultType == null) {
throw new IllegalArgumentException("Default type is missing");
@@ -173,7 +173,7 @@ public class ArrayConverter extends Abst
* @param defaultSize Specifies the size of the default array value or if less
* than zero indicates that a <code>null</code> default value should be used.
*/
- public ArrayConverter(Class<?> defaultType, Converter elementConverter, int defaultSize) {
+ public ArrayConverter(final Class<?> defaultType, final Converter elementConverter, final int defaultSize) {
this(defaultType, elementConverter);
this.defaultSize = defaultSize;
Object defaultValue = null;
@@ -188,7 +188,7 @@ public class ArrayConverter extends Abst
*
* @param delimiter The delimiter [default ',']
*/
- public void setDelimiter(char delimiter) {
+ public void setDelimiter(final char delimiter) {
this.delimiter = delimiter;
}
@@ -198,7 +198,7 @@ public class ArrayConverter extends Abst
* @param allowedChars Characters which are to be considered as part of
* the tokens when parsing a delimited String [default is '.' and '-']
*/
- public void setAllowedChars(char[] allowedChars) {
+ public void setAllowedChars(final char[] allowedChars) {
this.allowedChars = allowedChars;
}
@@ -211,7 +211,7 @@ public class ArrayConverter extends Abst
* converts all values in the array into a delimited list (default
* is <code>true</code>
*/
- public void setOnlyFirstToString(boolean onlyFirstToString) {
+ public void setOnlyFirstToString(final boolean onlyFirstToString) {
this.onlyFirstToString = onlyFirstToString;
}
@@ -233,15 +233,15 @@ public class ArrayConverter extends Abst
* @throws Throwable if an error occurs converting to a String
*/
@Override
- protected String convertToString(Object value) throws Throwable {
+ protected String convertToString(final Object value) throws Throwable {
int size = 0;
Iterator<?> iterator = null;
- Class<?> type = value.getClass();
+ final Class<?> type = value.getClass();
if (type.isArray()) {
size = Array.getLength(value);
} else {
- Collection<?> collection = convertToCollection(type, value);
+ final Collection<?> collection = convertToCollection(type, value);
size = collection.size();
iterator = collection.iterator();
}
@@ -255,7 +255,7 @@ public class ArrayConverter extends Abst
}
// Create a StringBuffer containing a delimited list of the values
- StringBuilder buffer = new StringBuilder();
+ final StringBuilder buffer = new StringBuilder();
for (int i = 0; i < size; i++) {
if (i > 0) {
buffer.append(delimiter);
@@ -281,7 +281,7 @@ public class ArrayConverter extends Abst
* @throws Throwable if an error occurs converting to the specified type
*/
@Override
- protected <T> T convertToType(Class<T> type, Object value) throws Throwable {
+ protected <T> T convertToType(final Class<T> type, final Object value) throws Throwable {
if (!type.isArray()) {
throw new ConversionException(toString(getClass())
@@ -295,14 +295,14 @@ public class ArrayConverter extends Abst
if (value.getClass().isArray()) {
size = Array.getLength(value);
} else {
- Collection<?> collection = convertToCollection(type, value);
+ final Collection<?> collection = convertToCollection(type, value);
size = collection.size();
iterator = collection.iterator();
}
// Allocate a new Array
- Class<?> componentType = type.getComponentType();
- Object newArray = Array.newInstance(componentType, size);
+ final Class<?> componentType = type.getComponentType();
+ final Object newArray = Array.newInstance(componentType, size);
// Convert and set each element in the new Array
for (int i = 0; i < size; i++) {
@@ -314,6 +314,7 @@ public class ArrayConverter extends Abst
}
@SuppressWarnings("unchecked")
+ final
// This is safe because T is an array type and newArray is an array of
// T's component type
T result = (T) newArray;
@@ -327,7 +328,7 @@ public class ArrayConverter extends Abst
* @return The value unchanged
*/
@Override
- protected Object convertArray(Object value) {
+ protected Object convertArray(final Object value) {
return value;
}
@@ -352,14 +353,14 @@ public class ArrayConverter extends Abst
* @param value value to be converted
* @return Collection elements.
*/
- protected Collection<?> convertToCollection(Class<?> type, Object value) {
+ protected Collection<?> convertToCollection(final Class<?> type, final Object value) {
if (value instanceof Collection) {
return (Collection<?>)value;
}
if (value instanceof Number ||
value instanceof Boolean ||
value instanceof java.util.Date) {
- List<Object> list = new ArrayList<Object>(1);
+ final List<Object> list = new ArrayList<Object>(1);
list.add(value);
return list;
}
@@ -374,12 +375,12 @@ public class ArrayConverter extends Abst
* @return The default value for the specified type.
*/
@Override
- protected Object getDefault(Class<?> type) {
+ protected Object getDefault(final Class<?> type) {
if (type.equals(String.class)) {
return null;
}
- Object defaultValue = super.getDefault(type);
+ final Object defaultValue = super.getDefault(type);
if (defaultValue == null) {
return null;
}
@@ -399,7 +400,7 @@ public class ArrayConverter extends Abst
*/
@Override
public String toString() {
- StringBuilder buffer = new StringBuilder();
+ final StringBuilder buffer = new StringBuilder();
buffer.append(toString(getClass()));
buffer.append("[UseDefault=");
buffer.append(isUseDefault());
@@ -431,7 +432,7 @@ public class ArrayConverter extends Abst
* @throws NullPointerException if <code>svalue</code>
* is <code>null</code>
*/
- private List<String> parseElements(Class<?> type, String value) {
+ private List<String> parseElements(final Class<?> type, String value) {
if (log().isDebugEnabled()) {
log().debug("Parsing elements, delimiter=[" + delimiter + "], value=[" + value + "]");
@@ -446,7 +447,7 @@ public class ArrayConverter extends Abst
try {
// Set up a StreamTokenizer on the characters in this String
- StreamTokenizer st = new StreamTokenizer(new StringReader(value));
+ final StreamTokenizer st = new StreamTokenizer(new StringReader(value));
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
@@ -458,7 +459,7 @@ public class ArrayConverter extends Abst
// Split comma-delimited tokens into a List
List<String> list = null;
while (true) {
- int ttype = st.nextToken();
+ final int ttype = st.nextToken();
if ((ttype == StreamTokenizer.TT_WORD) || (ttype > 0)) {
if (st.sval != null) {
if (list == null) {
@@ -484,7 +485,7 @@ public class ArrayConverter extends Abst
// Return the completed list
return (list);
- } catch (IOException e) {
+ } catch (final IOException e) {
throw new ConversionException("Error converting from String to '"
+ toString(type) + "': " + e.getMessage(), e);
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/BigDecimalConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/BigDecimalConverter.java?rev=1632171&r1=1632170&r2=1632171&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/BigDecimalConverter.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/BigDecimalConverter.java Wed Oct 15 20:15:17 2014
@@ -51,7 +51,7 @@ public final class BigDecimalConverter e
* if the value to be converted is missing or an error
* occurs converting the value.
*/
- public BigDecimalConverter(Object defaultValue) {
+ public BigDecimalConverter(final Object defaultValue) {
super(true, defaultValue);
}
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/BigIntegerConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/BigIntegerConverter.java?rev=1632171&r1=1632170&r2=1632171&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/BigIntegerConverter.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/BigIntegerConverter.java Wed Oct 15 20:15:17 2014
@@ -51,7 +51,7 @@ public final class BigIntegerConverter e
* if the value to be converted is missing or an error
* occurs converting the value.
*/
- public BigIntegerConverter(Object defaultValue) {
+ public BigIntegerConverter(final Object defaultValue) {
super(false, defaultValue);
}
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/BooleanArrayConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/BooleanArrayConverter.java?rev=1632171&r1=1632170&r2=1632171&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/BooleanArrayConverter.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/BooleanArrayConverter.java Wed Oct 15 20:15:17 2014
@@ -70,7 +70,7 @@ public final class BooleanArrayConverter
*
* @param defaultValue The default value to be returned
*/
- public BooleanArrayConverter(Object defaultValue) {
+ public BooleanArrayConverter(final Object defaultValue) {
super(defaultValue);
this.booleanConverter = DEFAULT_CONVERTER;
@@ -95,7 +95,7 @@ public final class BooleanArrayConverter
* specify that an exception should be thrown on conversion failure.
*
*/
- public BooleanArrayConverter(BooleanConverter converter, Object defaultValue) {
+ public BooleanArrayConverter(final BooleanConverter converter, final Object defaultValue) {
super(defaultValue);
this.booleanConverter = converter;
@@ -180,7 +180,7 @@ public final class BooleanArrayConverter
* array elements are null.
*/
@Override
- public Object convert(Class type, Object value) {
+ public Object convert(final Class type, final Object value) {
// Deal with a null value
if (value == null) {
@@ -202,15 +202,15 @@ public final class BooleanArrayConverter
// this requires casting to Object[], then using values[i].toString()
if (strings.getClass() == value.getClass()) {
try {
- String[] values = (String[]) value;
- boolean[] results = new boolean[values.length];
+ final String[] values = (String[]) value;
+ final boolean[] results = new boolean[values.length];
for (int i = 0; i < values.length; i++) {
- String stringValue = values[i];
- Object result = booleanConverter.convert(Boolean.class, stringValue);
+ final String stringValue = values[i];
+ final Object result = booleanConverter.convert(Boolean.class, stringValue);
results[i] = ((Boolean) result).booleanValue();
}
return (results);
- } catch (Exception e) {
+ } catch (final Exception e) {
if (useDefault) {
return (defaultValue);
} else {
@@ -224,15 +224,15 @@ public final class BooleanArrayConverter
// sequence of values; see method AbstractArrayConverter.parseElements
// for more information.
try {
- List list = parseElements(value.toString());
- boolean[] results = new boolean[list.size()];
+ final List list = parseElements(value.toString());
+ final boolean[] results = new boolean[list.size()];
for (int i = 0; i < results.length; i++) {
- String stringValue = (String) list.get(i);
- Object result = booleanConverter.convert(Boolean.class, stringValue);
+ final String stringValue = (String) list.get(i);
+ final Object result = booleanConverter.convert(Boolean.class, stringValue);
results[i] = ((Boolean) result).booleanValue();
}
return (results);
- } catch (Exception e) {
+ } catch (final Exception e) {
if (useDefault) {
return (defaultValue);
} else {
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=1632171&r1=1632170&r2=1632171&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 Wed Oct 15 20:15:17 2014
@@ -78,7 +78,7 @@ public final class BooleanConverter exte
* The special value BooleanConverter.NO_DEFAULT can also be passed here,
* in which case this constructor acts like the no-argument one.
*/
- public BooleanConverter(Object defaultValue) {
+ public BooleanConverter(final Object defaultValue) {
super();
if (defaultValue != NO_DEFAULT) {
setDefaultValue(defaultValue);
@@ -103,7 +103,7 @@ public final class BooleanConverter exte
* ignored.
* @since 1.8.0
*/
- public BooleanConverter(String[] trueStrings, String[] falseStrings) {
+ public BooleanConverter(final String[] trueStrings, final String[] falseStrings) {
super();
this.trueStrings = copyStrings(trueStrings);
this.falseStrings = copyStrings(falseStrings);
@@ -132,8 +132,8 @@ public final class BooleanConverter exte
* in which case an exception will be thrown on conversion failure.
* @since 1.8.0
*/
- public BooleanConverter(String[] trueStrings, String[] falseStrings,
- Object defaultValue) {
+ public BooleanConverter(final String[] trueStrings, final String[] falseStrings,
+ final Object defaultValue) {
super();
this.trueStrings = copyStrings(trueStrings);
this.falseStrings = copyStrings(falseStrings);
@@ -203,14 +203,14 @@ public final class BooleanConverter exte
* @since 1.8.0
*/
@Override
- protected <T> T convertToType(Class<T> type, Object value) throws Throwable {
+ protected <T> T convertToType(final Class<T> type, final Object value) throws Throwable {
if (Boolean.class.equals(type) || Boolean.TYPE.equals(type)) {
// All the values in the trueStrings and falseStrings arrays are
// guaranteed to be lower-case. By converting the input value
// to lowercase too, we can use the efficient String.equals method
// instead of the less-efficient String.equalsIgnoreCase method.
- String stringValue = value.toString().toLowerCase();
+ final String stringValue = value.toString().toLowerCase();
for (int i = 0; i < trueStrings.length; ++i) {
if (trueStrings[i].equals(stringValue)) {
@@ -236,8 +236,8 @@ public final class BooleanConverter exte
* Using this method to copy string arrays means that changes to the
* src array do not modify the dst array.
*/
- private static String[] copyStrings(String[] src) {
- String[] dst = new String[src.length];
+ private static String[] copyStrings(final String[] src) {
+ final String[] dst = new String[src.length];
for(int i=0; i<src.length; ++i) {
dst[i] = src[i].toLowerCase();
}
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/ByteArrayConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/ByteArrayConverter.java?rev=1632171&r1=1632170&r2=1632171&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/ByteArrayConverter.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/ByteArrayConverter.java Wed Oct 15 20:15:17 2014
@@ -59,7 +59,7 @@ public final class ByteArrayConverter ex
*
* @param defaultValue The default value to be returned
*/
- public ByteArrayConverter(Object defaultValue) {
+ public ByteArrayConverter(final Object defaultValue) {
this.defaultValue = defaultValue;
this.useDefault = true;
@@ -90,7 +90,7 @@ public final class ByteArrayConverter ex
* successfully
*/
@Override
- public Object convert(Class type, Object value) {
+ public Object convert(final Class type, final Object value) {
// Deal with a null value
if (value == null) {
@@ -109,13 +109,13 @@ public final class ByteArrayConverter ex
// Deal with input value as a String array
if (strings.getClass() == value.getClass()) {
try {
- String[] values = (String[]) value;
- byte[] results = new byte[values.length];
+ final String[] values = (String[]) value;
+ final byte[] results = new byte[values.length];
for (int i = 0; i < values.length; i++) {
results[i] = Byte.parseByte(values[i]);
}
return (results);
- } catch (Exception e) {
+ } catch (final Exception e) {
if (useDefault) {
return (defaultValue);
} else {
@@ -127,13 +127,13 @@ public final class ByteArrayConverter ex
// Parse the input value as a String into elements
// and convert to the appropriate type
try {
- List list = parseElements(value.toString());
- byte[] results = new byte[list.size()];
+ final List list = parseElements(value.toString());
+ final byte[] results = new byte[list.size()];
for (int i = 0; i < results.length; i++) {
results[i] = Byte.parseByte((String) list.get(i));
}
return (results);
- } catch (Exception e) {
+ } catch (final Exception e) {
if (useDefault) {
return (defaultValue);
} else {
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/ByteConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/ByteConverter.java?rev=1632171&r1=1632170&r2=1632171&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/ByteConverter.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/ByteConverter.java Wed Oct 15 20:15:17 2014
@@ -49,7 +49,7 @@ public final class ByteConverter extends
* if the value to be converted is missing or an error
* occurs converting the value.
*/
- public ByteConverter(Object defaultValue) {
+ public ByteConverter(final Object defaultValue) {
super(false, defaultValue);
}
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/CalendarConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/CalendarConverter.java?rev=1632171&r1=1632170&r2=1632171&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/CalendarConverter.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/CalendarConverter.java Wed Oct 15 20:15:17 2014
@@ -51,7 +51,7 @@ public final class CalendarConverter ext
* if the value to be converted is missing or an error
* occurs converting the value.
*/
- public CalendarConverter(Object defaultValue) {
+ public CalendarConverter(final Object defaultValue) {
super(defaultValue);
}
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/CharacterArrayConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/CharacterArrayConverter.java?rev=1632171&r1=1632170&r2=1632171&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/CharacterArrayConverter.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/CharacterArrayConverter.java Wed Oct 15 20:15:17 2014
@@ -59,7 +59,7 @@ public final class CharacterArrayConvert
*
* @param defaultValue The default value to be returned
*/
- public CharacterArrayConverter(Object defaultValue) {
+ public CharacterArrayConverter(final Object defaultValue) {
this.defaultValue = defaultValue;
this.useDefault = true;
@@ -91,7 +91,7 @@ public final class CharacterArrayConvert
* successfully
*/
@Override
- public Object convert(Class type, Object value) {
+ public Object convert(final Class type, final Object value) {
// Deal with a null value
if (value == null) {
@@ -110,13 +110,13 @@ public final class CharacterArrayConvert
// Deal with input value as a String array
if (strings.getClass() == value.getClass()) {
try {
- String[] values = (String[]) value;
- char[] results = new char[values.length];
+ final String[] values = (String[]) value;
+ final char[] results = new char[values.length];
for (int i = 0; i < values.length; i++) {
results[i] = values[i].charAt(0);
}
return (results);
- } catch (Exception e) {
+ } catch (final Exception e) {
if (useDefault) {
return (defaultValue);
} else {
@@ -128,13 +128,13 @@ public final class CharacterArrayConvert
// Parse the input value as a String into elements
// and convert to the appropriate type
try {
- List list = parseElements(value.toString());
- char[] results = new char[list.size()];
+ final List list = parseElements(value.toString());
+ final char[] results = new char[list.size()];
for (int i = 0; i < results.length; i++) {
results[i] = ((String) list.get(i)).charAt(0);
}
return (results);
- } catch (Exception e) {
+ } catch (final Exception e) {
if (useDefault) {
return (defaultValue);
} else {
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/CharacterConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/CharacterConverter.java?rev=1632171&r1=1632170&r2=1632171&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/CharacterConverter.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/CharacterConverter.java Wed Oct 15 20:15:17 2014
@@ -45,7 +45,7 @@ public final class CharacterConverter ex
* if the value to be converted is missing or an error
* occurs converting the value.
*/
- public CharacterConverter(Object defaultValue) {
+ public CharacterConverter(final Object defaultValue) {
super(defaultValue);
}
@@ -68,8 +68,8 @@ public final class CharacterConverter ex
* @since 1.8.0
*/
@Override
- protected String convertToString(Object value) {
- String strValue = value.toString();
+ protected String convertToString(final Object value) {
+ final String strValue = value.toString();
return strValue.length() == 0 ? "" : strValue.substring(0, 1);
}
@@ -84,7 +84,7 @@ public final class CharacterConverter ex
* @since 1.8.0
*/
@Override
- protected <T> T convertToType(Class<T> type, Object value) throws Exception {
+ protected <T> T convertToType(final Class<T> type, final Object value) throws Exception {
if (Character.class.equals(type) || Character.TYPE.equals(type)) {
return type.cast(new Character(value.toString().charAt(0)));
}
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/ClassConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/ClassConverter.java?rev=1632171&r1=1632170&r2=1632171&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/ClassConverter.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/ClassConverter.java Wed Oct 15 20:15:17 2014
@@ -48,7 +48,7 @@ public final class ClassConverter extend
* if the value to be converted is missing or an error
* occurs converting the value.
*/
- public ClassConverter(Object defaultValue) {
+ public ClassConverter(final Object defaultValue) {
super(defaultValue);
}
@@ -71,7 +71,7 @@ public final class ClassConverter extend
* @since 1.8.0
*/
@Override
- protected String convertToString(Object value) {
+ protected String convertToString(final Object value) {
return (value instanceof Class) ? ((Class<?>)value).getName() : value.toString();
}
@@ -86,14 +86,14 @@ public final class ClassConverter extend
* @since 1.8.0
*/
@Override
- protected <T> T convertToType(Class<T> type, Object value) throws Throwable {
+ protected <T> T convertToType(final Class<T> type, final Object value) throws Throwable {
if (Class.class.equals(type)) {
ClassLoader classLoader = Thread.currentThread()
.getContextClassLoader();
if (classLoader != null) {
try {
return type.cast(classLoader.loadClass(value.toString()));
- } catch (ClassNotFoundException ex) {
+ } catch (final ClassNotFoundException ex) {
// Don't fail, carry on and try this class's class loader
// (see issue# BEANUTILS-263)
}
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/ConverterFacade.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/ConverterFacade.java?rev=1632171&r1=1632170&r2=1632171&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/ConverterFacade.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/ConverterFacade.java Wed Oct 15 20:15:17 2014
@@ -40,7 +40,7 @@ public final class ConverterFacade imple
*
* @param converter The converter to delegate to
*/
- public ConverterFacade(Converter converter) {
+ public ConverterFacade(final Converter converter) {
if (converter == null) {
throw new IllegalArgumentException("Converter is missing");
}
@@ -57,7 +57,7 @@ public final class ConverterFacade imple
* @param value The input value to be converted
* @return The converted value.
*/
- public <T> T convert(Class<T> type, Object value) {
+ public <T> T convert(final Class<T> type, final Object value) {
return converter.convert(type, value);
}
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/DateConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/DateConverter.java?rev=1632171&r1=1632170&r2=1632171&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/DateConverter.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/DateConverter.java Wed Oct 15 20:15:17 2014
@@ -51,7 +51,7 @@ public final class DateConverter extends
* if the value to be converted is missing or an error
* occurs converting the value.
*/
- public DateConverter(Object defaultValue) {
+ public DateConverter(final Object defaultValue) {
super(defaultValue);
}