polishing

jhoeller · jhoeller · commit 07920fc3dfe6 · 2010-04-22T21:37:35.000Z
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/TargetClassAware.java b/org.springframework.aop/src/main/java/org/springframework/aop/TargetClassAware.java
@@ -34,6 +34,6 @@ public interface TargetClassAware {
 	 * (typically a proxy configuration or an actual proxy).
 	 * @return the target Class, or <code>null</code> if not known
 	 */
-	Class getTargetClass();
+	Class<?> getTargetClass();
 
 }
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/TargetSource.java b/org.springframework.aop/src/main/java/org/springframework/aop/TargetSource.java
@@ -1,5 +1,5 @@
 /*<
- * Copyright 2002-2007 the original author or authors.
+ * Copyright 2002-2010 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.
@@ -39,7 +39,7 @@ public interface TargetSource extends TargetClassAware {
 	 * target class.
 	 * @return the type of targets returned by this {@link TargetSource}
 	 */
-	Class getTargetClass();
+	Class<?> getTargetClass();
 
 	/**
 	 * Will all calls to {@link #getTarget()} return the same object?
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/framework/AdvisedSupport.java b/org.springframework.aop/src/main/java/org/springframework/aop/framework/AdvisedSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2010 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.
@@ -162,7 +162,7 @@ public void setTargetClass(Class targetClass) {
 		this.targetSource = EmptyTargetSource.forClass(targetClass);
 	}
 
-	public Class getTargetClass() {
+	public Class<?> getTargetClass() {
 		return this.targetSource.getTargetClass();
 	}
 
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/target/AbstractBeanFactoryBasedTargetSource.java b/org.springframework.aop/src/main/java/org/springframework/aop/target/AbstractBeanFactoryBasedTargetSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2010 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.
@@ -16,15 +16,12 @@
 
 package org.springframework.aop.target;
 
-import java.io.NotSerializableException;
-import java.io.ObjectStreamException;
 import java.io.Serializable;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import org.springframework.aop.TargetSource;
-import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;
 import org.springframework.util.ClassUtils;
@@ -65,7 +62,7 @@ public abstract class AbstractBeanFactoryBasedTargetSource
 	private String targetBeanName;
 
 	/** Class of the target */
-	private Class targetClass;
+	private Class<?> targetClass;
 
 	/**
 	 * BeanFactory that owns this TargetSource. We need to hold onto this
@@ -108,7 +105,7 @@ public void setTargetClass(Class targetClass) {
 	 * Set the owning BeanFactory. We need to save a reference so that we can
 	 * use the <code>getBean</code> method on every invocation.
 	 */
-	public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
+	public void setBeanFactory(BeanFactory beanFactory) {
 		if (this.targetBeanName == null) {
 			throw new IllegalStateException("Property'targetBeanName' is required");
 		}
@@ -123,15 +120,18 @@ public BeanFactory getBeanFactory() {
 	}
 
 
-	public synchronized Class getTargetClass() {
+	public synchronized Class<?> getTargetClass() {
 		if (this.targetClass == null && this.beanFactory != null) {
 			// Determine type of the target bean.
 			this.targetClass = this.beanFactory.getType(this.targetBeanName);
 			if (this.targetClass == null) {
 				if (logger.isTraceEnabled()) {
 					logger.trace("Getting bean with name '" + this.targetBeanName + "' in order to determine type");
 				}
-				this.targetClass = this.beanFactory.getBean(this.targetBeanName).getClass();
+				Object beanInstance = this.beanFactory.getBean(this.targetBeanName);
+				if (beanInstance != null) {
+					this.targetClass = beanInstance.getClass();
+				}
 			}
 		}
 		return this.targetClass;
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/target/AbstractLazyCreationTargetSource.java b/org.springframework.aop/src/main/java/org/springframework/aop/target/AbstractLazyCreationTargetSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * Copyright 2002-2010 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.
@@ -64,7 +64,7 @@ public synchronized boolean isInitialized() {
 	 * a meaningful value when the target is still <code>null</code>.
 	 * @see #isInitialized()
 	 */
-	public synchronized Class getTargetClass() {
+	public synchronized Class<?> getTargetClass() {
 		return (this.lazyTarget != null ? this.lazyTarget.getClass() : null);
 	}
 
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/target/EmptyTargetSource.java b/org.springframework.aop/src/main/java/org/springframework/aop/target/EmptyTargetSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * Copyright 2002-2010 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.
@@ -89,7 +89,7 @@ private EmptyTargetSource(Class targetClass, boolean isStatic) {
 	/**
 	 * Always returns the specified target Class, or <code>null</code> if none.
 	 */
-	public Class getTargetClass() {
+	public Class<?> getTargetClass() {
 		return this.targetClass;
 	}
 
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/target/HotSwappableTargetSource.java b/org.springframework.aop/src/main/java/org/springframework/aop/target/HotSwappableTargetSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * Copyright 2002-2010 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.
@@ -59,7 +59,7 @@ public HotSwappableTargetSource(Object initialTarget) {
 	 * Return the type of the current target object.
 	 * <p>The returned type should usually be constant across all target objects.
 	 */
-	public synchronized Class getTargetClass() {
+	public synchronized Class<?> getTargetClass() {
 		return this.target.getClass();
 	}
 
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/target/SingletonTargetSource.java b/org.springframework.aop/src/main/java/org/springframework/aop/target/SingletonTargetSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * Copyright 2002-2010 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.
@@ -55,7 +55,7 @@ public SingletonTargetSource(Object target) {
 	}
 
 
-	public Class getTargetClass() {
+	public Class<?> getTargetClass() {
 		return this.target.getClass();
 	}
 	
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/target/dynamic/AbstractRefreshableTargetSource.java b/org.springframework.aop/src/main/java/org/springframework/aop/target/dynamic/AbstractRefreshableTargetSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * Copyright 2002-2010 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.
@@ -63,7 +63,7 @@ public void setRefreshCheckDelay(long refreshCheckDelay) {
 	}
 
 
-	public synchronized Class getTargetClass() {
+	public synchronized Class<?> getTargetClass() {
 		if (this.targetObject == null) {
 			refresh();
 		}

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,6 @@ public interface TargetClassAware {`
`34`	`34`	`* (typically a proxy configuration or an actual proxy).`
`35`	`35`	`* @return the target Class, or <code>null</code> if not known`
`36`	`36`	`*/`
`37`		`- Class getTargetClass();`
	`37`	`+ Class<?> getTargetClass();`
`38`	`38`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2002-2009 the original author or authors.`
	`2`	`+ * Copyright 2002-2010 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -162,7 +162,7 @@ public void setTargetClass(Class targetClass) {`
`162`	`162`	`this.targetSource = EmptyTargetSource.forClass(targetClass);`
`163`	`163`	`}`
`164`	`164`
`165`		`- public Class getTargetClass() {`
	`165`	`+ public Class<?> getTargetClass() {`
`166`	`166`	`return this.targetSource.getTargetClass();`
`167`	`167`	`}`
`168`	`168`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2002-2007 the original author or authors.`
	`2`	`+ * Copyright 2002-2010 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -64,7 +64,7 @@ public synchronized boolean isInitialized() {`
`64`	`64`	`* a meaningful value when the target is still <code>null</code>.`
`65`	`65`	`* @see #isInitialized()`
`66`	`66`	`*/`
`67`		`- public synchronized Class getTargetClass() {`
	`67`	`+ public synchronized Class<?> getTargetClass() {`
`68`	`68`	`return (this.lazyTarget != null ? this.lazyTarget.getClass() : null);`
`69`	`69`	`}`
`70`	`70`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2002-2008 the original author or authors.`
	`2`	`+ * Copyright 2002-2010 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -63,7 +63,7 @@ public void setRefreshCheckDelay(long refreshCheckDelay) {`
`63`	`63`	`}`
`64`	`64`
`65`	`65`
`66`		`- public synchronized Class getTargetClass() {`
	`66`	`+ public synchronized Class<?> getTargetClass() {`
`67`	`67`	`if (this.targetObject == null) {`
`68`	`68`	`refresh();`
`69`	`69`	`}`