[jboss-cvs] JBossAS SVN: r70823 - projects/aop/trunk/aop/src/main/org/jboss/aop.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Mar 13 11:27:31 EDT 2008
Author: kabir.khan at jboss.com
Date: 2008-03-13 11:27:31 -0400 (Thu, 13 Mar 2008)
New Revision: 70823
Modified:
projects/aop/trunk/aop/src/main/org/jboss/aop/GeneratedAdvisorDomain.java
projects/aop/trunk/aop/src/main/org/jboss/aop/InstanceAdvisorDelegate.java
projects/aop/trunk/aop/src/main/org/jboss/aop/InterceptionMarkers.java
projects/aop/trunk/aop/src/main/org/jboss/aop/InterceptorChainObserver.java
projects/aop/trunk/aop/src/main/org/jboss/aop/Introduction.java
projects/aop/trunk/aop/src/main/org/jboss/aop/Mixin.java
projects/aop/trunk/aop/src/main/org/jboss/aop/SecurityActions.java
Log:
Tidyup, add generics and get rid of warnings
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/GeneratedAdvisorDomain.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/GeneratedAdvisorDomain.java 2008-03-13 15:02:46 UTC (rev 70822)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/GeneratedAdvisorDomain.java 2008-03-13 15:27:31 UTC (rev 70823)
@@ -28,12 +28,12 @@
public class GeneratedAdvisorDomain extends Domain
{
- public GeneratedAdvisorDomain(AspectManager manager, String name, Class clazz)
+ public GeneratedAdvisorDomain(AspectManager manager, String name, Class<?> clazz)
{
this(manager, name, clazz, false);
}
- public GeneratedAdvisorDomain(AspectManager manager, String name, Class clazz, boolean instanceDomain)
+ public GeneratedAdvisorDomain(AspectManager manager, String name, Class<?> clazz, boolean instanceDomain)
{
super(manager, name, false);
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/InstanceAdvisorDelegate.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/InstanceAdvisorDelegate.java 2008-03-13 15:02:46 UTC (rev 70822)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/InstanceAdvisorDelegate.java 2008-03-13 15:27:31 UTC (rev 70823)
@@ -23,7 +23,6 @@
import java.io.Serializable;
import java.lang.ref.WeakReference;
-import java.util.Iterator;
import java.util.Map;
import java.util.Set;
import java.util.WeakHashMap;
@@ -44,24 +43,24 @@
{
private static final long serialVersionUID = -5421366346785427537L;
- protected transient WeakReference classAdvisor;
+ protected transient WeakReference<Advisor> classAdvisor;
InstanceAdvisor instanceAdvisor;
- protected transient WeakHashMap aspects;
- protected transient WeakHashMap joinpointAspects;
+ protected transient WeakHashMap<AspectDefinition, Object> aspects;
+ protected transient WeakHashMap<AspectDefinition, ConcurrentHashMap<Joinpoint, Object>> joinpointAspects;
protected SimpleMetaData metadata;
public InstanceAdvisorDelegate(Advisor classAdvisor, InstanceAdvisor instanceAdvisor)
{
this.instanceAdvisor = instanceAdvisor;
- this.classAdvisor = new WeakReference(classAdvisor);
+ this.classAdvisor = new WeakReference<Advisor>(classAdvisor);
}
public Advisor getAdvisor()
{
if (classAdvisor != null)
{
- return (Advisor)classAdvisor.get();
+ return classAdvisor.get();
}
return null;
}
@@ -85,30 +84,27 @@
if (instanceAdvisor instanceof Advisor)
{
Advisor ia = (Advisor)instanceAdvisor;
- Set instanceDefs = ia.getPerInstanceAspectDefinitions();
+ Set<AspectDefinition> instanceDefs = ia.getPerInstanceAspectDefinitions();
if (instanceDefs.size() > 0)
{
- aspects = new WeakHashMap();
- for (Iterator it = instanceDefs.iterator() ; it.hasNext() ; )
+ aspects = new WeakHashMap<AspectDefinition, Object>();
+ for (AspectDefinition def : instanceDefs)
{
- AspectDefinition def = (AspectDefinition) it.next();
ia.addPerInstanceAspect(def);
Object aspect = def.getFactory().createPerInstance(getClassAdvisor(), instanceAdvisor);
aspects.put(def, aspect);
}
}
}
- Set defs = getClassAdvisor().getPerInstanceAspectDefinitions();
+ Set<AspectDefinition> defs = getClassAdvisor().getPerInstanceAspectDefinitions();
if (defs.size() > 0)
{
if (aspects == null)
{
- aspects = new WeakHashMap();
+ aspects = new WeakHashMap<AspectDefinition, Object>();
}
- Iterator it = defs.iterator();
- while (it.hasNext())
+ for (AspectDefinition def : defs)
{
- AspectDefinition def = (AspectDefinition) it.next();
Object aspect = def.getFactory().createPerInstance(getClassAdvisor(), instanceAdvisor);
aspects.put(def, aspect);
}
@@ -122,57 +118,51 @@
if (instanceAdvisor instanceof Advisor)
{
Advisor ia = (Advisor)instanceAdvisor;
- Map instanceJpAspects = ia.getPerInstanceJoinpointAspectDefinitions();
+ Map<AspectDefinition, Set<Joinpoint>> instanceJpAspects = ia.getPerInstanceJoinpointAspectDefinitions();
if (instanceJpAspects.size() > 0)
{
- joinpointAspects = new WeakHashMap();
- for (Iterator it = instanceJpAspects.keySet().iterator() ; it.hasNext() ; )
+ joinpointAspects = new WeakHashMap<AspectDefinition, ConcurrentHashMap<Joinpoint, Object>>();
+ for (AspectDefinition def : instanceJpAspects.keySet())
{
- AspectDefinition def = (AspectDefinition) it.next();
initJoinpointAspect(def, instanceJpAspects);
- Set joinpoints = (Set)instanceJpAspects.get(def);
+ Set<Joinpoint> joinpoints = instanceJpAspects.get(def);
ia.addPerInstanceJoinpointAspect(joinpoints, def);
}
}
}
- Map jpAspects = getClassAdvisor().getPerInstanceJoinpointAspectDefinitions();
+ Map<AspectDefinition, Set<Joinpoint>> jpAspects = getClassAdvisor().getPerInstanceJoinpointAspectDefinitions();
if (jpAspects.size() > 0)
{
- joinpointAspects = new WeakHashMap();
- Iterator it = jpAspects.keySet().iterator();
- while (it.hasNext())
+ joinpointAspects = new WeakHashMap<AspectDefinition, ConcurrentHashMap<Joinpoint, Object>>();
+ for (AspectDefinition def : jpAspects.keySet())
{
- AspectDefinition def = (AspectDefinition) it.next();
initJoinpointAspect(def, jpAspects);
}
}
}
- private void initJoinpointAspect(AspectDefinition def, Map jpAspects)
+ private void initJoinpointAspect(AspectDefinition def, Map<AspectDefinition, Set<Joinpoint>> jpAspects)
{
- ConcurrentHashMap joins = new ConcurrentHashMap();
+ ConcurrentHashMap<Joinpoint, Object> joins = new ConcurrentHashMap<Joinpoint, Object>();
joinpointAspects.put(def, joins);
- Set joinpoints = (Set) jpAspects.get(def);
- Iterator jps = joinpoints.iterator();
- while (jps.hasNext())
+ Set<Joinpoint> joinpoints = jpAspects.get(def);
+ for (Joinpoint joinpoint : joinpoints)
{
- Object joinpoint = jps.next();
- joins.put(joinpoint, def.getFactory().createPerJoinpoint(getClassAdvisor(), instanceAdvisor, (Joinpoint) joinpoint));
+ joins.put(joinpoint, def.getFactory().createPerJoinpoint(getClassAdvisor(), instanceAdvisor, joinpoint));
}
}
public Object getPerInstanceAspect(String def)
{
- Iterator it = aspects.keySet().iterator();
- while (it.hasNext())
+ for (AspectDefinition d : aspects.keySet())
{
- AspectDefinition d = (AspectDefinition) it.next();
if (d.getName().equals(def)) return aspects.get(d);
}
return null;
}
+
public Object getPerInstanceAspect(AspectDefinition def)
{
// aspects is a weak hash map of AspectDefinitions so that perinstance advices can be undeployed/redeployed
@@ -196,7 +186,7 @@
ClassAdvisor cadvisor = (ClassAdvisor) getClassAdvisor();
cadvisor.getPerInstanceAspectDefinitions().add(def);
aspect = def.getFactory().createPerInstance(null, null);
- WeakHashMap copy = new WeakHashMap(aspects);
+ WeakHashMap<AspectDefinition, Object> copy = new WeakHashMap<AspectDefinition, Object>(aspects);
copy.put(def, aspect);
aspects = copy;
}
@@ -225,11 +215,11 @@
ClassAdvisor cadvisor = (ClassAdvisor) getClassAdvisor();
cadvisor.addPerInstanceJoinpointAspect(joinpoint, def);
aspect = def.getFactory().createPerJoinpoint(getClassAdvisor(), instanceAdvisor, joinpoint);
- WeakHashMap copy = new WeakHashMap(joinpointAspects);
- Map map = (Map) copy.get(def);
+ WeakHashMap<AspectDefinition, ConcurrentHashMap<Joinpoint, Object>> copy = new WeakHashMap<AspectDefinition, ConcurrentHashMap<Joinpoint, Object>>(joinpointAspects);
+ Map<Joinpoint, Object> map = copy.get(def);
if (map == null)
{
- map = new ConcurrentHashMap();
+ map = new ConcurrentHashMap<Joinpoint, Object>();
}
map.put(joinpoint, aspect);
joinpointAspects = copy;
@@ -242,7 +232,7 @@
private Object getJoinpointAspect(AspectDefinition def, Joinpoint joinpoint)
{
if (joinpointAspects == null) return null;
- Map map = (Map) joinpointAspects.get(def);
+ Map<Joinpoint, Object> map = joinpointAspects.get(def);
Object aspect = map.get(joinpoint);
return aspect;
}
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/InterceptionMarkers.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/InterceptionMarkers.java 2008-03-13 15:02:46 UTC (rev 70822)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/InterceptionMarkers.java 2008-03-13 15:27:31 UTC (rev 70823)
@@ -30,13 +30,13 @@
*/
public class InterceptionMarkers
{
- protected final ConcurrentHashMap convertableReference = new ConcurrentHashMap();
- protected final ConcurrentHashMap hasFieldInterception = new ConcurrentHashMap();
- protected final ConcurrentHashMap hasConstructorInterception = new ConcurrentHashMap();
+ protected final ConcurrentHashMap<String, String> convertableReference = new ConcurrentHashMap<String, String>();
+ protected final ConcurrentHashMap<String, String> hasFieldInterception = new ConcurrentHashMap<String, String>();
+ protected final ConcurrentHashMap<String, String> hasConstructorInterception = new ConcurrentHashMap<String, String>();
- protected final ConcurrentHashMap skipConvertableReference = new ConcurrentHashMap();
- protected final ConcurrentHashMap skipFieldInterception = new ConcurrentHashMap();
- protected final ConcurrentHashMap skipConstructorInterception = new ConcurrentHashMap();
+ protected final ConcurrentHashMap<String, String> skipConvertableReference = new ConcurrentHashMap<String, String>();
+ protected final ConcurrentHashMap<String, String> skipFieldInterception = new ConcurrentHashMap<String, String>();
+ protected final ConcurrentHashMap<String, String> skipConstructorInterception = new ConcurrentHashMap<String, String>();
public void addConstructionInterceptionMarker(String classname)
{
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/InterceptorChainObserver.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/InterceptorChainObserver.java 2008-03-13 15:02:46 UTC (rev 70822)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/InterceptorChainObserver.java 2008-03-13 15:27:31 UTC (rev 70823)
@@ -21,8 +21,6 @@
*/
package org.jboss.aop;
-import gnu.trove.TLongObjectHashMap;
-
import org.jboss.aop.advice.Interceptor;
/**
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/Introduction.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/Introduction.java 2008-03-13 15:02:46 UTC (rev 70822)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/Introduction.java 2008-03-13 15:27:31 UTC (rev 70823)
@@ -35,7 +35,7 @@
@Target({ElementType.FIELD}) @Retention(RetentionPolicy.RUNTIME)
public @interface Introduction
{
- Class target() default java.lang.Class.class;
+ Class<?> target() default java.lang.Class.class;
String typeExpression() default "";
- Class[] interfaces();
+ Class<?>[] interfaces();
}
\ No newline at end of file
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/Mixin.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/Mixin.java 2008-03-13 15:02:46 UTC (rev 70822)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/Mixin.java 2008-03-13 15:27:31 UTC (rev 70823)
@@ -34,8 +34,8 @@
@Target({ElementType.METHOD}) @Retention(RetentionPolicy.RUNTIME)
public @interface Mixin
{
- Class target() default java.lang.Class.class;
+ Class<?> target() default java.lang.Class.class;
String typeExpression() default "";
- Class[] interfaces();
+ Class<?>[] interfaces();
boolean isTransient() default true;
}
\ No newline at end of file
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/SecurityActions.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/SecurityActions.java 2008-03-13 15:02:46 UTC (rev 70822)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/SecurityActions.java 2008-03-13 15:27:31 UTC (rev 70823)
@@ -47,7 +47,7 @@
{
try
{
- AccessController.doPrivileged(new PrivilegedExceptionAction()
+ AccessController.doPrivileged(new PrivilegedExceptionAction<Object>()
{
public Object run() throws Exception
{
@@ -94,7 +94,7 @@
{
try
{
- AccessController.doPrivileged(new PrivilegedExceptionAction()
+ AccessController.doPrivileged(new PrivilegedExceptionAction<Object>()
{
public Object run() throws Exception
{
@@ -151,29 +151,29 @@
interface GetDeclaredConstructorsAction
{
- Constructor[] getDeclaredConstructors(Class clazz);
+ Constructor<?>[] getDeclaredConstructors(Class<?> clazz);
GetDeclaredConstructorsAction NON_PRIVILEGED = new GetDeclaredConstructorsAction() {
- public Constructor[] getDeclaredConstructors(Class clazz)
+ public Constructor<?>[] getDeclaredConstructors(Class<?> clazz)
{
return clazz.getDeclaredConstructors();
}};
GetDeclaredConstructorsAction PRIVILEGED = new GetDeclaredConstructorsAction() {
- public Constructor[] getDeclaredConstructors(final Class clazz)
+ public Constructor<?>[] getDeclaredConstructors(final Class<?> clazz)
{
- return AccessController.doPrivileged(new PrivilegedAction<Constructor[]>() {
+ return AccessController.doPrivileged(new PrivilegedAction<Constructor<?>[]>() {
- public Constructor[] run()
+ public Constructor<?>[] run()
{
return clazz.getDeclaredConstructors();
}});
}};
}
- static Constructor[] getDeclaredConstructors(Class clazz)
+ static Constructor<?>[] getDeclaredConstructors(Class<?> clazz)
{
if (System.getSecurityManager() == null)
{
@@ -188,18 +188,18 @@
interface GetClassLoaderAction
{
- ClassLoader getClassLoader(Class clazz);
+ ClassLoader getClassLoader(Class<?> clazz);
GetClassLoaderAction NON_PRIVILEGED = new GetClassLoaderAction() {
- public ClassLoader getClassLoader(Class clazz)
+ public ClassLoader getClassLoader(Class<?> clazz)
{
return clazz.getClassLoader();
}};
GetClassLoaderAction PRIVILEGED = new GetClassLoaderAction() {
- public ClassLoader getClassLoader(final Class clazz)
+ public ClassLoader getClassLoader(final Class<?> clazz)
{
return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() {
@@ -210,7 +210,7 @@
}};
}
- static ClassLoader getClassLoader(Class clazz)
+ static ClassLoader getClassLoader(Class<?> clazz)
{
if (System.getSecurityManager() == null)
{
More information about the jboss-cvs-commits
mailing list