You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by oh...@apache.org on 2013/11/02 18:07:47 UTC
svn commit: r1538223 - in /commons/proper/beanutils/branches/java5/src:
main/java/org/apache/commons/beanutils/BeanMap.java
test/java/org/apache/commons/beanutils/BeanMapTestCase.java
Author: oheger
Date: Sat Nov 2 17:07:46 2013
New Revision: 1538223
URL: http://svn.apache.org/r1538223
Log:
Generified BeanMap.
Without breaking backwards compatibility, it is only possible to use the
parameters <Object, Object>, rather than the logically correct
<String, Object>. I did not touch the deprecated defaultTransformers field;
so there are still warnings present.
Modified:
commons/proper/beanutils/branches/java5/src/main/java/org/apache/commons/beanutils/BeanMap.java
commons/proper/beanutils/branches/java5/src/test/java/org/apache/commons/beanutils/BeanMapTestCase.java
Modified: commons/proper/beanutils/branches/java5/src/main/java/org/apache/commons/beanutils/BeanMap.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/branches/java5/src/main/java/org/apache/commons/beanutils/BeanMap.java?rev=1538223&r1=1538222&r2=1538223&view=diff
==============================================================================
--- commons/proper/beanutils/branches/java5/src/main/java/org/apache/commons/beanutils/BeanMap.java (original)
+++ commons/proper/beanutils/branches/java5/src/main/java/org/apache/commons/beanutils/BeanMap.java Sat Nov 2 17:07:46 2013
@@ -33,10 +33,9 @@ import java.util.Iterator;
import java.util.Map;
import java.util.Set;
-import org.apache.commons.collections.list.UnmodifiableList;
+import org.apache.commons.collections.Transformer;
import org.apache.commons.collections.keyvalue.AbstractMapEntry;
import org.apache.commons.collections.set.UnmodifiableSet;
-import org.apache.commons.collections.Transformer;
/**
* An implementation of Map for JavaBeans which uses introspection to
@@ -47,7 +46,7 @@ import org.apache.commons.collections.Tr
*
* @version $Id$
*/
-public class BeanMap extends AbstractMap implements Cloneable {
+public class BeanMap extends AbstractMap<Object, Object> implements Cloneable {
private transient Object bean;
@@ -499,8 +498,11 @@ public class BeanMap extends AbstractMap
* @return BeanMap keys. The Set returned by this method is not
* modifiable.
*/
+ @SuppressWarnings("unchecked")
+ // The set actually contains strings; however, because it cannot be
+ // modified there is no danger in selling it as Set<Object>
@Override
- public Set keySet() {
+ public Set<Object> keySet() {
return UnmodifiableSet.decorate(readMethods.keySet());
}
@@ -512,10 +514,10 @@ public class BeanMap extends AbstractMap
* @return the unmodifiable set of mappings
*/
@Override
- public Set entrySet() {
- return UnmodifiableSet.decorate(new AbstractSet() {
+ public Set<Map.Entry<Object, Object>> entrySet() {
+ return Collections.unmodifiableSet(new AbstractSet<Map.Entry<Object, Object>>() {
@Override
- public Iterator iterator() {
+ public Iterator<Map.Entry<Object, Object>> iterator() {
return entryIterator();
}
@Override
@@ -532,12 +534,12 @@ public class BeanMap extends AbstractMap
* modifiable.
*/
@Override
- public Collection values() {
- ArrayList answer = new ArrayList( readMethods.size() );
- for ( Iterator iter = valueIterator(); iter.hasNext(); ) {
+ public Collection<Object> values() {
+ ArrayList<Object> answer = new ArrayList<Object>( readMethods.size() );
+ for ( Iterator<Object> iter = valueIterator(); iter.hasNext(); ) {
answer.add( iter.next() );
}
- return UnmodifiableList.decorate(answer);
+ return Collections.unmodifiableList(answer);
}
@@ -551,7 +553,7 @@ public class BeanMap extends AbstractMap
* @return the type of the property, or <code>null</code> if no such
* property exists
*/
- public Class getType(String name) {
+ public Class<?> getType(String name) {
return types.get( name );
}
@@ -562,7 +564,7 @@ public class BeanMap extends AbstractMap
*
* @return an iterator over the keys
*/
- public Iterator keyIterator() {
+ public Iterator<String> keyIterator() {
return readMethods.keySet().iterator();
}
@@ -571,9 +573,9 @@ public class BeanMap extends AbstractMap
*
* @return an iterator over the values
*/
- public Iterator valueIterator() {
- final Iterator iter = keyIterator();
- return new Iterator() {
+ public Iterator<Object> valueIterator() {
+ final Iterator<?> iter = keyIterator();
+ return new Iterator<Object>() {
public boolean hasNext() {
return iter.hasNext();
}
@@ -592,16 +594,20 @@ public class BeanMap extends AbstractMap
*
* @return an iterator over the entries
*/
- public Iterator entryIterator() {
- final Iterator iter = keyIterator();
- return new Iterator() {
+ public Iterator<Map.Entry<Object, Object>> entryIterator() {
+ final Iterator<String> iter = keyIterator();
+ return new Iterator<Map.Entry<Object, Object>>() {
public boolean hasNext() {
return iter.hasNext();
}
- public Object next() {
+ public Map.Entry<Object, Object> next() {
Object key = iter.next();
Object value = get(key);
- return new Entry( BeanMap.this, key, value );
+ @SuppressWarnings("unchecked")
+ // This should not cause any problems; the key is actually a
+ // string, but it does no harm to expose it as Object
+ Map.Entry<Object, Object> tmpEntry = new Entry( BeanMap.this, key, value );
+ return tmpEntry;
}
public void remove() {
throw new UnsupportedOperationException( "remove() not supported for BeanMap" );
@@ -857,7 +863,7 @@ public class BeanMap extends AbstractMap
* @throws IllegalAccessException never
* @throws IllegalArgumentException never
*/
- protected Object convertType( Class newType, Object value )
+ protected Object convertType( Class<?> newType, Object value )
throws InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException {
// try call constructor
@@ -884,7 +890,7 @@ public class BeanMap extends AbstractMap
* @return a transformer that will convert strings into that type,
* or null if the given type is not a primitive type
*/
- protected Transformer getTypeTransformer( Class aType ) {
+ protected Transformer getTypeTransformer( Class<?> aType ) {
return typeTransformers.get( aType );
}
Modified: commons/proper/beanutils/branches/java5/src/test/java/org/apache/commons/beanutils/BeanMapTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/branches/java5/src/test/java/org/apache/commons/beanutils/BeanMapTestCase.java?rev=1538223&r1=1538222&r2=1538223&view=diff
==============================================================================
--- commons/proper/beanutils/branches/java5/src/test/java/org/apache/commons/beanutils/BeanMapTestCase.java (original)
+++ commons/proper/beanutils/branches/java5/src/test/java/org/apache/commons/beanutils/BeanMapTestCase.java Sat Nov 2 17:07:46 2013
@@ -19,22 +19,23 @@ package org.apache.commons.beanutils;
import java.io.Serializable;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import java.util.Map;
import java.util.HashMap;
+import java.util.Map;
import junit.framework.Test;
import junit.textui.TestRunner;
import org.apache.commons.beanutils.bugs.other.Jira87BeanFactory;
-import org.apache.commons.collections.map.AbstractTestMap;
import org.apache.commons.collections.BulkTest;
import org.apache.commons.collections.Transformer;
+import org.apache.commons.collections.map.AbstractTestMap;
/**
* Test cases for BeanMap
*
* @version $Id$
*/
+@SuppressWarnings("deprecation")
public class BeanMapTestCase extends AbstractTestMap {
public BeanMapTestCase(String testName) {
@@ -271,7 +272,7 @@ public class BeanMapTestCase extends Abs
}
@Override
- public Map makeFullMap() {
+ public Map<Object, Object> makeFullMap() {
// note: These values must match (i.e. .equals() must return true)
// those returned from getSampleValues().
BeanWithProperties bean = new BeanWithProperties();
@@ -289,7 +290,7 @@ public class BeanMapTestCase extends Abs
}
@Override
- public Map makeEmptyMap() {
+ public Map<Object, Object> makeEmptyMap() {
return new BeanMap();
}
@@ -361,7 +362,7 @@ public class BeanMapTestCase extends Abs
public void testMethodAccessor() throws Exception {
BeanMap map = (BeanMap) makeFullMap();
- Method method = BeanWithProperties.class.getDeclaredMethod("getSomeIntegerValue", null);
+ Method method = BeanWithProperties.class.getDeclaredMethod("getSomeIntegerValue");
assertEquals(method, map.getReadMethod("someIntegerValue"));
}
@@ -390,7 +391,6 @@ public class BeanMapTestCase extends Abs
* Test the default transformers via the public static Map instance
*/
public void testGetDefaultTransformersMap() {
- BeanMap beanMap = new BeanMap();
assertEquals("Boolean.TYPE", Boolean.TRUE, ((Transformer)BeanMap.defaultTransformers.get(Boolean.TYPE)).transform("true"));
assertEquals("Character.TYPE", new Character('B'), ((Transformer)BeanMap.defaultTransformers.get(Character.TYPE)).transform("BCD"));
assertEquals("Byte.TYPE", new Byte((byte)1), ((Transformer)BeanMap.defaultTransformers.get(Byte.TYPE)).transform("1"));
@@ -428,7 +428,7 @@ public class BeanMapTestCase extends Abs
// expected result
}
try {
- BeanMap.defaultTransformers.putAll(new HashMap());
+ BeanMap.defaultTransformers.putAll(new HashMap<Object, Object>());
fail("putAll() - expected UnsupportedOperationException");
} catch(UnsupportedOperationException e) {
// expected result
@@ -513,7 +513,7 @@ public class BeanMapTestCase extends Abs
}
/**
- * Test that the cause of exception thrown by put() is initialised.
+ * Test that the cause of exception thrown by put() is initialized.
*/
public void testExceptionThrowFromPut() {
@@ -523,7 +523,7 @@ public class BeanMapTestCase extends Abs
}
try {
- Map map = new BeanMap(new BeanThrowingExceptions());
+ Map<Object, Object> map = new BeanMap(new BeanThrowingExceptions());
map.put("valueThrowingException", "value");
fail("Setter exception - expected IllegalArgumentException");
} catch (IllegalArgumentException e) {