Java 5 code style

Author: jhoeller

org.springframework.aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcut.java

@@ -74,7 +74,7 @@
 public class AspectJExpressionPointcut extends AbstractExpressionPointcut
 		implements ClassFilter, IntroductionAwareMethodMatcher, BeanFactoryAware {
 
-	private static final Set DEFAULT_SUPPORTED_PRIMITIVES = new HashSet();
+	private static final Set<PointcutPrimitive> DEFAULT_SUPPORTED_PRIMITIVES = new HashSet<PointcutPrimitive>();
 
 	static {
 		DEFAULT_SUPPORTED_PRIMITIVES.add(PointcutPrimitive.EXECUTION);
@@ -92,7 +92,7 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut
 
 	private static final Log logger = LogFactory.getLog(AspectJExpressionPointcut.class);
 
-	private final Map shadowMapCache = new HashMap();
+	private final Map<Method, ShadowMatch> shadowMatchCache = new HashMap<Method, ShadowMatch>();
 
 	private PointcutParser pointcutParser;
 
@@ -364,8 +364,8 @@ private void bindParameters(ProxyMethodInvocation invocation, JoinPointMatch jpm
 	}
 
 	private ShadowMatch getShadowMatch(Method targetMethod, Method originalMethod) {
-		synchronized (this.shadowMapCache) {
-			ShadowMatch shadowMatch = (ShadowMatch) this.shadowMapCache.get(targetMethod);
+		synchronized (this.shadowMatchCache) {
+			ShadowMatch shadowMatch = this.shadowMatchCache.get(targetMethod);
 			if (shadowMatch == null) {
 				try {
 					shadowMatch = this.pointcutExpression.matchesMethodExecution(targetMethod);
@@ -378,7 +378,7 @@ private ShadowMatch getShadowMatch(Method targetMethod, Method originalMethod) {
 					}
 					shadowMatch = this.pointcutExpression.matchesMethodExecution(originalMethod);
 				}
-				this.shadowMapCache.put(targetMethod, shadowMatch);
+				this.shadowMatchCache.put(targetMethod, shadowMatch);
 			}
 			return shadowMatch;
 		}
@@ -520,8 +520,8 @@ private boolean matchesBeanName(String advisedBeanName) {
 			}
 			if (beanFactory != null) {
 				String[] aliases = beanFactory.getAliases(advisedBeanName);
-				for (int i = 0; i < aliases.length; i++) {
-					if (this.expressionPattern.matches(aliases[i])) {
+				for (String alias : aliases) {
+					if (this.expressionPattern.matches(alias)) {
 						return true;
 					}
 				}

org.springframework.aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectJProxyFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * Copyright 2002-2008 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -48,7 +48,7 @@
 public class AspectJProxyFactory extends ProxyCreatorSupport {
 
 	/** Cache for singleton aspect instances */
-	private static final Map aspectCache = new HashMap();
+	private static final Map<Class, Object> aspectCache = new HashMap<Class, Object>();
 
 	private final AspectJAdvisorFactory aspectFactory = new ReflectiveAspectJAdvisorFactory();
 
@@ -199,6 +199,7 @@ private Object getSingletonAspectInstance(Class aspectClass) {
 	 * (if necessary for proxy creation).
 	 * @return the new proxy
 	 */
+	@SuppressWarnings("unchecked")
 	public <T> T getProxy() {
 		return (T) createAopProxy().getProxy();
 	}
@@ -211,6 +212,7 @@ public <T> T getProxy() {
 	 * @param classLoader the class loader to create the proxy with
 	 * @return the new proxy
 	 */
+	@SuppressWarnings("unchecked")
 	public <T> T getProxy(ClassLoader classLoader) {
 		return (T) createAopProxy().getProxy(classLoader);
 	}

org.springframework.aop/src/main/java/org/springframework/aop/framework/AbstractSingletonProxyFactoryBean.java

@@ -142,17 +142,17 @@ public void afterPropertiesSet() {
 		ProxyFactory proxyFactory = new ProxyFactory();
 
 		if (this.preInterceptors != null) {
-			for (int i = 0; i < this.preInterceptors.length; i++) {
-				proxyFactory.addAdvisor(this.advisorAdapterRegistry.wrap(this.preInterceptors[i]));
+			for (Object interceptor : this.preInterceptors) {
+				proxyFactory.addAdvisor(this.advisorAdapterRegistry.wrap(interceptor));
 			}
 		}
 
 		// Add the main interceptor (typically an Advisor).
 		proxyFactory.addAdvisor(this.advisorAdapterRegistry.wrap(createMainInterceptor()));
 
 		if (this.postInterceptors != null) {
-			for (int i = 0; i < this.postInterceptors.length; i++) {
-				proxyFactory.addAdvisor(this.advisorAdapterRegistry.wrap(this.postInterceptors[i]));
+			for (Object interceptor : this.postInterceptors) {
+				proxyFactory.addAdvisor(this.advisorAdapterRegistry.wrap(interceptor));
 			}
 		}
 
@@ -170,7 +170,7 @@ else if (!isProxyTargetClass()) {
 					ClassUtils.getAllInterfacesForClass(targetSource.getTargetClass(), this.proxyClassLoader));
 		}
 
-		this.proxy = getProxy(proxyFactory);
+		this.proxy = proxyFactory.getProxy(this.proxyClassLoader);
 	}
 
 	/**
@@ -188,19 +188,6 @@ protected TargetSource createTargetSource(Object target) {
 		}
 	}
 
-	/**
-	 * Return the proxy object to expose.
-	 * <p>The default implementation uses a <code>getProxy</code> call with
-	 * the factory's bean class loader. Can be overridden to specify a
-	 * custom class loader.
-	 * @param aopProxy the prepared AopProxy instance to get the proxy from
-	 * @return the proxy object to expose
-	 * @see AopProxy#getProxy(ClassLoader)
-	 */
-	protected Object getProxy(AopProxy aopProxy) {
-		return aopProxy.getProxy(this.proxyClassLoader);
-	}
-
 
 	public Object getObject() {
 		if (this.proxy == null) {

org.springframework.aop/src/main/java/org/springframework/aop/framework/AdvisedSupport.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * Copyright 2002-2008 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -362,7 +362,7 @@ protected final void updateAdvisorArray() {
 	 * <p>Use with care, and remember to {@link #updateAdvisorArray() refresh the advisor array}
 	 * and {@link #adviceChanged() fire advice changed events} when making any modifications.
 	 */
-	protected final List getAdvisorsInternal() {
+	protected final List<Advisor> getAdvisorsInternal() {
 		return this.advisors;
 	}
 
@@ -454,7 +454,7 @@ public int countAdvicesOfType(Class adviceClass) {
 	 * @param targetClass the target class
 	 * @return List of MethodInterceptors (may also include InterceptorAndDynamicMethodMatchers)
 	 */
-	public List getInterceptorsAndDynamicInterceptionAdvice(Method method, Class targetClass) {
+	public List<Object> getInterceptorsAndDynamicInterceptionAdvice(Method method, Class targetClass) {
 		MethodCacheKey cacheKey = new MethodCacheKey(method);
 		List<Object> cached = this.methodCache.get(cacheKey);
 		if (cached == null) {