polishing

Author: jhoeller

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

@@ -102,8 +102,8 @@ public class ReflectiveMethodInvocation implements ProxyMethodInvocation, Clonea
 	 * but would complicate the code. And it would work only for static pointcuts.
 	 */
 	protected ReflectiveMethodInvocation(
-	    Object proxy, Object target, Method method, Object[] arguments,
-	    Class targetClass, List<Object> interceptorsAndDynamicMethodMatchers) {
+			Object proxy, Object target, Method method, Object[] arguments,
+			Class targetClass, List<Object> interceptorsAndDynamicMethodMatchers) {
 
 		this.proxy = proxy;
 		this.target = target;

org.springframework.core/src/main/java/org/springframework/core/convert/ConversionException.java

@@ -24,7 +24,6 @@
  * @author Keith Donald
  * @since 3.0 
  */
-@SuppressWarnings("serial")
 public abstract class ConversionException extends NestedRuntimeException {
 
 	/**

org.springframework.core/src/main/java/org/springframework/core/convert/ConversionFailedException.java

@@ -22,13 +22,13 @@
  * @author Keith Donald
  * @since 3.0
  */
-@SuppressWarnings("serial")
 public final class ConversionFailedException extends ConversionException {
 
 	private final TypeDescriptor sourceType;
 
 	private final TypeDescriptor targetType;
 
+
 	/**
 	 * Create a new conversion exception.
 	 * @param value the value we tried to convert
@@ -37,11 +37,13 @@ public final class ConversionFailedException extends ConversionException {
 	 * @param cause the cause of the conversion failure
 	 */
 	public ConversionFailedException(TypeDescriptor sourceType, TypeDescriptor targetType, Object value, Throwable cause) {
-		super(buildDefaultMessage(value, sourceType, targetType, cause), cause);
+		super("Unable to convert value " + value + " from type [" + sourceType.getName() + "] to type [" +
+				targetType.getName() + "]; reason = '" + cause.getMessage() + "'", cause);
 		this.sourceType = sourceType;
 		this.targetType = targetType;
 	}
 
+
 	/**
 	 * Return the source type we tried to convert the value from.
 	 */
@@ -56,10 +58,4 @@ public TypeDescriptor getTargetType() {
 		return this.targetType;
 	}
 
-	private static String buildDefaultMessage(Object value, TypeDescriptor sourceType, TypeDescriptor targetType,
-			Throwable cause) {
-		return "Unable to convert value " + value + " from type [" + sourceType.getName() + "] to type ["
-				+ targetType.getName() + "]; reason = '" + cause.getMessage() + "'";
-	}
-
-}
+}

org.springframework.core/src/main/java/org/springframework/core/convert/TypeDescriptor.java

@@ -26,6 +26,7 @@
 import org.springframework.core.MethodParameter;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
+import org.springframework.util.ObjectUtils;
 
 /**
  * Context about a type to convert to.
@@ -42,6 +43,7 @@ public class TypeDescriptor {
 	 */
 	public static final TypeDescriptor NULL = new TypeDescriptor();
 
+
 	private Class<?> type;
 
 	private TypeDescriptor elementType;
@@ -52,6 +54,7 @@ public class TypeDescriptor {
 
 	private Annotation[] cachedFieldAnnotations;
 
+
 	/**
 	 * Create a new descriptor for the given type.
 	 * <p>Use this constructor when a conversion point comes from a source such as a Map
@@ -99,6 +102,7 @@ private TypeDescriptor(Class<?> collectionType, TypeDescriptor elementType) {
 		this.elementType = elementType;
 	}
 
+
 	/**
 	 * Return the wrapped MethodParameter, if any.
 	 * <p>Note: Either MethodParameter or Field is available.
@@ -124,11 +128,14 @@ public Field getField() {
 	public Class<?> getType() {
 		if (this.type != null) {
 			return this.type;
-		} else if (this.field != null) {
+		}
+		else if (this.field != null) {
 			return this.field.getType();
-		} else if (this.methodParameter != null) {
+		}
+		else if (this.methodParameter != null) {
 			return this.methodParameter.getParameterType();
-		} else {
+		}
+		else {
 			return null;
 		}
 	}
@@ -139,16 +146,15 @@ public Class<?> getType() {
 	 */
 	public Class<?> getObjectType() {
 		Class<?> type = getType();
-		return type != null ? ClassUtils.resolvePrimitiveIfNecessary(type) : type;
+		return (type != null ? ClassUtils.resolvePrimitiveIfNecessary(type) : type);
 	}
 
 	/**
 	 * Does the underyling declared type equal the type provided?
 	 * @param type the type to test against
 	 */
 	public boolean typeEquals(Class<?> type) {
-		Class<?> thisType = getType();
-		return thisType != null ? thisType.equals(type) : false;
+		return ObjectUtils.nullSafeEquals(getType(), type);
 	}
 
 	/**
@@ -158,7 +164,8 @@ public String getName() {
 		Class<?> type = getType();
 		if (type != null) {
 			return getType().getName();
-		} else {
+		}
+		else {
 			return null;
 		}
 	}
@@ -198,14 +205,17 @@ public Class<?> getElementType() {
 	 * Return the element type as a type descriptor.
 	 */
 	public TypeDescriptor getElementTypeDescriptor() {
-		if (elementType != null) {
-			return elementType;
-		} else {
+		if (this.elementType != null) {
+			return this.elementType;
+		}
+		else {
 			if (isArray()) {
 				return TypeDescriptor.valueOf(getArrayComponentType());
-			} else if (isCollection()) {
+			}
+			else if (isCollection()) {
 				return TypeDescriptor.valueOf(getCollectionElementType());
-			} else {
+			}
+			else {
 				return TypeDescriptor.NULL;
 			}
 		}
@@ -232,9 +242,11 @@ public boolean isMapEntryTypeKnown() {
 	public Class<?> getMapKeyType() {
 		if (this.field != null) {
 			return GenericCollectionTypeResolver.getMapKeyFieldType(field);
-		} else if (this.methodParameter != null) {
+		}
+		else if (this.methodParameter != null) {
 			return GenericCollectionTypeResolver.getMapKeyParameterType(this.methodParameter);
-		} else {
+		}
+		else {
 			return null;
 		}
 	}
@@ -246,9 +258,11 @@ public Class<?> getMapKeyType() {
 	public Class<?> getMapValueType() {
 		if (this.field != null) {
 			return GenericCollectionTypeResolver.getMapValueFieldType(this.field);
-		} else if (this.methodParameter != null) {
+		}
+		else if (this.methodParameter != null) {
 			return GenericCollectionTypeResolver.getMapValueParameterType(this.methodParameter);
-		} else {
+		}
+		else {
 			return null;
 		}
 	}
@@ -276,9 +290,11 @@ public Annotation[] getAnnotations() {
 				this.cachedFieldAnnotations = this.field.getAnnotations();
 			}
 			return this.cachedFieldAnnotations;
-		} else if (this.methodParameter != null) {
+		}
+		else if (this.methodParameter != null) {
 			return this.methodParameter.getParameterAnnotations();
-		} else {
+		}
+		else {
 			return new Annotation[0];
 		}
 	}
@@ -324,6 +340,28 @@ public boolean isAssignableTo(TypeDescriptor targetType) {
 		return type != null && ClassUtils.isAssignable(targetType.getType(), type);
 	}
 
+	private Class<?> getArrayComponentType() {
+		return getType().getComponentType();
+	}
+
+	@SuppressWarnings("unchecked")
+	private Class<?> getCollectionElementType() {
+		if (this.type != null) {
+			return GenericCollectionTypeResolver.getCollectionType((Class<? extends Collection>) this.type);
+		}
+		else if (this.field != null) {
+			return GenericCollectionTypeResolver.getCollectionFieldType(this.field);
+		}
+		else {
+			return GenericCollectionTypeResolver.getCollectionParameterType(this.methodParameter);
+		}
+	}
+
+	private boolean isTypeAssignableTo(Class<?> clazz) {
+		Class<?> type = getType();
+		return (type != null && ClassUtils.isAssignable(clazz, type));
+	}
+
 	/**
 	 * @return a textual representation of the type descriptor (eg. Map<String,Foo>) for use in messages
 	 */
@@ -332,7 +370,8 @@ public String asString() {
 		if (isArray()) {
 			// TODO should properly handle multi dimensional arrays
 			stringValue.append(getArrayComponentType().getName()).append("[]");
-		} else {
+		}
+		else {
 			Class<?> clazz = getType();
 			if (clazz == null) {
 				return "null";
@@ -355,27 +394,23 @@ public String asString() {
 		return stringValue.toString();
 	}
 
-	// internal helpers
-
-	private Class<?> getArrayComponentType() {
-		return getType().getComponentType();
-	}
-
-	@SuppressWarnings("unchecked")
-	private Class<?> getCollectionElementType() {
-		if (this.type != null) {
-			return GenericCollectionTypeResolver.getCollectionType((Class<? extends Collection>) this.type);
-		} else if (this.field != null) {
-			return GenericCollectionTypeResolver.getCollectionFieldType(this.field);
-		} else {
-			return GenericCollectionTypeResolver.getCollectionParameterType(this.methodParameter);
+	public String toString() {
+		if (this == TypeDescriptor.NULL) {
+			return "[TypeDescriptor.NULL]";
+		}
+		else {
+			StringBuilder builder = new StringBuilder();
+			builder.append("[TypeDescriptor ");
+			Annotation[] anns = getAnnotations();
+			for (Annotation ann : anns) {
+				builder.append("@").append(ann.annotationType().getName()).append(' ');
+			}
+			builder.append(getType().getName());
+			builder.append("]");
+			return builder.toString();
 		}
 	}
 
-	private boolean isTypeAssignableTo(Class<?> clazz) {
-		Class<?> type = getType();
-		return (type != null && ClassUtils.isAssignable(clazz, type));
-	}
 
 	// static factory methods
 
@@ -406,21 +441,5 @@ public static TypeDescriptor forObject(Object object) {
 	public static TypeDescriptor collection(Class<?> type, TypeDescriptor elementType) {
 		return new TypeDescriptor(type, elementType);
 	}
-	
-	public String toString() {
-		if (this == TypeDescriptor.NULL) {
-			return "[TypeDescriptor.NULL]";
-		} else {
-			StringBuilder builder = new StringBuilder();
-			builder.append("[TypeDescriptor ");
-			Annotation[] anns = getAnnotations();
-			for (Annotation ann : anns) {
-				builder.append("@" + ann.annotationType().getName()).append(' ');
-			}
-			builder.append(getType().getName());
-			builder.append("]");
-			return builder.toString();
-		}
-	}
-	
+
 }