You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2013/05/06 16:09:05 UTC
svn commit: r1479574 -
/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BeanMap.java
Author: sebb
Date: Mon May 6 14:09:05 2013
New Revision: 1479574
URL: http://svn.apache.org/r1479574
Log:
Fix up internal raw types
Modified:
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BeanMap.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=1479574&r1=1479573&r2=1479574&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 Mon May 6 14:09:05 2013
@@ -51,9 +51,9 @@ public class BeanMap extends AbstractMap
private transient Object bean;
- private transient HashMap readMethods = new HashMap();
- private transient HashMap writeMethods = new HashMap();
- private transient HashMap types = new HashMap();
+ private transient HashMap<String, Method> readMethods = new HashMap<String, Method>();
+ private transient HashMap<String, Method> writeMethods = new HashMap<String, Method>();
+ private transient HashMap<String, Class<? extends Object>> types = new HashMap<String, Class<? extends Object>>();
/**
* An empty array. Used to invoke accessors via reflection.
@@ -66,7 +66,7 @@ public class BeanMap extends AbstractMap
*
* N.B. private & unmodifiable replacement for the (public & static) defaultTransformers instance.
*/
- private static final Map typeTransformers = Collections.unmodifiableMap(createTypeTransformers());
+ private static final Map<Class<? extends Object>, Transformer> typeTransformers = Collections.unmodifiableMap(createTypeTransformers());
/**
* This HashMap has been made unmodifiable to prevent issues when
@@ -127,8 +127,8 @@ public class BeanMap extends AbstractMap
}
};
- private static Map createTypeTransformers() {
- Map defaultTransformers = new HashMap();
+ private static Map<Class<? extends Object>, Transformer> createTypeTransformers() {
+ Map<Class<? extends Object>, Transformer> defaultTransformers = new HashMap<Class<? extends Object>, Transformer>();
defaultTransformers.put(
Boolean.TYPE,
new Transformer() {
@@ -268,7 +268,7 @@ public class BeanMap extends AbstractMap
}
Object newBean = null;
- Class beanClass = bean.getClass(); // Cannot throw Exception
+ Class<? extends Object> beanClass = bean.getClass(); // Cannot throw Exception
try {
newBean = beanClass.newInstance();
} catch (Exception e) {
@@ -294,7 +294,7 @@ public class BeanMap extends AbstractMap
// copy only properties that are readable and writable. If its
// not readable, we can't get the value from the old map. If
// its not writable, we can't write a value into the new map.
- Iterator readableKeys = readMethods.keySet().iterator();
+ Iterator<?> readableKeys = readMethods.keySet().iterator();
while(readableKeys.hasNext()) {
Object key = readableKeys.next();
if(getWriteMethod(key) != null) {
@@ -319,7 +319,7 @@ public class BeanMap extends AbstractMap
* @param map the BeanMap whose properties to put
*/
public void putAllWriteable(BeanMap map) {
- Iterator readableKeys = map.readMethods.keySet().iterator();
+ Iterator<?> readableKeys = map.readMethods.keySet().iterator();
while (readableKeys.hasNext()) {
Object key = readableKeys.next();
if (getWriteMethod(key) != null) {
@@ -343,7 +343,7 @@ public class BeanMap extends AbstractMap
return;
}
- Class beanClass = null;
+ Class<? extends Object> beanClass = null;
try {
beanClass = bean.getClass();
bean = beanClass.newInstance();
@@ -552,7 +552,7 @@ public class BeanMap extends AbstractMap
* property exists
*/
public Class getType(String name) {
- return (Class) types.get( name );
+ return types.get( name );
}
/**
@@ -641,7 +641,7 @@ public class BeanMap extends AbstractMap
* @return the accessor method for the property, or null
*/
public Method getReadMethod(String name) {
- return (Method) readMethods.get(name);
+ return readMethods.get(name);
}
/**
@@ -651,7 +651,7 @@ public class BeanMap extends AbstractMap
* @return the mutator method for the property, or null
*/
public Method getWriteMethod(String name) {
- return (Method) writeMethods.get(name);
+ return writeMethods.get(name);
}
@@ -667,7 +667,7 @@ public class BeanMap extends AbstractMap
* method for that property
*/
protected Method getReadMethod( Object name ) {
- return (Method) readMethods.get( name );
+ return readMethods.get( name );
}
/**
@@ -679,7 +679,7 @@ public class BeanMap extends AbstractMap
* property is read-only; or the mutator method for that property
*/
protected Method getWriteMethod( Object name ) {
- return (Method) writeMethods.get( name );
+ return writeMethods.get( name );
}
/**
@@ -698,7 +698,7 @@ public class BeanMap extends AbstractMap
return;
}
- Class beanClass = getBean().getClass();
+ Class<? extends Object> beanClass = getBean().getClass();
try {
//BeanInfo beanInfo = Introspector.getBeanInfo( bean, null );
BeanInfo beanInfo = Introspector.getBeanInfo( beanClass );
@@ -710,7 +710,7 @@ public class BeanMap extends AbstractMap
String name = propertyDescriptor.getName();
Method readMethod = propertyDescriptor.getReadMethod();
Method writeMethod = propertyDescriptor.getWriteMethod();
- Class aType = propertyDescriptor.getPropertyType();
+ Class<? extends Object> aType = propertyDescriptor.getPropertyType();
if ( readMethod != null ) {
readMethods.put( name, readMethod );
@@ -798,9 +798,9 @@ public class BeanMap extends AbstractMap
throws IllegalAccessException, ClassCastException {
try {
if ( value != null ) {
- Class[] types = method.getParameterTypes();
+ Class<? extends Object>[] types = method.getParameterTypes();
if ( types != null && types.length > 0 ) {
- Class paramType = types[0];
+ Class<? extends Object> paramType = types[0];
if ( ! paramType.isAssignableFrom( value.getClass() ) ) {
value = convertType( paramType, value );
}
@@ -861,9 +861,9 @@ public class BeanMap extends AbstractMap
throws InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException {
// try call constructor
- Class[] types = { value.getClass() };
+ Class<?>[] types = { value.getClass() };
try {
- Constructor constructor = newType.getConstructor( types );
+ Constructor<?> constructor = newType.getConstructor( types );
Object[] arguments = { value };
return constructor.newInstance( arguments );
}
@@ -885,7 +885,7 @@ public class BeanMap extends AbstractMap
* or null if the given type is not a primitive type
*/
protected Transformer getTypeTransformer( Class aType ) {
- return (Transformer) typeTransformers.get( aType );
+ return typeTransformers.get( aType );
}
/**
Re: svn commit: r1479574 - /commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BeanMap.java
Posted by Benedikt Ritter <br...@apache.org>.
2013/5/7 sebb <se...@gmail.com>
> On 6 May 2013 15:19, Benedikt Ritter <br...@apache.org> wrote:
> > 2013/5/6 <se...@apache.org>
> >
> >> Author: sebb
> >> Date: Mon May 6 14:09:05 2013
> >> New Revision: 1479574
> >>
> >> URL: http://svn.apache.org/r1479574
> >> Log:
> >> Fix up internal raw types
> >>
> >
> > Keep in mind, that this will make applying patches created before
> > generification harder.
> >
>
> OK, but at some point before the next release all the generics
> warnings have to be fixed.
>
Yeah sure they have to! But I wanted to review all issues first to make
sure we can apply as many patches as possible before fixing generics.
>
> >>
> >> Modified:
> >>
> >>
> commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BeanMap.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=1479574&r1=1479573&r2=1479574&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
> >> Mon May 6 14:09:05 2013
> >> @@ -51,9 +51,9 @@ public class BeanMap extends AbstractMap
> >>
> >> private transient Object bean;
> >>
> >> - private transient HashMap readMethods = new HashMap();
> >> - private transient HashMap writeMethods = new HashMap();
> >> - private transient HashMap types = new HashMap();
> >> + private transient HashMap<String, Method> readMethods = new
> >> HashMap<String, Method>();
> >> + private transient HashMap<String, Method> writeMethods = new
> >> HashMap<String, Method>();
> >> + private transient HashMap<String, Class<? extends Object>> types =
> >> new HashMap<String, Class<? extends Object>>();
> >>
> >> /**
> >> * An empty array. Used to invoke accessors via reflection.
> >> @@ -66,7 +66,7 @@ public class BeanMap extends AbstractMap
> >> *
> >> * N.B. private & unmodifiable replacement for the (public &
> static)
> >> defaultTransformers instance.
> >> */
> >> - private static final Map typeTransformers =
> >> Collections.unmodifiableMap(createTypeTransformers());
> >> + private static final Map<Class<? extends Object>, Transformer>
> >> typeTransformers =
> Collections.unmodifiableMap(createTypeTransformers());
> >>
> >> /**
> >> * This HashMap has been made unmodifiable to prevent issues when
> >> @@ -127,8 +127,8 @@ public class BeanMap extends AbstractMap
> >> }
> >> };
> >>
> >> - private static Map createTypeTransformers() {
> >> - Map defaultTransformers = new HashMap();
> >> + private static Map<Class<? extends Object>, Transformer>
> >> createTypeTransformers() {
> >> + Map<Class<? extends Object>, Transformer> defaultTransformers =
> >> new HashMap<Class<? extends Object>, Transformer>();
> >> defaultTransformers.put(
> >> Boolean.TYPE,
> >> new Transformer() {
> >> @@ -268,7 +268,7 @@ public class BeanMap extends AbstractMap
> >> }
> >>
> >> Object newBean = null;
> >> - Class beanClass = bean.getClass(); // Cannot throw Exception
> >> + Class<? extends Object> beanClass = bean.getClass(); // Cannot
> >> throw Exception
> >> try {
> >> newBean = beanClass.newInstance();
> >> } catch (Exception e) {
> >> @@ -294,7 +294,7 @@ public class BeanMap extends AbstractMap
> >> // copy only properties that are readable and writable. If
> >> its
> >> // not readable, we can't get the value from the old map.
> If
> >> // its not writable, we can't write a value into the new
> map.
> >> - Iterator readableKeys = readMethods.keySet().iterator();
> >> + Iterator<?> readableKeys = readMethods.keySet().iterator();
> >> while(readableKeys.hasNext()) {
> >> Object key = readableKeys.next();
> >> if(getWriteMethod(key) != null) {
> >> @@ -319,7 +319,7 @@ public class BeanMap extends AbstractMap
> >> * @param map the BeanMap whose properties to put
> >> */
> >> public void putAllWriteable(BeanMap map) {
> >> - Iterator readableKeys = map.readMethods.keySet().iterator();
> >> + Iterator<?> readableKeys = map.readMethods.keySet().iterator();
> >> while (readableKeys.hasNext()) {
> >> Object key = readableKeys.next();
> >> if (getWriteMethod(key) != null) {
> >> @@ -343,7 +343,7 @@ public class BeanMap extends AbstractMap
> >> return;
> >> }
> >>
> >> - Class beanClass = null;
> >> + Class<? extends Object> beanClass = null;
> >> try {
> >> beanClass = bean.getClass();
> >> bean = beanClass.newInstance();
> >> @@ -552,7 +552,7 @@ public class BeanMap extends AbstractMap
> >> * property exists
> >> */
> >> public Class getType(String name) {
> >> - return (Class) types.get( name );
> >> + return types.get( name );
> >> }
> >>
> >> /**
> >> @@ -641,7 +641,7 @@ public class BeanMap extends AbstractMap
> >> * @return the accessor method for the property, or null
> >> */
> >> public Method getReadMethod(String name) {
> >> - return (Method) readMethods.get(name);
> >> + return readMethods.get(name);
> >> }
> >>
> >> /**
> >> @@ -651,7 +651,7 @@ public class BeanMap extends AbstractMap
> >> * @return the mutator method for the property, or null
> >> */
> >> public Method getWriteMethod(String name) {
> >> - return (Method) writeMethods.get(name);
> >> + return writeMethods.get(name);
> >> }
> >>
> >>
> >> @@ -667,7 +667,7 @@ public class BeanMap extends AbstractMap
> >> * method for that property
> >> */
> >> protected Method getReadMethod( Object name ) {
> >> - return (Method) readMethods.get( name );
> >> + return readMethods.get( name );
> >> }
> >>
> >> /**
> >> @@ -679,7 +679,7 @@ public class BeanMap extends AbstractMap
> >> * property is read-only; or the mutator method for that property
> >> */
> >> protected Method getWriteMethod( Object name ) {
> >> - return (Method) writeMethods.get( name );
> >> + return writeMethods.get( name );
> >> }
> >>
> >> /**
> >> @@ -698,7 +698,7 @@ public class BeanMap extends AbstractMap
> >> return;
> >> }
> >>
> >> - Class beanClass = getBean().getClass();
> >> + Class<? extends Object> beanClass = getBean().getClass();
> >> try {
> >> //BeanInfo beanInfo = Introspector.getBeanInfo( bean, null
> );
> >> BeanInfo beanInfo = Introspector.getBeanInfo( beanClass );
> >> @@ -710,7 +710,7 @@ public class BeanMap extends AbstractMap
> >> String name = propertyDescriptor.getName();
> >> Method readMethod =
> >> propertyDescriptor.getReadMethod();
> >> Method writeMethod =
> >> propertyDescriptor.getWriteMethod();
> >> - Class aType =
> >> propertyDescriptor.getPropertyType();
> >> + Class<? extends Object> aType =
> >> propertyDescriptor.getPropertyType();
> >>
> >> if ( readMethod != null ) {
> >> readMethods.put( name, readMethod );
> >> @@ -798,9 +798,9 @@ public class BeanMap extends AbstractMap
> >> throws IllegalAccessException, ClassCastException {
> >> try {
> >> if ( value != null ) {
> >> - Class[] types = method.getParameterTypes();
> >> + Class<? extends Object>[] types =
> >> method.getParameterTypes();
> >> if ( types != null && types.length > 0 ) {
> >> - Class paramType = types[0];
> >> + Class<? extends Object> paramType = types[0];
> >> if ( ! paramType.isAssignableFrom(
> value.getClass() )
> >> ) {
> >> value = convertType( paramType, value );
> >> }
> >> @@ -861,9 +861,9 @@ public class BeanMap extends AbstractMap
> >> throws InstantiationException, IllegalAccessException,
> >> IllegalArgumentException, InvocationTargetException {
> >>
> >> // try call constructor
> >> - Class[] types = { value.getClass() };
> >> + Class<?>[] types = { value.getClass() };
> >> try {
> >> - Constructor constructor = newType.getConstructor( types );
> >> + Constructor<?> constructor = newType.getConstructor( types
> );
> >> Object[] arguments = { value };
> >> return constructor.newInstance( arguments );
> >> }
> >> @@ -885,7 +885,7 @@ public class BeanMap extends AbstractMap
> >> * or null if the given type is not a primitive type
> >> */
> >> protected Transformer getTypeTransformer( Class aType ) {
> >> - return (Transformer) typeTransformers.get( aType );
> >> + return typeTransformers.get( aType );
> >> }
> >>
> >> /**
> >>
> >>
> >>
> >
> >
> > --
> > http://people.apache.org/~britter/
> > http://www.systemoutprintln.de/
> > http://twitter.com/BenediktRitter
> > http://github.com/britter
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
> For additional commands, e-mail: dev-help@commons.apache.org
>
>
--
http://people.apache.org/~britter/
http://www.systemoutprintln.de/
http://twitter.com/BenediktRitter
http://github.com/britter
Re: svn commit: r1479574 - /commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BeanMap.java
Posted by sebb <se...@gmail.com>.
On 6 May 2013 15:19, Benedikt Ritter <br...@apache.org> wrote:
> 2013/5/6 <se...@apache.org>
>
>> Author: sebb
>> Date: Mon May 6 14:09:05 2013
>> New Revision: 1479574
>>
>> URL: http://svn.apache.org/r1479574
>> Log:
>> Fix up internal raw types
>>
>
> Keep in mind, that this will make applying patches created before
> generification harder.
>
OK, but at some point before the next release all the generics
warnings have to be fixed.
>>
>> Modified:
>>
>> commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BeanMap.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=1479574&r1=1479573&r2=1479574&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
>> Mon May 6 14:09:05 2013
>> @@ -51,9 +51,9 @@ public class BeanMap extends AbstractMap
>>
>> private transient Object bean;
>>
>> - private transient HashMap readMethods = new HashMap();
>> - private transient HashMap writeMethods = new HashMap();
>> - private transient HashMap types = new HashMap();
>> + private transient HashMap<String, Method> readMethods = new
>> HashMap<String, Method>();
>> + private transient HashMap<String, Method> writeMethods = new
>> HashMap<String, Method>();
>> + private transient HashMap<String, Class<? extends Object>> types =
>> new HashMap<String, Class<? extends Object>>();
>>
>> /**
>> * An empty array. Used to invoke accessors via reflection.
>> @@ -66,7 +66,7 @@ public class BeanMap extends AbstractMap
>> *
>> * N.B. private & unmodifiable replacement for the (public & static)
>> defaultTransformers instance.
>> */
>> - private static final Map typeTransformers =
>> Collections.unmodifiableMap(createTypeTransformers());
>> + private static final Map<Class<? extends Object>, Transformer>
>> typeTransformers = Collections.unmodifiableMap(createTypeTransformers());
>>
>> /**
>> * This HashMap has been made unmodifiable to prevent issues when
>> @@ -127,8 +127,8 @@ public class BeanMap extends AbstractMap
>> }
>> };
>>
>> - private static Map createTypeTransformers() {
>> - Map defaultTransformers = new HashMap();
>> + private static Map<Class<? extends Object>, Transformer>
>> createTypeTransformers() {
>> + Map<Class<? extends Object>, Transformer> defaultTransformers =
>> new HashMap<Class<? extends Object>, Transformer>();
>> defaultTransformers.put(
>> Boolean.TYPE,
>> new Transformer() {
>> @@ -268,7 +268,7 @@ public class BeanMap extends AbstractMap
>> }
>>
>> Object newBean = null;
>> - Class beanClass = bean.getClass(); // Cannot throw Exception
>> + Class<? extends Object> beanClass = bean.getClass(); // Cannot
>> throw Exception
>> try {
>> newBean = beanClass.newInstance();
>> } catch (Exception e) {
>> @@ -294,7 +294,7 @@ public class BeanMap extends AbstractMap
>> // copy only properties that are readable and writable. If
>> its
>> // not readable, we can't get the value from the old map. If
>> // its not writable, we can't write a value into the new map.
>> - Iterator readableKeys = readMethods.keySet().iterator();
>> + Iterator<?> readableKeys = readMethods.keySet().iterator();
>> while(readableKeys.hasNext()) {
>> Object key = readableKeys.next();
>> if(getWriteMethod(key) != null) {
>> @@ -319,7 +319,7 @@ public class BeanMap extends AbstractMap
>> * @param map the BeanMap whose properties to put
>> */
>> public void putAllWriteable(BeanMap map) {
>> - Iterator readableKeys = map.readMethods.keySet().iterator();
>> + Iterator<?> readableKeys = map.readMethods.keySet().iterator();
>> while (readableKeys.hasNext()) {
>> Object key = readableKeys.next();
>> if (getWriteMethod(key) != null) {
>> @@ -343,7 +343,7 @@ public class BeanMap extends AbstractMap
>> return;
>> }
>>
>> - Class beanClass = null;
>> + Class<? extends Object> beanClass = null;
>> try {
>> beanClass = bean.getClass();
>> bean = beanClass.newInstance();
>> @@ -552,7 +552,7 @@ public class BeanMap extends AbstractMap
>> * property exists
>> */
>> public Class getType(String name) {
>> - return (Class) types.get( name );
>> + return types.get( name );
>> }
>>
>> /**
>> @@ -641,7 +641,7 @@ public class BeanMap extends AbstractMap
>> * @return the accessor method for the property, or null
>> */
>> public Method getReadMethod(String name) {
>> - return (Method) readMethods.get(name);
>> + return readMethods.get(name);
>> }
>>
>> /**
>> @@ -651,7 +651,7 @@ public class BeanMap extends AbstractMap
>> * @return the mutator method for the property, or null
>> */
>> public Method getWriteMethod(String name) {
>> - return (Method) writeMethods.get(name);
>> + return writeMethods.get(name);
>> }
>>
>>
>> @@ -667,7 +667,7 @@ public class BeanMap extends AbstractMap
>> * method for that property
>> */
>> protected Method getReadMethod( Object name ) {
>> - return (Method) readMethods.get( name );
>> + return readMethods.get( name );
>> }
>>
>> /**
>> @@ -679,7 +679,7 @@ public class BeanMap extends AbstractMap
>> * property is read-only; or the mutator method for that property
>> */
>> protected Method getWriteMethod( Object name ) {
>> - return (Method) writeMethods.get( name );
>> + return writeMethods.get( name );
>> }
>>
>> /**
>> @@ -698,7 +698,7 @@ public class BeanMap extends AbstractMap
>> return;
>> }
>>
>> - Class beanClass = getBean().getClass();
>> + Class<? extends Object> beanClass = getBean().getClass();
>> try {
>> //BeanInfo beanInfo = Introspector.getBeanInfo( bean, null );
>> BeanInfo beanInfo = Introspector.getBeanInfo( beanClass );
>> @@ -710,7 +710,7 @@ public class BeanMap extends AbstractMap
>> String name = propertyDescriptor.getName();
>> Method readMethod =
>> propertyDescriptor.getReadMethod();
>> Method writeMethod =
>> propertyDescriptor.getWriteMethod();
>> - Class aType =
>> propertyDescriptor.getPropertyType();
>> + Class<? extends Object> aType =
>> propertyDescriptor.getPropertyType();
>>
>> if ( readMethod != null ) {
>> readMethods.put( name, readMethod );
>> @@ -798,9 +798,9 @@ public class BeanMap extends AbstractMap
>> throws IllegalAccessException, ClassCastException {
>> try {
>> if ( value != null ) {
>> - Class[] types = method.getParameterTypes();
>> + Class<? extends Object>[] types =
>> method.getParameterTypes();
>> if ( types != null && types.length > 0 ) {
>> - Class paramType = types[0];
>> + Class<? extends Object> paramType = types[0];
>> if ( ! paramType.isAssignableFrom( value.getClass() )
>> ) {
>> value = convertType( paramType, value );
>> }
>> @@ -861,9 +861,9 @@ public class BeanMap extends AbstractMap
>> throws InstantiationException, IllegalAccessException,
>> IllegalArgumentException, InvocationTargetException {
>>
>> // try call constructor
>> - Class[] types = { value.getClass() };
>> + Class<?>[] types = { value.getClass() };
>> try {
>> - Constructor constructor = newType.getConstructor( types );
>> + Constructor<?> constructor = newType.getConstructor( types );
>> Object[] arguments = { value };
>> return constructor.newInstance( arguments );
>> }
>> @@ -885,7 +885,7 @@ public class BeanMap extends AbstractMap
>> * or null if the given type is not a primitive type
>> */
>> protected Transformer getTypeTransformer( Class aType ) {
>> - return (Transformer) typeTransformers.get( aType );
>> + return typeTransformers.get( aType );
>> }
>>
>> /**
>>
>>
>>
>
>
> --
> http://people.apache.org/~britter/
> http://www.systemoutprintln.de/
> http://twitter.com/BenediktRitter
> http://github.com/britter
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
For additional commands, e-mail: dev-help@commons.apache.org
Re: svn commit: r1479574 - /commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BeanMap.java
Posted by Benedikt Ritter <br...@apache.org>.
2013/5/6 <se...@apache.org>
> Author: sebb
> Date: Mon May 6 14:09:05 2013
> New Revision: 1479574
>
> URL: http://svn.apache.org/r1479574
> Log:
> Fix up internal raw types
>
Keep in mind, that this will make applying patches created before
generification harder.
>
> Modified:
>
> commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BeanMap.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=1479574&r1=1479573&r2=1479574&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
> Mon May 6 14:09:05 2013
> @@ -51,9 +51,9 @@ public class BeanMap extends AbstractMap
>
> private transient Object bean;
>
> - private transient HashMap readMethods = new HashMap();
> - private transient HashMap writeMethods = new HashMap();
> - private transient HashMap types = new HashMap();
> + private transient HashMap<String, Method> readMethods = new
> HashMap<String, Method>();
> + private transient HashMap<String, Method> writeMethods = new
> HashMap<String, Method>();
> + private transient HashMap<String, Class<? extends Object>> types =
> new HashMap<String, Class<? extends Object>>();
>
> /**
> * An empty array. Used to invoke accessors via reflection.
> @@ -66,7 +66,7 @@ public class BeanMap extends AbstractMap
> *
> * N.B. private & unmodifiable replacement for the (public & static)
> defaultTransformers instance.
> */
> - private static final Map typeTransformers =
> Collections.unmodifiableMap(createTypeTransformers());
> + private static final Map<Class<? extends Object>, Transformer>
> typeTransformers = Collections.unmodifiableMap(createTypeTransformers());
>
> /**
> * This HashMap has been made unmodifiable to prevent issues when
> @@ -127,8 +127,8 @@ public class BeanMap extends AbstractMap
> }
> };
>
> - private static Map createTypeTransformers() {
> - Map defaultTransformers = new HashMap();
> + private static Map<Class<? extends Object>, Transformer>
> createTypeTransformers() {
> + Map<Class<? extends Object>, Transformer> defaultTransformers =
> new HashMap<Class<? extends Object>, Transformer>();
> defaultTransformers.put(
> Boolean.TYPE,
> new Transformer() {
> @@ -268,7 +268,7 @@ public class BeanMap extends AbstractMap
> }
>
> Object newBean = null;
> - Class beanClass = bean.getClass(); // Cannot throw Exception
> + Class<? extends Object> beanClass = bean.getClass(); // Cannot
> throw Exception
> try {
> newBean = beanClass.newInstance();
> } catch (Exception e) {
> @@ -294,7 +294,7 @@ public class BeanMap extends AbstractMap
> // copy only properties that are readable and writable. If
> its
> // not readable, we can't get the value from the old map. If
> // its not writable, we can't write a value into the new map.
> - Iterator readableKeys = readMethods.keySet().iterator();
> + Iterator<?> readableKeys = readMethods.keySet().iterator();
> while(readableKeys.hasNext()) {
> Object key = readableKeys.next();
> if(getWriteMethod(key) != null) {
> @@ -319,7 +319,7 @@ public class BeanMap extends AbstractMap
> * @param map the BeanMap whose properties to put
> */
> public void putAllWriteable(BeanMap map) {
> - Iterator readableKeys = map.readMethods.keySet().iterator();
> + Iterator<?> readableKeys = map.readMethods.keySet().iterator();
> while (readableKeys.hasNext()) {
> Object key = readableKeys.next();
> if (getWriteMethod(key) != null) {
> @@ -343,7 +343,7 @@ public class BeanMap extends AbstractMap
> return;
> }
>
> - Class beanClass = null;
> + Class<? extends Object> beanClass = null;
> try {
> beanClass = bean.getClass();
> bean = beanClass.newInstance();
> @@ -552,7 +552,7 @@ public class BeanMap extends AbstractMap
> * property exists
> */
> public Class getType(String name) {
> - return (Class) types.get( name );
> + return types.get( name );
> }
>
> /**
> @@ -641,7 +641,7 @@ public class BeanMap extends AbstractMap
> * @return the accessor method for the property, or null
> */
> public Method getReadMethod(String name) {
> - return (Method) readMethods.get(name);
> + return readMethods.get(name);
> }
>
> /**
> @@ -651,7 +651,7 @@ public class BeanMap extends AbstractMap
> * @return the mutator method for the property, or null
> */
> public Method getWriteMethod(String name) {
> - return (Method) writeMethods.get(name);
> + return writeMethods.get(name);
> }
>
>
> @@ -667,7 +667,7 @@ public class BeanMap extends AbstractMap
> * method for that property
> */
> protected Method getReadMethod( Object name ) {
> - return (Method) readMethods.get( name );
> + return readMethods.get( name );
> }
>
> /**
> @@ -679,7 +679,7 @@ public class BeanMap extends AbstractMap
> * property is read-only; or the mutator method for that property
> */
> protected Method getWriteMethod( Object name ) {
> - return (Method) writeMethods.get( name );
> + return writeMethods.get( name );
> }
>
> /**
> @@ -698,7 +698,7 @@ public class BeanMap extends AbstractMap
> return;
> }
>
> - Class beanClass = getBean().getClass();
> + Class<? extends Object> beanClass = getBean().getClass();
> try {
> //BeanInfo beanInfo = Introspector.getBeanInfo( bean, null );
> BeanInfo beanInfo = Introspector.getBeanInfo( beanClass );
> @@ -710,7 +710,7 @@ public class BeanMap extends AbstractMap
> String name = propertyDescriptor.getName();
> Method readMethod =
> propertyDescriptor.getReadMethod();
> Method writeMethod =
> propertyDescriptor.getWriteMethod();
> - Class aType =
> propertyDescriptor.getPropertyType();
> + Class<? extends Object> aType =
> propertyDescriptor.getPropertyType();
>
> if ( readMethod != null ) {
> readMethods.put( name, readMethod );
> @@ -798,9 +798,9 @@ public class BeanMap extends AbstractMap
> throws IllegalAccessException, ClassCastException {
> try {
> if ( value != null ) {
> - Class[] types = method.getParameterTypes();
> + Class<? extends Object>[] types =
> method.getParameterTypes();
> if ( types != null && types.length > 0 ) {
> - Class paramType = types[0];
> + Class<? extends Object> paramType = types[0];
> if ( ! paramType.isAssignableFrom( value.getClass() )
> ) {
> value = convertType( paramType, value );
> }
> @@ -861,9 +861,9 @@ public class BeanMap extends AbstractMap
> throws InstantiationException, IllegalAccessException,
> IllegalArgumentException, InvocationTargetException {
>
> // try call constructor
> - Class[] types = { value.getClass() };
> + Class<?>[] types = { value.getClass() };
> try {
> - Constructor constructor = newType.getConstructor( types );
> + Constructor<?> constructor = newType.getConstructor( types );
> Object[] arguments = { value };
> return constructor.newInstance( arguments );
> }
> @@ -885,7 +885,7 @@ public class BeanMap extends AbstractMap
> * or null if the given type is not a primitive type
> */
> protected Transformer getTypeTransformer( Class aType ) {
> - return (Transformer) typeTransformers.get( aType );
> + return typeTransformers.get( aType );
> }
>
> /**
>
>
>
--
http://people.apache.org/~britter/
http://www.systemoutprintln.de/
http://twitter.com/BenediktRitter
http://github.com/britter