Author: oheger
Date: Sun Oct 27 20:34:26 2013
New Revision: 1536200
URL: http://svn.apache.org/r1536200
Log:
Generified WrapDynaClass.
Modified:
commons/proper/beanutils/branches/java5/src/main/java/org/apache/commons/beanutils/WrapDynaClass.java
commons/proper/beanutils/branches/java5/src/test/java/org/apache/commons/beanutils/WrapDynaBeanTestCase.java
Modified:
commons/proper/beanutils/branches/java5/src/main/java/org/apache/commons/beanutils/WrapDynaClass.java
URL:
http://svn.apache.org/viewvc/commons/proper/beanutils/branches/java5/src/main/java/org/apache/commons/beanutils/WrapDynaClass.java?rev=1536200&r1=1536199&r2=1536200&view=diff
==============================================================================
---
commons/proper/beanutils/branches/java5/src/main/java/org/apache/commons/beanutils/WrapDynaClass.java
(original)
+++
commons/proper/beanutils/branches/java5/src/main/java/org/apache/commons/beanutils/WrapDynaClass.java
Sun Oct 27 20:34:26 2013
@@ -60,9 +60,9 @@ public class WrapDynaClass implements Dy
*
* @param beanClass JavaBean class to be introspected around
*/
- private WrapDynaClass(Class beanClass) {
+ private WrapDynaClass(Class<?> beanClass) {
- this.beanClassRef = new SoftReference(beanClass);
+ this.beanClassRef = new SoftReference<Class<?>>(beanClass);
this.beanClassName = beanClass.getName();
introspect();
@@ -79,7 +79,7 @@ public class WrapDynaClass implements Dy
/**
* Reference to the JavaBean class represented by this WrapDynaClass.
*/
- private Reference beanClassRef = null;
+ private Reference<Class<?>> beanClassRef = null;
/**
* The JavaBean <code>Class</code> which is represented by this
@@ -88,7 +88,7 @@ public class WrapDynaClass implements Dy
* @deprecated No longer initialized, use getBeanClass() method instead
*/
@Deprecated
- protected Class beanClass = null;
+ protected Class<?> beanClass = null;
/**
@@ -102,7 +102,7 @@ public class WrapDynaClass implements Dy
* property name. Individual descriptor instances will be the same
* instances as those in the <code>descriptors</code> list.
*/
- protected HashMap descriptorsMap = new HashMap();
+ protected HashMap<String, PropertyDescriptor> descriptorsMap = new
HashMap<String, PropertyDescriptor>();
/**
@@ -116,25 +116,25 @@ public class WrapDynaClass implements Dy
* keyed by the property name. Individual descriptor instances will
* be the same instances as those in the <code>properties</code> list.
*/
- protected HashMap propertiesMap = new HashMap();
+ protected HashMap<String, DynaProperty> propertiesMap = new
HashMap<String, DynaProperty>();
// ------------------------------------------------------- Static Variables
- private static final ContextClassLoaderLocal CLASSLOADER_CACHE =
- new ContextClassLoaderLocal() {
+ private static final ContextClassLoaderLocal<Map<Object, Object>>
CLASSLOADER_CACHE =
+ new ContextClassLoaderLocal<Map<Object, Object>>() {
@Override
- protected Object initialValue() {
- return new WeakHashMap();
+ protected Map<Object, Object> initialValue() {
+ return new WeakHashMap<Object, Object>();
}
};
/**
* Get the wrap dyna classes cache
*/
- private static Map getDynaClassesMap() {
- return (Map)CLASSLOADER_CACHE.get();
+ private static Map<Object, Object> getDynaClassesMap() {
+ return CLASSLOADER_CACHE.get();
}
/**
@@ -174,7 +174,7 @@ public class WrapDynaClass implements Dy
* @deprecated The dynaClasses Map will be removed in a subsequent release
*/
@Deprecated
- protected static HashMap dynaClasses = new HashMap() {
+ protected static HashMap<Object, Object> dynaClasses = new HashMap<Object,
Object>() {
@Override
public void clear() {
getDynaClassesMap().clear();
@@ -188,7 +188,7 @@ public class WrapDynaClass implements Dy
return getDynaClassesMap().containsValue(value);
}
@Override
- public Set entrySet() {
+ public Set<Map.Entry<Object, Object>> entrySet() {
return getDynaClassesMap().entrySet();
}
@Override
@@ -208,7 +208,7 @@ public class WrapDynaClass implements Dy
return getDynaClassesMap().isEmpty();
}
@Override
- public Set keySet() {
+ public Set<Object> keySet() {
return getDynaClassesMap().keySet();
}
@Override
@@ -216,7 +216,7 @@ public class WrapDynaClass implements Dy
return getDynaClassesMap().put(key, value);
}
@Override
- public void putAll(Map m) {
+ public void putAll(Map<? extends Object, ? extends Object> m) {
getDynaClassesMap().putAll(m);
}
@Override
@@ -228,7 +228,7 @@ public class WrapDynaClass implements Dy
return getDynaClassesMap().size();
}
@Override
- public Collection values() {
+ public Collection<Object> values() {
return getDynaClassesMap().values();
}
};
@@ -242,8 +242,8 @@ public class WrapDynaClass implements Dy
* @return the class of the underlying wrapped bean
* @since 1.8.0
*/
- protected Class getBeanClass() {
- return (Class)beanClassRef.get();
+ protected Class<?> getBeanClass() {
+ return beanClassRef.get();
}
/**
@@ -277,7 +277,7 @@ public class WrapDynaClass implements Dy
throw new IllegalArgumentException
("No property name specified");
}
- return ((DynaProperty) propertiesMap.get(name));
+ return (propertiesMap.get(name));
}
@@ -345,7 +345,7 @@ public class WrapDynaClass implements Dy
*/
public PropertyDescriptor getPropertyDescriptor(String name) {
- return ((PropertyDescriptor) descriptorsMap.get(name));
+ return (descriptorsMap.get(name));
}
@@ -370,7 +370,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(Class<?> beanClass) {
WrapDynaClass dynaClass =
(WrapDynaClass) getDynaClassesMap().get(beanClass);
@@ -392,16 +392,16 @@ public class WrapDynaClass implements Dy
protected void introspect() {
// Look up the property descriptors for this bean class
- Class beanClass = getBeanClass();
+ Class<?> beanClass = getBeanClass();
PropertyDescriptor[] regulars =
PropertyUtils.getPropertyDescriptors(beanClass);
if (regulars == null) {
regulars = new PropertyDescriptor[0];
}
- Map mappeds =
+ Map<?, ?> mappeds =
PropertyUtils.getMappedPropertyDescriptors(beanClass);
if (mappeds == null) {
- mappeds = new HashMap();
+ mappeds = new HashMap<Object, Object>();
}
// Construct corresponding DynaProperty information
@@ -416,7 +416,7 @@ public class WrapDynaClass implements Dy
properties[i]);
}
int j = regulars.length;
- Iterator names = mappeds.keySet().iterator();
+ Iterator<?> names = mappeds.keySet().iterator();
while (names.hasNext()) {
String name = (String) names.next();
PropertyDescriptor descriptor =
Modified:
commons/proper/beanutils/branches/java5/src/test/java/org/apache/commons/beanutils/WrapDynaBeanTestCase.java
URL:
http://svn.apache.org/viewvc/commons/proper/beanutils/branches/java5/src/test/java/org/apache/commons/beanutils/WrapDynaBeanTestCase.java?rev=1536200&r1=1536199&r2=1536200&view=diff
==============================================================================
---
commons/proper/beanutils/branches/java5/src/test/java/org/apache/commons/beanutils/WrapDynaBeanTestCase.java
(original)
+++
commons/proper/beanutils/branches/java5/src/test/java/org/apache/commons/beanutils/WrapDynaBeanTestCase.java
Sun Oct 27 20:34:26 2013
@@ -22,6 +22,7 @@ import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
+
import junit.framework.Test;
import junit.framework.TestSuite;
@@ -101,7 +102,7 @@ public class WrapDynaBeanTestCase extend
// Invalid getter
try {
- Object result = bean.get("invalidProperty");
+ bean.get("invalidProperty");
fail("Invalid get should have thrown IllegalArgumentException");
} catch (IllegalArgumentException t) {
// Expected result
@@ -141,7 +142,7 @@ public class WrapDynaBeanTestCase extend
// Invalid getter
try {
- Object result = bean.get("invalidProperty", 0);
+ bean.get("invalidProperty", 0);
fail("Invalid get should have thrown IllegalArgumentException");
} catch (IllegalArgumentException t) {
// Expected result
