generified FactoryBeans and further Java 5 code style updates

Author: jhoeller

org.springframework.aop/src/main/java/org/springframework/aop/config/MethodLocatingFactoryBean.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * Copyright 2002-2009 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.
@@ -30,7 +30,7 @@
  * @author Rob Harrop
  * @since 2.0
  */
-public class MethodLocatingFactoryBean implements FactoryBean, BeanFactoryAware {
+public class MethodLocatingFactoryBean implements FactoryBean<Method>, BeanFactoryAware {
 
 	private String targetBeanName;
 
@@ -78,11 +78,11 @@ public void setBeanFactory(BeanFactory beanFactory) {
 	}
 
 
-	public Object getObject() throws Exception {
+	public Method getObject() throws Exception {
 		return this.method;
 	}
 
-	public Class getObjectType() {
+	public Class<Method> getObjectType() {
 		return Method.class;
 	}
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * Copyright 2002-2009 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.
@@ -38,7 +38,7 @@
  * @since 2.0
  */
 public abstract class AbstractSingletonProxyFactoryBean extends ProxyConfig
-		implements FactoryBean, BeanClassLoaderAware, InitializingBean {
+		implements FactoryBean<Object>, BeanClassLoaderAware, InitializingBean {
 
 	private Object target;
 
@@ -196,7 +196,7 @@ public Object getObject() {
 		return this.proxy;
 	}
 
-	public Class getObjectType() {
+	public Class<?> getObjectType() {
 		if (this.proxy != null) {
 			return this.proxy.getClass();
 		}

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

@@ -89,7 +89,7 @@
  * @see Advised
  */
 public class ProxyFactoryBean extends ProxyCreatorSupport
-		implements FactoryBean, BeanClassLoaderAware, BeanFactoryAware {
+		implements FactoryBean<Object>, BeanClassLoaderAware, BeanFactoryAware {
 
 	/**
 	 * This suffix in a value in an interceptor list indicates to expand globals.
@@ -256,7 +256,7 @@ public Object getObject() throws BeansException {
 	 * a single one), the target bean type, or the TargetSource's target class.
 	 * @see org.springframework.aop.TargetSource#getTargetClass
 	 */
-	public Class getObjectType() {
+	public Class<?> getObjectType() {
 		synchronized (this) {
 			if (this.singletonInstance != null) {
 				return this.singletonInstance.getClass();
@@ -448,7 +448,7 @@ private synchronized void initializeAdvisorChain() throws AopConfigException, Be
 				else {
 					// If we get here, we need to add a named interceptor.
 					// We must check if it's a singleton or prototype.
-					Object advice = null;
+					Object advice;
 					if (this.singleton || this.beanFactory.isSingleton(name)) {
 						// Add the real Advisor/Advice to the chain.
 						advice = this.beanFactory.getBean(name);

org.springframework.aop/src/main/java/org/springframework/aop/scope/ScopedProxyFactoryBean.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * Copyright 2002-2009 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.
@@ -49,7 +49,7 @@
  * @since 2.0
  * @see #setProxyTargetClass
  */
-public class ScopedProxyFactoryBean extends ProxyConfig implements FactoryBean, BeanFactoryAware {
+public class ScopedProxyFactoryBean extends ProxyConfig implements FactoryBean<Object>, BeanFactoryAware {
 
 	/** The TargetSource that manages scoping */
 	private final SimpleBeanTargetSource scopedTargetSource = new SimpleBeanTargetSource();
@@ -117,7 +117,7 @@ public Object getObject() {
 		return this.proxy;
 	}
 
-	public Class getObjectType() {
+	public Class<?> getObjectType() {
 		if (this.proxy != null) {
 			return this.proxy.getClass();
 		}

org.springframework.beans/src/main/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBean.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * Copyright 2002-2009 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.
@@ -29,7 +29,7 @@
 import org.springframework.util.StringUtils;
 
 /**
- * FactoryBean which retrieves a static or non-static field value.
+ * {@link FactoryBean} which retrieves a static or non-static field value.
  * 
  * <p>Typically used for retrieving public static final constants. Usage example:
  *
@@ -52,7 +52,8 @@
  * @since 1.1
  * @see #setStaticField
  */
-public class FieldRetrievingFactoryBean implements FactoryBean, BeanNameAware, BeanClassLoaderAware, InitializingBean {
+public class FieldRetrievingFactoryBean
+		implements FactoryBean<Object>, BeanNameAware, BeanClassLoaderAware, InitializingBean {
 
 	private Class targetClass;
 
@@ -205,7 +206,7 @@ public Object getObject() throws IllegalAccessException {
 		}
 	}
 
-	public Class getObjectType() {
+	public Class<?> getObjectType() {
 		return (this.fieldObject != null ? this.fieldObject.getType() : null);
 	}
 

org.springframework.beans/src/main/java/org/springframework/beans/factory/config/MethodInvokingFactoryBean.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * Copyright 2002-2009 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.
@@ -29,7 +29,7 @@
 import org.springframework.util.ClassUtils;
 
 /**
- * FactoryBean which returns a value which is the result of a static or instance
+ * {@link FactoryBean} which returns a value which is the result of a static or instance
  * method invocation. For most use cases it is better to just use the container's 
  * built-in factory method support for the same purpose, since that is smarter at
  * converting arguments. This factory bean is still useful though when you need to
@@ -88,7 +88,7 @@
  * @since 21.11.2003
  */
 public class MethodInvokingFactoryBean extends ArgumentConvertingMethodInvoker
-		implements FactoryBean, BeanClassLoaderAware, BeanFactoryAware, InitializingBean {
+		implements FactoryBean<Object>, BeanClassLoaderAware, BeanFactoryAware, InitializingBean {
 
 	private boolean singleton = true;
 
@@ -196,7 +196,7 @@ public Object getObject() throws Exception {
 	 * Return the type of object that this FactoryBean creates,
 	 * or <code>null</code> if not known in advance.
 	 */
-	public Class getObjectType() {
+	public Class<?> getObjectType() {
 		if (!isPrepared()) {
 			// Not fully initialized yet -> return null to indicate "not known yet".
 			return null;

org.springframework.beans/src/main/java/org/springframework/beans/factory/config/PropertyPathFactoryBean.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * Copyright 2002-2009 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.
@@ -81,7 +81,7 @@
  * @see #setTargetBeanName
  * @see #setPropertyPath
  */
-public class PropertyPathFactoryBean implements FactoryBean, BeanNameAware, BeanFactoryAware {
+public class PropertyPathFactoryBean implements FactoryBean<Object>, BeanNameAware, BeanFactoryAware {
 
 	private static final Log logger = LogFactory.getLog(PropertyPathFactoryBean.class);
 
@@ -207,7 +207,7 @@ public Object getObject() throws BeansException {
 		return target.getPropertyValue(this.propertyPath);
 	}
 
-	public Class getObjectType() {
+	public Class<?> getObjectType() {
 		return this.resultType;
 	}
 

org.springframework.beans/src/main/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBean.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * Copyright 2002-2009 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.
@@ -35,9 +35,8 @@
 import org.springframework.util.StringUtils;
 
 /**
- * A {@link org.springframework.beans.factory.FactoryBean} implementation that
- * takes an interface which must have one or more methods with
- * the signatures <code>MyType xxx()</code> or <code>MyType xxx(MyIdType id)</code>
+ * A {@link FactoryBean} implementation that takes an interface which must have one or more
+ * methods with the signatures <code>MyType xxx()</code> or <code>MyType xxx(MyIdType id)</code>
  * (typically, <code>MyService getService()</code> or <code>MyService getService(String id)</code>)
  * and creates a dynamic proxy which implements that interface, delegating to an
  * underlying {@link org.springframework.beans.factory.BeanFactory}.
@@ -188,7 +187,7 @@
  * @see #setServiceMappings
  * @see ObjectFactoryCreatingFactoryBean
  */
-public class ServiceLocatorFactoryBean implements FactoryBean, BeanFactoryAware, InitializingBean {
+public class ServiceLocatorFactoryBean implements FactoryBean<Object>, BeanFactoryAware, InitializingBean {
 
 	private Class serviceLocatorInterface;
 
@@ -328,7 +327,7 @@ public Object getObject() {
 		return this.proxy;
 	}
 
-	public Class getObjectType() {
+	public Class<?> getObjectType() {
 		return this.serviceLocatorInterface;
 	}
 
@@ -359,6 +358,7 @@ else if (ReflectionUtils.isToStringMethod(method)) {
 			}
 		}
 
+		@SuppressWarnings("unchecked")
 		private Object invokeServiceLocatorMethod(Method method, Object[] args) throws Exception {
 			Class serviceLocatorMethodReturnType = getServiceLocatorMethodReturnType(method);
 			try {

org.springframework.context.support/src/main/java/org/springframework/scheduling/commonj/TimerManagerFactoryBean.java

@@ -53,7 +53,7 @@
  * @see commonj.timers.TimerListener
  */
 public class TimerManagerFactoryBean extends JndiLocatorSupport
-		implements FactoryBean, InitializingBean, DisposableBean, Lifecycle {
+		implements FactoryBean<TimerManager>, InitializingBean, DisposableBean, Lifecycle {
 
 	private TimerManager timerManager;
 
@@ -169,11 +169,11 @@ public void afterPropertiesSet() throws NamingException {
 	// Implementation of FactoryBean interface
 	//---------------------------------------------------------------------
 
-	public Object getObject() {
+	public TimerManager getObject() {
 		return this.timerManager;
 	}
 
-	public Class getObjectType() {
+	public Class<? extends TimerManager> getObjectType() {
 		return (this.timerManager != null ? this.timerManager.getClass() : TimerManager.class);
 	}
 

org.springframework.context.support/src/main/java/org/springframework/scheduling/quartz/MethodInvokingJobDetailFactoryBean.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * Copyright 2002-2009 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.
@@ -70,7 +70,7 @@
  * @see #setConcurrent
  */
 public class MethodInvokingJobDetailFactoryBean extends ArgumentConvertingMethodInvoker
-	implements FactoryBean, BeanNameAware, BeanClassLoaderAware, BeanFactoryAware, InitializingBean {
+	implements FactoryBean<Object>, BeanNameAware, BeanClassLoaderAware, BeanFactoryAware, InitializingBean {
 
 	private String name;
 
@@ -171,7 +171,7 @@ public void afterPropertiesSet() throws ClassNotFoundException, NoSuchMethodExce
 		String name = (this.name != null ? this.name : this.beanName);
 
 		// Consider the concurrent flag to choose between stateful and stateless job.
-		Class jobClass = (this.concurrent ? (Class) MethodInvokingJob.class : StatefulMethodInvokingJob.class);
+		Class jobClass = (this.concurrent ? MethodInvokingJob.class : StatefulMethodInvokingJob.class);
 
 		// Build JobDetail instance.
 		this.jobDetail = new JobDetail(name, this.group, jobClass);
@@ -181,8 +181,8 @@ public void afterPropertiesSet() throws ClassNotFoundException, NoSuchMethodExce
 
 		// Register job listener names.
 		if (this.jobListenerNames != null) {
-			for (int i = 0; i < this.jobListenerNames.length; i++) {
-				this.jobDetail.addJobListener(this.jobListenerNames[i]);
+			for (String jobListenerName : this.jobListenerNames) {
+				this.jobDetail.addJobListener(jobListenerName);
 			}
 		}
 
@@ -229,7 +229,7 @@ public Object getObject() {
 		return this.jobDetail;
 	}
 
-	public Class getObjectType() {
+	public Class<?> getObjectType() {
 		return JobDetail.class;
 	}